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
@@ -6,7 +6,7 @@ import Dodge.LevelGen.Data
 --import Dodge.PlacementSpot
 import Dodge.Room.RunPast
 import Dodge.Room.Containing
-import Dodge.Room.LongDoor
+--import Dodge.Room.LongDoor
 --import Dodge.RoomLink
 --import Dodge.Data
 --import Dodge.Default
@@ -49,20 +49,17 @@ powerFakeout = do
         `treeFromPost` useAll door
 
 startRoom :: RandomGen g => Int -> State g (LabTree Room)
-startRoom i = join (takeOne $ 
+startRoom i = join (takeOne
     [-- (,) (0.5::Float) ((chainUses <$> sequence [powerFakeout,fmap fst $weaponRoom i]) 
      --       <&> (,TreeSubLabelling "chainUses <$> sequence [powerFakeout,weaponRoom i]" Nothing))
      --     wat
-      (rezBoxesWp <&>      (toOnward "rezBoxesWp",))
-    , (rezBoxThenWeaponRoom i)
-    , (rezBoxesWpCrit <&> (toOnward "rezBoxesWpCrit",))
-    , (runPastStart i <&> (toOnward ("runPastStart " ++ show i),))
---    , ((startCrafts >>= roomsContaining' [] >>= rezBoxThenRooms) <&> 
---        (toOnward "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms",))
+      rezBoxesWp                >>= rToOnward "rezBoxesWp"
+    , rezBoxThenWeaponRoom i
+    , rezBoxesWpCrit            >>= rToOnward "rezBoxesWpCrit"
+    , runPastStart i            >>= rToOnward ("runPastStart " ++ show i)
+    , startCrafts >>= roomsContaining' [] >>= rezBoxThenRooms
+        >>= rToOnward "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms"
     ])
-  where
-    roomsContaining' a b = fst <$> roomsContaining a b
-    one = 1::Float
 randomChallenges :: RandomGen g => State g (LabTree Room)
 randomChallenges = shootingRange
 --        join (takeOne