Fix volleyGun

src/Dodge/Item/Held/Cane.hs

@@ -13,34 +13,19 @@ import Dodge.Default
 import LensHelp
 
 volleyGun :: Int -> Item
-volleyGun i =
-    defaultHeldItem
---        & itUse . heldMuzzles .~ getZipList 
---            (ZipList [Muzzle (V2 15 x) 0 0.01 | x <- spreadAroundCenter i 6]
---            <*> ZipList [0..i-1] 
---            <*> pure MiniGunFlare
---            <*> pure MuzzleShootBullet
---            <*> pure (UseExactly 1)
---            <*> ZipList [0..i-1] 
---            )
-        & itType .~ HELD (VOLLEYGUN i)
---        & itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo)
---        & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
+volleyGun i = defaultHeldItem & itType .~ HELD (VOLLEYGUN i)
+    & itParams .~ VolleyUnfiredBarrels [0..i-1]
 
 rifle :: Item
 rifle = defaultHeldItem & itType .~ HELD RIFLE
---        & itUse . heldMuzzles . ix 0 . mzPos .~ V2 25 0
 
 alteRifle :: Item
 alteRifle = rifle
     & itType .~ HELD ALTERIFLE
---    & itAmmoSlots .~ IM.fromList (zip [0..1] $ repeat BulletAmmo)
     & itParams .~ AlteRifleSwitch 0
 
 autoRifle :: Item
-autoRifle =
-    rifle
-        & itType .~ HELD AUTORIFLE
+autoRifle = rifle & itType .~ HELD AUTORIFLE
 
 burstRifle :: Item
 burstRifle = rifle & itType .~ HELD BURSTRIFLE
@@ -48,14 +33,5 @@ burstRifle = rifle & itType .~ HELD BURSTRIFLE
 miniGunX :: Int -> Item
 miniGunX i =
     autoRifle
---        & itUse . heldDelay .~ WarmUpNoDelay{
---            --_warmTime = 0, 
---            _warmMax = 100, _warmSound = crankSlowS}
---        & itAmmoSlots .~ singleAmmo BeltBulletAmmo
---        & itUse . heldMuzzles 
---            .~ replicate i 
---                (Muzzle (V2 30 0) 0 0.05 0 MiniGunFlare MuzzleShootBullet (UseExactly 1) 0)
         & itType .~ HELD (MINIGUNX i)
---        & itEffect . ieInv .~ ItemReduceWarmTime
---        & itEffect . ieOnDrop .~ ItemSetWarmTime 0
         & itParams .~ WarmTime 0 False Nothing