warscript 0.0.1-dev.d1983c6 → 0.0.1-dev.d1b563b

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
@@ -509,63 +506,50 @@ 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)
-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)
-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)
@@ -616,11 +600,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 +629,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 +788,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 +868,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 +955,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,11 +978,11 @@ __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
@@ -1028,11 +1007,11 @@ __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
@@ -1055,11 +1034,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 +1057,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 +1080,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 +1101,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 +1233,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

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

package/engine/internal/item.d.ts

@@ -8,12 +8,10 @@ import { AbilityTypeId } from "../object-data/entry/ability-type";
 import type { ItemTypeId } from "../object-data/entry/item-type";
 type DefenseType = 0 | 1 | 2 | 3 | 4 | 5;
 declare const enum ItemPropertyKey {
-    ABILITIES = 100,
-    LUA_INDEX_BY_ABILITY_TYPE_ID = 101
+    ABILITIES = 100
 }
 export declare class Item extends Handle<jitem> {
     private readonly [ItemPropertyKey.ABILITIES];
-    private readonly [ItemPropertyKey.LUA_INDEX_BY_ABILITY_TYPE_ID];
     constructor(handle: jitem);
     protected onDestroy(): HandleDestructor;
     static create<T extends Item>(this: typeof Item & (new (handle: jitem) => T), id: number, x: number, y: number, skinId?: number): T;

package/engine/internal/item.lua

@@ -46,9 +46,11 @@ local getItemY = GetItemY
 local getItemCharges = GetItemCharges
 local setItemCharges = SetItemCharges
 local unitRemoveAbility = UnitRemoveAbility
+local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitUseItemPoint = UnitUseItemPoint
 local unitUseItemTarget = UnitUseItemTarget
+local tableRemove = table.remove
 _G.SetItemCharges = function(whichItem, charges)
     setItemCharges(whichItem, charges)
     invoke(
@@ -137,15 +139,13 @@ Item.name = "Item"
 __TS__ClassExtends(Item, Handle)
 function Item.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
-    local abilities = doAbilityAction(handle, getItemAbilities, self)
-    self[100] = abilities
-    local luaIndexByAbilityTypeId = {}
-    for i = 1, #abilities do
-        luaIndexByAbilityTypeId[abilities[i].typeId] = i
-    end
-    self[101] = luaIndexByAbilityTypeId
+    self[100] = doAbilityAction(handle, getItemAbilities, self)
 end
 function Item.prototype.onDestroy(self)
+    local owner = self.owner
+    if owner ~= nil then
+        unitRemoveItem(owner.handle, self.handle)
+    end
     local abilities = self[100]
     for i = 1, #abilities do
         abilities[i]:destroy()
@@ -191,33 +191,32 @@ function Item.prototype.addAbility(self, abilityTypeId)
     if nativeAbility ~= nil then
         local ability = ItemAbility:of(nativeAbility, abilityTypeId, self)
         local abilities = self[100]
-        local luaIndex = #abilities + 1
-        abilities[luaIndex] = ability
-        self[101][abilityTypeId] = luaIndex
+        abilities[#abilities + 1] = ability
         return ability
     end
     return nil
 end
 function Item.prototype.removeAbility(self, abilityTypeId)
-    local luaIndexByAbilityTypeId = self[101]
-    local luaIndex = luaIndexByAbilityTypeId[abilityTypeId]
-    if luaIndex ~= nil and doAbilityAction(self.handle, itemRemoveAbility, abilityTypeId) then
-        luaIndexByAbilityTypeId[abilityTypeId] = nil
-        local abilities = self[100]
-        abilities[luaIndex]:destroy()
-        local abilityTypeIdsLength = #abilities
-        for j = luaIndex, abilityTypeIdsLength do
-            abilities[j] = abilities[j + 1]
+    local abilities = self[100]
+    for i = 1, #abilities do
+        if abilities[i].typeId == abilityTypeId then
+            local ability = abilities[i]
+            tableRemove(abilities, i)
+            ability:destroy()
+            return true
         end
     end
-    return false
+    return doAbilityAction(self.handle, itemRemoveAbility, abilityTypeId)
 end
 function Item.prototype.hasAbility(self, abilityTypeId)
-    return self[101][abilityTypeId] ~= nil
+    return doAbilityAction(self.handle, getItemAbility, abilityTypeId) ~= nil
 end
 function Item.prototype.getAbility(self, abilityTypeId)
-    local ability = self[101][abilityTypeId] ~= nil and doAbilityAction(self.handle, getItemAbility, abilityTypeId)
-    return ability and ItemAbility:of(ability, abilityTypeId, self) or nil
+    return ItemAbility:of(
+        doAbilityAction(self.handle, getItemAbility, abilityTypeId),
+        abilityTypeId,
+        self
+    )
 end
 function Item.getInRange(self, x, y, range)
     targetCollection = {}

package/engine/internal/unit/ability.lua

@@ -438,7 +438,7 @@ rawset(
                         condition(function()
                             local unit = Unit:of(getTriggerUnit())
                             if unit ~= nil then
-                                local ability = unit:getAbilityById(abilityTypeId)
+                                local ability = unit:getAbility(abilityTypeId)
                                 if ability ~= nil then
                                     eventInvoke(event, unit, ability, orderTypeStringId)
                                 end

package/engine/internal/unit+ability.lua

@@ -7,8 +7,8 @@ local UnitAbility = ____ability.UnitAbility
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
-local Event = ____event.Event
 local createDispatchingEvent = ____event.createDispatchingEvent
+local Event = ____event.Event
 local abilityGainedEvent = createDispatchingEvent(
     __TS__New(Event),
     function(unit, ability) return ability.typeId end
@@ -40,6 +40,15 @@ ItemAbility.onCreate:addListener(
         end
     end
 )
+ItemAbility.destroyEvent:addListener(
+    4,
+    function(ability)
+        local unit = ability.owner.owner
+        if unit ~= nil then
+            Event.invoke(abilityLostEvent, unit, ability)
+        end
+    end
+)
 Unit.itemPickedUpEvent:addListener(
     0,
     function(unit, item)

package/engine/internal/unit.d.ts

@@ -271,8 +271,8 @@ export declare class Unit extends Handle<junit> {
     setAbilityLevel(abilityId: number, level: number): number;
     getAbilityLevel(abilityId: number): number;
     hasAbility(abilityId: number): boolean;
-    getAbilityById(abilityId: number): UnitAbility | undefined;
-    removeAbility(abilityId: number): boolean;
+    getAbility(abilityId: number): UnitAbility | undefined;
+    removeAbility(abilityTypeId: number): boolean;
     hideAbility(abilityId: number, flag: boolean): void;
     getAbilityRemainingCooldown(abilityId: number): number;
     startAbilityCooldown(abilityId: number, cooldown: number): void;
@@ -353,7 +353,7 @@ export declare class Unit extends Handle<junit> {
     static itemDroppedEvent: UnitTriggerEvent<[Item]>;
     static itemPickedUpEvent: UnitTriggerEvent<[Item]>;
     static itemUsedEvent: UnitTriggerEvent<[Item]>;
-    static itemStackedEvent: UnitTriggerEvent<[Item]>;
+    static itemStackedEvent: UnitTriggerEvent<[target: Item, source: Item]>;
     static get itemChargesChangedEvent(): Event<[unit: Unit, item: Item]>;
     static get itemUseOrderEvent(): Event<[unit: Unit, item: Item]>;
     static get itemMoveOrderEvent(): Event<[

package/engine/internal/unit.lua

@@ -935,23 +935,21 @@ end
 function Unit.prototype.hasAbility(self, abilityId)
     return getUnitAbilityLevel(self.handle, abilityId) > 0
 end
-function Unit.prototype.getAbilityById(self, abilityId)
+function Unit.prototype.getAbility(self, abilityId)
     local ability = doUnitAbilityAction(self.handle, abilityId, getUnitAbility, abilityId)
     return UnitAbility:of(ability, abilityId, self)
 end
-function Unit.prototype.removeAbility(self, abilityId)
-    if doUnitAbilityAction(self.handle, abilityId, unitRemoveAbility, abilityId) then
-        local abilities = self.abilities
-        for i = 1, #abilities do
-            if abilities[i].typeId == abilityId then
-                abilities[i]:destroy()
-                tremove(abilities, i)
-                return true
-            end
+function Unit.prototype.removeAbility(self, abilityTypeId)
+    local abilities = self.abilities
+    for i = 1, #abilities do
+        if abilities[i].typeId == abilityTypeId then
+            local ability = abilities[i]
+            tremove(abilities, i)
+            ability:destroy()
+            return true
         end
-        return true
     end
-    return false
+    return doUnitAbilityAction(self.handle, abilityTypeId, unitRemoveAbility, abilityTypeId)
 end
 function Unit.prototype.hideAbility(self, abilityId, flag)
     BlzUnitHideAbility(self.handle, abilityId, flag)
@@ -2670,10 +2668,14 @@ Unit.itemPickedUpEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
-        local unit = getTriggerUnit()
-        local item = getManipulatedItem()
-        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
-            return ____exports.Unit:of(unit), Item:of(item)
+        local unitHandle = getTriggerUnit()
+        local itemHandle = getManipulatedItem()
+        if getUnitTypeId(unitHandle) ~= dummyUnitId and not (ignoreEventsItems[itemHandle] ~= nil) then
+            local unit = ____exports.Unit:of(unitHandle)
+            local item = Item:of(itemHandle)
+            if item.owner ~= unit then
+                return unit, item
+            end
         end
         return IgnoreEvent
     end
@@ -2693,7 +2695,7 @@ Unit.itemUsedEvent = __TS__New(
 Unit.itemStackedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_STACK_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(BlzGetStackingItemTarget()), Item:of(BlzGetStackingItemSource()) end
 )
 __TS__ObjectDefineProperty(
     Unit,

package/engine/object-field/ability.d.ts

@@ -12,7 +12,7 @@ import { ReadonlyNonEmptyLinkedSet } from "../../utility/linked-set";
 export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
 }
 export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
@@ -48,7 +48,7 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
 export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -68,7 +68,7 @@ export declare abstract class AbilityLevelField<ValueType extends number | strin
     protected get instanceClass(): typeof Ability;
     protected getLevelCount(entry: AbilityType | Ability): number;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
 }
 export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {

package/engine/object-field/ability.lua

@@ -7,6 +7,7 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
+local abilityTypeHasField = ____ability.abilityTypeHasField
 local ____object_2Dfield = require("engine.object-field")
 local ObjectArrayField = ____object_2Dfield.ObjectArrayField
 local ObjectField = ____object_2Dfield.ObjectField
@@ -29,8 +30,8 @@ __TS__ClassExtends(AbilityField, ObjectField)
 function AbilityField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityField.prototype,
@@ -197,8 +198,8 @@ __TS__ClassExtends(AbilityArrayField, ObjectArrayField)
 function AbilityArrayField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityArrayField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityArrayField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
@@ -269,8 +270,8 @@ end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityLevelField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityLevelField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityLevelField.prototype,