Minor changes, commit before playing with creature update

This commit is contained in:
2021-08-17 22:54:44 +02:00
parent 4b7562521c
commit a283bb286a
2 changed files with 11 additions and 20 deletions
+3 -10
View File
@@ -42,10 +42,8 @@ twinSlowDoorRoom drID w h x = defaultRoom
[ sPS (V2 0 (h/2)) 0 putLamp
, sPS (V2 25 5) 0 putLamp
, sPS (V2 (negate 25) 5) 0 putLamp
--, sPS (V2 0 0) 0 $ PutDoor col (not . cond) drL
--, sPS (V2 0 0) 0 $ PutDoor col (not . cond) drR
, sPS (V2 0 0) 0 $ PutSingleDoor col cond (V2 x 0) (V2 x h)
, sPS (V2 0 0) 0 $ PutSingleDoor col cond (V2 (-x) 0) (V2 (-x) h)
, sPS (V2 0 0) 0 $ PutSingleDoor col cond (V2 x 1) (V2 x h)
, sPS (V2 0 0) 0 $ PutSingleDoor col cond (V2 (-x) 1) (V2 (-x) h)
, sPS (V2 0 (h-5)) pi $ PutButton $ makeButton col
(over worldState (M.insert (DoorNumOpen drID) True))
]
@@ -53,14 +51,9 @@ twinSlowDoorRoom drID w h x = defaultRoom
}
where
ps =
[rectNSWE h (-2) (-w) w
[rectNSWE h 0 (-w) w
,rectNSWE 20 (-h) (negate x) x
]
drL = fmap ((\h' -> (V2 x (-h'),V2 x (h-h'))) . (* h) . (/ fromIntegral nDrp) . fromIntegral)
[0..nDrp]
drR = fmap ((\h' -> (V2 (-x) (-h'),V2 (-x) (h-h'))) . (* h) . (/ fromIntegral nDrp) . fromIntegral)
[0..nDrp]
nDrp = ceiling h :: Int
cond w' = or $ M.lookup (DoorNumOpen drID) (_worldState w')
col = dim $ dim $ bright red