warscript 0.0.1-dev.d5f6f38 → 0.0.1-dev.d750e38

package/engine/behaviour/ability.lua

@@ -1,9 +1,11 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+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")
@@ -14,6 +16,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
@@ -21,24 +25,33 @@ local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_IN
 local SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD = ____ability.SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD
 local SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 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 ____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 subscribedValuesByAbilityBehavior = {}
+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 +59,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 +67,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 +78,48 @@ ____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
+    self:onCreate()
+end
+function AbilityBehavior.prototype.onDestroy(self)
+    subscribedValuesByAbilityBehavior[self] = nil
+    return Behavior.prototype.onDestroy(self)
+end
+function AbilityBehavior.prototype.subscribe(self, value)
+    if __TS__InstanceOf(value, AbilityField) or __TS__InstanceOf(value, AbilityLevelField) then
+        local subscribedValues = subscribedValuesByAbilityBehavior[self]
+        if subscribedValues == nil then
+            subscribedValues = {}
+            subscribedValuesByAbilityBehavior[self] = subscribedValues
+        end
+        subscribedValues[value] = true
+    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,15 +153,9 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
         )
     end
 end
-function AbilityBehavior.prototype.launchMissile(self, source, target, ...)
-    Missile:launch(
-        self.missileLaunchConfig,
-        source,
-        target,
-        invokeOnMissileArrival,
-        self,
-        ...
-    )
+function AbilityBehavior.prototype.onCreate(self)
+end
+function AbilityBehavior.prototype.onValueChange(self, _value)
 end
 function AbilityBehavior.prototype.onMissileArrival(self, ...)
 end
@@ -120,6 +163,8 @@ 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 +224,7 @@ __TS__SetDescriptor(
     end},
     true
 )
-AbilityBehavior.MissileLaunchConfig = ____class_0
+AbilityBehavior.MissileLaunchConfig = ____class_2
 __TS__SetDescriptor(
     AbilityBehavior.prototype,
     "missileLaunchConfig",
@@ -191,17 +236,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"))
@@ -223,6 +257,18 @@ __TS__SetDescriptor(
     Unit.abilityChannelingFinishEvent:addListener(createUnitEventListener("onChannelingFinish"))
     Unit.abilityStopEvent:addListener(createUnitEventListener("onStop"))
 end)(AbilityBehavior)
+local function checkBehaviorOnValueChange(behavior, field)
+    local subscribedValues = subscribedValuesByAbilityBehavior[behavior]
+    if subscribedValues ~= nil and subscribedValues[field] ~= nil then
+        behavior:onValueChange(field)
+    end
+end
+AbilityField.valueChangeEvent:addListener(function(ability, field)
+    ____exports.AbilityBehavior:forAll(ability, checkBehaviorOnValueChange, field)
+end)
+AbilityLevelField.valueChangeEvent:addListener(function(ability, field)
+    ____exports.AbilityBehavior:forAll(ability, checkBehaviorOnValueChange, field)
+end)
 Ability.onCreate:addListener(function(ability)
     local createBehaviorFunctions = createBehaviorFunctionsByAbilityTypeId[ability.typeId]
     if createBehaviorFunctions ~= nil then

package/engine/buff.lua

@@ -515,7 +515,7 @@ function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrPa
         )
         local ____isWidgetProvided_38
         if isWidgetProvided then
-            ____isWidgetProvided_38 = parametersOrDuration
+            ____isWidgetProvided_38 = yOrParametersOrDuration
         else
             ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
         end

package/engine/internal/ability.d.ts

@@ -12,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;
@@ -34,6 +35,9 @@ export declare abstract class Ability extends Handle<jability> {
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
     get levelCount(): number;
     abstract get level(): number;
+    abstract get cooldownRemaining(): number;
+    abstract set cooldownRemaining(cooldownRemaining: number);
+    abstract interruptCast(): void;
     static get onCreate(): Event<[Ability]>;
     static get destroyEvent(): Event<[Ability]>;
 }
@@ -44,6 +48,9 @@ export declare class UnrecognizedAbility extends Ability {
     readonly owner: Unit;
     constructor(typeId: number, owner: Unit);
     get level(): number;
+    get cooldownRemaining(): number;
+    set cooldownRemaining(_: number);
+    interruptCast(): void;
 }
 export declare class UnitAbility extends Ability {
     readonly owner: Unit;
@@ -54,7 +61,8 @@ export declare class UnitAbility extends Ability {
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;
-    set cooldownRemaining(v: number);
+    set cooldownRemaining(cooldownRemaining: number);
+    interruptCast(): void;
     static get onCreate(): Event<[UnitAbility]>;
     static get onDestroy(): Event<[UnitAbility]>;
 }
@@ -78,6 +86,9 @@ export declare class ItemAbility extends Ability {
     setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
     get level(): number;
+    get cooldownRemaining(): number;
+    set cooldownRemaining(cooldownRemaining: number);
+    interruptCast(): void;
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }

package/engine/internal/ability.lua

@@ -10,7 +10,10 @@ local ____exports = {}
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____ability = require("engine.internal.item.ability")
+local abilityActionDummy = ____ability.abilityActionDummy
 local doAbilityAction = ____ability.doAbilityAction
+local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
+local startItemCooldown = ____ability.startItemCooldown
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local setUnitAbilityLevel = SetUnitAbilityLevel
 local setAbilityIntegerField = BlzSetAbilityIntegerField
@@ -32,6 +35,8 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
+local getItemBooleanField = BlzGetItemBooleanField
+local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
 local match = string.match
 local ____type = _G.type
@@ -296,10 +301,18 @@ __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,
+    "orderTypeId",
+    {get = function(self)
+        return order2orderId(self.orderTypeStringId)
     end},
     true
 )
@@ -318,6 +331,17 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Ability.prototype,
+    "cooldownRemaining",
+    {
+        get = function(self)
+        end,
+        set = function(self, cooldownRemaining)
+        end
+    },
+    true
+)
 __TS__ObjectDefineProperty(
     Ability,
     "onCreate",
@@ -341,6 +365,8 @@ function UnrecognizedAbility.prototype.____constructor(self, typeId, owner)
     UnrecognizedAbility.____super.prototype.____constructor(self, nil, typeId)
     self.owner = owner
 end
+function UnrecognizedAbility.prototype.interruptCast(self)
+end
 __TS__SetDescriptor(
     UnrecognizedAbility.prototype,
     "level",
@@ -349,6 +375,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    UnrecognizedAbility.prototype,
+    "cooldownRemaining",
+    {
+        get = function(self)
+            return 0
+        end,
+        set = function(self, _)
+        end
+    },
+    true
+)
 ____exports.UnitAbility = __TS__Class()
 local UnitAbility = ____exports.UnitAbility
 UnitAbility.name = "UnitAbility"
@@ -364,6 +402,9 @@ end
 function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
+function UnitAbility.prototype.interruptCast(self)
+    self.owner:interruptCast(self.typeId)
+end
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",
@@ -384,8 +425,8 @@ __TS__SetDescriptor(
         get = function(self)
             return getUnitAbilityCooldownRemaining(self.u, self.typeId)
         end,
-        set = function(self, v)
-            startUnitAbilityCooldown(self.u, self.typeId, v)
+        set = function(self, cooldownRemaining)
+            startUnitAbilityCooldown(self.u, self.typeId, cooldownRemaining)
         end
     },
     true
@@ -410,6 +451,9 @@ end
 local function setAbilityField(_, ability, field, levelOrValue, value)
     return ____exports.Ability.prototype.setField(ability, field, levelOrValue, value)
 end
+local function getAbilityCooldown(_, abilityTypeId)
+    return getUnitAbilityCooldownRemaining(abilityActionDummy, abilityTypeId)
+end
 ____exports.ItemAbility = __TS__Class()
 local ItemAbility = ____exports.ItemAbility
 ItemAbility.name = "ItemAbility"
@@ -437,6 +481,14 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
         value
     )
 end
+function ItemAbility.prototype.interruptCast(self)
+    local handle = self.owner.handle
+    local activelyUsed = getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED)
+    if activelyUsed then
+        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, false)
+        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, true)
+    end
+end
 __TS__SetDescriptor(
     ItemAbility.prototype,
     "level",
@@ -445,6 +497,27 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    ItemAbility.prototype,
+    "cooldownRemaining",
+    {
+        get = function(self)
+            local item = self.owner
+            local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
+            local ____item_handle_3 = item.handle
+            local ____opt_1 = item.owner
+            return ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, getAbilityCooldown, self.typeId)
+        end,
+        set = function(self, cooldownRemaining)
+            local item = self.owner
+            local ____startItemCooldown_8 = startItemCooldown
+            local ____item_handle_7 = item.handle
+            local ____opt_5 = item.owner
+            ____startItemCooldown_8(____item_handle_7, ____opt_5 and ____opt_5.handle, cooldownRemaining)
+        end
+    },
+    true
+)
 __TS__ObjectDefineProperty(
     ItemAbility,
     "onCreate",

package/engine/internal/item/ability.lua

@@ -1,16 +1,60 @@
 local ____exports = {}
+local restoreCooldownGroup
 local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
 local dummyUnitId = ____dummy.dummyUnitId
+local ____utility = require("engine.internal.utility")
+local findUnitItemSlot = ____utility.findUnitItemSlot
+local ____blank = require("engine.object-data.entry.item-type.blank")
+local BlankItemType = ____blank.BlankItemType
+local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
+local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
+local ____math = require("math")
+local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
 local isItemOwned = IsItemOwned
 local isItemPowerup = IsItemPowerup
 local getItemX = GetItemX
 local getItemY = GetItemY
+local setAbilityRealLevelField = BlzSetAbilityRealLevelField
+local setItemIntegerField = BlzSetItemIntegerField
+local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local setItemPosition = SetItemPosition
 local unitAddItem = UnitAddItem
 local unitRemoveItem = UnitRemoveItem
+local unitUseItem = UnitUseItem
+local unitResetCooldown = UnitResetCooldown
+local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
+    if not currentMap then
+        return 0
+    end
+    local abilityType = currentMap.objects.ability:newObject(
+        util.id2s(abilityTypeIdGenerator:next()),
+        "Absk"
+    )
+    abilityType["bsk1+0"] = 0
+    abilityType["bsk2+0"] = 0
+    abilityType["bsk3+0"] = 0
+    abilityType["amcs+0"] = 0
+    abilityType["adur+0"] = MINIMUM_POSITIVE_NORMALIZED_FLOAT
+    abilityType["ahdu+0"] = MINIMUM_POSITIVE_NORMALIZED_FLOAT
+    return util.s2id(abilityType.id)
+end)
+local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
+    local itemType = BlankItemType:create()
+    itemType.name = "[Warscript/Dummy] Item Cooldown Starter"
+    itemType.abilityTypeIds = {COOLDOWN_STARTER_ABILITY_TYPE_ID}
+    itemType.cooldownGroupId = COOLDOWN_STARTER_ABILITY_TYPE_ID
+    itemType.activelyUsed = true
+    return itemType.id
+end)
 local dummy = assert(CreateUnit(
     Player.neutralVictim.handle,
     dummyUnitId,
@@ -18,10 +62,37 @@ local dummy = assert(CreateUnit(
     0,
     270
 ))
+local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
+local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
 ShowUnit(dummy, 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)
+    Timer:run(restoreCooldownGroup, handle, cooldownGroup)
+end
+restoreCooldownGroup = function(handle, cooldownGroup)
+    if getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP) == COOLDOWN_STARTER_ABILITY_TYPE_ID then
+        setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, cooldownGroup)
+    end
+end
+---
+-- @internal For use by internal systems only.
+____exports.startItemCooldown = function(handle, owner, cooldown)
+    ____exports.doAbilityActionForceDummy(handle, owner, startItemCooldownInternal, cooldown)
+end
+---
+-- @internal For use by internal systems only.
+____exports.abilityActionDummy = dummy
 ---
 -- @internal For use by internal systems only.
 ____exports.doAbilityAction = function(handle, action, ...)
+    local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = true
+    end
     local isOwned = isItemOwned(handle)
     local isPowerup
     local x
@@ -43,6 +114,41 @@ ____exports.doAbilityAction = function(handle, action, ...)
             setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
         end
     end
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = nil
+    end
+    return result
+end
+---
+-- @internal For use by internal systems only.
+____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
+    if owner == nil then
+        return ____exports.doAbilityAction(handle, action, ...)
+    end
+    local slot = findUnitItemSlot(owner, handle)
+    if slot == nil then
+        return ____exports.doAbilityAction(handle, action, ...)
+    end
+    local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = true
+    end
+    local isPowerup
+    if isItemPowerup(handle) then
+        setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
+        isPowerup = true
+    end
+    unitRemoveItem(owner, handle)
+    unitAddItem(dummy, handle)
+    local result = action(handle, ...)
+    unitRemoveItem(dummy, handle)
+    unitAddItemToSlot(owner, handle, slot)
+    if isPowerup then
+        setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
+    end
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = nil
+    end
     return result
 end
 return ____exports

package/engine/internal/misc/ability-disable-counter.d.ts

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

package/engine/internal/misc/ability-disable-counter.lua

@@ -0,0 +1,13 @@
+local ____exports = {}
+local disableAbility = BlzUnitDisableAbility
+---
+-- @internal For use by internal systems only.
+____exports.increaseAbilityDisableCounter = function(unit, abilityTypeId, times)
+    for _ = 1, times do
+        disableAbility(unit, abilityTypeId, true, false)
+    end
+    for _ = times, -1 do
+        disableAbility(unit, abilityTypeId, false, false)
+    end
+end
+return ____exports

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,6 +33,8 @@ local getSpellTargetUnit = GetSpellTargetUnit
 local getSpellTargetX = GetSpellTargetX
 local getSpellTargetY = GetSpellTargetY
 local getTriggerUnit = GetTriggerUnit
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterCommandEvent = TriggerRegisterCommandEvent
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
 local function retrieveAbility(unit, ability, abilityId)
@@ -352,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/add-item-to-slot-init.d.ts

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

package/engine/internal/unit/add-item-to-slot-init.lua

@@ -0,0 +1,23 @@
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local fillerItems = ____add_2Ditem_2Dto_2Dslot.fillerItems
+local unitsWithFillerItems = ____add_2Ditem_2Dto_2Dslot.unitsWithFillerItems
+local setItemVisible = SetItemVisible
+local unitRemoveItem = UnitRemoveItem
+Unit.itemPickedUpEvent:addListener(
+    4,
+    function(unit)
+        local handle = unit.handle
+        if unitsWithFillerItems[handle] ~= nil then
+            for previousSlot = 1, 6 do
+                local fillerItem = fillerItems[previousSlot]
+                unitRemoveItem(handle, fillerItem)
+                setItemVisible(fillerItem, false)
+            end
+            unitsWithFillerItems[handle] = nil
+        end
+    end
+)
+return ____exports