Commit before modifying crEquipment for item locations

This commit is contained in:
2025-08-26 22:13:40 +01:00
parent e5473d1028
commit 49efe62910
2 changed files with 4 additions and 6 deletions
+3 -3
View File
@@ -3,8 +3,8 @@ module Dodge.Creature.ArmourChase (
flockArmourChaseCrit, flockArmourChaseCrit,
) where ) where
import Dodge.Data.Equipment.Misc --import Dodge.Data.Equipment.Misc
import Control.Lens --import Control.Lens
import Dodge.Creature.ChaseCrit import Dodge.Creature.ChaseCrit
import Dodge.Data.Creature import Dodge.Data.Creature
import Dodge.Default import Dodge.Default
@@ -43,4 +43,4 @@ armourChaseCrit =
-- ] -- ]
-- , _crMvType = defaultChaseMvType{_mvTurnRad = FloatConst 0.05} -- , _crMvType = defaultChaseMvType{_mvTurnRad = FloatConst 0.05}
} }
& crEquipment . at OnChest ?~ 0 -- & crEquipment . at OnChest ?~ 0
+1 -3
View File
@@ -96,9 +96,7 @@ rmInvItem cid invid w =
itm = w ^?! cWorld . lWorld . items . ix itid itm = w ^?! cWorld . lWorld . items . ix itid
dounequipfunction = effectOnRemove itm cr dounequipfunction = effectOnRemove itm cr
removeAnySlotEquipment = fromMaybe id $ do removeAnySlotEquipment = fromMaybe id $ do
epos <- epos <- w ^? cWorld . lWorld . items . ix itid
w ^? cWorld . lWorld . creatures . ix cid . crInv . ix invid
>>= \k -> w ^? cWorld . lWorld . items . ix k
. itLocation . itLocation
. ilEquipSite . ilEquipSite
. _Just . _Just