Commit before partial cleanup, continue weapon effect refactor

src/Dodge/Item/Held/Rod.hs

@@ -4,7 +4,7 @@ module Dodge.Item.Held.Rod (
     amr,
     autoAmr,
     sniperRifle,
-    machineGun,
+--    machineGun,
 ) where
 
 import Dodge.SoundLogic.ExternallyGeneratedSounds
@@ -31,7 +31,8 @@ bangRod =
         & itUse . heldAim . aimStance .~ OneHand
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         -- & itUse . heldAim . aimHandlePos .~ 5
-        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 30 0) 0 0.1 0 HeavySmokeFlare MuzzleShootBullet]
+        & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 30 0
+        & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ HeavySmokeFlare
 --        & itUse . heldConsumption . laAmmoType .~ hvBulletAmmo
 
 elephantGun :: Item
@@ -59,18 +60,18 @@ sniperRifle =
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 0.5, _izMin = 0.5,_izFac = 1}
 
-machineGun :: Item
-machineGun =
-    bangRod
-        & itType . iyBase .~ HELD MACHINEGUN
---        & itUse . heldMods .~ MachineGunMod
-        & itUse . heldMods .~ PistolMod
-        & itUse . heldAim . aimWeight .~ 8
-        & itUse . heldAim . aimRange .~ 1
-        & itUse . heldAim . aimStance .~ TwoHandUnder
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
-        & itUse . heldDelay .~ VariableRate
-            {_rateMax = 25, _rateMaxMax = 24, _rateMinMax = 7, _rateTime = 0}
-        & itInvSize .~ 3
-        & itUse . heldParams . torqueAfter .~ 0.2 -- not sure if this is necessary?
-        & itUse . heldTriggerType .~ AutoTrigger
+--machineGun :: Item
+--machineGun =
+--    bangRod
+--        & itType . iyBase .~ HELD MACHINEGUN
+----        & itUse . heldMods .~ MachineGunMod
+--        & itUse . heldMods .~ PistolMod
+--        & itUse . heldAim . aimWeight .~ 8
+--        & itUse . heldAim . aimRange .~ 1
+--        & itUse . heldAim . aimStance .~ TwoHandUnder
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
+--        & itUse . heldDelay .~ VariableRate
+--            {_rateMax = 25, _rateMaxMax = 24, _rateMinMax = 7, _rateTime = 0}
+--        & itInvSize .~ 3
+--        & itUse . heldParams . torqueAfter .~ 0.2 -- not sure if this is necessary?
+--        & itUse . heldTriggerType .~ AutoTrigger