warscript 0.0.1-dev.effa673 → 0.0.1-dev.f024cc2

package/engine/behaviour/unit.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____behavior = require("engine.behavior")
@@ -9,6 +10,17 @@ local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 require("engine.internal.unit+ability")
 require("engine.internal.unit-missile-launch")
+local ____linked_2Dset = require("utility.linked-set")
+local LinkedSet = ____linked_2Dset.LinkedSet
+local ____lua_2Dmaps = require("utility.lua-maps")
+local getOrPut = ____lua_2Dmaps.getOrPut
+local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
+local ____lua_2Dsets = require("utility.lua-sets")
+local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
+local behaviorsByEvent = {}
+local rangeByBehaviorByEvent = {}
+local listenerByBehaviorByEvent = {}
+local eventsByBehavior = {}
 ____exports.UnitBehavior = __TS__Class()
 local UnitBehavior = ____exports.UnitBehavior
 UnitBehavior.name = "UnitBehavior"
@@ -16,10 +28,69 @@ __TS__ClassExtends(UnitBehavior, Behavior)
 function UnitBehavior.prototype.____constructor(self, unit)
     Behavior.prototype.____constructor(self, unit)
 end
+function UnitBehavior.prototype.onDestroy(self)
+    local events = eventsByBehavior[self]
+    if events ~= nil then
+        for event in pairs(events) do
+            local ____opt_0 = behaviorsByEvent[event]
+            if ____opt_0 ~= nil then
+                ____opt_0:remove(self)
+            end
+            local ____opt_2 = rangeByBehaviorByEvent[event]
+            if ____opt_2 ~= nil then
+                ____opt_2[self] = nil
+            end
+            local ____opt_4 = listenerByBehaviorByEvent[event]
+            if ____opt_4 ~= nil then
+                ____opt_4[self] = nil
+            end
+        end
+        eventsByBehavior[self] = nil
+    end
+    return Behavior.prototype.onDestroy(self)
+end
+function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
+    local rangeByBehavior = getOrPut(rangeByBehaviorByEvent, event, mutableLuaMap)
+    rangeByBehavior[self] = range
+    local listenerByBehavior = getOrPut(listenerByBehaviorByEvent, event, mutableLuaMap)
+    listenerByBehavior[self] = listener
+    getOrPut(eventsByBehavior, self, mutableLuaSet)[event] = true
+    local behaviors = behaviorsByEvent[event]
+    if behaviors == nil then
+        event:addListener(function(...)
+            local behaviors = behaviorsByEvent[event]
+            if behaviors ~= nil then
+                local unit = extractUnit(...)
+                if unit ~= nil then
+                    for behavior in pairs(behaviors) do
+                        local range = rangeByBehavior[behavior]
+                        if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
+                            local ____self_6 = behavior
+                            ____self_6[listenerByBehavior[behavior]](____self_6, ...)
+                        end
+                    end
+                end
+            end
+        end)
+        behaviors = __TS__New(LinkedSet)
+        behaviorsByEvent[event] = behaviors
+    end
+    behaviors:add(self)
+end
+function UnitBehavior.prototype.onImmediateOrder(self, orderId)
+end
+function UnitBehavior.prototype.onTargetOrder(self, orderId, target)
+end
+function UnitBehavior.prototype.onPointOrder(self, orderId, x, y)
+end
 function UnitBehavior.prototype.onAutoAttackStart(self, target)
 end
 function UnitBehavior.prototype.onAutoAttackFinish(self, target)
 end
+function UnitBehavior.prototype.onTargetingAutoAttackStart(self, source)
+end
+function UnitBehavior.prototype.onTargetingAutoAttackFinish(self, source)
+end
 function UnitBehavior.prototype.onDamageDealing(self, target, event)
 end
 function UnitBehavior.prototype.onDamageDealt(self, target, event)
@@ -32,6 +103,32 @@ function UnitBehavior.prototype.onAbilityGained(self, ability)
 end
 function UnitBehavior.prototype.onAbilityLost(self, ability)
 end
+function UnitBehavior.prototype.onAbilityChannelingStart(self, ability)
+end
+function UnitBehavior.prototype.onAbilityImpact(self, ability)
+end
+function UnitBehavior.prototype.onAbilityWidgetTargetImpact(self, ability, target)
+end
+function UnitBehavior.prototype.onAbilityUnitTargetImpact(self, ability, target)
+end
+function UnitBehavior.prototype.onAbilityItemTargetImpact(self, ability, target)
+end
+function UnitBehavior.prototype.onAbilityDestructibleTargetImpact(self, ability, target)
+end
+function UnitBehavior.prototype.onAbilityPointTargetImpact(self, ability, x, y)
+end
+function UnitBehavior.prototype.onAbilityNoTargetImpact(self, ability)
+end
+function UnitBehavior.prototype.onAbilityChannelingFinish(self, ability)
+end
+function UnitBehavior.prototype.onAbilityStop(self, ability)
+end
+function UnitBehavior.prototype.onTargetingAbilityChannelingStart(self, ability, source)
+end
+function UnitBehavior.prototype.onTargetingAbilityImpact(self, ability, source)
+end
+function UnitBehavior.prototype.onBuffGained(self, buff)
+end
 function UnitBehavior.prototype.onItemDropped(self, item)
 end
 function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -40,6 +137,8 @@ function UnitBehavior.prototype.onItemUsed(self, item)
 end
 function UnitBehavior.prototype.onItemStacked(self, item)
 end
+function UnitBehavior.prototype.onItemChargesChanged(self, item)
+end
 function UnitBehavior.prototype.onKill(self, target)
 end
 function UnitBehavior.prototype.onDeath(self, source)
@@ -53,11 +152,28 @@ __TS__SetDescriptor(
     true
 );
 (function(self)
+    Unit.onImmediateOrder:addListener(function(source, orderId)
+        ____exports.UnitBehavior:forAll(source, "onImmediateOrder", orderId)
+    end)
+    Unit.onTargetOrder:addListener(function(source, orderId, target)
+        ____exports.UnitBehavior:forAll(source, "onTargetOrder", orderId, target)
+    end)
+    Unit.onPointOrder:addListener(function(source, orderId, x, y)
+        ____exports.UnitBehavior:forAll(
+            source,
+            "onPointOrder",
+            orderId,
+            x,
+            y
+        )
+    end)
     Unit.autoAttackStartEvent:addListener(function(source, target)
         ____exports.UnitBehavior:forAll(source, "onAutoAttackStart", target)
+        ____exports.UnitBehavior:forAll(target, "onTargetingAutoAttackStart", source)
     end)
     Unit.autoAttackFinishEvent:addListener(function(source, target)
         ____exports.UnitBehavior:forAll(source, "onAutoAttackFinish", target)
+        ____exports.UnitBehavior:forAll(target, "onTargetingAutoAttackFinish", source)
     end)
     Unit.onDamaging:addListener(function(source, target, event)
         if source ~= nil then
@@ -71,11 +187,51 @@ __TS__SetDescriptor(
         end
         ____exports.UnitBehavior:forAll(target, "onDamageReceived", source, event)
     end)
-    Unit.abilityGainedEvent:addListener(function(source, target)
-        ____exports.UnitBehavior:forAll(source, "onAbilityGained", target)
+    Unit.abilityGainedEvent:addListener(function(source, ability)
+        ____exports.UnitBehavior:forAll(source, "onAbilityGained", ability)
+    end)
+    Unit.abilityLostEvent:addListener(function(source, ability)
+        ____exports.UnitBehavior:forAll(source, "onAbilityLost", ability)
+    end)
+    Unit.abilityChannelingStartEvent:addListener(function(source, ability)
+        ____exports.UnitBehavior:forAll(source, "onAbilityChannelingStart", ability)
+    end)
+    Unit.abilityUnitTargetChannelingStartEvent:addListener(function(source, ability, target)
+        ____exports.UnitBehavior:forAll(target, "onTargetingAbilityChannelingStart", ability, source)
     end)
-    Unit.abilityLostEvent:addListener(function(source, target)
-        ____exports.UnitBehavior:forAll(source, "onAbilityLost", target)
+    Unit.abilityImpactEvent:addListener(function(source, ability)
+        ____exports.UnitBehavior:forAll(source, "onAbilityImpact", ability)
+    end)
+    Unit.abilityWidgetTargetImpactEvent:addListener(function(source, ability, target)
+        ____exports.UnitBehavior:forAll(source, "onAbilityWidgetTargetImpact", ability, target)
+    end)
+    Unit.abilityUnitTargetImpactEvent:addListener(function(source, ability, target)
+        ____exports.UnitBehavior:forAll(source, "onAbilityUnitTargetImpact", ability, target)
+        ____exports.UnitBehavior:forAll(target, "onTargetingAbilityImpact", ability, source)
+    end)
+    Unit.abilityItemTargetImpactEvent:addListener(function(source, ability, target)
+        ____exports.UnitBehavior:forAll(source, "onAbilityItemTargetImpact", ability, target)
+    end)
+    Unit.abilityDestructibleTargetImpactEvent:addListener(function(source, ability, target)
+        ____exports.UnitBehavior:forAll(source, "onAbilityDestructibleTargetImpact", ability, target)
+    end)
+    Unit.abilityPointTargetImpactEvent:addListener(function(source, ability, x, y)
+        ____exports.UnitBehavior:forAll(
+            source,
+            "onAbilityPointTargetImpact",
+            ability,
+            x,
+            y
+        )
+    end)
+    Unit.abilityNoTargetImpactEvent:addListener(function(source, ability)
+        ____exports.UnitBehavior:forAll(source, "onAbilityNoTargetImpact", ability)
+    end)
+    Unit.abilityChannelingFinishEvent:addListener(function(source, ability)
+        ____exports.UnitBehavior:forAll(source, "onAbilityChannelingFinish", ability)
+    end)
+    Unit.abilityStopEvent:addListener(function(source, ability)
+        ____exports.UnitBehavior:forAll(source, "onAbilityStop", ability)
     end)
     Unit.deathEvent:addListener(function(target, source)
         if source ~= nil then
@@ -95,6 +251,9 @@ __TS__SetDescriptor(
     Unit.itemStackedEvent:addListener(function(unit, item)
         ____exports.UnitBehavior:forAll(unit, "onItemStacked", item)
     end)
+    Unit.itemChargesChangedEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
+    end)
 end)(UnitBehavior)
 Unit.destroyEvent:addListener(function(unit)
     ____exports.UnitBehavior:forAll(unit, "destroy")

package/engine/buff.d.ts

@@ -278,6 +278,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     onDeath(source: Unit | undefined): void;
     onDamageDealt(target: Unit, event: DamageEvent): void;
     onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
-    static readonly destroyEvent: Event<[Buff<object>]>;
+    static readonly createdEvent: Event<[Buff<object>]>;
+    static readonly beingDestroyedEvent: Event<[Buff<object>]>;
 }
 export {};

package/engine/buff.lua

@@ -304,7 +304,8 @@ buffHealingIntervalTimerCallback = function(buff)
         source:healTarget(buff[101], healingPerInterval)
     end
 end
-local buffDestroyEvent = __TS__New(Event)
+local buffCreatedEvent = __TS__New(Event)
+local buffBeingDestroyedEvent = __TS__New(Event)
 ____exports.Buff = __TS__Class()
 local Buff = ____exports.Buff
 Buff.name = "Buff"
@@ -506,6 +507,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     end
     self:onCreate()
     self[100] = 1
+    Event.invoke(buffCreatedEvent, self)
 end
 function Buff.prototype.getUnitBonus(self, bonusType)
     local ____opt_38 = self._bonusIdByBonusType
@@ -619,7 +621,7 @@ function Buff.prototype.onDestroy(self)
             removeUnitBonus(unit, bonusType, bonusId)
         end
     end
-    Event.invoke(buffDestroyEvent, self)
+    Event.invoke(buffBeingDestroyedEvent, self)
     self[100] = 3
     return UnitBehavior.prototype.onDestroy(self)
 end
@@ -1288,7 +1290,8 @@ __TS__SetDescriptor(
     },
     true
 )
-Buff.destroyEvent = buffDestroyEvent;
+Buff.createdEvent = buffCreatedEvent
+Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
 (function(self)
     local function destroyBuffIfNeeded(buff)
         if getUnitAbility(buff[101].handle, buff.typeId) ~= buff.handle and buff[100] == 1 then
@@ -1342,5 +1345,8 @@ Buff.destroyEvent = buffDestroyEvent;
             ____exports.checkBuffs(target)
         end
     )
+    buffCreatedEvent:addListener(function(buff)
+        UnitBehavior:forAll(buff.unit, "onBuffGained", buff)
+    end)
 end)(Buff)
 return ____exports

package/engine/internal/ability.d.ts

@@ -55,9 +55,13 @@ export declare class UnrecognizedAbility extends Ability {
 export declare class UnitAbility extends Ability {
     readonly owner: Unit;
     private readonly u;
+    private d?;
     constructor(handle: jability, typeId: number, owner: Unit);
     incrementHideCounter(): void;
     decrementHideCounter(): void;
+    incrementDisableCounter(): void;
+    decrementDisableCounter(): void;
+    get isDisabled(): boolean;
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;

package/engine/internal/ability.lua

@@ -38,6 +38,7 @@ local getHandleId = GetHandleId
 local getItemBooleanField = BlzGetItemBooleanField
 local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
+local unitDisableAbility = BlzUnitDisableAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -402,9 +403,31 @@ end
 function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
+function UnitAbility.prototype.incrementDisableCounter(self)
+    local unit = self.u
+    local typeId = self.typeId
+    unitHideAbility(unit, typeId, true)
+    unitDisableAbility(unit, typeId, true, false)
+    self.d = (self.d or 0) + 1
+end
+function UnitAbility.prototype.decrementDisableCounter(self)
+    local unit = self.u
+    local typeId = self.typeId
+    unitDisableAbility(unit, typeId, false, false)
+    unitHideAbility(unit, typeId, true)
+    self.d = (self.d or 0) - 1
+end
 function UnitAbility.prototype.interruptCast(self)
     self.owner:interruptCast(self.typeId)
 end
+__TS__SetDescriptor(
+    UnitAbility.prototype,
+    "isDisabled",
+    {get = function(self)
+        return self.d ~= nil and self.d > 0
+    end},
+    true
+)
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",

package/engine/internal/item/ability.lua

@@ -20,6 +20,7 @@ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slo
 local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
 local isItemOwned = IsItemOwned
 local isItemPowerup = IsItemPowerup
+local getItemAbility = BlzGetItemAbility
 local getItemX = GetItemX
 local getItemY = GetItemY
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
@@ -31,6 +32,8 @@ local unitAddItem = UnitAddItem
 local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitResetCooldown = UnitResetCooldown
+local unitInventorySize = UnitInventorySize
+local unitItemInSlot = UnitItemInSlot
 local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
     if not currentMap then
         return 0
@@ -55,22 +58,24 @@ local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
     itemType.activelyUsed = true
     return itemType.id
 end)
-local dummy = assert(CreateUnit(
+---
+-- @internal For use by internal systems only.
+____exports.itemAbilityDummy = assert(CreateUnit(
     Player.neutralVictim.handle,
     dummyUnitId,
     0,
     0,
     270
 ))
-local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
-local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
-ShowUnit(dummy, false)
+local cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
+local cooldownStarterAbility = getItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
+ShowUnit(____exports.itemAbilityDummy, false)
 local function startItemCooldownInternal(handle, cooldown)
     local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
     setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, COOLDOWN_STARTER_ABILITY_TYPE_ID)
     setAbilityRealLevelField(cooldownStarterAbility, ABILITY_RLF_COOLDOWN, 0, cooldown)
-    unitResetCooldown(dummy)
-    unitUseItem(dummy, cooldownStarterItem)
+    unitResetCooldown(____exports.itemAbilityDummy)
+    unitUseItem(____exports.itemAbilityDummy, cooldownStarterItem)
     Timer:run(restoreCooldownGroup, handle, cooldownGroup)
 end
 restoreCooldownGroup = function(handle, cooldownGroup)
@@ -85,7 +90,7 @@ ____exports.startItemCooldown = function(handle, owner, cooldown)
 end
 ---
 -- @internal For use by internal systems only.
-____exports.abilityActionDummy = dummy
+____exports.abilityActionDummy = ____exports.itemAbilityDummy
 ---
 -- @internal For use by internal systems only.
 ____exports.doAbilityAction = function(handle, action, ...)
@@ -104,11 +109,11 @@ ____exports.doAbilityAction = function(handle, action, ...)
         end
         x = getItemX(handle)
         y = getItemY(handle)
-        unitAddItem(dummy, handle)
+        unitAddItem(____exports.itemAbilityDummy, handle)
     end
     local result = action(handle, ...)
     if not isOwned then
-        unitRemoveItem(dummy, handle)
+        unitRemoveItem(____exports.itemAbilityDummy, handle)
         setItemPosition(handle, x, y)
         if isPowerup then
             setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
@@ -139,9 +144,9 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
         isPowerup = true
     end
     unitRemoveItem(owner, handle)
-    unitAddItem(dummy, handle)
+    unitAddItem(____exports.itemAbilityDummy, handle)
     local result = action(handle, ...)
-    unitRemoveItem(dummy, handle)
+    unitRemoveItem(____exports.itemAbilityDummy, handle)
     unitAddItemToSlot(owner, handle, slot)
     if isPowerup then
         setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
@@ -151,4 +156,51 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
     end
     return result
 end
+local depth = 0
+local itemBySlot = {}
+---
+-- @internal For use by internal systems only.
+____exports.doUnitAbilityAction = function(unit, abilityTypeId, action, ...)
+    local ____depth_0 = depth
+    depth = ____depth_0 + 1
+    local offset = 6 * ____depth_0
+    for slot = 0, unitInventorySize(unit) - 1 do
+        local item = unitItemInSlot(unit, slot)
+        if getItemAbility(item, abilityTypeId) ~= nil then
+            local isAlreadyIgnoredInEvents = ignoreEventsItems[item] ~= nil
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = true
+            end
+            unitRemoveItem(unit, item)
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = nil
+            end
+            itemBySlot[offset + slot] = item
+        end
+    end
+    local result = action(unit, ...)
+    for slot = 0, unitInventorySize(unit) - 1 do
+        local item = itemBySlot[offset + slot]
+        if item ~= nil then
+            local isAlreadyIgnoredInEvents = ignoreEventsItems[item] ~= nil
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = true
+            end
+            local isPowerup = isItemPowerup(item)
+            if isPowerup then
+                setItemBooleanField(item, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
+            end
+            unitAddItemToSlot(unit, item, slot)
+            if isPowerup then
+                setItemBooleanField(item, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
+            end
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = nil
+            end
+            itemBySlot[offset + slot] = nil
+        end
+    end
+    depth = depth - 1
+    return result
+end
 return ____exports

package/engine/internal/item+owner.lua

@@ -6,12 +6,18 @@ local Item = ____item.Item
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ownerByItem = setmetatable({}, {__mode = "kv"})
-Unit.itemPickedUpEvent:addListener(function(unit, item)
-    ownerByItem[item] = unit
-end)
-Unit.itemDroppedEvent:addListener(function(unit, item)
-    ownerByItem[item] = nil
-end)
+Unit.itemPickedUpEvent:addListener(
+    4,
+    function(unit, item)
+        ownerByItem[item] = unit
+    end
+)
+Unit.itemDroppedEvent:addListener(
+    4,
+    function(unit, item)
+        ownerByItem[item] = nil
+    end
+)
 __TS__ObjectDefineProperty(
     Item.prototype,
     "owner",

package/engine/internal/item.d.ts

@@ -5,8 +5,8 @@ import { Event } from "../../event";
 import { ReadonlyRect } from "../../core/types/rect";
 import { ItemAbility } from "./ability";
 import { AbilityTypeId } from "../object-data/entry/ability-type";
+import type { ItemTypeId } from "../object-data/entry/item-type";
 type DefenseType = 0 | 1 | 2 | 3 | 4 | 5;
-export declare const addAndGetAbility: (handle: jitem, abilityTypeId: AbilityTypeId) => jability | null;
 declare const enum ItemPropertyKey {
     ABILITIES = 100,
     LUA_INDEX_BY_ABILITY_TYPE_ID = 101
@@ -17,7 +17,7 @@ export declare class Item extends Handle<jitem> {
     constructor(handle: jitem);
     protected onDestroy(): HandleDestructor;
     static create<T extends Item>(this: typeof Item & (new (handle: jitem) => T), id: number, x: number, y: number, skinId?: number): T;
-    get typeId(): number;
+    get typeId(): ItemTypeId;
     set skinId(v: number);
     get skinId(): number;
     set name(v: string);
@@ -73,6 +73,8 @@ export declare class Item extends Handle<jitem> {
     set position(v: Vec2);
     set charges(v: number);
     get charges(): number;
+    consumeCharge(): boolean;
+    consumeCharges(count: number): boolean;
     addAbility(abilityTypeId: AbilityTypeId): ItemAbility | undefined;
     removeAbility(abilityTypeId: AbilityTypeId): boolean;
     hasAbility(abilityTypeId: AbilityTypeId): boolean;
@@ -82,5 +84,6 @@ export declare class Item extends Handle<jitem> {
     static getInRect(rect: ReadonlyRect): Item[];
     static get onCreate(): Event<[Item]>;
     static get destroyEvent(): Event<[Item]>;
+    static readonly chargesChangedEvent: Event<[Item]>;
 }
 export {};

package/engine/internal/item.lua

@@ -1,26 +1,33 @@
 local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__Delete = ____lualib.__TS__Delete
 local ____exports = {}
+local invoke
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____color = require("core.types.color")
 local Color = ____color.Color
+local ____event = require("event")
+local Event = ____event.Event
 local ____rect = require("core.types.rect")
 local Rect = ____rect.Rect
 local ____ability = require("engine.internal.ability")
 local ItemAbility = ____ability.ItemAbility
 local ____ability = require("engine.internal.item.ability")
 local doAbilityAction = ____ability.doAbilityAction
+local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
+local itemAbilityDummy = ____ability.itemAbilityDummy
 local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
 local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
 local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
 local SLOT_FILLER_ITEM_TYPE_ID = ____add_2Ditem_2Dto_2Dslot.SLOT_FILLER_ITEM_TYPE_ID
 local ____vec2 = require("math.vec2")
 local distance = ____vec2.distance
+local itemChargesChangeEvent = __TS__New(Event)
 local itemAddAbility = BlzItemAddAbility
 local itemRemoveAbility = BlzItemRemoveAbility
 local getItemAbility = BlzGetItemAbility
@@ -36,10 +43,26 @@ local getEnumItem = GetEnumItem
 local getItemTypeId = GetItemTypeId
 local getItemX = GetItemX
 local getItemY = GetItemY
+local getItemCharges = GetItemCharges
+local setItemCharges = SetItemCharges
+local unitRemoveAbility = UnitRemoveAbility
+local unitUseItem = UnitUseItem
+local unitUseItemPoint = UnitUseItemPoint
+local unitUseItemTarget = UnitUseItemTarget
+_G.SetItemCharges = function(whichItem, charges)
+    setItemCharges(whichItem, charges)
+    invoke(
+        itemChargesChangeEvent,
+        ____exports.Item:of(whichItem)
+    )
+end
 local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local getItemBooleanField = BlzGetItemBooleanField
+invoke = Event.invoke
 local enumRect = Rect:create(0, 0, 0, 0).handle
+---
+-- @internal For use by internal systems only.
 ____exports.addAndGetAbility = function(handle, abilityTypeId)
     if itemAddAbility(handle, abilityTypeId) then
         return getItemAbility(handle, abilityTypeId)
@@ -65,6 +88,23 @@ local function getItemAbilities(handle, item)
     end
     return abilities
 end
+local function consumeCharge(handle)
+    do
+        local i = 0
+        local ability = getItemAbilityByIndex(handle, i)
+        while ability ~= nil do
+            unitRemoveAbility(
+                itemAbilityDummy,
+                getAbilityId(ability)
+            )
+            do
+                i = i + 1
+                ability = getItemAbilityByIndex(handle, i)
+            end
+        end
+    end
+    return unitUseItem(itemAbilityDummy, handle) or unitUseItemPoint(itemAbilityDummy, handle, 0, 0) or unitUseItemTarget(itemAbilityDummy, handle, itemAbilityDummy)
+end
 local targetCollection
 local targetCollectionNextIndex
 local centerX
@@ -116,6 +156,36 @@ end
 function Item.create(self, id, x, y, skinId)
     return self:of(BlzCreateItemWithSkin(id, x, y, skinId or id))
 end
+function Item.prototype.consumeCharge(self)
+    return self:consumeCharges(1)
+end
+function Item.prototype.consumeCharges(self, count)
+    local handle = self.handle
+    local charges = getItemCharges(handle)
+    if charges > count then
+        setItemCharges(handle, charges - count)
+        invoke(itemChargesChangeEvent, self)
+        return true
+    end
+    if charges == count then
+        if getItemBooleanField(handle, ITEM_BF_PERISHABLE) then
+            self:destroy()
+            return true
+        end
+        if not getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED) then
+            setItemCharges(handle, 0)
+            invoke(itemChargesChangeEvent, self)
+            return true
+        end
+        setItemCharges(handle, 1)
+        local ____doAbilityActionForceDummy_2 = doAbilityActionForceDummy
+        local ____opt_0 = self.owner
+        ____doAbilityActionForceDummy_2(handle, ____opt_0 and ____opt_0.handle, consumeCharge)
+        invoke(itemChargesChangeEvent, self)
+        return true
+    end
+    return false
+end
 function Item.prototype.addAbility(self, abilityTypeId)
     local nativeAbility = doAbilityAction(self.handle, ____exports.addAndGetAbility, abilityTypeId)
     if nativeAbility ~= nil then
@@ -301,7 +371,7 @@ __TS__SetDescriptor(
     "perishable",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
+            return getItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
         end,
         set = function(self, v)
             BlzSetItemBooleanField(self.handle, ITEM_BF_PERISHABLE, v)
@@ -557,10 +627,11 @@ __TS__SetDescriptor(
     "charges",
     {
         get = function(self)
-            return GetItemCharges(self.handle)
+            return getItemCharges(self.handle)
         end,
         set = function(self, v)
-            SetItemCharges(self.handle, v)
+            setItemCharges(self.handle, v)
+            invoke(itemChargesChangeEvent, self)
         end
     },
     true
@@ -587,6 +658,7 @@ __TS__ObjectDefineProperty(
         return self.onDestroyEvent
     end}
 )
+Item.chargesChangedEvent = itemChargesChangeEvent
 local getManipulatedItem = GetManipulatedItem
 local trigger = CreateTrigger()
 TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_PICKUP_ITEM)

package/engine/internal/misc/damage-metadata-by-target.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};