warscript 0.0.1-dev.f5421e8 → 0.0.1-dev.f70428f

package/engine/buff.lua

@@ -16,6 +16,7 @@ local internalApplyBuff = ____applicable.internalApplyBuff
 local removeBuff = ____applicable.removeBuff
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
+local UnitAbility = ____ability.UnitAbility
 local ____ability = require("engine.object-field.ability")
 local AbilityBooleanField = ____ability.AbilityBooleanField
 local AbilityNumberField = ____ability.AbilityNumberField
@@ -28,9 +29,6 @@ local ____math = require("math")
 local max = ____math.max
 local min = ____math.min
 local ____bonus = require("engine.internal.unit.bonus")
-local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
-local getUnitBonus = ____bonus.getUnitBonus
-local removeUnitBonus = ____bonus.removeUnitBonus
 local UnitBonusType = ____bonus.UnitBonusType
 local ____area_2Ddamage = require("engine.internal.mechanics.area-damage")
 local damageArea = ____area_2Ddamage.damageArea
@@ -53,6 +51,8 @@ local ____item = require("engine.internal.item")
 local Item = ____item.Item
 local ____destructable = require("core.types.destructable")
 local Destructable = ____destructable.Destructable
+local ____ability = require("engine.standard.fields.ability")
+local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -124,7 +124,8 @@ local buffParametersKeys = {
     damageOnExpiration = true,
     healingOnExpiration = true,
     killsOnExpiration = true,
-    explodesOnExpiration = true
+    explodesOnExpiration = true,
+    abilityCooldownFactor = true
 }
 local function resolveEnumValue(ability, level, value)
     if value == nil or type(value) == "number" then
@@ -201,7 +202,8 @@ local buffNumberParameters = {
     "healingPerInterval",
     "healingOverDuration",
     "damageOnExpiration",
-    "healingOnExpiration"
+    "healingOnExpiration",
+    "abilityCooldownFactor"
 }
 local unsuccessfulApplicationMarker = {}
 local function selectBuffTypeIdWithLeastDuration(buffTypeIds, unit)
@@ -304,7 +306,8 @@ buffHealingIntervalTimerCallback = function(buff)
         source:healTarget(buff[101], healingPerInterval)
     end
 end
-local buffDestroyEvent = __TS__New(Event)
+local buffCreatedEvent = __TS__New(Event)
+local buffBeingDestroyedEvent = __TS__New(Event)
 ____exports.Buff = __TS__Class()
 local Buff = ____exports.Buff
 Buff.name = "Buff"
@@ -506,64 +509,68 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     end
     self:onCreate()
     self[100] = 1
+    Event.invoke(buffCreatedEvent, self)
 end
-function Buff.prototype.getUnitBonus(self, bonusType)
-    local ____opt_38 = self._bonusIdByBonusType
-    local bonusId = ____opt_38 and ____opt_38[bonusType]
-    return bonusId == nil and 0 or getUnitBonus(self._unit, bonusType, bonusId)
+function Buff.prototype.onAbilityGained(self, ability)
+    if __TS__InstanceOf(ability, UnitAbility) then
+        local abilityCooldownModifier = self[144]
+        if abilityCooldownModifier then
+            COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:applyModifier(ability, abilityCooldownModifier)
+        end
+    end
 end
-function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
-    local bonusIdByBonusType = self._bonusIdByBonusType
-    if bonusIdByBonusType == nil then
-        bonusIdByBonusType = {}
-        self._bonusIdByBonusType = bonusIdByBonusType
+function Buff.prototype.onAbilityLost(self, ability)
+    if __TS__InstanceOf(ability, UnitAbility) then
+        local abilityCooldownModifier = self[144]
+        if abilityCooldownModifier then
+            COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, abilityCooldownModifier)
+        end
     end
-    bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self._unit, bonusType, bonusIdByBonusType[bonusType], value)
 end
 function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
         Effect:flash(self[105], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
         local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
-        local ____Effect_42 = Effect
-        local ____Effect_flash_43 = Effect.flash
-        local ____array_41 = __TS__SparseArrayNew(
+        local ____Effect_40 = Effect
+        local ____Effect_flash_41 = Effect.flash
+        local ____array_39 = __TS__SparseArrayNew(
             self[105],
             isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
             stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
         )
-        local ____isWidgetProvided_40
+        local ____isWidgetProvided_38
         if isWidgetProvided then
-            ____isWidgetProvided_40 = yOrParametersOrDuration
+            ____isWidgetProvided_38 = yOrParametersOrDuration
         else
-            ____isWidgetProvided_40 = widgetOrXOrParametersOrDuration
+            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
         end
-        __TS__SparseArrayPush(____array_41, ____isWidgetProvided_40)
-        ____Effect_flash_43(
-            ____Effect_42,
-            __TS__SparseArraySpread(____array_41)
+        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
+        ____Effect_flash_41(
+            ____Effect_40,
+            __TS__SparseArraySpread(____array_39)
         )
     end
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
     local isWidgetProvided = type(widgetOrDuration) == "table"
-    local ____Effect_46 = Effect
-    local ____Effect_flash_47 = Effect.flash
-    local ____array_45 = __TS__SparseArrayNew(
+    local ____Effect_44 = Effect
+    local ____Effect_flash_45 = Effect.flash
+    local ____array_43 = __TS__SparseArrayNew(
         self[106],
         isWidgetProvided and widgetOrDuration or self._unit,
         stringValueByBuffTypeIdByFieldId[fourCC("fspt")][self.typeId] or "origin"
     )
-    local ____isWidgetProvided_44
+    local ____isWidgetProvided_42
     if isWidgetProvided then
-        ____isWidgetProvided_44 = duration
+        ____isWidgetProvided_42 = duration
     else
-        ____isWidgetProvided_44 = widgetOrDuration
+        ____isWidgetProvided_42 = widgetOrDuration
     end
-    __TS__SparseArrayPush(____array_45, ____isWidgetProvided_44)
-    ____Effect_flash_47(
-        ____Effect_46,
-        __TS__SparseArraySpread(____array_45)
+    __TS__SparseArrayPush(____array_43, ____isWidgetProvided_42)
+    ____Effect_flash_45(
+        ____Effect_44,
+        __TS__SparseArraySpread(____array_43)
     )
 end
 function Buff.prototype.onCreate(self)
@@ -594,6 +601,12 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
+    local previousAbilityCooldownModifier = self[144]
+    if previousAbilityCooldownModifier then
+        for ____, ability in ipairs(self._unit.abilities) do
+            COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, previousAbilityCooldownModifier)
+        end
+    end
     if self[139] then
         unit:decrementInvulnerabilityCounter()
     end
@@ -602,7 +615,7 @@ function Buff.prototype.onDestroy(self)
     end
     if self[136] then
         if self[137] then
-            unit:decrementStunCounter()
+            unit:decrementForceStunCounter()
         end
         unit:decrementStunCounter()
     end
@@ -614,12 +627,7 @@ function Buff.prototype.onDestroy(self)
             unit:removeAbility(abilityTypeId)
         end
     end
-    if self._bonusIdByBonusType ~= nil then
-        for bonusType, bonusId in pairs(self._bonusIdByBonusType) do
-            removeUnitBonus(unit, bonusType, bonusId)
-        end
-    end
-    Event.invoke(buffDestroyEvent, self)
+    Event.invoke(buffBeingDestroyedEvent, self)
     self[100] = 3
     return UnitBehavior.prototype.onDestroy(self)
 end
@@ -648,8 +656,8 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getByTypeId(self, unit, typeId)
-    local ____opt_48 = buffByTypeIdByUnit[unit]
-    local buff = ____opt_48 and ____opt_48[typeId]
+    local ____opt_46 = buffByTypeIdByUnit[unit]
+    local buff = ____opt_46 and ____opt_46[typeId]
     if __TS__InstanceOf(buff, self) then
         return buff
     end
@@ -807,8 +815,8 @@ __TS__SetDescriptor(
                 return
             end
             self[112] = damageInterval
-            local ____opt_50 = self._timer
-            local elapsed = ____opt_50 and ____opt_50.elapsed or 0
+            local ____opt_48 = self._timer
+            local elapsed = ____opt_48 and ____opt_48.elapsed or 0
             local timer = self[114]
             if timer == nil then
                 timer = Timer:create()
@@ -887,8 +895,8 @@ __TS__SetDescriptor(
                 return
             end
             self[117] = healingInterval
-            local ____opt_52 = self._timer
-            local elapsed = ____opt_52 and ____opt_52.elapsed or 0
+            local ____opt_50 = self._timer
+            local elapsed = ____opt_50 and ____opt_50.elapsed or 0
             local timer = self[119]
             if timer == nil then
                 timer = Timer:create()
@@ -974,11 +982,11 @@ __TS__SetDescriptor(
     "turnsIntoGhost",
     {
         get = function(self)
-            local ____self__135_54 = self[135]
-            if ____self__135_54 == nil then
-                ____self__135_54 = false
+            local ____self__135_52 = self[135]
+            if ____self__135_52 == nil then
+                ____self__135_52 = false
             end
-            return ____self__135_54
+            return ____self__135_52
         end,
         set = function(self, turnsIntoGhost)
             if not turnsIntoGhost and self[135] then
@@ -997,22 +1005,22 @@ __TS__SetDescriptor(
     "stuns",
     {
         get = function(self)
-            local ____self__136_55 = self[136]
-            if ____self__136_55 == nil then
-                ____self__136_55 = false
+            local ____self__136_53 = self[136]
+            if ____self__136_53 == nil then
+                ____self__136_53 = false
             end
-            return ____self__136_55
+            return ____self__136_53
         end,
         set = function(self, stuns)
             if not stuns and self[136] then
                 if self[137] then
-                    self.object:decrementStunCounter()
+                    self.object:decrementForceStunCounter()
                 end
                 self.object:decrementStunCounter()
                 self[136] = nil
             elseif stuns and not self[136] then
                 if self[137] then
-                    self.object:incrementStunCounter()
+                    self.object:incrementForceStunCounter()
                 end
                 self.object:incrementStunCounter()
                 self[136] = true
@@ -1026,21 +1034,21 @@ __TS__SetDescriptor(
     "ignoresStunImmunity",
     {
         get = function(self)
-            local ____self__137_56 = self[137]
-            if ____self__137_56 == nil then
-                ____self__137_56 = false
+            local ____self__137_54 = self[137]
+            if ____self__137_54 == nil then
+                ____self__137_54 = false
             end
-            return ____self__137_56
+            return ____self__137_54
         end,
         set = function(self, ignoresStunImmunity)
             if not ignoresStunImmunity and self[137] then
                 if self[136] then
-                    self.object:decrementStunCounter()
+                    self.object:decrementForceStunCounter()
                 end
                 self[137] = nil
             elseif ignoresStunImmunity and not self[137] then
                 if self[136] then
-                    self.object:incrementStunCounter()
+                    self.object:incrementForceStunCounter()
                 end
                 self[137] = true
             end
@@ -1053,11 +1061,11 @@ __TS__SetDescriptor(
     "disablesAutoAttack",
     {
         get = function(self)
-            local ____self__138_57 = self[138]
-            if ____self__138_57 == nil then
-                ____self__138_57 = false
+            local ____self__138_55 = self[138]
+            if ____self__138_55 == nil then
+                ____self__138_55 = false
             end
-            return ____self__138_57
+            return ____self__138_55
         end,
         set = function(self, disablesAutoAttack)
             if not disablesAutoAttack and self[138] then
@@ -1076,11 +1084,11 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__139_58 = self[139]
-            if ____self__139_58 == nil then
-                ____self__139_58 = false
+            local ____self__139_56 = self[139]
+            if ____self__139_56 == nil then
+                ____self__139_56 = false
             end
-            return ____self__139_58
+            return ____self__139_56
         end,
         set = function(self, providesInvulnerability)
             if not providesInvulnerability and self[139] then
@@ -1099,11 +1107,11 @@ __TS__SetDescriptor(
     "killsOnExpiration",
     {
         get = function(self)
-            local ____self__140_59 = self[140]
-            if ____self__140_59 == nil then
-                ____self__140_59 = false
+            local ____self__140_57 = self[140]
+            if ____self__140_57 == nil then
+                ____self__140_57 = false
             end
-            return ____self__140_59
+            return ____self__140_57
         end,
         set = function(self, killsOnExpiration)
             if not killsOnExpiration and self[140] then
@@ -1120,11 +1128,11 @@ __TS__SetDescriptor(
     "explodesOnExpiration",
     {
         get = function(self)
-            local ____self__141_60 = self[141]
-            if ____self__141_60 == nil then
-                ____self__141_60 = false
+            local ____self__141_58 = self[141]
+            if ____self__141_58 == nil then
+                ____self__141_58 = false
             end
-            return ____self__141_60
+            return ____self__141_58
         end,
         set = function(self, killsOnExpiration)
             if not killsOnExpiration and self[141] then
@@ -1252,13 +1260,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_61 = self._timer
-            return ____opt_61 and ____opt_61.remaining or 0
+            local ____opt_59 = self._timer
+            return ____opt_59 and ____opt_59.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_65 = remainingDuration
-            local ____opt_63 = self._timer
-            local remainingDurationDelta = ____remainingDuration_65 - (____opt_63 and ____opt_63.remaining or 0)
+            local ____remainingDuration_63 = remainingDuration
+            local ____opt_61 = self._timer
+            local remainingDurationDelta = ____remainingDuration_63 - (____opt_61 and ____opt_61.remaining or 0)
             if remainingDurationDelta ~= 0 then
                 self[103] = self[103] + remainingDurationDelta
                 if remainingDuration <= 0 then
@@ -1288,7 +1296,34 @@ __TS__SetDescriptor(
     },
     true
 )
-Buff.destroyEvent = buffDestroyEvent;
+__TS__SetDescriptor(
+    Buff.prototype,
+    "abilityCooldownFactor",
+    {
+        get = function(self)
+            return self[143] or 1
+        end,
+        set = function(self, abilityCooldownFactor)
+            local previousAbilityCooldownModifier = self[144]
+            if previousAbilityCooldownModifier then
+                for ____, ability in ipairs(self._unit.abilities) do
+                    COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, previousAbilityCooldownModifier)
+                end
+            end
+            local function modifier(ability, level, cooldown)
+                return cooldown * abilityCooldownFactor
+            end
+            for ____, ability in ipairs(self._unit.abilities) do
+                COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:applyModifier(ability, modifier)
+            end
+            self[144] = modifier
+            self[143] = abilityCooldownFactor
+        end
+    },
+    true
+)
+Buff.createdEvent = buffCreatedEvent
+Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
 (function(self)
     local function destroyBuffIfNeeded(buff)
         if getUnitAbility(buff[101].handle, buff.typeId) ~= buff.handle and buff[100] == 1 then
@@ -1342,5 +1377,8 @@ Buff.destroyEvent = buffDestroyEvent;
             ____exports.checkBuffs(target)
         end
     )
+    buffCreatedEvent:addListener(function(buff)
+        UnitBehavior:forAll(buff.unit, "onBuffGained", buff)
+    end)
 end)(Buff)
 return ____exports

package/engine/internal/ability.d.ts

@@ -1,5 +1,5 @@
 /** @noSelfInFile */
-import { Handle } from "../../core/types/handle";
+import { Handle, HandleDestructor } from "../../core/types/handle";
 import { Event } from "../../event";
 import type { Item } from "../../core/types/item";
 import type { Unit } from "./unit";
@@ -55,14 +55,19 @@ 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;
     set cooldownRemaining(cooldownRemaining: number);
     interruptCast(): void;
+    protected onDestroy(): HandleDestructor;
     static get onCreate(): Event<[UnitAbility]>;
     static get onDestroy(): Event<[UnitAbility]>;
 }
@@ -89,6 +94,7 @@ export declare class ItemAbility extends Ability {
     get cooldownRemaining(): number;
     set cooldownRemaining(cooldownRemaining: number);
     interruptCast(): void;
+    protected onDestroy(): HandleDestructor;
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }

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
@@ -231,6 +232,19 @@ ____exports.getOrderIdByAbilityTypeId = function(abilityTypeId)
     local parentTypeId = availableFields[abilityTypeId]
     return order2orderId(orders[____type(parentTypeId) == "number" and parentTypeId or abilityTypeId] or "")
 end
+---
+-- @internal For use by internal systems only.
+____exports.abilityTypeHasField = function(abilityTypeId, field)
+    field = ____type(field) == "number" and field or getHandleId(field)
+    if commonFields[field] then
+        return true
+    end
+    local id = availableFields[abilityTypeId]
+    if ____type(id) == "number" then
+        id = availableFields[id]
+    end
+    return not not (id and id[field])
+end
 ____exports.Ability = __TS__Class()
 local Ability = ____exports.Ability
 Ability.name = "Ability"
@@ -246,15 +260,7 @@ function Ability.prototype.getSnapshot(self)
     return nil
 end
 function Ability.prototype.hasField(self, field)
-    field = ____type(field) == "number" and field or getHandleId(field)
-    if commonFields[field] then
-        return true
-    end
-    local id = availableFields[self.typeId]
-    if ____type(id) == "number" then
-        id = availableFields[id]
-    end
-    return not not (id and id[field])
+    return ____exports.abilityTypeHasField(self.typeId, field)
 end
 function Ability.prototype.getField(self, field, level)
     local fieldType = match(
@@ -402,9 +408,37 @@ end
 function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
+function UnitAbility.prototype.incrementDisableCounter(self)
+    local unit = self.u
+    local typeId = self.typeId
+    unitHideAbility(unit, typeId, true)
+    unitDisableAbility(unit, typeId, true, false)
+    self.d = (self.d or 0) + 1
+end
+function UnitAbility.prototype.decrementDisableCounter(self)
+    local unit = self.u
+    local typeId = self.typeId
+    unitDisableAbility(unit, typeId, false, false)
+    unitHideAbility(unit, typeId, true)
+    self.d = (self.d or 0) - 1
+end
 function UnitAbility.prototype.interruptCast(self)
     self.owner:interruptCast(self.typeId)
 end
+function UnitAbility.prototype.onDestroy(self)
+    if self.owner.state ~= 2 then
+        self.owner:removeAbility(self.typeId)
+    end
+    return UnitAbility.____super.prototype.onDestroy(self)
+end
+__TS__SetDescriptor(
+    UnitAbility.prototype,
+    "isDisabled",
+    {get = function(self)
+        return self.d ~= nil and self.d > 0
+    end},
+    true
+)
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",
@@ -489,6 +523,12 @@ function ItemAbility.prototype.interruptCast(self)
         setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, true)
     end
 end
+function ItemAbility.prototype.onDestroy(self)
+    if self.owner.state ~= 2 then
+        self.owner:removeAbility(self.typeId)
+    end
+    return ItemAbility.____super.prototype.onDestroy(self)
+end
 __TS__SetDescriptor(
     ItemAbility.prototype,
     "level",

package/engine/internal/item/ability.lua

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