Unify bullet creation

src/Dodge/Item/Weapon/BulletGun/Cane.hs

@@ -58,7 +58,7 @@ bangCane = defaultGun
         , _reloadTime = 20
         , _reloadType = ActivePartial 1
         }
-    , _itUse = useAmmoParamsRate 6 upHammer
+    , _itUse = ruseAmmoParamsRate 6 upHammer
         [ ammoHammerCheck
         , useTimeCheck
         , withSoundStart tap3S
@@ -88,7 +88,7 @@ bangCaneX :: Int -> Item
 bangCaneX i = bangCane
     { _itName = "BANGCANEx"++show i
     , _itType = BANGCANEX i
-    , _itUse = useAmmoParamsRate 6 upHammer
+    , _itUse = ruseAmmoParamsRate 6 upHammer
         [ ammoHammerCheck
         , useTimeCheck
         , withSoundItemChoiceStart caneStickSoundChoice
@@ -233,7 +233,7 @@ completeBurstRifle = repeater
         , withRecoilI 50
         ]
 miniGunUse :: Int -> ItemUse
-miniGunUse i = ruseInstant (useAmmoParamsVelMod 1) NoHammer $
+miniGunUse i = ruseInstant (useAmmoParams $ Just 1) NoHammer $
     [ ammoCheckI
     , withWarmUp crankSlowS
     , withSoundForI mini1S 2
@@ -248,7 +248,7 @@ miniGunUse i = ruseInstant (useAmmoParamsVelMod 1) NoHammer $
         , afterRecoil recoilAmount
         , withRandomOffsetI 10
         , withOldDir x
-        , trigDoAlso (useAmmoParamsVelMod x)
+        , trigDoAlso (useAmmoParams $ Just x)
         ] | x <- map ((/fromIntegral i) . fromIntegral) [1..i-1]
         ]
     <> 

src/Dodge/Item/Weapon/BulletGun/Rod.hs

@@ -43,7 +43,7 @@ bangRod = defaultGun
         , _bore = 2
         , _gunBarrels = SingleBarrel 0.1
         }
-    , _itUse = useAmmoParamsRate 6 upHammer
+    , _itUse = ruseAmmoParamsRate 6 upHammer
         [ ammoHammerCheck
         , useTimeCheck
         , withSoundStart autoGunS

src/Dodge/Item/Weapon/BulletGun/Stick.hs

@@ -52,7 +52,7 @@ bangStick i = defaultGun
         , _reloadTime = 15
         , _reloadType = ActivePartial 1
         }
-    , _itUse = useAmmoParamsRate 8 upHammer
+    , _itUse = ruseAmmoParamsRate 8 upHammer
         [ ammoHammerCheck
         , useTimeCheck
         , withSoundItemChoiceStart bangStickSoundChoice
@@ -178,7 +178,7 @@ pistol = (bangStick 1)
         , _reloadTime = 70
         , _reloadType = ActiveClear
         }
-    , _itUse = useAmmoParamsRate 6 upHammer
+    , _itUse = ruseAmmoParamsRate 6 upHammer
         (ammoHammerCheck : pistolAfterHamMods)
 --    , _itZoom = defaultItZoom
 --    , _itEquipPict = pictureWeaponAim pistolPic
@@ -218,7 +218,7 @@ revolverX :: Int -> Item
 revolverX i = revolver
     { _itName = "REVx"++show i
     , _itType = REVOLVERX i
-    , _itUse = useAmmoParamsRate 8 upHammer
+    , _itUse = ruseAmmoParamsRate 8 upHammer
         [ ammoHammerCheck
         , useTimeCheck
         -- rather than locking the inventory, a better solution may be to check