Refactor, try to limit dependencies

2022-07-28 00:59:56 +01:00
parent 8aa5c17ab9
commit 160560af5f
418 changed files with 15104 additions and 13342 deletions
@@ -6,8 +6,9 @@ module Dodge.Data.Item.Use (
    module Dodge.Data.Item.Use.Equipment,
    module Dodge.Data.Item.HeldUse,
    module Dodge.Data.Item.HeldScroll,
-    module Dodge.Data.Item.UseDelay,
+    module Dodge.Data.Item.HeldDelay,
    module Dodge.Data.Item.Use.Consumption,
+    module Dodge.Data.Hammer,
 ) where

 import Control.Lens
@@ -18,23 +19,23 @@ import Dodge.Data.Item.HeldScroll
 import Dodge.Data.Item.HeldUse
 import Dodge.Data.Item.Use.Consumption
 import Dodge.Data.Item.Use.Equipment
-import Dodge.Data.Item.UseDelay
+import Dodge.Data.Item.HeldDelay

 data ItemUse
-    = RightUse
-        { _rUse :: HeldUse
-        , _useDelay :: UseDelay
-        , _useMods :: HeldMod
-        , _useHammer :: HammerPosition
-        , _useAim :: AimParams
+    = HeldUse
+        { _heldUse :: HeldUse
+        , _heldDelay :: UseDelay
+        , _heldMods :: HeldMod
+        , _heldHammer :: HammerPosition
+        , _heldAim :: AimParams
        , _heldScroll :: HeldScroll
        , _heldConsumption :: HeldConsumption
        }
    | LeftUse
-        { _lUse :: Luse
-        , _useDelay :: UseDelay
-        , _useHammer :: HammerPosition
-        , _eqEq :: Equipment
+        { _leftUse :: Luse
+        , _leftDelay :: UseDelay
+        , _leftHammer :: HammerPosition
+        , _equipEffect :: EquipEffect
        , _leftConsumption :: LeftConsumption
        }
    | ConsumeUse
@@ -42,7 +43,7 @@ data ItemUse
        , _useAmount :: ItAmount
        }
    | EquipUse
-        { _eqEq :: Equipment
+        { _equipEffect :: EquipEffect
        }
    | CraftUse
        {_useAmount :: ItAmount}