Cleanup

src/Dodge/Creature/Statistics.hs

@@ -3,9 +3,7 @@ module Dodge.Creature.Statistics (
     getCrDexterity,
 ) where
 
-import Data.IntMap.Merge.Strict
 import Data.Maybe
---import Dodge.Creature.Test
 import Dodge.Data.Creature
 import qualified IntMapHelp as IM
 import LensHelp
@@ -26,13 +24,13 @@ equipmentStrValue itm = case _itType itm of
     _ -> 0
 
 crCurrentEquipment :: Creature -> IM.IntMap Item
-crCurrentEquipment cr =
-    merge
-        dropMissing
-        dropMissing
-        (zipWithMatched (\_ _ itm -> itm))
-        (_crInvEquipped cr)
-        (_crInv cr)
+crCurrentEquipment = IM.filter (isJust . (^? itLocation . ilEquipPosition)) . _crInv
+--    merge
+--        dropMissing
+--        dropMissing
+--        (zipWithMatched (\_ _ itm -> itm))
+--        (_crInvEquipped cr)
+--        (_crInv cr)
 
 strFromHeldItem :: Creature -> Int
 strFromHeldItem cr