diff --git a/src/Dodge/Item/Held/Cane.hs b/src/Dodge/Item/Held/Cane.hs index ecda8b255..a81aa417d 100644 --- a/src/Dodge/Item/Held/Cane.hs +++ b/src/Dodge/Item/Held/Cane.hs @@ -44,10 +44,8 @@ volleyGun i = <*> ZipList [0..i-1] ) & itUse . heldParams . weaponInvLock .~ i + 1 --- & itUse . heldParams . torqueAfter .~ 0.15 + 0.05 * fromIntegral i --- & itUse . heldParams . recoil .~ 20 + 10 * fromIntegral i - & itUse . heldParams . torqueAfter .~ 0 - & itUse . heldParams . recoil .~ 0 + & itUse . heldParams . torqueAfter .~ 0.1 + & itUse . heldParams . recoil .~ 30 & itType .~ HELD (VOLLEYGUN i) & itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo) & itUse . heldParams . weaponRepeat .~ [1..i-1] @@ -82,6 +80,10 @@ burstRifle = & itUse . heldDelay . rateMax .~ 6 & itUse . heldParams . weaponInvLock .~ 7 & itUse . heldParams . weaponRepeat .~ [3,6] + & itUse . heldAim . aimMuzzles %~ 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 =