Commit mid big tree composing change

src/Dodge/Room/Start.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE TupleSections #-}
 module Dodge.Room.Start where
+import Dodge.UseAll
 import Dodge.Data
 import Dodge.LevelGen.Data
 --import Dodge.PlacementSpot
@@ -29,7 +30,7 @@ import LensHelp
 --import Data.Tree
 --import qualified Data.IntMap.Strict as IM
 
-powerFakeout :: RandomGen g => State g (SubCompTree Room)
+powerFakeout :: RandomGen g => State g (Tree Room)
 powerFakeout = do
     ncor <- state $ randomR (0,2)
     it <- takeOne 
@@ -37,71 +38,72 @@ powerFakeout = do
         ,launcherX 7
         ]
     roomwithmini <- pedestalRoom it
-    randcors <- replicateM ncor $ (fmap PassDown . shuffleLinks) corridor
-    return $ ([PassDown door
-                ,PassDown roomwithmini 
-                ,PassDown door
+    randcors <- replicateM ncor $ shuffleLinks corridor
+    return $ ([ door
+                , roomwithmini 
+                , door
                 ] 
             ++ randcors
-            ++ [PassDown $ corridor & rmPmnts .:~ plRRpt 0 (PutFlIt shrinkGun)
-                ,PassDown keyholeCorridor,PassDown corridor])
-        `treeFromPost` UseAll door
+            ++ [ corridor & rmPmnts .:~ plRRpt 0 (PutFlIt shrinkGun)
+                , keyholeCorridor, corridor])
+        `treeFromPost` useAll door
 
-startRoom :: RandomGen g => Int -> State g (LabSubCompTree Room)
+startRoom :: RandomGen g => Int -> State g (LabTree Room)
 startRoom i = join (uncurry takeOneWeighted $ unzip 
-    [ (,) (0.5::Float) ((chainUses <$> sequence [powerFakeout,fmap fst $weaponRoom i]) 
-            <&> (,TreeSubLabelling "chainUses <$> sequence [powerFakeout,weaponRoom i]" Nothing))
-    , (,) one (rezBoxesWp <&> (,TreeSubLabelling "rezBoxesWp" Nothing))
+    [-- (,) (0.5::Float) ((chainUses <$> sequence [powerFakeout,fmap fst $weaponRoom i]) 
+     --       <&> (,TreeSubLabelling "chainUses <$> sequence [powerFakeout,weaponRoom i]" Nothing))
+     --     wat
+     (,) one (rezBoxesWp <&>      (toOnward "rezBoxesWp",))
     , (,) one (rezBoxThenWeaponRoom i)
-    , (,) one (rezBoxesWpCrit <&> (,TreeSubLabelling "rezBoxesWpCrit" Nothing))
-    , (,) one (runPastStart i <&> (,TreeSubLabelling ("runPastStart " ++ show i) Nothing))
+    , (,) one (rezBoxesWpCrit <&> (toOnward "rezBoxesWpCrit"))
+    , (,) one (runPastStart i <&> (toOnward ("runPastStart " ++ show i)))
     , (,) one (startCrafts >>= roomsContaining' [] >>= rezBoxThenRooms <&> 
-        (,TreeSubLabelling "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms" Nothing))
+        (toOnward "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms"))
     ])
     <&> over (_2 . topLabel) ("startRoom:"++)
   where
     roomsContaining' a b = fst <$> roomsContaining a b
     one = 1::Float
-randomChallenges :: RandomGen g => State g (LabSubCompTree Room)
+randomChallenges :: RandomGen g => State g (LabTree Room)
 randomChallenges = join (takeOne
-    [fmap (return . UseAll) doubleCorridorBarrels <&> (,TreeSubLabelling "doubleCorridorBarrels" Nothing)
+    [fmap (return . useAll) doubleCorridorBarrels <&> (,TreeSubLabelling "doubleCorridorBarrels" Nothing)
     ,shootingRange
-    ,fmap (return . UseAll) twinSlowDoorChasers <&> (,TreeSubLabelling "twinSlowDoorChasers" Nothing)
+    ,fmap (return . useAll) twinSlowDoorChasers <&> (,TreeSubLabelling "twinSlowDoorChasers" Nothing)
     ]) <&> over (_2 . topLabel) ("randomChallenges:"++)
 
-runPastStart :: RandomGen g => Int -> State g (SubCompTree Room)
+runPastStart :: RandomGen g => Int -> State g (Tree Room)
 runPastStart i = do
     s <- rezBoxStart
     rp <- runPastRoom i
-    return $ s `passUntilUseAll` [rp]
+    return $ s `passUntiluseAll` [rp]
 
-rezBoxStart :: RandomGen g => State g (SubCompTree Room)
+rezBoxStart :: RandomGen g => State g (Tree Room)
 rezBoxStart = do
     ls <- rezColor
-    return $ treeFromPost [PassDown $ rezBox ls] (UseAll door)
+    return $ treeFromPost [ rezBox ls] (useAll door)
 
-rezBoxesThenWeaponRoom :: RandomGen g => Int -> State g (SubCompTree Room,String)
+rezBoxesThenWeaponRoom :: RandomGen g => Int -> State g (Tree Room,String)
 rezBoxesThenWeaponRoom i = do
     rboxes <- rezBoxes
     wroom  <- fst <$> weaponRoom i
-    return (rboxes `passUntilUseAll` [wroom] , "rezBoxesThenWeaponRoom " ++ show i)
+    return (rboxes `passUntiluseAll` [wroom] , "rezBoxesThenWeaponRoom " ++ show i)
 
-rezBoxThenWeaponRoom :: RandomGen g => Int -> State g (LabSubCompTree Room)
+rezBoxThenWeaponRoom :: RandomGen g => Int -> State g (LabTree Room)
 rezBoxThenWeaponRoom i = do
     rcol <- rezColor
     (wroom,wroomname) <- weaponRoom i
-    return (treeFromTrunk [PassDown $ rezBox rcol,PassDown door] wroom
+    return (treeFromTrunk [ rezBox rcol, door] wroom
          , TreeSubLabelling ("rezBoxThenWeaponRoom "++ show i) (Just $ return wroomname))
 
-rezBoxThenRoom :: RandomGen g => Room -> State g (SubCompTree Room)
+rezBoxThenRoom :: RandomGen g => Room -> State g (Tree Room)
 rezBoxThenRoom r = do
     rcol <- rezColor
-    return $ treeFromTrunk [PassDown $ rezBox rcol,PassDown door] $ singleUseAll r
+    return $ treeFromTrunk [ rezBox rcol, door] $ pure r
 
-rezBoxThenRooms :: RandomGen g => SubCompTree Room -> State g (SubCompTree Room)
+rezBoxThenRooms :: RandomGen g => Tree Room -> State g (Tree Room)
 rezBoxThenRooms r = do
     rcol <- rezColor
-    return . treeFromTrunk [PassDown $ rezBox rcol,PassDown door] $ r
+    return . treeFromTrunk [ rezBox rcol, door] $ r
 
 startCrafts :: RandomGen g => State g [Item]
 startCrafts = takeOne $ map (map makeTypeCraft)