Tweak longRoom

src/Dodge/Room/Start.hs

@@ -50,13 +50,12 @@ powerFakeout = do
 
 startRoom :: RandomGen g => Int -> State g (SubCompTree Room)
 startRoom i = join $ uncurry takeOneWeighted $ unzip 
---    [ (,) (0.5::Float) $ chainUses <$> sequence [powerFakeout,weaponRoom]
---    , (,) one rezBoxesWp
---    , (,) one rezBoxesThenWeaponRoom
-    [ (,) one rezBoxThenWeaponRoom
---    , (,) one rezBoxesWpCrit
---    , (,) 1 $ runPastStart i
---    , (,) 1 $ startCrafts >>= roomsContaining [] >>= rezBoxThenRooms
+    [ (,) (0.5::Float) $ chainUses <$> sequence [powerFakeout,weaponRoom i]
+    , (,) one rezBoxesWp
+    , (,) one (rezBoxThenWeaponRoom i)
+    , (,) one rezBoxesWpCrit
+    , (,) 1 $ runPastStart i
+    , (,) 1 $ startCrafts >>= roomsContaining [] >>= rezBoxThenRooms
     ]
   where
     one = 1::Float
@@ -78,16 +77,16 @@ rezBoxStart = do
     ls <- rezColor
     return $ treeFromPost [PassDown $ rezBox ls] (UseAll door)
 
-rezBoxesThenWeaponRoom :: RandomGen g => State g (SubCompTree Room)
-rezBoxesThenWeaponRoom = do
+rezBoxesThenWeaponRoom :: RandomGen g => Int -> State g (SubCompTree Room)
+rezBoxesThenWeaponRoom i = do
     rboxes <- rezBoxes
-    wroom  <- weaponRoom
+    wroom  <- weaponRoom i
     return $ rboxes `passUntilUseAll` [wroom]
 
-rezBoxThenWeaponRoom :: RandomGen g => State g (SubCompTree Room)
-rezBoxThenWeaponRoom = do
+rezBoxThenWeaponRoom :: RandomGen g => Int -> State g (SubCompTree Room)
+rezBoxThenWeaponRoom i = do
     rcol <- rezColor
-    treeFromTrunk [PassDown $ rezBox rcol,PassDown door] <$> weaponRoom
+    treeFromTrunk [PassDown $ rezBox rcol,PassDown door] <$> weaponRoom i
 
 rezBoxThenRoom :: RandomGen g => Room -> State g (SubCompTree Room)
 rezBoxThenRoom r = do