Start unifying heldUse and heldMods

2024-09-15 10:54:24 +01:00
parent cde7bc9aef
commit 6f372109d9
33 changed files with 585 additions and 270 deletions
@@ -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 = []
@@ -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
        }