warscript 0.0.1-dev.eb24bc1 → 0.0.1-dev.eb6b18a

package/engine/behaviour/ability/emulate-impact.lua

@@ -1,9 +1,12 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____ability = require("engine.behaviour.ability")
 local AbilityBehavior = ____ability.AbilityBehavior
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
 local ____ability = require("engine.standard.fields.ability")
 local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
 local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTEGER_LEVEL_FIELD
@@ -13,6 +16,10 @@ local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_F
 local ____sound = require("core.types.sound")
 local Sound3D = ____sound.Sound3D
 local SoundSettings = ____sound.SoundSettings
+local ____ability = require("engine.internal.ability")
+local UnitAbility = ____ability.UnitAbility
+local ____event = require("event")
+local Event = ____event.Event
 ____exports.EmulateImpactAbilityBehavior = __TS__Class()
 local EmulateImpactAbilityBehavior = ____exports.EmulateImpactAbilityBehavior
 EmulateImpactAbilityBehavior.name = "EmulateImpactAbilityBehavior"
@@ -20,7 +27,7 @@ __TS__ClassExtends(EmulateImpactAbilityBehavior, AbilityBehavior)
 function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
     local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
     local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
-    if self.ability.cooldownRemaining ~= 0 or caster.mana < manaCost then
+    if self.ability.cooldownRemaining ~= 0 or caster.mana < manaCost or __TS__InstanceOf(self.ability, UnitAbility) and self.ability.isDisabled then
         return
     end
     caster.mana = caster.mana - manaCost
@@ -30,6 +37,6 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
     if soundPresetId ~= "" then
         Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
     end
-    AbilityBehavior:forAll(self.ability, "onImpact", caster)
+    Event.invoke(Unit.abilityImpactEvent, caster, self.ability)
 end
 return ____exports

package/engine/behaviour/ability.lua

@@ -5,7 +5,6 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
-local createUnitEventListener
 local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
 local ____unit = require("engine.unit")
@@ -30,17 +29,9 @@ local ____ability = require("engine.object-field.ability")
 local AbilityField = ____ability.AbilityField
 local AbilityLevelField = ____ability.AbilityLevelField
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
-local ____timer = require("core.types.timer")
-local Timer = ____timer.Timer
 local createBehaviorFunctionsByAbilityTypeId = {}
 local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
-local function createZeroTimerUnitEventListener(key)
-    local unitEventListener = createUnitEventListener(key)
-    return function(unit, ability, ...)
-        Timer:run(unitEventListener, unit, ability, ...)
-    end
-end
-createUnitEventListener = function(key)
+local function createUnitEventListener(key)
     return function(unit, ability, ...)
         ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
     end
@@ -274,13 +265,13 @@ __TS__SetDescriptor(
     Unit.abilityDestructibleTargetChannelingStartEvent:addListener(createUnitEventListener("onDestructibleTargetChannelingStart"))
     Unit.abilityPointTargetChannelingStartEvent:addListener(createUnitEventListener("onPointTargetChannelingStart"))
     Unit.abilityNoTargetChannelingStartEvent:addListener(createUnitEventListener("onNoTargetChannelingStart"))
-    Unit.abilityChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onImpact"))
-    Unit.abilityWidgetTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onWidgetTargetImpact"))
-    Unit.abilityUnitTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onUnitTargetImpact"))
-    Unit.abilityItemTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onItemTargetImpact"))
-    Unit.abilityDestructibleTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onDestructibleTargetImpact"))
-    Unit.abilityPointTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onPointTargetImpact"))
-    Unit.abilityNoTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onNoTargetImpact"))
+    Unit.abilityImpactEvent:addListener(createUnitEventListener("onImpact"))
+    Unit.abilityWidgetTargetImpactEvent:addListener(createUnitEventListener("onWidgetTargetImpact"))
+    Unit.abilityUnitTargetImpactEvent:addListener(createUnitEventListener("onUnitTargetImpact"))
+    Unit.abilityItemTargetImpactEvent:addListener(createUnitEventListener("onItemTargetImpact"))
+    Unit.abilityDestructibleTargetImpactEvent:addListener(createUnitEventListener("onDestructibleTargetImpact"))
+    Unit.abilityPointTargetImpactEvent:addListener(createUnitEventListener("onPointTargetImpact"))
+    Unit.abilityNoTargetImpactEvent:addListener(createUnitEventListener("onNoTargetImpact"))
     Unit.abilityChannelingFinishEvent:addListener(createUnitEventListener("onChannelingFinish"))
     Unit.abilityStopEvent:addListener(createUnitEventListener("onStop"))
 end)(AbilityBehavior)

package/engine/behaviour/unit/stun-immunity.d.ts

@@ -10,9 +10,11 @@ export type StunImmunityUnitBehaviourParameters = {
     textTagText?: string;
 };
 export declare class StunImmunityUnitBehavior extends UnitBehavior {
-    private readonly parameters;
+    readonly parameters: Readonly<StunImmunityUnitBehaviourParameters>;
     static defaultParameters: StunImmunityUnitBehaviourParameters;
-    constructor(unit: Unit, parameters?: StunImmunityUnitBehaviourParameters);
+    constructor(unit: Unit, parameters?: Readonly<StunImmunityUnitBehaviourParameters>);
     protected onDestroy(): Destructor;
-    private onBuffsCheck;
+    onDamageReceived(): void;
+    onTargetingAbilityChannelingStart(): void;
+    onTargetingAbilityImpact(): void;
 }

package/engine/behaviour/unit/stun-immunity.lua

@@ -12,31 +12,46 @@ local flatMapToLuaSet = ____arrays.flatMapToLuaSet
 local map = ____arrays.map
 local ____text_2Dtag = require("engine.text-tag")
 local TextTag = ____text_2Dtag.TextTag
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
 local DEFAULT_BUFF_TYPE_IDS = postcompile(function()
     return flatMapToLuaSet(
         AbilityType:getAllByBaseIds(map({
-            "Aslo",
-            "AHtc",
-            "Aens",
-            "Aprg",
-            "Apg2",
-            "AOeq",
-            "SNeq",
-            "Aweb",
-            "Afra",
-            "Afrb",
-            "Afrc",
-            "Afr2",
-            "Acri",
-            "Scri",
-            "AUfn",
-            "Aspo",
-            "AEer",
-            "ACwb"
+            "AHtb",
+            "AHbh",
+            "AOws",
+            "AOw2",
+            "AUim",
+            "Acyc",
+            "ANfb",
+            "ANsb",
+            "ANcs",
+            "ANc1",
+            "ANc2",
+            "ANc3",
+            "ACbh",
+            "ANbh",
+            "SCc1",
+            "ACcy",
+            "ANb2",
+            "Awrs",
+            "Awrh",
+            "Awrg",
+            "ACtb",
+            "ACcb"
         }, fourCC)),
         function(abilityType) return __TS__ArrayFlat(abilityType.buffTypeIds) end
     )
 end)
+local function process(behavior)
+    local hasRemovedBuffs = false
+    for buffTypeId in pairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
+        hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
+    end
+    if hasRemovedBuffs and behavior.parameters.textTagText ~= nil then
+        TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
+    end
+end
 ____exports.StunImmunityUnitBehavior = __TS__Class()
 local StunImmunityUnitBehavior = ____exports.StunImmunityUnitBehavior
 StunImmunityUnitBehavior.name = "StunImmunityUnitBehavior"
@@ -48,20 +63,21 @@ function StunImmunityUnitBehavior.prototype.____constructor(self, unit, paramete
     UnitBehavior.prototype.____constructor(self, unit)
     self.parameters = parameters
     unit:decrementStunCounter()
-    self:onBuffsCheck()
+    process(self)
 end
 function StunImmunityUnitBehavior.prototype.onDestroy(self)
     self.unit:incrementStunCounter()
     return UnitBehavior.prototype.onDestroy(self)
 end
-function StunImmunityUnitBehavior.prototype.onBuffsCheck(self)
-    local hasRemovedBuffs = false
-    for buffTypeId in pairs(self.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
-        hasRemovedBuffs = hasRemovedBuffs or self.unit:removeBuff(buffTypeId)
-    end
-    if hasRemovedBuffs and self.parameters.textTagText ~= nil then
-        TextTag:flash(TextTag.MISS, self.parameters.textTagText, self.unit.x, self.unit.y)
-    end
+function StunImmunityUnitBehavior.prototype.onDamageReceived(self)
+    process(self)
+    Timer:run(process, self)
+end
+function StunImmunityUnitBehavior.prototype.onTargetingAbilityChannelingStart(self)
+    process(self)
+end
+function StunImmunityUnitBehavior.prototype.onTargetingAbilityImpact(self)
+    process(self)
 end
 StunImmunityUnitBehavior.defaultParameters = {buffTypeIds = DEFAULT_BUFF_TYPE_IDS, textTagPreset = TextTag.MISS, textTagText = nil}
 return ____exports

package/engine/behaviour/unit.d.ts

@@ -6,23 +6,47 @@ import "../internal/unit+ability";
 import "../internal/unit-missile-launch";
 import { Item } from "../internal/item";
 import type { AbilityBehavior } from "./ability";
+import { Event } from "../../event";
+import { Destructor } from "../../destroyable";
+import type { Widget } from "../../core/types/widget";
+import { Destructable } from "../../core/types/destructable";
 export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
 export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
     constructor(unit: Unit);
+    protected onDestroy(): Destructor;
     readonly sourceAbilityBehavior?: AbilityBehavior;
     get unit(): Unit;
+    registerInRangeUnitEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, unit: Unit, ...args: Args) => unknown>, event: Event<[Unit, ...Args]>, range: number, listener: T): void;
+    onImmediateOrder(orderId: number): void;
+    onTargetOrder(orderId: number, target: Widget): void;
+    onPointOrder(orderId: number, x: number, y: number): void;
     onAutoAttackStart(target: Unit): void;
     onAutoAttackFinish(target: Unit): void;
+    onTargetingAutoAttackStart(source: Unit): void;
+    onTargetingAutoAttackFinish(source: Unit): void;
     onDamageDealing(target: Unit, event: DamagingEvent): void;
     onDamageDealt(target: Unit, event: DamageEvent): void;
     onDamageReceiving(source: Unit | undefined, event: DamagingEvent): void;
     onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
     onAbilityGained(ability: Ability): void;
     onAbilityLost(ability: Ability): void;
+    onAbilityChannelingStart(ability: Ability): void;
+    onAbilityImpact(ability: Ability): void;
+    onAbilityWidgetTargetImpact(ability: Ability, target: Widget): void;
+    onAbilityUnitTargetImpact(ability: Ability, target: Unit): void;
+    onAbilityItemTargetImpact(ability: Ability, target: Item): void;
+    onAbilityDestructibleTargetImpact(ability: Ability, target: Destructable): void;
+    onAbilityPointTargetImpact(ability: Ability, x: number, y: number): void;
+    onAbilityNoTargetImpact(ability: Ability): void;
+    onAbilityChannelingFinish(ability: Ability): void;
+    onAbilityStop(ability: Ability): void;
+    onTargetingAbilityChannelingStart(ability: Ability, source: Unit): void;
+    onTargetingAbilityImpact(ability: Ability, source: Unit): void;
     onItemDropped(item: Item): void;
     onItemPickedUp(item: Item): void;
     onItemUsed(item: Item): void;
     onItemStacked(item: Item): void;
+    onItemChargesChanged(item: Item): void;
     onKill(target: Unit): void;
     onDeath(source: Unit | undefined): void;
 }

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,66 @@ __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, 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(unit, ...)
+            local behaviors = behaviorsByEvent[event]
+            if behaviors ~= 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, unit, ...)
+                    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 +100,30 @@ 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.onItemDropped(self, item)
 end
 function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -40,6 +132,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 +147,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 +182,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 +246,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/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,25 @@ end
 function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
+function UnitAbility.prototype.incrementDisableCounter(self)
+    unitDisableAbility(self.u, self.typeId, true, false)
+    self.d = (self.d or 0) + 1
+end
+function UnitAbility.prototype.decrementDisableCounter(self)
+    unitDisableAbility(self.u, self.typeId, false, false)
+    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

@@ -55,22 +55,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 cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
 local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
-ShowUnit(dummy, false)
+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 +87,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 +106,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 +141,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)

package/engine/internal/item.d.ts

@@ -7,7 +7,6 @@ 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
@@ -74,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;
@@ -83,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 {};