Cleanup

src/Dodge/Room/Breather.hs

@@ -1,42 +1,21 @@
 module Dodge.Room.Breather where
---import Dodge.Cleat
-import Dodge.Combine.Data
-import Dodge.Data
---import Dodge.PlacementSpot
---import Dodge.RoomLink
---import Dodge.Default.Room
-import Dodge.Item
---import Dodge.Creature
---import Dodge.Room.Pillar
---import Dodge.Room.Girder
---import Dodge.Room.Modify.Girder
---import Dodge.LevelGen.Data
-import RandomHelp
-import Dodge.Tree
---import Dodge.Placement.Instance
---import Dodge.LevelGen.Data
---import Dodge.Room.Procedural
---import Dodge.Room.Corridor
---import Dodge.Room.Tanks
---import Dodge.Room.Link
---import Dodge.Room.Door
---import Dodge.Room.Airlock
-import Dodge.Room.Containing
---import Geometry
---import MonadHelp
---import LensHelp
 
---import qualified Data.Set as S
+import Dodge.Data
+import Dodge.Item
+import Dodge.Room.Containing
+import Dodge.Tree
+import RandomHelp
 
 firstBreather :: State StdGen (MetaTree Room String)
 firstBreather = do
-    itms <- takeOne 
-        [[itemFromBase $ CRAFT TUBE]
-        ,[itemFromBase $ CRAFT PIPE]
-        ,[itemFromBase $ CRAFT HARDWARE]
-        ,[itemFromBase $ CRAFT CAN]
-        ,[itemFromBase $ CRAFT TIN]
-        ,[itemFromBase $ CRAFT PLANK]
-        ,[itemFromBase $ CRAFT DRUM]
-        ]
+    itms <-
+        takeOne
+            [ [itemFromBase $ CRAFT TUBE]
+            , [itemFromBase $ CRAFT PIPE]
+            , [itemFromBase $ CRAFT HARDWARE]
+            , [itemFromBase $ CRAFT CAN]
+            , [itemFromBase $ CRAFT TIN]
+            , [itemFromBase $ CRAFT PLANK]
+            , [itemFromBase $ CRAFT DRUM]
+            ]
     roomsContaining [] itms

src/Dodge/Room/LasTurret.hs

@@ -65,7 +65,7 @@ keyCardRoomRunPast keyid rmid = do
         ]
 
 keyCardAnalyserByDoor :: Int -> Int -> Room -> Room
-keyCardAnalyserByDoor keyid = analyserByDoor (RequireEquipment (KEYCARD keyid))
+keyCardAnalyserByDoor keyid = analyserByDoor (RequireEquipment (HELD (KEYCARD keyid)))
 
 healthAnalyserByDoor :: Int -> Room -> Room
 healthAnalyserByDoor = analyserByDoor (RequireHealth 1100)