Move towards moving muzzles out of records

src/Dodge/Item/Held/Cane.hs

@@ -28,7 +28,6 @@ defaultBangCane =
 volleyGun :: Int -> Item
 volleyGun i =
     defaultBangCane
---        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         & itUse . heldMuzzles .~ getZipList 
             (ZipList [Muzzle (V2 15 x) 0 0.01 | x <- spreadAroundCenter i 6]
             <*> ZipList [0..i-1] 
@@ -37,23 +36,19 @@ volleyGun i =
             <*> pure (UseExactly 1)
             <*> ZipList [0..i-1] 
             )
---        & itUse . heldParams . recoil .~ 30
         & itType .~ HELD (VOLLEYGUN i)
         & itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo)
---        & itUse . heldParams . weaponRepeat .~ [1..i-1]
-        & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
+--        & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
 
 rifle :: Item
 rifle =
     defaultBangCane
         & itType .~ HELD RIFLE
---        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         & itUse . heldMuzzles . ix 0 . mzPos .~ V2 25 0
 
 alteRifle :: Item
 alteRifle = rifle
     & itType .~ HELD ALTERIFLE
-    & itUse . heldUseEffect .~ SwitchAlteRifle
     & itAmmoSlots .~ IM.fromList (zip [0..1] $ repeat BulletAmmo)
 
 --repeater :: Item
@@ -73,10 +68,6 @@ burstRifle =
         & itType .~ HELD BURSTRIFLE
         & itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0.05
         & itUse . heldDelay . rateMax .~ 6
-        & itUse . heldMuzzles %~ doreplicate
-  where
-    doreplicate (x:_) = [x,x & mzFrame .~ 3,x & mzFrame .~ 6]
-    doreplicate [] = error "tried to replicate non-existing burstRifle muzzle"
 
 miniGunX :: Int -> Item
 miniGunX i =

src/Dodge/Item/Held/SprayGuns.hs

@@ -64,7 +64,7 @@ flameWall =
 flameThrower :: Item
 flameThrower =
     defaultHeldItem
-        & itParams .~ NoParams
+        & itParams .~ NozzleAngle 0
         & itUse . heldDelay .~ NoDelay
 --        & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 5, _izMin = 1.5}
         & itUse . heldMuzzles .~ [Muzzle (V2 18 0) 0 0 0 NoFlare 
@@ -72,7 +72,7 @@ flameThrower =
                         { _nzPressure = ConstFloat 4
                         , _nzMaxWalkAngle = 0.2
                         , _nzWalkSpeed = 0.01
-                        , _nzCurrentWalkAngle = 0
+--                        , _nzCurrentWalkAngle = 0
                         }
             (UseExactly 1)
             0