Cleanup

src/Dodge/Room/Start.hs

@@ -1,4 +1,4 @@
---{-# LANGUAGE TupleSections #-}
+{-# LANGUAGE TupleSections #-}
 module Dodge.Room.Start where
 import Dodge.UseAll
 import Dodge.Data
@@ -53,12 +53,12 @@ startRoom i = join (takeOne
     [-- (,) (0.5::Float) ((chainUses <$> sequence [powerFakeout,fmap fst $weaponRoom i]) 
      --       <&> (,TreeSubLabelling "chainUses <$> sequence [powerFakeout,weaponRoom i]" Nothing))
      --     wat
-      rezBoxesWp                >>= rToOnward "rezBoxesWp"
-    , rezBoxThenWeaponRoom i
-    , rezBoxesWpCrit            >>= rToOnward "rezBoxesWpCrit"
-    , runPastStart i            >>= rToOnward ("runPastStart " ++ show i)
-    , startCrafts >>= roomsContaining' [] >>= rezBoxThenRooms
-        >>= rToOnward "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms"
+--      rezBoxesWp                >>= rToOnward "rezBoxesWp"
+--    , rezBoxThenWeaponRoom i
+--    , rezBoxesWpCrit            >>= rToOnward "rezBoxesWpCrit"
+     runPastStart i            >>= rToOnward ("runPastStart " ++ show i)
+--    , startCrafts >>= roomsContaining' [] >>= rezBoxThenRooms
+--        >>= rToOnward "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms"
     ])
 randomChallenges :: RandomGen g => State g (LabTree Room)
 randomChallenges = shootingRange
@@ -72,7 +72,10 @@ runPastStart :: RandomGen g => Int -> State g (Tree Room)
 runPastStart i = do
     s <- rezBoxStart
     rp <- runPastRoom i
-    return $ s `passUntiluseAll` [rp]
+    --return $ s `passUntiluseAll` [rp]
+    return . shiftChildren $ attachTree toOnward' rp $ fmap ([],) s
+--    return . shiftChildren $ attachTree toOnward' (pure $ useAll corridor) $ fmap ([],) s
+    
 
 rezBoxStart :: RandomGen g => State g (Tree Room)
 rezBoxStart = do