Tweak drawing order, text now blocks window shadows

src/Dodge/Rooms.hs

@@ -48,6 +48,7 @@ lev1 = do
 --            [randomiseLinks =<< pistolerRoom] 
             [return $ return $ Right deadEndRoom
             ]
+            ++ [roomMiniIntro]
             ++ [return $ connectRoom corridor
                ,return $ connectRoom door]
 --            ++ [randomiseLinks =<< longRoom]
@@ -342,9 +343,11 @@ glassLesson = do
               botplmnts = [PS (0,0) 0 $ PutWindow (rectNSWE (200) 0 (90) (110)) 
                                       $ withAlpha 0.5 aquamarine
                           ,PS (50,100) 0 $ PutCrit miniGunCrit
+                          ,PS (50,50) 0 basicLS
                           ]
               topplmnts = [PS (0,0) 0 $ PutWindowBlock (100,200) (100,0) 
                           ,PS (50,100) 0 $ PutCrit miniGunCrit
+                          ,PS (50,50) 0 basicLS
                           ]
 
 miniRoom1 :: RandomGen g => State g Room
@@ -689,6 +692,7 @@ slowDoorRoom = do
      xs' <- sequence $ replicate 5 $ state $ randomR (10,x-10)
      ys' <- sequence $ replicate 5 $ state $ randomR (h+20,y)
      let crits = zipWith (\p r -> PS p r randC1) ps rs
+         lsources = [PS (x/2,30) 0 basicLS, PS (x/2,y-30) 0 basicLS]
      let barrels = zipWith (\x y -> PS (x,y) 0 $ PutCrit explosiveBarrel) xs' ys'
      let pillarsa = []
      let pillarsb = putBlockRect (x/5-20) (x/5+20) (h/2-20) (h/2+20)
@@ -704,7 +708,7 @@ slowDoorRoom = do
                   --  ,PutSwitchDoor (dim $ light red) butPos butRot (0,h) (x,h)
                     ]
      fmap connectRoom (filterLinks cond =<< (changeLinkTo cond2
-                                             $ set rmPS ([PS (0,0) 0 but] ++ crits ++ pillars ++ barrels) 
+                                             $ set rmPS ([PS (0,0) 0 but] ++ crits ++ pillars ++ barrels ++ lsources) 
                                              $ roomRect x y
                                              ))
 longRoom :: RandomGen g => State g Room
@@ -877,6 +881,7 @@ spawnerRoom = do
         let plmnts = [PS (x/4, y/4) (pi/2) $ PutCrit spawnerCrit
                   --   ,PS (0,0) 0 $ PutWindowBlock (x/2,0) (x/2,y-60)
                      ,wl
+                     ,PS (x/2, y-10) 0 basicLS
                      ]
         let f ((lx,_),_) = lx < x/2-5 
         roomWithSpawner <- randomiseLinks =<< (filterLinks f $ set rmPS plmnts $ roomRect' x y 2 2)