Tweak module display and logic

src/Dodge/LockAndKey.hs

@@ -25,8 +25,8 @@ lockRoomMultiItems =
 lockRoomKeyItems :: RandomGen g => [(Int -> State g (MetaTree Room String), State g ItemBaseType)]
 lockRoomKeyItems =
     [ (lasCenSensEdge, takeOne [HELD LAUNCHER, HELD LASGUN, HELD SPARKGUN, HELD FLATSHIELD, HELD FORCEFIELDGUN])
-    , (sensorRoomRunPast ELECTRICAL, takeOne [CRAFT STATICMODULE, HELD SPARKGUN])
-    , (sensorRoomRunPast FLAMING, takeOne [HELD FLAMESPITTER, CRAFT INCENDIARYMODULE])
+    , (sensorRoomRunPast ELECTRICAL, takeOne [CRAFT (BULPAYLOADMODULE TeslaBall), HELD SPARKGUN])
+    , (sensorRoomRunPast FLAMING, takeOne [HELD FLAMESPITTER, CRAFT (BULPAYLOADMODULE IncBall)])
     , (sensorRoomRunPast LASERING, return $ HELD LASGUN)
     , (const slowDoorRoomRunPast, return $ HELD (MINIGUNX 3))
     , (const longRoomRunPast, takeOne [HELD SNIPERRIFLE, HELD FLATSHIELD])
@@ -107,17 +107,17 @@ itemRooms =
                 ]
         )
     ,
-        ( CRAFT INCENDIARYMODULE
+        ( CRAFT (BULPAYLOADMODULE IncBall)
         , join $
             takeOne
                 [ rc [incendiaryModule]
                 ]
         )
     ,
-        ( CRAFT STATICMODULE
+        ( CRAFT (BULPAYLOADMODULE TeslaBall)
         , join $
             takeOne
-                [ rc [makeTypeCraft STATICMODULE]
+                [ rc [makeTypeCraft (BULPAYLOADMODULE TeslaBall)]
                 ]
         )
     ]