warscript 0.0.1-dev.f5421e8 → 0.0.1-dev.f9166a3

package/engine/behaviour/ability/damage.d.ts

@@ -4,26 +4,29 @@ import { Ability } from "../../internal/ability";
 import { Unit } from "../../internal/unit";
 import { AbilityDependentValue } from "../../object-field/ability";
 import { Widget } from "../../../core/types/widget";
-import { AttackType, DamageType, WeaponType } from "../../internal/unit+damage";
+import { DamageType, WeaponType } from "../../internal/unit+damage";
 import { CombatClassifications } from "../../object-data/auxiliary/combat-classification";
+import { AttackType } from "../../object-data/auxiliary/attack-type";
 export type DamageAbilityBehaviorParameters = {
     damagePerStrength?: AbilityDependentValue<number>;
     damagePerAgility?: AbilityDependentValue<number>;
     damagePerIntelligence?: AbilityDependentValue<number>;
-    attackType?: AttackType;
+    attackType?: AbilityDependentValue<AttackType>;
     damageType?: DamageType;
     weaponType?: WeaponType;
+    metadata?: AbilityDependentValue<string | number | boolean>;
 };
 export type DamageAreaAbilityBehaviorParameters = DamageAbilityBehaviorParameters & {
     maximumDamage?: AbilityDependentValue<number>;
     areaOfEffect?: AbilityDependentValue<number>;
     allowedTargetCombatClassifications?: AbilityDependentValue<CombatClassifications>;
 };
-declare abstract class DamageAbilityBehavior<T extends DamageAbilityBehaviorParameters = DamageAbilityBehaviorParameters> extends AbilityBehavior {
+export declare abstract class DamageAbilityBehavior<T extends DamageAbilityBehaviorParameters = DamageAbilityBehaviorParameters> extends AbilityBehavior {
     protected readonly damage: AbilityDependentValue<number>;
     protected readonly parameters?: T | undefined;
     protected constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: T | undefined);
     protected calculateDamage(caster: Unit): number;
+    protected damageTarget(caster: Unit, target: Widget, damage?: number): void;
 }
 export declare class DamageSelfAbilityBehavior extends DamageAbilityBehavior {
     constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAbilityBehaviorParameters);

package/engine/behaviour/ability/damage.lua

@@ -9,7 +9,8 @@ local Unit = ____unit.Unit
 local ____ability = require("engine.standard.fields.ability")
 local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD
 local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
-local DamageAbilityBehavior = __TS__Class()
+____exports.DamageAbilityBehavior = __TS__Class()
+local DamageAbilityBehavior = ____exports.DamageAbilityBehavior
 DamageAbilityBehavior.name = "DamageAbilityBehavior"
 __TS__ClassExtends(DamageAbilityBehavior, AbilityBehavior)
 function DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
@@ -34,49 +35,44 @@ function DamageAbilityBehavior.prototype.calculateDamage(self, caster)
     end
     return damage
 end
-____exports.DamageSelfAbilityBehavior = __TS__Class()
-local DamageSelfAbilityBehavior = ____exports.DamageSelfAbilityBehavior
-DamageSelfAbilityBehavior.name = "DamageSelfAbilityBehavior"
-__TS__ClassExtends(DamageSelfAbilityBehavior, DamageAbilityBehavior)
-function DamageSelfAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
-    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
-end
-function DamageSelfAbilityBehavior.prototype.onImpact(self, caster)
+function DamageAbilityBehavior.prototype.damageTarget(self, caster, target, damage)
     local parameters = self.parameters
     caster:damageTarget(
-        caster,
-        self:calculateDamage(caster),
+        target,
+        damage or self:calculateDamage(caster),
         nil,
         nil,
-        parameters and parameters.attackType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.attackType),
         parameters and parameters.damageType,
-        parameters and parameters.weaponType
+        parameters and parameters.weaponType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.metadata)
     )
 end
+____exports.DamageSelfAbilityBehavior = __TS__Class()
+local DamageSelfAbilityBehavior = ____exports.DamageSelfAbilityBehavior
+DamageSelfAbilityBehavior.name = "DamageSelfAbilityBehavior"
+__TS__ClassExtends(DamageSelfAbilityBehavior, ____exports.DamageAbilityBehavior)
+function DamageSelfAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageSelfAbilityBehavior.____super.prototype.____constructor(self, ability, damage, parameters)
+end
+function DamageSelfAbilityBehavior.prototype.onImpact(self, caster)
+    self:damageTarget(caster, caster)
+end
 ____exports.DamageTargetAbilityBehavior = __TS__Class()
 local DamageTargetAbilityBehavior = ____exports.DamageTargetAbilityBehavior
 DamageTargetAbilityBehavior.name = "DamageTargetAbilityBehavior"
-__TS__ClassExtends(DamageTargetAbilityBehavior, DamageAbilityBehavior)
+__TS__ClassExtends(DamageTargetAbilityBehavior, ____exports.DamageAbilityBehavior)
 function DamageTargetAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
-    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageTargetAbilityBehavior.____super.prototype.____constructor(self, ability, damage, parameters)
 end
 function DamageTargetAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
-    local parameters = self.parameters
-    caster:damageTarget(
-        target,
-        self:calculateDamage(caster),
-        nil,
-        nil,
-        parameters and parameters.attackType,
-        parameters and parameters.damageType,
-        parameters and parameters.weaponType
-    )
+    self:damageTarget(caster, target)
 end
 local DamageAreaAbilityBehavior = __TS__Class()
 DamageAreaAbilityBehavior.name = "DamageAreaAbilityBehavior"
-__TS__ClassExtends(DamageAreaAbilityBehavior, DamageAbilityBehavior)
+__TS__ClassExtends(DamageAreaAbilityBehavior, ____exports.DamageAbilityBehavior)
 function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
-    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageAreaAbilityBehavior.____super.prototype.____constructor(self, ability, damage, parameters)
 end
 function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
     local parameters = self.parameters
@@ -93,15 +89,7 @@ function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
         damage = maximumDamage / #targets
     end
     for ____, target in ipairs(targets) do
-        caster:damageTarget(
-            target,
-            damage,
-            nil,
-            nil,
-            parameters and parameters.attackType,
-            parameters and parameters.damageType,
-            parameters and parameters.weaponType
-        )
+        self:damageTarget(caster, target, damage)
     end
 end
 ____exports.DamageSelfAreaAbilityBehavior = __TS__Class()

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

@@ -1,15 +1,25 @@
 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
 local ____math = require("math")
 local max = ____math.max
 local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
+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"
@@ -17,12 +27,16 @@ __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
     self.ability.cooldownRemaining = max(cooldown, MINIMUM_POSITIVE_NORMALIZED_FLOAT)
     self:flashCasterEffect(caster)
-    AbilityBehavior:forAll(self.ability, "onImpact", caster)
+    local soundPresetId = self.ability:getField(ABILITY_SF_EFFECT_SOUND)
+    if soundPresetId ~= "" then
+        Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
+    end
+    Event.invoke(Unit.abilityImpactEvent, caster, self.ability)
 end
 return ____exports

package/engine/behaviour/ability.lua

@@ -274,7 +274,7 @@ __TS__SetDescriptor(
     Unit.abilityDestructibleTargetChannelingStartEvent:addListener(createUnitEventListener("onDestructibleTargetChannelingStart"))
     Unit.abilityPointTargetChannelingStartEvent:addListener(createUnitEventListener("onPointTargetChannelingStart"))
     Unit.abilityNoTargetChannelingStartEvent:addListener(createUnitEventListener("onNoTargetChannelingStart"))
-    Unit.abilityChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onImpact"))
+    Unit.abilityImpactEvent:addListener(createUnitEventListener("onImpact"))
     Unit.abilityWidgetTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onWidgetTargetImpact"))
     Unit.abilityUnitTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onUnitTargetImpact"))
     Unit.abilityItemTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onItemTargetImpact"))

package/engine/behaviour/unit.d.ts

@@ -6,23 +6,38 @@ 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";
 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;
+    onAbilityChannelingFinish(ability: Ability): void;
+    onAbilityStop(ability: Ability): 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,14 @@ 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.onAbilityChannelingFinish(self, ability)
+end
+function UnitBehavior.prototype.onAbilityStop(self, ability)
+end
 function UnitBehavior.prototype.onItemDropped(self, item)
 end
 function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -40,6 +116,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 +131,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 +166,23 @@ __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, target)
-        ____exports.UnitBehavior:forAll(source, "onAbilityLost", target)
+    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.abilityImpactEvent:addListener(function(source, ability)
+        ____exports.UnitBehavior:forAll(source, "onAbilityImpact", 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 +202,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

@@ -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 {};