Allow for item use when not root

2024-12-20 16:07:58 +00:00
parent 3a72bd366f
commit d9aaa8cc05
26 changed files with 436 additions and 493 deletions
@@ -40,6 +40,8 @@ data Consumables

 data Item = Item
    { _itUse :: ItemUse
+    , _itUseCondition :: UseCondition
+    , _itUseFocus :: UseFocus
    , _itConsumables :: Consumables
    , _itType :: ItemType
    , _itID :: NewInt ItmInt
@@ -16,7 +16,6 @@ data ItemType
    = HELD {_ibtHeld :: HeldItemType}
 --    | LEFT {_ibtLeft :: LeftItemType}
    | EQUIP {_ibtEquip :: EquipItemType}
-    | CONSUMABLE {_ibtConsumable :: ConsumableItemType}
    | CRAFT {_ibtCraft :: CraftType}
    | ATTACH {_ibtAttach :: AttachType}
    | AMMOMAG {_ibtAmmoMag :: AmmoMagType}
@@ -37,13 +37,9 @@ data ItemUse
        { _heldDelay :: UseDelay
        , _heldHammer :: HammerPosition
        , _heldAim :: AimParams
--        , _heldAmmoTypes :: IM.IntMap AmmoType
        , _heldParams :: HeldParams
        , _heldTriggerType :: TriggerType
-        , _useCondition :: UseCondition
-        , _useFocus :: UseFocus
        }
-    | UseConsume { _cUse :: Cuse }
    | UseEquip { _uequipEffect :: EquipEffect }
    | UseAttach {_uaParams :: AttachParams}
    | UseNothing