Fix at least one bug from item refactor, more remain

src/Dodge/Creature/ArmourChase.hs

@@ -8,7 +8,7 @@ import Control.Lens
 import Dodge.Creature.ChaseCrit
 import Dodge.Data.Creature
 import Dodge.Default
-import Dodge.Item.Equipment
+--import Dodge.Item.Equipment
 import qualified IntMapHelp as IM
 
 flockArmourChaseCrit :: Creature

src/Dodge/Creature/AutoCrit.hs

@@ -2,11 +2,11 @@ module Dodge.Creature.AutoCrit (
     autoCrit,
 ) where
 
-import Dodge.Item.Held.Cane
+--import Dodge.Item.Held.Cane
 --import Control.Lens
 import Dodge.Data.Creature
 import Dodge.Default
-import qualified IntMapHelp as IM
+--import qualified IntMapHelp as IM
 --import Picture
 
 autoCrit :: Creature

src/Dodge/Creature/ChaseCrit.hs

@@ -4,11 +4,11 @@ module Dodge.Creature.ChaseCrit (
     chaseCrit,
 ) where
 
-import Dodge.Data.Equipment.Misc
-import Control.Lens
+--import Dodge.Data.Equipment.Misc
+--import Control.Lens
 import Dodge.Data.Creature
 import Dodge.Default
-import Dodge.Item.Equipment
+--import Dodge.Item.Equipment
 import Picture
 
 smallChaseCrit :: Creature

src/Dodge/Creature/HandPos.hs

@@ -15,7 +15,7 @@ module Dodge.Creature.HandPos (
     headPQ,
 ) where
 
-import Dodge.Data.Equipment.Misc
+--import Dodge.Data.Equipment.Misc
 import qualified Data.IntMap.Strict as IM
 import qualified Quaternion as Q
 import Control.Lens
@@ -27,13 +27,13 @@ import ShapePicture
 translatePointToRightHand :: IM.IntMap Item -> Creature -> Point3 -> Point3
 translatePointToRightHand m cr p =  fst (rightHandPQ m cr `Q.comp` (p,Q.qID))
 
-equipSitePQ :: EquipSite -> IM.IntMap Item -> Creature -> Point3Q
-equipSitePQ = \case
-    OnRightWrist -> rightHandPQ
-    OnLeftWrist -> leftHandPQ
-    OnBack -> backPQ
-    OnChest -> chestPQ
-    _ -> undefined
+--equipSitePQ :: EquipSite -> IM.IntMap Item -> Creature -> Point3Q
+--equipSitePQ = \case
+--    OnRightWrist -> rightHandPQ
+--    OnLeftWrist -> leftHandPQ
+--    OnBack -> backPQ
+--    OnChest -> chestPQ
+--    _ -> undefined
 
 rightHandPQ :: IM.IntMap Item -> Creature -> Point3Q
 rightHandPQ m cr

src/Dodge/Creature/LauncherCrit.hs

@@ -2,11 +2,11 @@ module Dodge.Creature.LauncherCrit (
     launcherCrit,
 ) where
 
-import Dodge.Item.Held.Launcher
+--import Dodge.Item.Held.Launcher
 --import Control.Lens
 import Dodge.Data.Creature
 import Dodge.Default
-import qualified IntMapHelp as IM
+--import qualified IntMapHelp as IM
 --import Picture
 
 launcherCrit :: Creature

src/Dodge/Creature/SpreadGunCrit.hs

@@ -5,8 +5,7 @@ module Dodge.Creature.SpreadGunCrit (
 --import Control.Lens
 import Dodge.Data.Creature
 import Dodge.Default
-import Dodge.Item.Held.Stick
-import qualified IntMapHelp as IM
+--import qualified IntMapHelp as IM
 --import Picture
 
 spreadGunCrit :: Creature

src/Dodge/Creature/Statistics.hs

@@ -8,7 +8,6 @@ module Dodge.Creature.Statistics (
 
 import Dodge.Data.LWorld
 import Data.Maybe
-import Dodge.Data.Creature
 import qualified IntMapHelp as IM
 import LensHelp
 

src/Dodge/Creature/Test.hs

@@ -97,7 +97,7 @@ crInAimStance as m cr = crIsAiming cr && mitstance == Just as
     mitstance = do
         i <- cr ^? crManipulation . manObject . imRootSelectedItem
         --itm <- invRootTrees' (cr ^. crInv) ^? ix i
-        itm <- fmap (fmap (\(a,b,_) -> (a,b))) $ invIMDT (fmap (\i -> m ^?! ix i) (cr ^. crInv)) ^? ix i
+        itm <- fmap (fmap (\(a,b,_) -> (a,b))) $ invIMDT (fmap (\k -> m ^?! ix k) (cr ^. crInv)) ^? ix i
         return $ aimStance itm
         --cr ^? crInv . ix i . itUse . heldAim . aimStance