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
@@ -3,11 +3,10 @@ module Dodge.Creature.Statistics (
    getCrDexterity,
 ) where

--import Data.Strict.IntMap.Autogen.Merge.Strict
 import Data.IntMap.Merge.Strict
 import Data.Maybe
 import Dodge.Creature.Test
-import Dodge.Data
+import Dodge.Data.Creature
 import qualified IntMapHelp as IM
 import LensHelp

@@ -38,5 +37,5 @@ crCurrentEquipment cr =
 strFromHeldItem :: Creature -> Int
 strFromHeldItem cr
    | _posture (_crStance cr) == Aiming || crIsReloading cr =
-        negate $ fromMaybe 0 $ cr ^? crInv . ix (crSel cr) . itUse . useAim . aimWeight
+        negate $ fromMaybe 0 $ cr ^? crInv . ix (crSel cr) . itUse . heldAim . aimWeight
    | otherwise = 0