Move toward better info display during level generation

2021-11-10 23:40:04 +00:00
parent 9aefc11e17
commit a195157e54
13 changed files with 122 additions and 118 deletions
@@ -22,6 +22,7 @@ import Dodge.Layout.Tree.Shift
 import Dodge.Creature
 import Dodge.LevelGen.Data
 import Dodge.Item.Weapon.Launcher
+import MonadHelp

 import Control.Lens
 import Control.Monad.State
@@ -34,21 +35,18 @@ initialRoomTree = do
    let t' = padCorridors struct
        t = treeFromTrunk 
            [[StartRoom]
+            ,[SpecificRoom spawnerRoom]
            ,[Corridor]
            ,[Corridor]
-            ,[SpecificRoom $ fmap connectRoom pistolerRoom]
            ,[Corridor]
            ,[Corridor]
--            ,[Corridor]
--            ,[Corridor]
--            ,[Corridor]
            ,[SpecificRoom $ return $ connectRoom lasTunnel ]
            ,[Corridor]
            ,[SpecificRoom $ fmap connectRoom slowDoorRoom ]
            ,[Corridor]
            ,[Corridor]
            ,[Corridor]
-            ,[SpecificRoom roomCCrits]
+            ,[SpecificRoom $ fmap connectRoom roomCCrits]
            ,[Corridor]
            ,[AirlockAno]
            ,[Corridor]
@@ -99,5 +97,7 @@ initialRoomTree = do
            t'
    shiftExpandTree . expandTreeBy id <$> mapM annoToRoomTree t

-levx :: RandomGen g => Int -> State g [Room]
-levx _ = untilJust initialRoomTree
+levx :: RandomGen g => Int -> State g ([Room] , Int)
+levx _ = untilJustCount initialRoomTree
+
+