warscript 0.0.1-dev.193ed34 → 0.0.1-dev.1a26d39

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
@@ -44,6 +42,7 @@ local BuffType = ____buff_2Dtype.BuffType
 local ____unit = require("engine.behaviour.unit")
 local UnitBehavior = ____unit.UnitBehavior
 local ____arrays = require("utility.arrays")
+local emptyArray = ____arrays.emptyArray
 local forEach = ____arrays.forEach
 local ____event = require("event")
 local Event = ____event.Event
@@ -53,6 +52,12 @@ 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 ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+local ____records = require("utility.records")
+local sortedKeysUnnested = ____records.sortedKeysUnnested
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -101,6 +106,7 @@ local buffParametersKeys = {
     armorIncreaseFactor = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
+    manaRegenerationRateIncreaseFactor = true,
     evasionProbability = true,
     missProbability = true,
     damageFactor = true,
@@ -124,7 +130,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
@@ -187,6 +194,7 @@ local buffNumberParameters = {
     "durationIncreaseOnAutoAttack",
     "attackSpeedIncreaseFactor",
     "movementSpeedIncreaseFactor",
+    "manaRegenerationRateIncreaseFactor",
     "evasionProbability",
     "armorIncrease",
     "damageFactor",
@@ -201,7 +209,8 @@ local buffNumberParameters = {
     "healingPerInterval",
     "healingOverDuration",
     "damageOnExpiration",
-    "healingOnExpiration"
+    "healingOnExpiration",
+    "abilityCooldownFactor"
 }
 local unsuccessfulApplicationMarker = {}
 local function selectBuffTypeIdWithLeastDuration(buffTypeIds, unit)
@@ -320,33 +329,38 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     local polarity
     local resistanceType
     local ability
+    local abilityBehavior
     if type(typeIdOrTypeIds) ~= "number" then
         typeId = selectBuffTypeIdWithLeastDuration(typeIdOrTypeIds, _unit)
         polarity = resistanceTypeOrPolarity
         resistanceType = abilityOrParametersOrResistanceType
-        if __TS__InstanceOf(parametersOrAbility, Ability) or parametersOrAbility == nil then
+        if __TS__InstanceOf(parametersOrAbility, AbilityBehavior) then
+            abilityBehavior = parametersOrAbility
+            ability = abilityBehavior.ability
+        elseif __TS__InstanceOf(parametersOrAbility, Ability) then
             ability = parametersOrAbility
-        else
-            ability = nil
+        elseif parametersOrAbility ~= nil then
             parameters = parametersOrAbility
         end
     else
         typeId = typeIdOrTypeIds
         polarity = polarityOrTypeIdSelectionPolicy
         resistanceType = resistanceTypeOrPolarity
-        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) or abilityOrParametersOrResistanceType == nil then
+        if __TS__InstanceOf(abilityOrParametersOrResistanceType, AbilityBehavior) then
+            abilityBehavior = abilityOrParametersOrResistanceType
+            ability = abilityBehavior.ability
+            parameters = parametersOrAbility
+        elseif __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) then
             ability = abilityOrParametersOrResistanceType
             parameters = parametersOrAbility
-        else
-            ability = nil
+        elseif abilityOrParametersOrResistanceType ~= nil then
             parameters = abilityOrParametersOrResistanceType
+        else
+            parameters = parametersOrAbility
         end
     end
+    self.sourceAbilityBehavior = abilityBehavior
     self.typeId = typeId
-    if not (__TS__InstanceOf(ability, Ability) or ability == nil) then
-        parameters = ability
-        ability = nil
-    end
     local defaultParameters = self.constructor.defaultParameters
     local level = parameters and parameters.level or defaultParameters.level
     local spellStealPriority = parameters and parameters.spellStealPriority or defaultParameters.spellStealPriority
@@ -457,24 +471,22 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
                 abilityTypeIds = {}
                 self._abilityTypeIds = abilityTypeIds
             end
-            for abilityTypeId, abilityParameters in pairs(parametersAbilityTypeIds) do
+            for ____, abilityTypeId in ipairs(sortedKeysUnnested(parametersAbilityTypeIds)) do
+                local abilityParameters = parametersAbilityTypeIds[abilityTypeId]
                 local addedAbility = _unit:addAbility(abilityTypeId)
                 if addedAbility ~= nil then
                     _unit:makeAbilityPermanent(abilityTypeId, true)
                     _unit:setAbilityLevel(abilityTypeId, 1 + (abilityParameters.level or ability and ability.level or 0))
-                    for abilityParameterKey, abilityParameterValue in pairs(abilityParameters) do
-                        if abilityParameterKey == "isButtonVisible" then
-                            if not resolveBooleanValue(ability, level, abilityParameterValue) then
-                                _unit:hideAbility(abilityTypeId, true)
-                            end
-                        elseif abilityParameterKey ~= "level" then
-                            abilityParameterKey:setValue(
-                                addedAbility,
-                                resolveNumberValue(ability, level, abilityParameterValue)
-                            )
-                        end
+                    if abilityParameters.isButtonVisible == false then
+                        _unit:hideAbility(abilityTypeId, true)
+                    end
+                    for ____, field in ipairs(abilityParameters.fields or emptyArray()) do
+                        field[1]:setValue(
+                            addedAbility,
+                            resolveNumberValue(ability, level, field[2])
+                        )
                     end
-                    abilityTypeIds[abilityTypeId] = true
+                    abilityTypeIds[#abilityTypeIds + 1] = abilityTypeId
                 end
             end
             local behaviorConstructors = parameters and parameters.behaviorConstructors or defaultParameters.behaviorConstructors
@@ -486,18 +498,20 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
                 self._behaviors = behaviors
             end
         end
-        local additionalParameters = {}
-        for key, value in pairs(parameters) do
-            if not buffParametersKeys[key] then
-                if ability then
-                    additionalParameters[key] = resolveCurrentAbilityDependentValue(ability, value)
-                else
-                    additionalParameters[key] = value
+        if parameters ~= nil then
+            local additionalParameters = {}
+            for ____, key in ipairs(sortedKeysUnnested(parameters)) do
+                if not buffParametersKeys[key] then
+                    if ability then
+                        additionalParameters[key] = resolveCurrentAbilityDependentValue(ability, parameters[key])
+                    else
+                        additionalParameters[key] = parameters[key]
+                    end
                 end
             end
-        end
-        if (next(additionalParameters)) ~= nil then
-            self.parameters = additionalParameters
+            if (next(additionalParameters)) ~= nil then
+                self.parameters = additionalParameters
+            end
         end
     end
     if duration ~= nil and duration > 0 then
@@ -509,63 +523,66 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     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)
@@ -596,6 +613,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
@@ -604,7 +627,7 @@ function Buff.prototype.onDestroy(self)
     end
     if self[136] then
         if self[137] then
-            unit:decrementStunCounter()
+            unit:decrementForceStunCounter()
         end
         unit:decrementStunCounter()
     end
@@ -612,15 +635,10 @@ function Buff.prototype.onDestroy(self)
         unit:decrementGhostCounter()
     end
     if self._abilityTypeIds ~= nil then
-        for abilityTypeId in pairs(self._abilityTypeIds) do
+        for ____, abilityTypeId in ipairs(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(buffBeingDestroyedEvent, self)
     self[100] = 3
     return UnitBehavior.prototype.onDestroy(self)
@@ -650,8 +668,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
@@ -809,8 +827,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()
@@ -889,8 +907,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()
@@ -976,11 +994,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
@@ -999,22 +1017,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
@@ -1028,21 +1046,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
@@ -1055,11 +1073,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
@@ -1078,11 +1096,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
@@ -1101,11 +1119,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
@@ -1122,11 +1140,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
@@ -1241,6 +1259,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "manaRegenerationRateIncreaseFactor",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.MANA_REGENERATION_RATE_FACTOR)
+        end,
+        set = function(self, manaRegenerationRateIncreaseFactor)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.MANA_REGENERATION_RATE_FACTOR, manaRegenerationRateIncreaseFactor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "duration",
@@ -1254,13 +1285,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
@@ -1290,6 +1321,32 @@ __TS__SetDescriptor(
     },
     true
 )
+__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)
@@ -1348,5 +1405,8 @@ Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
     buffCreatedEvent:addListener(function(buff)
         UnitBehavior:forAll(buff.unit, "onBuffGained", buff)
     end)
+    buffBeingDestroyedEvent:addListener(function(buff)
+        UnitBehavior:forAll(buff.unit, "onBuffLost", 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";
@@ -67,6 +67,7 @@ export declare class UnitAbility extends Ability {
     get cooldownRemaining(): number;
     set cooldownRemaining(cooldownRemaining: number);
     interruptCast(): void;
+    protected onDestroy(): HandleDestructor;
     static get onCreate(): Event<[UnitAbility]>;
     static get onDestroy(): Event<[UnitAbility]>;
 }
@@ -93,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

@@ -232,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"
@@ -247,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(
@@ -420,6 +425,12 @@ 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",
@@ -512,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",