Commit before partial cleanup, continue weapon effect refactor

src/Dodge/Combine/Combinations.hs

@@ -76,7 +76,7 @@ itemCombinations =
         ++ [ po [HELD AMR, cr PIPE] sniperRifle
            , po [HELD RIFLE, cr PIPE] amr
            , po [HELD AMR, cr SPRING] autoAmr
-           , po [HELD AMR, cr MOTOR] machineGun
+--           , po [HELD AMR, cr MOTOR] machineGun
            , p [p 2 $ cr TUBE, o $ cr HARDWARE] launcher
            , p [p 2 $ cr TUBE, o $ HELD LAUNCHER] (launcherX 2)
            ]
@@ -87,8 +87,8 @@ itemCombinations =
            , po [HELD FLAMETHROWER, cr STEELDRUM] flameWall
            , po [HELD FLAMETHROWER, cr PUMP] flameTorrent
            , p [o $ cr PRISM, o $ cr TRANSFORMER, o $ cr PIPE] lasGun
-           , po [HELD LASGUN, HELD LASGUN, cr HARDWARE] dualBeam
-           , po [HELD LASGUN, cr TRANSFORMER] (lasWide 2)
+--           , po [HELD LASGUN, HELD LASGUN, cr HARDWARE] dualBeam
+--           , po [HELD LASGUN, cr TRANSFORMER] (lasWide 2)
 --           , po [HELD LASGUN, HELD LASGUN, HELD LASGUN, cr HARDWARE] lasCircle
            , p [o $ cr TRANSFORMER, p 2 $ cr CAN] sparkGun
            , p [o (HELD SPARKGUN), p 2 $ cr PIPE] teslaGun
@@ -111,7 +111,7 @@ itemCombinations =
            , po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (energyBallCraft IncBall)
            , po [cr TRANSFORMER, AMMOMAG BATTERY, cr MICROCHIP] (energyBallCraft TeslaBall)
            ]
-        ++ map (\i -> po [HELD (LASWIDE i), cr TRANSFORMER] $ lasWide (i + 1)) [2 .. 9]
+--        ++ map (\i -> po [HELD (LASWIDE i), cr TRANSFORMER] $ lasWide (i + 1)) [2 .. 9]
         ++ map (\i -> po [cr PIPE, HELD (BANGSTICK i)] $ bangStick (i + 1)) [1 .. 8]
         ++ 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]
@@ -194,7 +194,8 @@ moduleCombinations =
         )
     ,
         ( ModDualBeam
-        , [dualBeam]
+        ,[]
+--        , [dualBeam]
         ,
             [ amod [cr (ENERGYBALLCRAFT IncBall)] INCENDLAS
             , amod [cr TRANSFORMER] SPLITLAS
@@ -260,7 +261,7 @@ bulletWeapons =
            , burstRifle
            , bangCone
            , blunderbuss
-           , machineGun
+--           , machineGun
            , elephantGun
            , sniperRifle
            , amr

src/Dodge/Combine/Graph.hs

@@ -48,7 +48,7 @@ maxShowX bt = case bt of
     HELD (MINIGUNX  _) -> Just 3
     HELD (GRAPECANNON _) -> Just 1
     HELD (LAUNCHERX _) -> Just 2
-    HELD (LASWIDE _) -> Just 2
+--    HELD (LASWIDE _) -> Just 2
 --    LASGUNFOCUS _ -> Just 2
     _ -> Nothing