Cleanup

src/Dodge/Combine/Combinations.hs

@@ -81,14 +81,29 @@ itemCombinations =
     , p [p 2 $ cr DRUM] plateCraft
 
     , p [p 2 $ cr PLATE] flatShield
+    
+    , po [cr MICROCHIP, cr PRISM] (makeTypeCraft LIGHTSENSOR)
+    , po [cr MICROCHIP, cr MAGNET] (makeTypeCraft SOUNDSENSOR)
+    , po [cr MICROCHIP, cr THERMOMETER] (makeTypeCraft HEATSENSOR)
+
+    , po [cr MICROCHIP, cr TRANSMITTER, cr LIGHTSENSOR] (autoDetector ITEMDETECTOR)
+    , po [cr MICROCHIP, cr TRANSMITTER, cr SOUNDSENSOR] (autoDetector WALLDETECTOR)
+    , po [cr MICROCHIP, cr TRANSMITTER, cr HEATSENSOR]  (autoDetector CREATUREDETECTOR)
+    
+    , po [cr BATTERY, cr LED] torch
+
+    , po [hd TORCH, eq HAT] headLamp
+
+    , po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (makeTypeCraft INCENDIARYMODULE)
+    , po [cr TRANSFORMER, cr BATTERY, cr MICROCHIP] (makeTypeCraft STATICMODULE)
     ] 
     ++ map (\i -> po [HELD (LASWIDE i),cr TRANSFORMER] $ lasWide (i+1)) [2..9]
 --    ++ map (\i -> po [LASGUNWIDE i,cr HARDWARE] $ lasFocus i) [2..10]
     ++ map (\i -> po [cr PIPE,HELD (BANGSTICK i)] $ bangStick (i+1)) [1..8]
-    ++ map (\i -> po [HELD (REVOLVERX i),cr CAN]  $ revolverX (i+1)) [1..5]
-    ++ map (\i -> po [HELD (VOLLEYGUN i),HELD (BANGSTICK 1)] $ volleyGun (i+1)) [3..5]
-    ++ map (\i -> po [HELD (MINIGUNX i),HELD (BANGSTICK 1)] $ miniGunX (i+1)) [3..15]
-    ++ map (\i -> po [HELD (GRAPECANNON i),cr DRUM] $ grapeCannon (i+1)) [1,2,3]
+    ++ map (\i -> po [hd (REVOLVERX i),cr CAN]  $ revolverX (i+1)) [1..5]
+    ++ map (\i -> po [hd (VOLLEYGUN i),HELD (BANGSTICK 1)] $ volleyGun (i+1)) [3..5]
+    ++ map (\i -> po [hd (MINIGUNX i),HELD (BANGSTICK 1)] $ miniGunX (i+1)) [3..15]
+    ++ map (\i -> po [hd (GRAPECANNON i),cr DRUM] $ grapeCannon (i+1)) [1,2,3]
 
     ++ [ po (_iyBase (_itType it):mtype) $ it & itType . iyModules . ix modtype .~ m
             | (modtype,is,ms) <- moduleCombinations
@@ -100,13 +115,15 @@ itemCombinations =
     po xs it = (map o xs,it)
     o = (1,)
     cr = CRAFT
+    hd = HELD
+    eq = EQUIP
 
 moduleCombinations :: [( ModuleSlot, [Item], [([ItemBaseType],ItemModuleType)] )]
 moduleCombinations =
     [   ( ModRifleMag
         ,   [repeater
             ,autoRifle
---            ,burstRifle
+            ,burstRifle
 --            ,fastBurstRifle
             ]
         ,   [amod [cr DRUM,cr HARDWARE]  DRUMMAG
@@ -131,9 +148,9 @@ moduleCombinations =
         )
     ,   ( ModTarget
         , homingLaunchers ++ bulletWeapons
-        ,   [amod [cr MICROCHIP,cr CREATURESENSOR]    TARGCR
-            ,amod [cr MICROCHIP,cr PRISM]             TARGLAS
-            ,amod [cr MICROCHIP,cr TIN]               TARGPOS
+        ,   [amod [cr MICROCHIP,cr HEATSENSOR]  TARGCR
+            ,amod [cr MICROCHIP,cr LIGHTSENSOR] TARGLAS
+            ,amod [cr MICROCHIP,cr SOUNDSENSOR] TARGPOS
             ]
         )
     ,   ( ModBulletTrajectory