Fix---at least partially---level generation bug

src/Dodge/Floor.hs

@@ -8,6 +8,7 @@ import Picture
 
 import Dodge.Data
 import Dodge.Rooms
+import Dodge.Room.Data
 import Dodge.Base
 import Dodge.Layout
 import Dodge.Creature
@@ -32,44 +33,44 @@ lev1 = do
             (
             [return $ return $ Right deadEndRoom
             ]
-            ++ [return $ connectRoom corridor
-               ,return $ connectRoom door
-               ,glassSwitchBack >>= randomiseLinks]
-            ++ [return $ connectRoom corridor
-               ,return $ connectRoom door]
-            ++ [miniRoom3]
-            ++ [return $ connectRoom corridor
-               ,return $ connectRoom door]
-            ++ [roomCCrits]
-            ++ [return $ connectRoom corridor
-               ,return $ connectRoom door]
-            ++[roomMiniIntro]
-            ++ [longRoom >>= randomiseLinks]
-            ++ [return $ connectRoom corridor
-               ,return $ connectRoom door]
+--            ++ [return $ connectRoom corridor
+--               ,return $ connectRoom door
+--               ,glassSwitchBack >>= randomiseLinks]
+--            ++ [return $ connectRoom corridor
+--               ,return $ connectRoom door]
+--            ++ [miniRoom3]
+--            ++ [return $ connectRoom corridor
+--               ,return $ connectRoom door]
+--            ++ [roomCCrits]
+--            ++ [return $ connectRoom corridor
+--               ,return $ connectRoom door]
+--            ++[roomMiniIntro]
+--            ++ [longRoom >>= randomiseLinks]
+--            ++ [return $ connectRoom corridor
+--               ,return $ connectRoom door]
             ++ firstWeapon
-            ++ [return $ connectRoom corridor
-               ,return $ connectRoom door]
-            ++ [randomiseLinks =<< pistolerRoom]
-            ++ [return $ connectRoom door]
-             ++ [randomiseLinks =<< shooterRoom]
-             ++ (replicate 3 $ randomiseLinks corridor)
-            ++ [return $ connectRoom (set rmPS [PS (20,40) 0 basicLS] corridor)]
-            ++ [return $ connectRoom corridor]
-             ++ (replicate 3 $ randomiseLinks corridor)
-            ++ [return $ connectRoom corridor]
-            ++[return $ connectRoom corridor,return $ connectRoom door]
-            ++ [shootingRange]
-               ++ (replicate 3 $ randomiseLinks corridor)
-              ++[roomMiniIntro]
-               ++ (replicate 3 $ randomiseLinks corridor)
-              ++ [return $ connectRoom corridor
-                 ,return $ connectRoom door
-                 ,slowDoorRoom]
-            ++ [return $ connectRoom corridor
-               ,spawnerRoom
-               ,return $ connectRoom corridor
-               ]
+--            ++ [return $ connectRoom corridor
+--               ,return $ connectRoom door]
+--            ++ [randomiseLinks =<< pistolerRoom]
+--            ++ [return $ connectRoom door]
+--             ++ [randomiseLinks =<< shooterRoom]
+--             ++ (replicate 3 $ randomiseLinks corridor)
+--            ++ [return $ connectRoom (set rmPS [PS (20,40) 0 basicLS] corridor)]
+--            ++ [return $ connectRoom corridor]
+--             ++ (replicate 3 $ randomiseLinks corridor)
+--            ++ [return $ connectRoom corridor]
+--            ++[return $ connectRoom corridor,return $ connectRoom door]
+--            ++ [shootingRange]
+--               ++ (replicate 3 $ randomiseLinks corridor)
+--              ++[roomMiniIntro]
+--               ++ (replicate 3 $ randomiseLinks corridor)
+--              ++ [return $ connectRoom corridor
+--                 ,return $ connectRoom door
+--                 ,slowDoorRoom]
+--            ++ [return $ connectRoom corridor
+--               ,spawnerRoom
+--               ,return $ connectRoom corridor
+--               ]
             )
             $ randomiseLinks corridor