Remove record concerning removing equipment effects

This commit is contained in:
2025-06-05 15:39:33 +01:00
parent 6300a90257
commit 0710427aa2
4 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -11,7 +11,6 @@ import Dodge.Data.ComposedItem
import Dodge.Data.DoubleTree import Dodge.Data.DoubleTree
import Dodge.Data.World import Dodge.Data.World
import Dodge.DoubleTree import Dodge.DoubleTree
import Dodge.Euse
import Dodge.HeldUse import Dodge.HeldUse
import Dodge.Inventory import Dodge.Inventory
import Dodge.Item.Grammar import Dodge.Item.Grammar
@@ -127,7 +126,8 @@ toggleEquipmentAt invid cr w = case getEquipmentAllocation invid w of
crpoint = cWorld . lWorld . creatures . ix (_crID cr) crpoint = cWorld . lWorld . creatures . ix (_crID cr)
itmat i = _crInv cr IM.! i itmat i = _crInv cr IM.! i
itm = itmat invid itm = itmat invid
onequip itm' = doItmCrWdWd ((_eeOnEquip . _uequipEffect . _itUse) itm') itm' --onequip itm' = doItmCrWdWd ((_eeOnEquip . _uequipEffect . _itUse) itm') itm'
onequip itm' = effectOnEquip itm'
--onremove itm' = doItmCrWdWd ((_eeOnRemove . _uequipEffect . _itUse) itm') itm' --onremove itm' = doItmCrWdWd ((_eeOnRemove . _uequipEffect . _itUse) itm') itm'
onremove itm' = effectOnRemove itm' onremove itm' = effectOnRemove itm'
+1 -1
View File
@@ -15,7 +15,7 @@ import Dodge.Data.Item.HeldUse
data EquipEffect = EquipEffect data EquipEffect = EquipEffect
{ _eeUse :: Euse --Item -> Creature -> World -> World { _eeUse :: Euse --Item -> Creature -> World -> World
, _eeOnEquip :: ItmCrWdWd --Item -> Creature -> World -> World -- , _eeOnEquip :: ItmCrWdWd --Item -> Creature -> World -> World
-- , _eeOnRemove :: ItmCrWdWd --Item -> Creature -> World -> World -- , _eeOnRemove :: ItmCrWdWd --Item -> Creature -> World -> World
-- , _eeParams :: EquipParams -- , _eeParams :: EquipParams
-- , _eeViewDist :: Maybe Float -- , _eeViewDist :: Maybe Float
+1 -1
View File
@@ -8,7 +8,7 @@ defaultEquip =
EquipEffect EquipEffect
{ --_eeType = GoesOnHead { --_eeType = GoesOnHead
_eeUse = EDoNothing _eeUse = EDoNothing
, _eeOnEquip = ItmCrWdWdDoNothing -- , _eeOnEquip = ItmCrWdWdDoNothing
-- , _eeOnRemove = ItmCrWdWdDoNothing -- , _eeOnRemove = ItmCrWdWdDoNothing
-- , _eeParams = NoEquipParams -- , _eeParams = NoEquipParams
-- , _eeViewDist = Nothing -- , _eeViewDist = Nothing
+1 -1
View File
@@ -42,7 +42,7 @@ frontArmour =
wristArmour :: Item wristArmour :: Item
wristArmour = wristArmour =
defaultEquipment defaultEquipment
& itUse . uequipEffect . eeOnEquip .~ EonWristShield -- & itUse . uequipEffect . eeOnEquip .~ EonWristShield
& itUse . uequipEffect . eeUse .~ EWristShield & itUse . uequipEffect . eeUse .~ EWristShield
-- & itUse . uequipEffect . eeOnRemove .~ EoffWristShield -- & itUse . uequipEffect . eeOnRemove .~ EoffWristShield
& itType .~ EQUIP WRISTARMOUR & itType .~ EQUIP WRISTARMOUR