warscript 0.0.1-dev.46a1ede → 0.0.1-dev.4753736

package/engine/buff.lua

@@ -28,9 +28,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
@@ -102,12 +99,14 @@ local buffParametersKeys = {
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
     evasionProbability = true,
+    missProbability = true,
     damageFactor = true,
     receivedDamageFactor = true,
     receivedMagicDamageFactor = true,
     durationIncreaseOnAutoAttack = true,
     maximumDuration = true,
     maximumRemainingDuration = true,
+    turnsIntoGhost = true,
     stuns = true,
     ignoresStunImmunity = true,
     providesStunImmunity = true,
@@ -173,6 +172,7 @@ local function resolveAndSetNumberValue(buff, property, ability, level, value, d
     end
 end
 local buffBooleanParameters = {
+    "turnsIntoGhost",
     "stuns",
     "ignoresStunImmunity",
     "disablesAutoAttack",
@@ -301,7 +301,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"
@@ -320,7 +321,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         typeId = selectBuffTypeIdWithLeastDuration(typeIdOrTypeIds, _unit)
         polarity = resistanceTypeOrPolarity
         resistanceType = abilityOrParametersOrResistanceType
-        if __TS__InstanceOf(parametersOrAbility, Ability) then
+        if __TS__InstanceOf(parametersOrAbility, Ability) or parametersOrAbility == nil then
             ability = parametersOrAbility
         else
             ability = nil
@@ -330,7 +331,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         typeId = typeIdOrTypeIds
         polarity = polarityOrTypeIdSelectionPolicy
         resistanceType = resistanceTypeOrPolarity
-        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) then
+        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) or abilityOrParametersOrResistanceType == nil then
             ability = abilityOrParametersOrResistanceType
             parameters = parametersOrAbility
         else
@@ -339,7 +340,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         end
     end
     self.typeId = typeId
-    if not __TS__InstanceOf(ability, Ability) then
+    if not (__TS__InstanceOf(ability, Ability) or ability == nil) then
         parameters = ability
         ability = nil
     end
@@ -367,14 +368,19 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     end
     self.polarity = resolveEnumValue(ability, level, polarity)
     self.resistanceType = resolveEnumValue(ability, level, resistanceType)
+    local missProbability = parameters and parameters.missProbability or defaultParameters.missProbability
+    if missProbability ~= nil then
+        missProbability = resolveNumberValue(ability, level, missProbability)
+        self[142] = missProbability
+    end
     local buffByTypeId = buffByTypeIdByUnit[_unit]
     if buffByTypeId == nil then
         buffByTypeId = {}
         buffByTypeIdByUnit[_unit] = buffByTypeId
     end
-    local ____opt_13 = buffByTypeId[typeId]
-    if ____opt_13 ~= nil then
-        ____opt_13:destroy()
+    local ____opt_15 = buffByTypeId[typeId]
+    if ____opt_15 ~= nil then
+        ____opt_15:destroy()
     end
     local uniqueGroup = parameters and parameters.uniqueGroup or defaultParameters and defaultParameters.uniqueGroup
     if uniqueGroup ~= nil then
@@ -388,13 +394,16 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         level,
         duration,
         spellStealPriority,
-        learnLevelMinimum
+        learnLevelMinimum,
+        missProbability
     ) then
+        self[100] = 1
         UnitBehavior.prototype.destroy(self)
         error(unsuccessfulApplicationMarker, 0)
     end
     local handle = BlzGetUnitAbility(_unit.handle, typeId)
     if handle == nil then
+        self[100] = 1
         UnitBehavior.prototype.destroy(self)
         error(unsuccessfulApplicationMarker, 0)
     end
@@ -410,13 +419,13 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     self[106] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_SPECIAL, 0)
     if parameters ~= nil or (next(defaultParameters)) ~= nil then
         for ____, buffBooleanParameter in ipairs(buffBooleanParameters) do
-            local ____ability_22 = ability
-            local ____level_23 = level
-            local ____temp_21 = parameters and parameters[buffBooleanParameter]
-            if ____temp_21 == nil then
-                ____temp_21 = defaultParameters[buffBooleanParameter]
+            local ____ability_24 = ability
+            local ____level_25 = level
+            local ____temp_23 = parameters and parameters[buffBooleanParameter]
+            if ____temp_23 == nil then
+                ____temp_23 = defaultParameters[buffBooleanParameter]
             end
-            if resolveBooleanValue(____ability_22, ____level_23, ____temp_21) then
+            if resolveBooleanValue(____ability_24, ____level_25, ____temp_23) then
                 self[buffBooleanParameter] = true
             end
         end
@@ -495,19 +504,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     end
     self:onCreate()
     self[100] = 1
-end
-function Buff.prototype.getUnitBonus(self, bonusType)
-    local ____opt_36 = self._bonusIdByBonusType
-    local bonusId = ____opt_36 and ____opt_36[bonusType]
-    return bonusId == nil and 0 or getUnitBonus(self._unit, bonusType, bonusId)
-end
-function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
-    local bonusIdByBonusType = self._bonusIdByBonusType
-    if bonusIdByBonusType == nil then
-        bonusIdByBonusType = {}
-        self._bonusIdByBonusType = bonusIdByBonusType
-    end
-    bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self._unit, bonusType, bonusIdByBonusType[bonusType], value)
+    Event.invoke(buffCreatedEvent, self)
 end
 function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
@@ -583,26 +580,27 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    if self[137] then
+    if self[139] then
+        unit:decrementInvulnerabilityCounter()
+    end
+    if self[138] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[135] then
-        if self[136] then
+    if self[136] then
+        if self[137] then
             unit:decrementStunCounter()
         end
         unit:decrementStunCounter()
     end
+    if self[135] then
+        unit:decrementGhostCounter()
+    end
     if self._abilityTypeIds ~= nil then
         for abilityTypeId in pairs(self._abilityTypeIds) do
             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
@@ -646,9 +644,9 @@ function Buff.prototype.onExpiration(self)
     if self[121] ~= nil then
         (self[102] or unit):healTarget(unit, self[120] or 0)
     end
-    if self[140] then
+    if self[141] then
         unit:explode()
-    elseif self[139] then
+    elseif self[140] then
         unit:kill()
     end
 end
@@ -954,7 +952,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "stuns",
+    "turnsIntoGhost",
     {
         get = function(self)
             local ____self__135_52 = self[135]
@@ -963,18 +961,12 @@ __TS__SetDescriptor(
             end
             return ____self__135_52
         end,
-        set = function(self, stuns)
-            if not stuns and self[135] then
-                if self[136] then
-                    self.object:decrementStunCounter()
-                end
-                self.object:decrementStunCounter()
+        set = function(self, turnsIntoGhost)
+            if not turnsIntoGhost and self[135] then
+                self.object:decrementGhostCounter()
                 self[135] = nil
-            elseif stuns and not self[135] then
-                if self[136] then
-                    self.object:incrementStunCounter()
-                end
-                self.object:incrementStunCounter()
+            elseif turnsIntoGhost and not self[135] then
+                self.object:incrementGhostCounter()
                 self[135] = true
             end
         end
@@ -983,7 +975,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "ignoresStunImmunity",
+    "stuns",
     {
         get = function(self)
             local ____self__136_53 = self[136]
@@ -992,16 +984,18 @@ __TS__SetDescriptor(
             end
             return ____self__136_53
         end,
-        set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[136] then
-                if self[135] then
+        set = function(self, stuns)
+            if not stuns and self[136] then
+                if self[137] then
                     self.object:decrementStunCounter()
                 end
+                self.object:decrementStunCounter()
                 self[136] = nil
-            elseif ignoresStunImmunity and not self[136] then
-                if self[135] then
+            elseif stuns and not self[136] then
+                if self[137] then
                     self.object:incrementStunCounter()
                 end
+                self.object:incrementStunCounter()
                 self[136] = true
             end
         end
@@ -1010,7 +1004,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "disablesAutoAttack",
+    "ignoresStunImmunity",
     {
         get = function(self)
             local ____self__137_54 = self[137]
@@ -1019,12 +1013,16 @@ __TS__SetDescriptor(
             end
             return ____self__137_54
         end,
-        set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[137] then
-                self.object:decrementDisableAutoAttackCounter()
+        set = function(self, ignoresStunImmunity)
+            if not ignoresStunImmunity and self[137] then
+                if self[136] then
+                    self.object:decrementStunCounter()
+                end
                 self[137] = nil
-            elseif disablesAutoAttack and not self[137] then
-                self.object:incrementDisableAutoAttackCounter()
+            elseif ignoresStunImmunity and not self[137] then
+                if self[136] then
+                    self.object:incrementStunCounter()
+                end
                 self[137] = true
             end
         end
@@ -1033,7 +1031,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "providesInvulnerability",
+    "disablesAutoAttack",
     {
         get = function(self)
             local ____self__138_55 = self[138]
@@ -1042,12 +1040,12 @@ __TS__SetDescriptor(
             end
             return ____self__138_55
         end,
-        set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[138] then
-                self.object:decrementInvulnerabilityCounter()
+        set = function(self, disablesAutoAttack)
+            if not disablesAutoAttack and self[138] then
+                self.object:decrementDisableAutoAttackCounter()
                 self[138] = nil
-            elseif providesInvulnerability and not self[138] then
-                self.object:incrementInvulnerabilityCounter()
+            elseif disablesAutoAttack and not self[138] then
+                self.object:incrementDisableAutoAttackCounter()
                 self[138] = true
             end
         end
@@ -1056,7 +1054,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "killsOnExpiration",
+    "providesInvulnerability",
     {
         get = function(self)
             local ____self__139_56 = self[139]
@@ -1065,10 +1063,12 @@ __TS__SetDescriptor(
             end
             return ____self__139_56
         end,
-        set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[139] then
+        set = function(self, providesInvulnerability)
+            if not providesInvulnerability and self[139] then
+                self.object:decrementInvulnerabilityCounter()
                 self[139] = nil
-            elseif killsOnExpiration and not self[139] then
+            elseif providesInvulnerability and not self[139] then
+                self.object:incrementInvulnerabilityCounter()
                 self[139] = true
             end
         end
@@ -1077,7 +1077,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "explodesOnExpiration",
+    "killsOnExpiration",
     {
         get = function(self)
             local ____self__140_57 = self[140]
@@ -1096,6 +1096,27 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "explodesOnExpiration",
+    {
+        get = function(self)
+            local ____self__141_58 = self[141]
+            if ____self__141_58 == nil then
+                ____self__141_58 = false
+            end
+            return ____self__141_58
+        end,
+        set = function(self, killsOnExpiration)
+            if not killsOnExpiration and self[141] then
+                self[141] = nil
+            elseif killsOnExpiration and not self[141] then
+                self[141] = true
+            end
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "maximumDamageDealtEventCount",
@@ -1212,13 +1233,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_58 = self._timer
-            return ____opt_58 and ____opt_58.remaining or 0
+            local ____opt_59 = self._timer
+            return ____opt_59 and ____opt_59.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_62 = remainingDuration
-            local ____opt_60 = self._timer
-            local remainingDurationDelta = ____remainingDuration_62 - (____opt_60 and ____opt_60.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
@@ -1232,7 +1253,8 @@ __TS__SetDescriptor(
                         self._level,
                         remainingDuration,
                         self._spellStealPriority,
-                        self._learnLevelMinimum
+                        self._learnLevelMinimum,
+                        self[142]
                     ) then
                         local timer = self._timer
                         if timer == nil then
@@ -1247,7 +1269,8 @@ __TS__SetDescriptor(
     },
     true
 )
-Buff.destroyEvent = buffDestroyEvent;
+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
@@ -1301,5 +1324,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