Make buttons have shape, expose multiple bugs

2021-09-27 12:28:53 +01:00
parent d9ad55ec50
commit 743c1c878d
19 changed files with 157 additions and 71 deletions
@@ -15,6 +15,7 @@ import Dodge.LevelGen.Switch
 import Dodge.RandomHelp
 import Dodge.Creature.Inanimate
 import Dodge.Creature
+import Dodge.LightSources
 import Picture
 import Geometry

@@ -44,14 +45,17 @@ twinSlowDoorRoom drID w h x = defaultRoom
        , sPS (V2 (negate 25) 5) 0 putLamp
        , sPS (V2 0 0) 0 $ PutSingleDoor col cond (V2   x  1) (V2   x  h) 1
        , sPS (V2 0 0) 0 $ PutSingleDoor col cond (V2 (-x) 1) (V2 (-x) h) 1
-        , sPS (V2 0 (h-5)) pi $ PutButton $ makeSwitch col 
+        , sPS (V2 0 (h-5)) pi $ PutButton $ makeSwitch col red
            (over worldState (M.insert (DoorNumOpen drID) True))
            (over worldState (M.insert (DoorNumOpen drID) False))
+--        , sPS (V2 0 (h-1)) 0 $ PutLS (colorLightAt (V3 0.75 0 0) (V3 0 0 lampHeight) 0) (lampPic lampHeight)
+--        , sPS (V2 0 (h-1)) 0 $ PutProp $ lampCover lampHeight
        ]
    , _rmBound  = ps
    , _rmName   = "twinSlowDoorRoom"
    }
  where
+    lampHeight = 41
    ps = 
        [rectNSWE h    0 (-w) w
        ,rectNSWE 20 (-h) (negate x) x