From 5cb8be13634d07dfcb27f1415b3de104fde5d16d Mon Sep 17 00:00:00 2001 From: justin Date: Wed, 27 Aug 2025 11:33:09 +0100 Subject: [PATCH] Cleanup equipment item function --- src/Dodge/Creature/Statistics.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Dodge/Creature/Statistics.hs b/src/Dodge/Creature/Statistics.hs index 2c848a97d..2bcd48c47 100644 --- a/src/Dodge/Creature/Statistics.hs +++ b/src/Dodge/Creature/Statistics.hs @@ -6,10 +6,12 @@ module Dodge.Creature.Statistics ( crIntelligence, ) where +import Dodge.Data.Equipment.Misc +import qualified Data.Map.Strict as M import NewInt import Dodge.Data.LWorld import Data.Maybe -import qualified IntMapHelp as IM +--import qualified IntMapHelp as IM import LensHelp crDexterity :: Creature -> Int @@ -55,10 +57,10 @@ equipmentStrValue itm = case _itType itm of EQUIP POWERLEGS -> 3 _ -> 0 -crCurrentEquipment :: LWorld -> Creature -> NewIntMap InvInt Item -crCurrentEquipment lw = over unNIntMap (IM.filter (isJust . (^? itLocation . ilEquipSite . _Just))) . fmap f . _crInv +crCurrentEquipment :: LWorld -> Creature -> M.Map EquipSite Item +crCurrentEquipment lw = fmap f . _crEquipment where - f i = lw ^?! items . ix i + f i = lw ^?! items . ix (_unNInt i) strFromHeldItem :: LWorld -> Creature -> Int strFromHeldItem lw cr = fromMaybe 0 $ do