Automatically order placements

src/Dodge/LockAndKey.hs

@@ -1,5 +1,6 @@
 module Dodge.LockAndKey where
 
+import Dodge.Item.Ammo
 import Dodge.Cleat
 import Dodge.Creature
 import Dodge.Data.GenWorld
@@ -24,7 +25,7 @@ lockRoomMultiItems =
 
 lockRoomKeyItems :: [(Int -> State LayoutVars (MetaTree Room String), State LayoutVars ItemType)]
 lockRoomKeyItems =
-    [ (lasCenSensEdge, takeOne [ HELD FLATSHIELD])
+    [ (lasCenSensEdge, takeOne [LASER,HELD TESLACOIL, HELD FLATSHIELD])
 --    [ (lasCenSensEdge, takeOne [HELD RLAUNCHER, LASER, HELD SPARKGUN, HELD FLATSHIELD])
 --    , (sensorRoomRunPast LaserSensor, return LASER)
 --    , (const slowDoorRoomRunPast, return $ HELD (MINIGUNX 3))
@@ -59,14 +60,15 @@ itemRooms =
         ( LASER
         , join $
             takeOne
-                [ rc $ map makeTypeCraft [PRISM, TRANSFORMER, PIPE]
+                [ rc $ battery : map makeTypeCraft [PRISM, TRANSFORMER, PIPE, TRANSFORMER]
+                , rc $ battery : laser : [makeTypeCraft TRANSFORMER]
                 ]
         )
     ,
-        ( HELD SPARKGUN
+        ( HELD TESLACOIL
         , join $
             takeOne
-                [ rc $ map makeTypeCraft [TRANSFORMER, CAN, CAN]
+                [ rc (battery : map makeTypeCraft [TRANSFORMER, CAN, CAN])
                 ]
         )
     ,