warscript 0.0.1-dev.56d888d → 0.0.1-dev.587ef8c

package/engine/behaviour/ability.lua

@@ -4,6 +4,7 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 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")
@@ -14,6 +15,8 @@ local ____effect = require("core.types.effect")
 local Effect = ____effect.Effect
 local ____ability = require("engine.standard.fields.ability")
 local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = ____ability.CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD
+local CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
 local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
@@ -24,21 +27,27 @@ local ____ability = require("engine.object-field.ability")
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
-local ____missile = require("core.types.missile")
-local Missile = ____missile.Missile
 local createBehaviorFunctionsByAbilityTypeId = {}
-local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
-    if success then
-        abilityBehavior:onMissileArrival(...)
+local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
+local function createZeroTimerUnitEventListener(key)
+    local unitEventListener = createUnitEventListener(key)
+    return function(unit, ability, ...)
+        Timer:run(unitEventListener, unit, ability, ...)
     end
 end
-local ____class_0 = __TS__Class()
-____class_0.name = ""
-function ____class_0.prototype.____constructor(self, abilityBehavior)
+createUnitEventListener = function(key)
+    return function(unit, ability, ...)
+        ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
+    end
+end
+local registeredCommandEventIds = {}
+local ____class_2 = __TS__Class()
+____class_2.name = ""
+function ____class_2.prototype.____constructor(self, abilityBehavior)
     self.abilityBehavior = abilityBehavior
 end
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "art",
     {get = function(self)
         return MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.abilityBehavior.ability, 0)
@@ -46,7 +55,7 @@ __TS__SetDescriptor(
     true
 )
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "arc",
     {get = function(self)
         return MISSILE_ARC_ABILITY_FLOAT_FIELD:getValue(self.abilityBehavior.ability)
@@ -54,7 +63,7 @@ __TS__SetDescriptor(
     true
 )
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "speed",
     {get = function(self)
         return MISSILE_SPEED_ABILITY_INTEGER_FIELD:getValue(self.abilityBehavior.ability)
@@ -65,12 +74,33 @@ ____exports.AbilityBehavior = __TS__Class()
 local AbilityBehavior = ____exports.AbilityBehavior
 AbilityBehavior.name = "AbilityBehavior"
 __TS__ClassExtends(AbilityBehavior, Behavior)
-function AbilityBehavior.prototype.____constructor(self, ability)
+function AbilityBehavior.prototype.____constructor(self, ability, parameters)
     Behavior.prototype.____constructor(self, ability)
+    if parameters and parameters.isExclusiveOnImpactHandler then
+        exclusiveOnImpactHandlerAbilityBehaviorByAbility[ability] = self
+    end
+end
+function AbilityBehavior.prototype.registerCommandEvent(self, orderTypeStringId)
+    if orderTypeStringId == nil then
+        orderTypeStringId = self.ability.orderTypeStringId
+    end
+    local commandEventId = (tostring(self.ability.typeId) .. "#") .. orderTypeStringId
+    if not (registeredCommandEventIds[commandEventId] ~= nil) then
+        registeredCommandEventIds[commandEventId] = true
+        Unit.abilityCommandEvent[self.ability.typeId][orderTypeStringId]:addListener(createUnitEventListener("onCommand"))
+    end
 end
 function AbilityBehavior.prototype.resolveCurrentAbilityDependentValue(self, value)
     return resolveCurrentAbilityDependentValue(self.ability, value)
 end
+function AbilityBehavior.prototype.flashCasterEffect(self, widget)
+    local attachmentPoint = CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
+    Effect:flash(
+        CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
+        widget,
+        attachmentPoint ~= "" and attachmentPoint or "origin"
+    )
+end
 function AbilityBehavior.prototype.flashAreaEffect(self, x, y, ...)
     Effect:flash(
         AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
@@ -104,22 +134,14 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
         )
     end
 end
-function AbilityBehavior.prototype.launchMissile(self, source, target, ...)
-    Missile:launch(
-        self.missileLaunchConfig,
-        source,
-        target,
-        invokeOnMissileArrival,
-        self,
-        ...
-    )
-end
 function AbilityBehavior.prototype.onMissileArrival(self, ...)
 end
 function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
 end
 function AbilityBehavior.prototype.onUnitLoseAbility(self, _unit)
 end
+function AbilityBehavior.prototype.onCommand(self, caster, orderTypeStringId)
+end
 function AbilityBehavior.prototype.onCastingStart(self, caster)
 end
 function AbilityBehavior.prototype.onCastingFinish(self, caster)
@@ -179,7 +201,7 @@ __TS__SetDescriptor(
     end},
     true
 )
-AbilityBehavior.MissileLaunchConfig = ____class_0
+AbilityBehavior.MissileLaunchConfig = ____class_2
 __TS__SetDescriptor(
     AbilityBehavior.prototype,
     "missileLaunchConfig",
@@ -191,17 +213,6 @@ __TS__SetDescriptor(
     true
 );
 (function(self)
-    local function createUnitEventListener(key)
-        return function(unit, ability, ...)
-            ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
-        end
-    end
-    local function createZeroTimerUnitEventListener(key)
-        local unitEventListener = createUnitEventListener(key)
-        return function(unit, ability, ...)
-            Timer:run(unitEventListener, unit, ability, ...)
-        end
-    end
     Unit.abilityGainedEvent:addListener(createUnitEventListener("onUnitGainAbility"))
     Unit.abilityLostEvent:addListener(createUnitEventListener("onUnitLoseAbility"))
     Unit.abilityCastingStartEvent:addListener(createUnitEventListener("onCastingStart"))

package/engine/behaviour/unit.d.ts

@@ -4,6 +4,7 @@ import { Ability } from "../internal/ability";
 import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
 import "../internal/unit+ability";
 import "../internal/unit-missile-launch";
+import { Item } from "../internal/item";
 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);
@@ -16,6 +17,10 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
     onAbilityGained(ability: Ability): void;
     onAbilityLost(ability: Ability): void;
+    onItemDropped(item: Item): void;
+    onItemPickedUp(item: Item): void;
+    onItemUsed(item: Item): void;
+    onItemStacked(item: Item): void;
     onKill(target: Unit): void;
     onDeath(source: Unit | undefined): void;
 }

package/engine/behaviour/unit.lua

@@ -32,6 +32,14 @@ function UnitBehavior.prototype.onAbilityGained(self, ability)
 end
 function UnitBehavior.prototype.onAbilityLost(self, ability)
 end
+function UnitBehavior.prototype.onItemDropped(self, item)
+end
+function UnitBehavior.prototype.onItemPickedUp(self, item)
+end
+function UnitBehavior.prototype.onItemUsed(self, item)
+end
+function UnitBehavior.prototype.onItemStacked(self, item)
+end
 function UnitBehavior.prototype.onKill(self, target)
 end
 function UnitBehavior.prototype.onDeath(self, source)
@@ -75,6 +83,18 @@ __TS__SetDescriptor(
         end
         ____exports.UnitBehavior:forAll(target, "onDeath", source)
     end)
+    Unit.itemDroppedEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemDropped", item)
+    end)
+    Unit.itemPickedUpEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemPickedUp", item)
+    end)
+    Unit.itemUsedEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemUsed", item)
+    end)
+    Unit.itemStackedEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemStacked", item)
+    end)
 end)(UnitBehavior)
 Unit.destroyEvent:addListener(function(unit)
     ____exports.UnitBehavior:forAll(unit, "destroy")

package/engine/buff.d.ts

@@ -8,6 +8,7 @@ import { BuffResistanceType } from "./object-data/auxiliary/buff-resistance-type
 import { AbilityBooleanField, AbilityBooleanLevelField, AbilityCombatClassificationsLevelField, AbilityDependentValue, AbilityEnumLevelField, AbilityIntegerField, AbilityIntegerLevelField, AbilityNumberField, AbilityNumberLevelField } from "./object-field/ability";
 import { CombatClassifications } from "./object-data/auxiliary/combat-classification";
 import { IsExactlyAny, Prohibit, ReadonlyNonEmptyArray } from "../utility/types";
+import { EffectParameters } from "../core/types/effect";
 import { UnitBehavior } from "./behaviour/unit";
 import type { Widget } from "../core/types/widget";
 import { Destructor } from "../destroyable";
@@ -250,8 +251,12 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     get duration(): number;
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);
-    flashEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    flashEffect(...parameters: [
+        ...widgetOrXY: [] | [Widget] | [x: number, x: number],
+        ...parametersOrDuration: [] | [EffectParameters] | [number]
+    ]): void;
     flashSpecialEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    protected onCreate(): void;
     protected onDestroy(): Destructor;
     static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;
     static getByTypeId<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, unit: Unit, typeId: ApplicableBuffTypeId): T | undefined;

package/engine/buff.lua

@@ -46,6 +46,10 @@ local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
 local ____ability_2Dduration = require("engine.internal.mechanics.ability-duration")
 local getAbilityDuration = ____ability_2Dduration.getAbilityDuration
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____destructable = require("core.types.destructable")
+local Destructable = ____destructable.Destructable
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -482,6 +486,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         timer:start(duration, false, expireBuff, self)
         self._timer = timer
     end
+    self:onCreate()
 end
 function Buff.prototype.getUnitBonus(self, bonusType)
     local ____opt_36 = self._bonusIdByBonusType
@@ -496,26 +501,30 @@ function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
     end
     bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self._unit, bonusType, bonusIdByBonusType[bonusType], value)
 end
-function Buff.prototype.flashEffect(self, widgetOrDuration, duration)
-    local isWidgetProvided = type(widgetOrDuration) == "table"
-    local ____Effect_40 = Effect
-    local ____Effect_flash_41 = Effect.flash
-    local ____array_39 = __TS__SparseArrayNew(
-        self[104],
-        isWidgetProvided and widgetOrDuration or self._unit,
-        stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
-    )
-    local ____isWidgetProvided_38
-    if isWidgetProvided then
-        ____isWidgetProvided_38 = duration
+function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
+    if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
+        Effect:flash(self[104], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
-        ____isWidgetProvided_38 = widgetOrDuration
+        local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
+        local ____Effect_40 = Effect
+        local ____Effect_flash_41 = Effect.flash
+        local ____array_39 = __TS__SparseArrayNew(
+            self[104],
+            isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
+            stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
+        )
+        local ____isWidgetProvided_38
+        if isWidgetProvided then
+            ____isWidgetProvided_38 = yOrParametersOrDuration
+        else
+            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
+        end
+        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
+        ____Effect_flash_41(
+            ____Effect_40,
+            __TS__SparseArraySpread(____array_39)
+        )
     end
-    __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
-    ____Effect_flash_41(
-        ____Effect_40,
-        __TS__SparseArraySpread(____array_39)
-    )
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
     local isWidgetProvided = type(widgetOrDuration) == "table"
@@ -538,6 +547,8 @@ function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
         __TS__SparseArraySpread(____array_43)
     )
 end
+function Buff.prototype.onCreate(self)
+end
 function Buff.prototype.onDestroy(self)
     local unit = self._unit
     if getUnitAbility(unit.handle, self.typeId) == self.handle then

package/engine/internal/ability.d.ts

@@ -4,14 +4,6 @@ import { Event } from "../../event";
 import type { Item } from "../../core/types/item";
 import type { Unit } from "./unit";
 import type { AbilityTypeId } from "../object-data/entry/ability-type";
-interface Fields<K, V> {
-    set(field: K, value: V): boolean;
-    get(field: K): V;
-    has(field: K): boolean;
-}
-interface AbilityLevel {
-    realFields: Fields<jabilityreallevelfield, number>;
-}
 export type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
 export declare class AbilitySnapshot {
 }
@@ -20,7 +12,8 @@ export declare abstract class Ability extends Handle<jability> {
     protected constructor(handle: jability, typeId: number);
     toString(): string;
     get parentTypeId(): number;
-    get orderId(): number;
+    get orderTypeStringId(): string;
+    get orderTypeId(): number;
     abstract readonly owner: Unit | Item;
     getSnapshot(): AbilitySnapshot;
     hasField(field: jabilityfield | number): boolean;
@@ -40,8 +33,7 @@ export declare abstract class Ability extends Handle<jability> {
     setField(field: jabilityintegerlevelfield | jabilityreallevelfield, level: number, value: number): boolean;
     setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
-    get realFields(): Fields<jabilityrealfield, number>;
-    get levels(): readonly AbilityLevel[];
+    get levelCount(): number;
     abstract get level(): number;
     static get onCreate(): Event<[Ability]>;
     static get destroyEvent(): Event<[Ability]>;
@@ -58,6 +50,8 @@ export declare class UnitAbility extends Ability {
     readonly owner: Unit;
     private readonly u;
     constructor(handle: jability, typeId: number, owner: Unit);
+    incrementHideCounter(): void;
+    decrementHideCounter(): void;
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;
@@ -88,4 +82,3 @@ export declare class ItemAbility extends Ability {
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }
-export {};

package/engine/internal/ability.lua

@@ -2,7 +2,6 @@ local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__Class = ____lualib.__TS__Class
-local __TS__New = ____lualib.__TS__New
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -33,7 +32,7 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
-local getItemAbility = BlzGetItemAbility
+local unitHideAbility = BlzUnitHideAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -151,55 +150,6 @@ local orders = postcompile(function()
     end
     return orders
 end)
-local RealFields = __TS__Class()
-RealFields.name = "RealFields"
-function RealFields.prototype.____constructor(self, handle)
-    self.handle = handle
-end
-function RealFields.prototype.set(self, field, value)
-    return BlzSetAbilityRealField(self.handle, field, value)
-end
-function RealFields.prototype.get(self, field)
-    return BlzGetAbilityRealField(self.handle, field)
-end
-function RealFields.prototype.has(self, field)
-    local handle = self.handle
-    return BlzSetAbilityRealField(
-        handle,
-        field,
-        BlzGetAbilityRealField(handle, field)
-    )
-end
-local RealLevelFields = __TS__Class()
-RealLevelFields.name = "RealLevelFields"
-function RealLevelFields.prototype.____constructor(self, handle, level)
-    self.handle = handle
-    self.level = level
-end
-function RealLevelFields.prototype.set(self, field, value)
-    return BlzSetAbilityRealLevelField(self.handle, field, self.level, value)
-end
-function RealLevelFields.prototype.get(self, field)
-    return BlzGetAbilityRealLevelField(self.handle, field, self.level)
-end
-function RealLevelFields.prototype.has(self, field)
-    local handle = self.handle
-    return BlzSetAbilityRealLevelField(
-        handle,
-        field,
-        0,
-        BlzGetAbilityRealLevelField(handle, field, 0)
-    )
-end
-local realLevelMetatable = {__index = self}
-local levelDescriptors = {realFields = function(self, handle, level)
-    return __TS__New(RealLevelFields, handle, level)
-end}
-local levelMetatable = {__index = function(self, key)
-    local fields = levelDescriptors[key](levelDescriptors, self.handle, self.level)
-    rawset(self, key, fields)
-    return fields
-end}
 local fieldGetters = {
     abilityintegerfield = function(ability, field)
         return getAbilityIntegerField(ability.handle, field)
@@ -346,43 +296,26 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Ability.prototype,
-    "orderId",
+    "orderTypeStringId",
     {get = function(self)
         local field = orderIdFieldByParentTypeId[self.parentTypeId]
-        return order2orderId(field ~= nil and getAbilityStringLevelField(self.handle, ABILITY_SLF_BASE_ORDER_ID_NCL6, self.level) or (orders[self.parentTypeId] or ""))
+        return field ~= nil and getAbilityStringLevelField(self.handle, field, self.level) or (orders[self.parentTypeId] or "")
     end},
     true
 )
 __TS__SetDescriptor(
     Ability.prototype,
-    "realFields",
+    "orderTypeId",
     {get = function(self)
-        local realFields = __TS__New(RealFields, self.handle)
-        rawset(self, "realFields", realFields)
-        return realFields
+        return order2orderId(self.orderTypeStringId)
     end},
     true
 )
 __TS__SetDescriptor(
     Ability.prototype,
-    "levels",
+    "levelCount",
     {get = function(self)
-        local handle = self.handle
-        local levels = setmetatable(
-            {},
-            {
-                __len = function(self)
-                    return BlzGetAbilityIntegerField(handle, ABILITY_IF_LEVELS)
-                end,
-                __index = function(self, i)
-                    local level = setmetatable({handle = handle, level = i - 1}, levelMetatable)
-                    self[i] = level
-                    return level
-                end
-            }
-        )
-        rawset(self, "levels", levels)
-        return levels
+        return self:getField(ABILITY_IF_LEVELS)
     end},
     true
 )
@@ -433,6 +366,12 @@ function UnitAbility.prototype.____constructor(self, handle, typeId, owner)
     self.owner = owner
     self.u = owner.handle
 end
+function UnitAbility.prototype.incrementHideCounter(self)
+    unitHideAbility(self.u, self.typeId, true)
+end
+function UnitAbility.prototype.decrementHideCounter(self)
+    unitHideAbility(self.u, self.typeId, false)
+end
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",

package/engine/internal/item+owner.lua

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

package/engine/internal/unit/ability.d.ts

@@ -3,7 +3,7 @@ import { Ability } from "../ability";
 import { Destructable } from "../../../core/types/destructable";
 import { Item } from "../item";
 import { Widget } from "../../../core/types/widget";
-import { DispatchingEvent } from "../../../event";
+import { DispatchingEvent, Event } from "../../../event";
 declare module "../unit" {
     namespace Unit {
         const abilityCastingStartEvent: DispatchingEvent<[Unit, Ability]>;
@@ -141,3 +141,12 @@ declare module "../unit" {
         const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
+declare module "../unit" {
+    namespace Unit {
+        const abilityCommandEvent: {
+            readonly [abilityTypeId: number]: {
+                readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
+            };
+        };
+    }
+}

package/engine/internal/unit/ability.lua

@@ -15,8 +15,15 @@ local UnitTriggerEvent = ____unit.UnitTriggerEvent
 local ____event = require("event")
 local createDispatchingEvent = ____event.createDispatchingEvent
 local DependentInitializingEvent = ____event.DependentInitializingEvent
+local Event = ____event.Event
+local InitializingEvent = ____event.InitializingEvent
 local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
+local ____lazy = require("utility.lazy")
+local lazyRecord = ____lazy.lazyRecord
+local eventInvoke = Event.invoke
+local condition = Condition
+local createTrigger = CreateTrigger
 local getItemAbility = BlzGetItemAbility
 local getSpellAbility = GetSpellAbility
 local getSpellAbilityId = GetSpellAbilityId
@@ -26,11 +33,10 @@ local getSpellTargetUnit = GetSpellTargetUnit
 local getSpellTargetX = GetSpellTargetX
 local getSpellTargetY = GetSpellTargetY
 local getTriggerUnit = GetTriggerUnit
-local getUnitAbility = BlzGetUnitAbility
-local unitAddAbility = UnitAddAbility
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterCommandEvent = TriggerRegisterCommandEvent
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
-local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
         return __TS__New(
@@ -39,17 +45,6 @@ local function retrieveAbility(unit, ability, abilityId)
             Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
@@ -366,4 +361,31 @@ rawset(
         extractAbilityTypeId
     )
 )
+rawset(
+    Unit,
+    "abilityCommandEvent",
+    lazyRecord(function(abilityTypeId)
+        return lazyRecord(function(orderTypeStringId)
+            return __TS__New(
+                InitializingEvent,
+                function(event)
+                    local trigger = createTrigger()
+                    triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
+                    triggerAddCondition(
+                        trigger,
+                        condition(function()
+                            local unit = Unit:of(getTriggerUnit())
+                            if unit ~= nil then
+                                local ability = unit:getAbilityById(abilityTypeId)
+                                if ability ~= nil then
+                                    eventInvoke(event, unit, ability, orderTypeStringId)
+                                end
+                            end
+                        end)
+                    )
+                end
+            )
+        end)
+    end)
+)
 return ____exports

package/engine/internal/unit/item.d.ts

@@ -0,0 +1,24 @@
+/** @noSelfInFile */
+import { Item } from "../item";
+export interface UnitItems extends ReadonlyArray<Item | undefined> {
+    readonly length: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+    [0]: Item | undefined;
+    [1]: Item | undefined;
+    [2]: Item | undefined;
+    [3]: Item | undefined;
+    [4]: Item | undefined;
+    [5]: Item | undefined;
+}
+export declare class UnitItems {
+    constructor(handle: junit);
+    findSlot(item: Item): 0 | 1 | 2 | 3 | 4 | 5 | undefined;
+    protected __newindex(slot: number, item: Item | undefined): void;
+    protected __index(key: string | number): unknown;
+    protected __len(): number;
+    protected __ipairs(): LuaIterator<LuaMultiReturn<[number, Item | undefined]>, junit>;
+}
+declare module "../unit" {
+    interface Unit {
+        readonly items: UnitItems;
+    }
+}