Cleanup

src/Dodge/Room/Start.hs

@@ -3,7 +3,7 @@ module Dodge.Room.Start
     ( startRoom
     , randomChallenges
     ) where
-import Dodge.UseAll
+import Dodge.Cleat
 import Dodge.Data
 import Dodge.LevelGen.Data
 --import Dodge.PlacementSpot
@@ -82,38 +82,19 @@ rezBoxStart = do
     ls <- rezColor
     return $ treePost [ rezBox ls, cleatOnward door ]
 
-rezBoxesThenWeaponRoom :: RandomGen g => Int -> State g (MetaTree Room String)
-rezBoxesThenWeaponRoom i = do
-    rboxes <- rezBoxes
-    wroom  <- weaponRoom i
-    return $ attachOnward "rezBoxesThenWeaponRoom" rboxes wroom
-
 preCritStart :: RandomGen g => State g (MetaTree Room String)
 preCritStart = join $ takeOneWeighted 
-    [10,10,(1::Float)]
+    [10,10,1::Float]
     [rezBoxes
     ,rezBox'
     ,attachOnward "rezBoxPowerFakeout" <$> rezBox' <*> powerFakeout'
     ]
 
-startThenWeaponRoom :: RandomGen g => Int -> State g (MetaTree Room String)
-startThenWeaponRoom i = do
-    startrm <- preCritStart
-    wroom <- weaponRoom i
-    return $ attachOnward "rezBoxThenWeaponRoom" startrm wroom
-
-rezBoxThenRoom :: RandomGen g => Room -> State g (Tree Room)
-rezBoxThenRoom r = do
-    rcol <- rezColor
-    return $ treeFromTrunk [ rezBox rcol, cleatOnward door] $ pure r
-
-rezBoxThenRooms :: RandomGen g => Tree Room -> State g (Tree Room)
-rezBoxThenRooms r = do
-    rcol <- rezColor
-    return . treeFromTrunk [ rezBox rcol, door] $ r
-
 startCrafts :: RandomGen g => State g [Item]
 startCrafts = takeOne $ map (map makeTypeCraft)
     [ [PIPE,PIPE,HARDWARE]
     , [TUBE,PIPE,HARDWARE]
+    , [PIPE,HARDWARE,HARDWARE]
+    , [TUBE,TUBE,HARDWARE]
+    , [TUBE,HARDWARE,HARDWARE]
     ]