Delete cruft, add Reader monad to some internal ai

src/Dodge/Floor.hs

@@ -40,8 +40,7 @@ import Control.Lens
 import Control.Monad.State
 import Control.Monad.Loops
 import System.Random
-{- |
-A test level tree. -}
+{- | A test level tree. -}
 roomTreex :: RandomGen g => State g (Maybe [Room])
 roomTreex = do
     struct' <- aTreeStrut
@@ -51,16 +50,19 @@ roomTreex = do
         t = treeFromTrunk 
             [[StartRoom]
             ,[Corridor]
+            ,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400 
+                & rmPS %~ ([sPS (0,50) 0 $ PutCrit chaseCrit ]++)
+             ]
+            ,[Corridor]
             ,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400 
                 & rmPS %~ ([swarmPS 0 (x,y) 0 swarmCrit | x <- [-20,-19.5.. 20] , y <- [200] ]++)
              ]
             ,[Corridor]
             ,[Corridor]
-            ,[SpecificRoom . fmap (pure . Right) $ twinSlowDoorChasers 30]
+            ,[SpecificRoom $ pure . Right <$> twinSlowDoorChasers 30]
             ,[Corridor]
             ,[DoorAno]
-            ,[SpecificRoom $ fmap (pure . Right) 
-                $ centerVaultExplosiveExit 50]
+            ,[SpecificRoom $ pure . Right <$> centerVaultExplosiveExit 50]
             ,[SpecificRoom blockedCorridor]
             ,[OrAno [[DoorAno]
                     ,[Corridor]
@@ -82,8 +84,7 @@ roomTreex = do
             ,[TreasureAno [addArmour autoCrit,addArmour autoCrit] [launcher]]
             ] 
             t'
-    fmap (shiftExpandTree . expandTreeBy id) $ mapM annoToRoomTree t
+    shiftExpandTree . expandTreeBy id <$> mapM annoToRoomTree t
 
 levx :: RandomGen g => State g [Room]
 levx = untilJust roomTreex
-