Implement terminals

src/Dodge/LockAndKey.hs

@@ -14,11 +14,14 @@ import Control.Monad.State
 
 lockRoomKeyItems :: RandomGen g => [ (Int -> State g (SubCompTree Room) , State g CombineType ) ]
 lockRoomKeyItems = 
-    [(lasCenSensEdge, takeOne [LAUNCHER,LASGUN,SPARKGUN,FLATSHIELD] )
-    ,(const slowDoorRoomRunPast, return MINIGUN)
-    ,(const longRoomRunPast, takeOne [SNIPERRIFLE,FLATSHIELD])
-    ,(const glassLessonRunPast, takeOne [LASGUN])
-    ,(const $ lasTunnelRunPast 400, return FLATSHIELD)
+    --[(lasCenSensEdge, takeOne [LAUNCHER,LASGUN,SPARKGUN,FLATSHIELD] )
+    --,(sensorRoomRunPast Electrical, return SPARKGUN )
+    [(sensorRoomRunPast Flaming, return FLAMESTICK )
+--    ,(sensorRoomRunPast Lasering, return LASGUN )
+--    ,(const slowDoorRoomRunPast, return MINIGUN)
+--    ,(const longRoomRunPast, takeOne [SNIPERRIFLE,FLATSHIELD])
+--    ,(const glassLessonRunPast, takeOne [LASGUN])
+--    ,(const $ lasTunnelRunPast 400, return FLATSHIELD)
     ]
 
 itemRooms :: RandomGen g => [(CombineType, State g (SubCompTree Room))]
@@ -30,13 +33,17 @@ itemRooms =
       )
     , (MINIGUN  , join $ takeOne [roomMiniIntro, minigunFakeout] )
     , (LASGUN   , join $ takeOne 
-        [rc $ map makeTypeCraft [PRISM,PIPE,PIPE,HARDWARE]
+        [rc $ map makeTypeCraft [PRISM,TRANSFORMER,PIPE]
         ]
       )
     , (SPARKGUN   , join $ takeOne 
         [rc $ map makeTypeCraft [TRANSFORMER,CAN,CAN]
         ]
       )
+    , (FLAMESTICK   , join $ takeOne 
+        [rc $ map makeTypeCraft [LIGHTER,PUMP,CAN]
+        ]
+      )
     , (FLATSHIELD   , join $ takeOne 
         [rc $ map makeTypeCraft [PLATE,PLATE]
         ,rc $ map makeTypeCraft [DRUM,DRUM,PLATE]