Commit before changes to item grammar

src/Dodge/Item/Held/BatteryGuns.hs

@@ -32,7 +32,10 @@ teslaGun =
         & itUse . heldAim . aimWeight .~ 6
         & itUse . heldAim . aimStance .~ TwoHandFlat
         -- & itUse . heldAim . aimMuzPos .~ 4
-        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 4 0) 0 0 0 TeslaGunFlare MuzzleTesla Nothing]
+        & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 4 0
+        & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
+        & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ TeslaGunFlare
+        & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTesla
         & itType . iyBase .~ HELD TESLAGUN
         & itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
         & itUse . heldTriggerType .~ AutoTrigger
@@ -46,7 +49,10 @@ lasGun =
         & itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
         & itUse . heldDelay .~ NoDelay
         & itUse . heldTriggerType .~ AutoTrigger
-        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 30 0) 0 0 0 LasGunFlare MuzzleLaser Nothing]
+        & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 30 0
+        & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
+        & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ LasGunFlare
+        & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleLaser
         & itParams
             .~ Refracting
                 { _phaseV = 1

src/Dodge/Item/Held/Cane.hs

@@ -42,7 +42,6 @@ volleyGun i =
             <*> ZipList [0..i-1] 
             <*> pure PistolFlare
             <*> pure MuzzleShootBullet
-            <*> pure Nothing
             )
         & itUse . heldParams . torqueAfter .~ 0.15 + 0.05 * fromIntegral i
         & itUse . heldParams . recoil .~ 20 + 10 * fromIntegral i
@@ -97,7 +96,7 @@ miniGunX i =
         & itUse . heldParams . bulGunSound ?~ (mini1S,2)
         & itUse . heldAim . aimTurnSpeed .~ 0.5
         & itUse . heldAim . aimMuzzles 
-            .~ replicate i (Muzzle (V2 30 0) 0 0.05 0 MiniGunFlare MuzzleShootBullet Nothing)
+            .~ replicate i (Muzzle (V2 30 0) 0 0.05 0 MiniGunFlare MuzzleShootBullet)
         & itUse . heldParams . recoil .~ 10 * fromIntegral i
         & itUse . heldParams . torqueAfter .~ 0.04 + 0.02 * fromIntegral i
         & itUse . heldParams . sidePush .~ 10 * fromIntegral i

src/Dodge/Item/Held/Cone.hs

@@ -17,7 +17,7 @@ bangCone =
         & itUse . heldMods .~ PistolMod
         -- & itUse . heldAim . aimHandlePos .~ 5
         & itUse . heldAim . aimMuzzles 
-            .~ replicate 15 (Muzzle (V2 15 0) 0 0.5 0 DefaultFlareType MuzzleShootBullet Nothing)
+            .~ replicate 15 (Muzzle (V2 15 0) 0 0.5 0 DefaultFlareType MuzzleShootBullet)
         & itUse . heldParams . muzVel .~ UniRandFloat 0.5 0.8
         & itUse . heldParams . rifling .~ UniRandFloat 0.3 0.8
         & itUse . heldParams . recoil .~ 150

src/Dodge/Item/Held/Launcher.hs

@@ -56,7 +56,6 @@ launcherX i =
             <*> ZipList [0..] 
             <*> pure DefaultFlareType
             <*> pure MuzzleLauncher
-            <*> pure Nothing
             )
         & itUse . heldAmmoTypes .~ IM.fromList [(j,ProjectileAmmo) | j <- [0..i-1]]
   where

src/Dodge/Item/Held/SprayGuns.hs

@@ -92,7 +92,6 @@ flameThrower =
                         , _nzWalkSpeed = 0.01
                         , _nzCurrentWalkAngle = 0
                         }
-            Nothing
             ]
         & itUse . heldAmmoTypes .~ singleAmmo GasAmmo
         & itType . iyBase .~ HELD FLAMETHROWER

src/Dodge/Item/Held/Stick.hs

@@ -27,7 +27,7 @@ bangStick i =
 --        & itUse . heldMods .~ BangStickMod
         & itUse . heldMods .~ PistolMod
         & itUse . heldAim . aimMuzzles 
-            .~ [Muzzle (V2 10 0) a 0.01 0 DefaultFlareType MuzzleShootBullet Nothing | a <- spreadAroundCenter i baseStickSpread]
+            .~ [Muzzle (V2 10 0) a 0.01 0 DefaultFlareType MuzzleShootBullet | a <- spreadAroundCenter i baseStickSpread]
 
 baseStickSpread :: Float
 baseStickSpread = 0.2

src/Dodge/Item/Held/Utility.hs

@@ -33,7 +33,7 @@ torch =
 
 forceFieldGun :: Item
 forceFieldGun =
-    defaultWeapon
+    defaultHeldItem
 --        & itUse . useTargeting ?~ TargetRBLine
         & itType . iyModules . at ModTarget ?~ TARGET TargetRBLine
         & itParams .~ ParamMID Nothing
@@ -52,7 +52,7 @@ Sends out pulses that display walls.
 -}
 clickDetector :: Detector -> Item
 clickDetector dt =
-    defaultWeapon
+    defaultHeldItem
         & itUse . heldDelay . rateMax .~ 20
 --        & itUse . heldUse .~ HeldDetectorEffect dt --detectorEffect dt
 --        & itUse . heldMods .~ AmmoUseCheckMod