From 0710427aa2d2a265bc04febf2b718fd9bd55dddb Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 5 Jun 2025 15:39:33 +0100 Subject: [PATCH] Remove record concerning removing equipment effects --- src/Dodge/Creature/Impulse/UseItem.hs | 4 ++-- src/Dodge/Data/Item/Use/Equipment.hs | 2 +- src/Dodge/Default/Item/Use/Equipment.hs | 2 +- src/Dodge/Item/Equipment.hs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Dodge/Creature/Impulse/UseItem.hs b/src/Dodge/Creature/Impulse/UseItem.hs index 3f548d9a2..3153faa55 100644 --- a/src/Dodge/Creature/Impulse/UseItem.hs +++ b/src/Dodge/Creature/Impulse/UseItem.hs @@ -11,7 +11,6 @@ import Dodge.Data.ComposedItem import Dodge.Data.DoubleTree import Dodge.Data.World import Dodge.DoubleTree -import Dodge.Euse import Dodge.HeldUse import Dodge.Inventory import Dodge.Item.Grammar @@ -127,7 +126,8 @@ toggleEquipmentAt invid cr w = case getEquipmentAllocation invid w of crpoint = cWorld . lWorld . creatures . ix (_crID cr) itmat i = _crInv cr IM.! i 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' = effectOnRemove itm' diff --git a/src/Dodge/Data/Item/Use/Equipment.hs b/src/Dodge/Data/Item/Use/Equipment.hs index 41981148d..9f9a267ac 100644 --- a/src/Dodge/Data/Item/Use/Equipment.hs +++ b/src/Dodge/Data/Item/Use/Equipment.hs @@ -15,7 +15,7 @@ import Dodge.Data.Item.HeldUse data EquipEffect = EquipEffect { _eeUse :: Euse --Item -> Creature -> World -> World - , _eeOnEquip :: ItmCrWdWd --Item -> Creature -> World -> World +-- , _eeOnEquip :: ItmCrWdWd --Item -> Creature -> World -> World -- , _eeOnRemove :: ItmCrWdWd --Item -> Creature -> World -> World -- , _eeParams :: EquipParams -- , _eeViewDist :: Maybe Float diff --git a/src/Dodge/Default/Item/Use/Equipment.hs b/src/Dodge/Default/Item/Use/Equipment.hs index 083550e8e..fd6ccff0d 100644 --- a/src/Dodge/Default/Item/Use/Equipment.hs +++ b/src/Dodge/Default/Item/Use/Equipment.hs @@ -8,7 +8,7 @@ defaultEquip = EquipEffect { --_eeType = GoesOnHead _eeUse = EDoNothing - , _eeOnEquip = ItmCrWdWdDoNothing +-- , _eeOnEquip = ItmCrWdWdDoNothing -- , _eeOnRemove = ItmCrWdWdDoNothing -- , _eeParams = NoEquipParams -- , _eeViewDist = Nothing diff --git a/src/Dodge/Item/Equipment.hs b/src/Dodge/Item/Equipment.hs index 52b1d6096..bd60d7f5d 100644 --- a/src/Dodge/Item/Equipment.hs +++ b/src/Dodge/Item/Equipment.hs @@ -42,7 +42,7 @@ frontArmour = wristArmour :: Item wristArmour = defaultEquipment - & itUse . uequipEffect . eeOnEquip .~ EonWristShield +-- & itUse . uequipEffect . eeOnEquip .~ EonWristShield & itUse . uequipEffect . eeUse .~ EWristShield -- & itUse . uequipEffect . eeOnRemove .~ EoffWristShield & itType .~ EQUIP WRISTARMOUR