Redo tree composition

src/Dodge/Room/Start.hs

@@ -49,27 +49,27 @@ powerFakeout = do
         `treeFromPost` useAll door
 
 startRoom :: RandomGen g => Int -> State g (LabTree Room)
-startRoom i = join (uncurry takeOneWeighted $ unzip 
+startRoom i = join (takeOne $ 
     [-- (,) (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 <&> (toOnward "rezBoxesWpCrit"))
-    , (,) one (runPastStart i <&> (toOnward ("runPastStart " ++ show i)))
-    , (,) one (startCrafts >>= roomsContaining' [] >>= rezBoxThenRooms <&> 
-        (toOnward "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms"))
+      (rezBoxesWp <&>      (toOnward "rezBoxesWp",))
+    , (rezBoxThenWeaponRoom i)
+    , (rezBoxesWpCrit <&> (toOnward "rezBoxesWpCrit",))
+    , (runPastStart i <&> (toOnward ("runPastStart " ++ show i),))
+--    , ((startCrafts >>= roomsContaining' [] >>= rezBoxThenRooms) <&> 
+--        (toOnward "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms",))
     ])
-    <&> over (_2 . topLabel) ("startRoom:"++)
   where
     roomsContaining' a b = fst <$> roomsContaining a b
     one = 1::Float
 randomChallenges :: RandomGen g => State g (LabTree Room)
-randomChallenges = join (takeOne
-    [fmap (return . useAll) doubleCorridorBarrels <&> (,TreeSubLabelling "doubleCorridorBarrels" Nothing)
-    ,shootingRange
-    ,fmap (return . useAll) twinSlowDoorChasers <&> (,TreeSubLabelling "twinSlowDoorChasers" Nothing)
-    ]) <&> over (_2 . topLabel) ("randomChallenges:"++)
+randomChallenges = shootingRange
+--        join (takeOne
+--    [fmap (return . useAll) doubleCorridorBarrels <&> (,TreeSubLabelling "doubleCorridorBarrels" Nothing)
+--    ,shootingRange
+--    ,fmap (return . useAll) twinSlowDoorChasers <&> (,TreeSubLabelling "twinSlowDoorChasers" Nothing)
+--    ]) -- <&> over (_2 . topLabel) ("randomChallenges:"++)
 
 runPastStart :: RandomGen g => Int -> State g (Tree Room)
 runPastStart i = do
@@ -85,15 +85,16 @@ rezBoxStart = do
 rezBoxesThenWeaponRoom :: RandomGen g => Int -> State g (Tree Room,String)
 rezBoxesThenWeaponRoom i = do
     rboxes <- rezBoxes
-    wroom  <- fst <$> weaponRoom i
+    wroom  <- snd <$> weaponRoom i
     return (rboxes `passUntiluseAll` [wroom] , "rezBoxesThenWeaponRoom " ++ show i)
 
 rezBoxThenWeaponRoom :: RandomGen g => Int -> State g (LabTree Room)
 rezBoxThenWeaponRoom i = do
     rcol <- rezColor
-    (wroom,wroomname) <- weaponRoom i
-    return (treeFromTrunk [ rezBox rcol, door] wroom
-         , TreeSubLabelling ("rezBoxThenWeaponRoom "++ show i) (Just $ return wroomname))
+    (_,wroom) <- weaponRoom i
+    return (toOnward ("rezBoxThenWeaponRoom "++ show i)
+        , treeFromTrunk [ rezBox rcol, door] wroom
+        )
 
 rezBoxThenRoom :: RandomGen g => Room -> State g (Tree Room)
 rezBoxThenRoom r = do