Cleanup

src/Dodge/Default/Item.hs

@@ -30,9 +30,6 @@ defaultHeldItem = Item
         , _itDimension = defaultItemDimension
         , _itUse = defaultHeldUse
         , _itParams = NoParams
---        , _itTweaks = NoTweaks
---        , _itScope = NoScope
-        , _itAttachments = mempty
         }
 
 defaultLeftItem :: Item

src/Dodge/Default/Item/Use.hs

@@ -12,14 +12,13 @@ import Dodge.Default.Item.Use.Consumption
 import Dodge.Default.Item.Use.Equipment
 
 defaultLeftUse :: ItemUse
-defaultLeftUse =
-    LeftUse
-        { _leftUse = LDoNothing
-        , _leftDelay = FixedRate{_rateMax = 8, _rateTime = 0}
-        , _leftHammer = HammerUp
-        , _equipEffect = defaultEquip
-        , _leftConsumption = defaultLeftLoadable
-        }
+defaultLeftUse = UseHotkey
+    { _leftUse = LDoNothing
+    , _leftDelay = FixedRate{_rateMax = 8, _rateTime = 0}
+    , _leftHammer = HammerUp
+    , _equipEffect = defaultEquip
+    , _leftConsumption = defaultLeftLoadable
+    }
 
 defaultEquipUse :: ItemUse
 defaultEquipUse = EquipUse
@@ -28,24 +27,21 @@ defaultEquipUse = EquipUse
     }
 
 defaultHeldUse :: ItemUse
-defaultHeldUse =
-    HeldUse
-        { _heldDelay = FixedRate{_rateMax = 8, _rateTime = 0}
---        , _heldMods = DoNothingMod
-        , _heldHammer = HammerUp
-        , _heldAim = defaultAimParams
-        , _heldAmmoTypes = mempty
-        , _heldParams = BulletShooterParams
-            { _muzVel = ConstFloat 0.8
-            , _rifling = ConstFloat 0.8
-            , _recoil = 10
-            , _torqueAfter = 0.2
-            , _randomOffset = 0
-            , _sidePush = 0
-            , _bulGunSound = Just (tap3S, 0)
-            , _weaponInvLock = 0
-            , _weaponRepeat = []
-            }
-        , _heldTriggerType = HammerTrigger
-        , _heldUsageTime = 0
+defaultHeldUse = UseHeld
+    { _heldDelay = FixedRate{_rateMax = 8, _rateTime = 0}
+    , _heldHammer = HammerUp
+    , _heldAim = defaultAimParams
+    , _heldAmmoTypes = mempty
+    , _heldParams = BulletShooterParams
+        { _muzVel = ConstFloat 0.8
+        , _rifling = ConstFloat 0.8
+        , _recoil = 10
+        , _torqueAfter = 0.2
+        , _randomOffset = 0
+        , _sidePush = 0
+        , _bulGunSound = Just (tap3S, 0)
+        , _weaponInvLock = 0
+        , _weaponRepeat = []
         }
+    , _heldTriggerType = HammerTrigger
+    }