Move function fields outside equipment

2022-07-20 20:40:13 +01:00
parent e9f0130013
commit 845c1f282e
14 changed files with 87 additions and 29 deletions
@@ -25,6 +25,7 @@ module Dodge.Inventory
    )
    where
 import Dodge.Data
+import Dodge.Euse
 import Dodge.Inventory.CloseObject
 import Dodge.Inventory.CheckSlots
 import Dodge.Inventory.ItemSpace
@@ -71,7 +72,7 @@ rmInvItem cid invid w = case w ^? creatures . ix cid . crInv . ix invid . itCons
    itm = _crInv cr IM.! invid
    dounequipfunction = fromMaybe id $ do
        rmf <- itm ^? itUse . eqEq . eqOnRemove
-        return $ rmf itm cr
+        return $ useE rmf itm cr
    doanyitemeffect = fromMaybe id $ do
        rmf <- itm ^? itEffect . ieDrop
        return $ rmf itm cr