Commit before partial cleanup, continue weapon effect refactor

src/Dodge/Item/Draw/SPic.hs

@@ -177,7 +177,7 @@ heldItemSPic ht it = case ht of
     AMR -> noPic $ baseAMRShape <> addTinClip it
     AUTOAMR -> noPic $ baseAMRShape <> addTinClip it
     SNIPERRIFLE -> noPic $ baseAMRShape -- <> addBullets it
-    MACHINEGUN -> noPic $ baseAMRShape <> addTinClip it
+--    MACHINEGUN -> noPic $ baseAMRShape <> addTinClip it
     FLAMESPITTER -> flamerPic it
     FLAMETHROWER -> flamerPic it
     FLAMETORRENT -> flamerPic it
@@ -187,8 +187,8 @@ heldItemSPic ht it = case ht of
     TESLAGUN -> teslaGunPic
     LASGUN -> lasGunPic it
 --    LASCIRCLE -> lasGunPic it
-    DUALBEAM -> dualBeamPic it
-    LASWIDE _ -> lasGunPic it
+--    DUALBEAM -> dualBeamPic it
+--    LASWIDE _ -> lasGunPic it
     --SONICGUN        -> noPic baseSonicShape
     TRACTORGUN -> tractorGunPic it
     LAUNCHER -> launcherPic it
@@ -468,19 +468,19 @@ lasGunPic _ =
     amFrac = 0.5
     col = brightX 2 1.5 $ mixColors amFrac (1 - amFrac) green red
 
-dualBeamPic :: Item -> SPic
-dualBeamPic it =
-    ( colorSH blue $
-        upperBoxST 4 (rectNESW gap 3 (- gap) 1)
-            <> upperBoxSU 4 (rectNESW gap (-1) (- gap) (-3))
-            <> upperBoxSU 1 (rectNESW gap 3 (- gap) (-3))
-    , setLayer BloomNoZWrite . color col . setDepth 1.1 . polygon $ rectNESW gap 1 (- gap) (-1)
-    )
-  where
-    --amFrac = fractionLoadedAmmo it
-    amFrac = 0.5
-    col = brightX 2 1.5 $ mixColors amFrac (1 - amFrac) green red
-    gap = _dbGap (_itParams it) - 3
+--dualBeamPic :: Item -> SPic
+--dualBeamPic it =
+--    ( colorSH blue $
+--        upperBoxST 4 (rectNESW gap 3 (- gap) 1)
+--            <> upperBoxSU 4 (rectNESW gap (-1) (- gap) (-3))
+--            <> upperBoxSU 1 (rectNESW gap 3 (- gap) (-3))
+--    , setLayer BloomNoZWrite . color col . setDepth 1.1 . polygon $ rectNESW gap 1 (- gap) (-1)
+--    )
+--  where
+--    --amFrac = fractionLoadedAmmo it
+--    amFrac = 0.5
+--    col = brightX 2 1.5 $ mixColors amFrac (1 - amFrac) green red
+--    gap = _dbGap (_itParams it) - 3
 
 tractorGunPic :: Item -> SPic
 tractorGunPic = lasGunPic