Remove (by commenting out) module item-type system

src/Dodge/Combine/Combinations.hs

@@ -116,11 +116,11 @@ itemCombinations =
         ++ 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 STEELDRUM] $ grapeCannon (i + 1)) [1, 2, 3]
-        ++ [ po (_iyBase (_itType it) : mtype) $ it & itType . iyModules . ix modtype .~ m
-           | (modtype, is, ms) <- moduleCombinations
-           , it <- is
-           , (mtype, m) <- ms
-           ]
+--        ++ [ po (_iyBase (_itType it) : mtype) $ it & itType . iyModules . ix modtype .~ m
+--           | (modtype, is, ms) <- moduleCombinations
+--           , it <- is
+--           , (mtype, m) <- ms
+--           ]
   where
     p = (,)
     po xs it = (map o xs, it)
@@ -132,95 +132,95 @@ itemCombinations =
 -- so there are two requirements for a module combination: the module slot must
 -- exist on the item, and the item must be in the given list below
 -- these two requirements should probably be combined
-moduleCombinations :: [(ModuleSlot, [Item], [([ItemBaseType], ItemModuleType)])]
-moduleCombinations =
-    [
-        ( ModHeldAttach
-        ,
-            [ rifle
-            , autoRifle
-            , burstRifle
-            ]
-        ,
-            [ amod [cr TAPE, HELD TORCH] ATTACHTORCH
-            ]
-        )
-    ,
-        ( ModAutoMag
-        ,
-            [ autoRifle
-            , autoPistol
-            , smg
-            ]
-        ,
-            [ amod [cr MAGNET, cr HARDWARE] MAGNETMAG
-            ]
-        )
-    ,
-        ( ModBulletCollision
-        , bulletWeapons
-        ,
-            [ amod [cr (BULBODYCRAFT be)] (BULBODY be) | be <- [minBound..]
-            ]
-        )
-    ,
-        ( ModBulletPayload
-        , bulletMagazines
-        ,
-            [ amod [cr (ENERGYBALLCRAFT x)] (BULPAY (BulBall x)) | x <- [minBound ..]
-            ] ++ 
-            [ amod [cr GASINJECTOR] (BULPAY BulGas)
-            , amod [cr FRAGCRAFT] (BULPAY BulFrag)
-            , amod [cr FLAKCRAFT] (BULPAY BulFlak)
-            ]
-        )
-    ,
-        ( ModTarget
-        , homingLaunchers ++ bulletWeapons
-        ,
-            [ amod [cr MICROCHIP, cr HEATSENSOR] (TARGET TargetRBCreature)
-            , amod [cr MICROCHIP, cr LIGHTSENSOR] (TARGET TARGETLASER)
-            , amod [cr MICROCHIP, cr SOUNDSENSOR] (TARGET TargetRBPress)
-            ]
-        )
-    ,
-        ( ModBulletTrajectory
-        , bulletWeapons
-        ,
-            [ amod [cr MAGNET, cr MICROCHIP, cr HARDWARE] (BULTRAJ MagnetTrajectoryType)
-            , amod [cr MICROCHIP, cr HARDWARE] (BULTRAJ FlechetteTrajectoryType)
-            , amod [cr ANTIMATTER, cr HARDWARE] (BULTRAJ BezierTrajectoryType)
-            ]
-        )
-    ,
-        ( ModDualBeam
-        ,[]
---        , [dualBeam]
-        ,
-            [ amod [cr (ENERGYBALLCRAFT IncBall)] INCENDLAS
-            , amod [cr TRANSFORMER] SPLITLAS
-            , amod [cr (ENERGYBALLCRAFT TeslaBall)] STATICLAS
-            ]
-        )
---    ,
---        ( ModTeleport
---        , teleportableWeapons
+--moduleCombinations :: [(ModuleSlot, [Item], [([ItemBaseType], ItemModuleType)])]
+--moduleCombinations =
+--    [
+--        ( ModHeldAttach
 --        ,
---            [ amod [cr TELEPORTMODULE, cr MICROCHIP] WEPTELE
+--            [ rifle
+--            , autoRifle
+--            , burstRifle
+--            ]
+--        ,
+--            [ amod [cr TAPE, HELD TORCH] ATTACHTORCH
 --            ]
 --        )
-    ,
-        ( ModLauncherHoming
-        , homingLaunchers
-        ,
-            [ amod [cr MICROCHIP, cr TRANSMITTER] LAUNCHHOME
-            ]
-        )
-    
-    ]
-  where
-    amod = (,)
-    cr = CRAFT
+--    ,
+--        ( ModAutoMag
+--        ,
+--            [ autoRifle
+--            , autoPistol
+--            , smg
+--            ]
+--        ,
+--            [ amod [cr MAGNET, cr HARDWARE] MAGNETMAG
+--            ]
+--        )
+--    ,
+--        ( ModBulletCollision
+--        , bulletWeapons
+--        ,
+--            [ amod [cr (BULBODYCRAFT be)] (BULBODY be) | be <- [minBound..]
+--            ]
+--        )
+--    ,
+--        ( ModBulletPayload
+--        , bulletMagazines
+--        ,
+--            [ amod [cr (ENERGYBALLCRAFT x)] (BULPAY (BulBall x)) | x <- [minBound ..]
+--            ] ++ 
+--            [ amod [cr GASINJECTOR] (BULPAY BulGas)
+--            , amod [cr FRAGCRAFT] (BULPAY BulFrag)
+--            , amod [cr FLAKCRAFT] (BULPAY BulFlak)
+--            ]
+--        )
+--    ,
+--        ( ModTarget
+--        , homingLaunchers ++ bulletWeapons
+--        ,
+--            [ amod [cr MICROCHIP, cr HEATSENSOR] (TARGET TargetRBCreature)
+--            , amod [cr MICROCHIP, cr LIGHTSENSOR] (TARGET TARGETLASER)
+--            , amod [cr MICROCHIP, cr SOUNDSENSOR] (TARGET TargetRBPress)
+--            ]
+--        )
+--    ,
+--        ( ModBulletTrajectory
+--        , bulletWeapons
+--        ,
+--            [ amod [cr MAGNET, cr MICROCHIP, cr HARDWARE] (BULTRAJ MagnetTrajectoryType)
+--            , amod [cr MICROCHIP, cr HARDWARE] (BULTRAJ FlechetteTrajectoryType)
+--            , amod [cr ANTIMATTER, cr HARDWARE] (BULTRAJ BezierTrajectoryType)
+--            ]
+--        )
+--    ,
+--        ( ModDualBeam
+--        ,[]
+----        , [dualBeam]
+--        ,
+--            [ amod [cr (ENERGYBALLCRAFT IncBall)] INCENDLAS
+--            , amod [cr TRANSFORMER] SPLITLAS
+--            , amod [cr (ENERGYBALLCRAFT TeslaBall)] STATICLAS
+--            ]
+--        )
+----    ,
+----        ( ModTeleport
+----        , teleportableWeapons
+----        ,
+----            [ amod [cr TELEPORTMODULE, cr MICROCHIP] WEPTELE
+----            ]
+----        )
+--    ,
+--        ( ModLauncherHoming
+--        , homingLaunchers
+--        ,
+--            [ amod [cr MICROCHIP, cr TRANSMITTER] LAUNCHHOME
+--            ]
+--        )
+--    
+--    ]
+--  where
+--    amod = (,)
+--    cr = CRAFT
 
 homingLaunchers :: [Item]
 homingLaunchers = launcher : [launcherX i | i <- [2 .. 10]]