warscript 0.0.1-dev.a319619 → 0.0.1-dev.a3deff8

package/engine/behaviour/unit/stun-immunity.d.ts

@@ -8,6 +8,7 @@ export type StunImmunityUnitBehaviourParameters = {
     buffTypeIds?: LuaSet<BuffTypeId>;
     textTagPreset?: TextTagPreset;
     textTagText?: string;
+    additionalAction?: (this: void, unit: Unit) => void;
 };
 export declare class StunImmunityUnitBehavior extends UnitBehavior {
     readonly parameters: Readonly<StunImmunityUnitBehaviourParameters>;
@@ -17,4 +18,5 @@ export declare class StunImmunityUnitBehavior extends UnitBehavior {
     onDamageReceived(): void;
     onTargetingAbilityChannelingStart(): void;
     onTargetingAbilityImpact(): void;
+    protected onEffect(): void;
 }

package/engine/behaviour/unit/stun-immunity.lua

@@ -48,8 +48,15 @@ local function process(behavior)
     for buffTypeId in pairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
         hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
     end
-    if hasRemovedBuffs and behavior.parameters.textTagText ~= nil then
-        TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
+    if hasRemovedBuffs then
+        behavior.onEffect(behavior)
+        if behavior.parameters.textTagText ~= nil then
+            TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
+        end
+        local ____opt_0 = behavior.parameters.additionalAction
+        if ____opt_0 ~= nil then
+            ____opt_0(behavior.unit)
+        end
     end
 end
 ____exports.StunImmunityUnitBehavior = __TS__Class()
@@ -79,5 +86,7 @@ end
 function StunImmunityUnitBehavior.prototype.onTargetingAbilityImpact(self)
     process(self)
 end
+function StunImmunityUnitBehavior.prototype.onEffect(self)
+end
 StunImmunityUnitBehavior.defaultParameters = {buffTypeIds = DEFAULT_BUFF_TYPE_IDS, textTagPreset = TextTag.MISS, textTagText = nil}
 return ____exports

package/engine/behaviour/unit.d.ts

@@ -11,13 +11,18 @@ import { Destructor } from "../../destroyable";
 import type { Widget } from "../../core/types/widget";
 import { Destructable } from "../../core/types/destructable";
 import type { Buff } from "../buff";
+import { UnitBonusType } from "../internal/unit/bonus";
+import { Player } from "../../core/types/player";
 export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
 export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
+    readonly sourceAbilityBehavior?: AbilityBehavior;
+    private _bonusIdByBonusType?;
     constructor(unit: Unit);
     protected onDestroy(): Destructor;
-    readonly sourceAbilityBehavior?: AbilityBehavior;
     get unit(): Unit;
-    registerInRangeUnitEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractUnit: (...args: Args) => Unit | undefined, range: number, listener: T): void;
+    protected getUnitBonus(bonusType: UnitBonusType): number;
+    protected addOrUpdateOrRemoveUnitBonus(bonusType: UnitBonusType, value: number): void;
+    protected registerInRangeUnitEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractUnit: (...args: Args) => Unit | undefined, range: number, listener: T): void;
     onImmediateOrder(orderId: number): void;
     onTargetOrder(orderId: number, target: Widget): void;
     onPointOrder(orderId: number, x: number, y: number): void;
@@ -51,4 +56,5 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onItemChargesChanged(item: Item): void;
     onKill(target: Unit): void;
     onDeath(source: Unit | undefined): void;
+    onOwnerChange(previousOwner: Player): void;
 }

package/engine/behaviour/unit.lua

@@ -17,6 +17,11 @@ local getOrPut = ____lua_2Dmaps.getOrPut
 local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
 local ____lua_2Dsets = require("utility.lua-sets")
 local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
+local ____bonus = require("engine.internal.unit.bonus")
+local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
+local getUnitBonus = ____bonus.getUnitBonus
+local removeUnitBonus = ____bonus.removeUnitBonus
+local safeCall = warpack.safeCall
 local behaviorsByEvent = {}
 local rangeByBehaviorByEvent = {}
 local listenerByBehaviorByEvent = {}
@@ -47,8 +52,26 @@ function UnitBehavior.prototype.onDestroy(self)
         end
         eventsByBehavior[self] = nil
     end
+    if self._bonusIdByBonusType ~= nil then
+        for bonusType, bonusId in pairs(self._bonusIdByBonusType) do
+            removeUnitBonus(self.object, bonusType, bonusId)
+        end
+    end
     return Behavior.prototype.onDestroy(self)
 end
+function UnitBehavior.prototype.getUnitBonus(self, bonusType)
+    local ____opt_6 = self._bonusIdByBonusType
+    local bonusId = ____opt_6 and ____opt_6[bonusType]
+    return bonusId == nil and 0 or getUnitBonus(self.object, bonusType, bonusId)
+end
+function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
+    local bonusIdByBonusType = self._bonusIdByBonusType
+    if bonusIdByBonusType == nil then
+        bonusIdByBonusType = {}
+        self._bonusIdByBonusType = bonusIdByBonusType
+    end
+    bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self.object, bonusType, bonusIdByBonusType[bonusType], value)
+end
 function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
     local rangeByBehavior = getOrPut(rangeByBehaviorByEvent, event, mutableLuaMap)
     rangeByBehavior[self] = range
@@ -65,8 +88,7 @@ function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUni
                     for behavior in pairs(behaviors) do
                         local range = rangeByBehavior[behavior]
                         if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
-                            local ____self_6 = behavior
-                            ____self_6[listenerByBehavior[behavior]](____self_6, ...)
+                            safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
                         end
                     end
                 end
@@ -143,6 +165,8 @@ function UnitBehavior.prototype.onKill(self, target)
 end
 function UnitBehavior.prototype.onDeath(self, source)
 end
+function UnitBehavior.prototype.onOwnerChange(self, previousOwner)
+end
 __TS__SetDescriptor(
     UnitBehavior.prototype,
     "unit",
@@ -254,6 +278,9 @@ __TS__SetDescriptor(
     Unit.itemChargesChangedEvent:addListener(function(unit, item)
         ____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
     end)
+    Unit.onOwnerChange:addListener(function(unit, previousOwner)
+        ____exports.UnitBehavior:forAll(unit, "onOwnerChange", previousOwner)
+    end)
 end)(UnitBehavior)
 Unit.destroyEvent:addListener(function(unit)
     ____exports.UnitBehavior:forAll(unit, "destroy")

package/engine/buff.d.ts

@@ -124,7 +124,9 @@ declare const enum BuffPropertyKey {
     PROVIDES_INVULNERABILITY = 139,
     KILLS_ON_EXPIRATION = 140,
     EXPLODES_ON_EXPIRATION = 141,
-    MISS_PROBABILITY = 142
+    MISS_PROBABILITY = 142,
+    ABILITY_COOLDOWN_FACTOR = 143,
+    ABILITY_COOLDOWN_MODIFIER = 144
 }
 export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
@@ -187,6 +189,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private [BuffPropertyKey.PROVIDES_INVULNERABILITY]?;
     private [BuffPropertyKey.KILLS_ON_EXPIRATION]?;
     private [BuffPropertyKey.EXPLODES_ON_EXPIRATION]?;
+    private [BuffPropertyKey.ABILITY_COOLDOWN_FACTOR]?;
+    private [BuffPropertyKey.ABILITY_COOLDOWN_MODIFIER]?;
     protected static readonly defaultParameters: BuffParameters;
     get source(): Unit;
     readonly typeId: ApplicableBuffTypeId;
@@ -201,11 +205,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private readonly _spellStealPriority?;
     private readonly _learnLevelMinimum?;
     private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
-    private _bonusIdByBonusType?;
     private readonly _abilityTypeIds?;
     private _behaviors?;
-    private getUnitBonus;
-    private addOrUpdateOrRemoveUnitBonus;
     constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
     get level(): number;
     get remainingDamageOverDuration(): number;
@@ -265,6 +266,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     get duration(): number;
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);
+    get abilityCooldownFactor(): number;
+    set abilityCooldownFactor(abilityCooldownFactor: number);
+    onAbilityGained(ability: Ability): void;
+    onAbilityLost(ability: Ability): void;
     flashEffect(...parameters: [
         ...widgetOrXY: [] | [Widget] | [x: number, x: number],
         ...parametersOrDuration: [] | [EffectParameters] | [number]

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 = {}
@@ -509,63 +509,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 +599,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 +613,7 @@ function Buff.prototype.onDestroy(self)
     end
     if self[136] then
         if self[137] then
-            unit:decrementStunCounter()
+            unit:decrementForceStunCounter()
         end
         unit:decrementStunCounter()
     end
@@ -616,11 +625,6 @@ 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(buffBeingDestroyedEvent, self)
     self[100] = 3
     return UnitBehavior.prototype.onDestroy(self)
@@ -650,8 +654,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 +813,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 +893,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 +980,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 +1003,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 +1032,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 +1059,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 +1082,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 +1105,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 +1126,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
@@ -1254,13 +1258,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 +1294,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)

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",

package/engine/internal/item+owner.lua

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