diff --git a/src/Dodge/Room/Airlock.hs b/src/Dodge/Room/Airlock.hs index 3d483c16a..c3f7915f9 100644 --- a/src/Dodge/Room/Airlock.hs +++ b/src/Dodge/Room/Airlock.hs @@ -113,7 +113,8 @@ airlock90 = defaultRoom , _rmPmnts = [pContID (PS (V2 120 120) (3 * pi/4)) (PutButton $ makeSwitch col red id id) $ \btid -> jsps (V2 5 5) 0 $ PutDoor col (cond btid) pss - ,mntLS vShape (V2 20 20) (V3 70 70 50) + --,mntLS vShape (V2 20 20) (V3 70 70 50) + ,mntLS vShape (V2 35 35) (V3 70 70 50) ] , _rmBound = [map toV2 [ (10,10) diff --git a/src/Dodge/Room/Start.hs b/src/Dodge/Room/Start.hs index f507bfcd2..e13f2c850 100644 --- a/src/Dodge/Room/Start.hs +++ b/src/Dodge/Room/Start.hs @@ -57,10 +57,11 @@ startRoom i = join (takeOne -- <&> (,TreeSubLabelling "chainUses <$> sequence [powerFakeout,weaponRoom i]" Nothing)) -- wat -- rezBoxesWp >>= rToOnward "rezBoxesWp" - attachOnward "rezBoxThenWeaponRoom" <$> preCritStart <*> weaponRoom i +-- attachOnward "startThenWeaponRoom" <$> preCritStart <*> weaponRoom i -- startThenWeaponRoom i -- rezBoxesWpCrit >>= rToOnward "rezBoxesWpCrit" -- runPastStart i >>= rToOnward ("runPastStart " ++ show i) + attachOnward "startThenCraft" <$> preCritStart <*> (startCrafts >>= roomsContaining []) -- startCrafts >>= roomsContaining' [] >>= preCritStart -- >>= rToOnward "startCrafts >>= roomsContaining [] >>= preCritStart" ])