Start unifying heldUse and heldMods

src/Dodge/Default/Item.hs

@@ -45,7 +45,7 @@ defaultBulletWeapon :: Item
 defaultBulletWeapon =
     defaultWeapon
         & itUse . heldAmmoTypes .~ [BulletAmmo]
-        & itUse . heldUse .~ HeldUseAmmoParams -- useAmmoParams
+--        & itUse . heldUse .~ HeldUseAmmoParams -- useAmmoParams
         & itType . iyModules . at ModBulletCollision ?~ EMPTYMODULE
 --        & itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE
 --        & itType . iyModules . at ModBulletTrajectory ?~ EMPTYMODULE

src/Dodge/Default/Item/Use.hs

@@ -29,9 +29,8 @@ defaultEquipUse = EquipUse
 defaultHeldUse :: ItemUse
 defaultHeldUse =
     HeldUse
-        { _heldUse = HeldDoNothing
-        , _heldDelay = FixedRate{_rateMax = 8, _rateTime = 0}
-        , _heldMods = HeldModNothing
+        { _heldDelay = FixedRate{_rateMax = 8, _rateTime = 0}
+        , _heldMods = DoNothingMod
         , _heldHammer = HammerUp
         , _heldAim = defaultAimParams
         , _heldAmmoTypes = []

src/Dodge/Default/Item/Use/AimParams.hs

@@ -13,7 +13,7 @@ defaultAimParams =
         , _aimStance = OneHand
         , --, _aimHandlePos = 10
           _aimHandlePos = V2 3 0
-        , _aimMuzzles = [Muzzle (V2 20 0) 0 0]
+        , _aimMuzzles = [Muzzle (V2 20 0) 0 0 0]
         --        , _aimMuzPos = 20
         }