warscript 0.0.1-dev.91da42b → 0.0.1-dev.9381e62

package/engine/internal/unit+rally.lua

@@ -23,22 +23,22 @@ local issueTargetOrderById = IssueTargetOrderById
 local queuePointOrderById = BlzQueuePointOrderById
 local queueTargetOrderById = BlzQueueTargetOrderById
 local rallyRouteByUnit = setmetatable({}, {__mode = "k"})
-Unit.onPointOrder[orderId("setrally")]:addListener(function(unit, x, y)
+Unit.onPointOrder[851980]:addListener(function(unit, x, y)
     processPoint(unit, x, y)
 end)
-Unit.onPointOrder[orderId("smart")]:addListener(function(unit, x, y)
+Unit.onPointOrder[851971]:addListener(function(unit, x, y)
     if unit:hasAbility(fourCC("ARal")) then
         processPoint(unit, x, y)
     end
 end)
-Unit.onTargetOrder[orderId("setrally")]:addListener(function(unit, target)
+Unit.onTargetOrder[851980]:addListener(function(unit, target)
     if __TS__InstanceOf(target, Unit) then
         processUnit(unit, target)
     elseif __TS__InstanceOf(target, Destructable) then
         processDestructible(unit, target)
     end
 end)
-Unit.onTargetOrder[orderId("smart")]:addListener(function(unit, target)
+Unit.onTargetOrder[851971]:addListener(function(unit, target)
     if unit:hasAbility(fourCC("ARal")) then
         if __TS__InstanceOf(target, Unit) then
             processUnit(unit, target)
@@ -116,41 +116,19 @@ __TS__ObjectDefineProperty(
             do
                 local rallyPoint = rallyRoute[1]
                 if __TS__InstanceOf(rallyPoint, Handle) then
-                    issueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint.handle
-                    )
+                    issueTargetOrderById(handle, 851980, rallyPoint.handle)
                 elseif rallyPoint ~= nil then
-                    issuePointOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint[1],
-                        rallyPoint[2]
-                    )
+                    issuePointOrderById(handle, 851980, rallyPoint[1], rallyPoint[2])
                 else
-                    issueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        handle
-                    )
+                    issueTargetOrderById(handle, 851980, handle)
                 end
             end
             for i = 2, #rallyRoute do
                 local rallyPoint = rallyRoute[i]
                 if __TS__InstanceOf(rallyPoint, Handle) then
-                    queueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint.handle
-                    )
+                    queueTargetOrderById(handle, 851980, rallyPoint.handle)
                 else
-                    queuePointOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint[1],
-                        rallyPoint[2]
-                    )
+                    queuePointOrderById(handle, 851980, rallyPoint[1], rallyPoint[2])
                 end
             end
         end

package/engine/internal/unit-missile-data.lua

@@ -44,58 +44,84 @@ ____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = (function()
                     UnitType:getAll(),
                     function(unitType) return unitType.id end,
                     function(unitType)
-                        local ____ = unitType.missileImpactOffsetZSD
-                        local ____ = unitType.missileImpactOffsetZHD
                         return {
                             [0] = unitType.missileImpactOffsetZSD ~= ____exports.DEFAULT_MISSILE_IMPACT_OFFSET_Z and unitType.missileImpactOffsetZSD or nil,
                             [1] = unitType.missileImpactOffsetZHD ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZHD or nil,
-                            [2] = unitType.missileLaunchOffsetX ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_X and unitType.missileLaunchOffsetX or nil,
-                            [3] = unitType.missileLaunchOffsetY ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Y and unitType.missileLaunchOffsetY or nil,
-                            [4] = unitType.missileLaunchOffsetZSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Z and unitType.missileLaunchOffsetZSD or nil,
-                            [5] = unitType.missileLaunchOffsetZHD ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZHD or nil,
-                            [6] = unitType.missileLaunchVisualOffsetXSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_X and unitType.missileLaunchVisualOffsetXSD or nil,
-                            [7] = unitType.missileLaunchVisualOffsetXHD ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXHD or nil,
-                            [8] = unitType.missileLaunchVisualOffsetYSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y and unitType.missileLaunchVisualOffsetYSD or nil,
-                            [9] = unitType.missileLaunchVisualOffsetYHD ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYHD or nil
+                            [2] = unitType.missileImpactOffsetZDE ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZDE or nil,
+                            [3] = unitType.missileLaunchOffsetX ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_X and unitType.missileLaunchOffsetX or nil,
+                            [4] = unitType.missileLaunchOffsetY ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Y and unitType.missileLaunchOffsetY or nil,
+                            [5] = unitType.missileLaunchOffsetZSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Z and unitType.missileLaunchOffsetZSD or nil,
+                            [6] = unitType.missileLaunchOffsetZHD ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZHD or nil,
+                            [7] = unitType.missileLaunchOffsetZDE ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZDE or nil,
+                            [8] = unitType.missileLaunchVisualOffsetXSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_X and unitType.missileLaunchVisualOffsetXSD or nil,
+                            [9] = unitType.missileLaunchVisualOffsetXHD ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXHD or nil,
+                            [10] = unitType.missileLaunchVisualOffsetXDE ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXDE or nil,
+                            [11] = unitType.missileLaunchVisualOffsetYSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y and unitType.missileLaunchVisualOffsetYSD or nil,
+                            [12] = unitType.missileLaunchVisualOffsetYHD ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYHD or nil,
+                            [13] = unitType.missileLaunchVisualOffsetYDE ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYDE or nil
                         }
                     end
                 )
             end),
             function(data)
-                local ____setmetatable_6 = setmetatable
-                local ____LocalClient_isHD_0
+                local ____setmetatable_10 = setmetatable
+                local ____LocalClient_isHD_1
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_0 = data[1] or data[0]
+                    ____LocalClient_isHD_1 = data[1] or data[0]
                 else
-                    ____LocalClient_isHD_0 = data[0]
+                    local ____LocalClient_isDE_0
+                    if LocalClient.isDE then
+                        ____LocalClient_isDE_0 = data[2] or data[0]
+                    else
+                        ____LocalClient_isDE_0 = data[0]
+                    end
+                    ____LocalClient_isHD_1 = ____LocalClient_isDE_0
                 end
-                local ____data__2_4 = data[2]
-                local ____data__3_5 = data[3]
-                local ____LocalClient_isHD_1
+                local ____data__3_8 = data[3]
+                local ____data__4_9 = data[4]
+                local ____LocalClient_isHD_3
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_1 = data[5] or data[4]
+                    ____LocalClient_isHD_3 = data[6] or data[5]
                 else
-                    ____LocalClient_isHD_1 = data[4]
+                    local ____LocalClient_isDE_2
+                    if LocalClient.isDE then
+                        ____LocalClient_isDE_2 = data[7] or data[5]
+                    else
+                        ____LocalClient_isDE_2 = data[5]
+                    end
+                    ____LocalClient_isHD_3 = ____LocalClient_isDE_2
                 end
-                local ____LocalClient_isHD_2
+                local ____LocalClient_isHD_5
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_2 = data[7] or data[6]
+                    ____LocalClient_isHD_5 = data[9] or data[8]
                 else
-                    ____LocalClient_isHD_2 = data[6]
+                    local ____LocalClient_isDE_4
+                    if LocalClient.isDE then
+                        ____LocalClient_isDE_4 = data[10] or data[8]
+                    else
+                        ____LocalClient_isDE_4 = data[8]
+                    end
+                    ____LocalClient_isHD_5 = ____LocalClient_isDE_4
                 end
-                local ____LocalClient_isHD_3
+                local ____LocalClient_isHD_7
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_3 = data[9] or data[8]
+                    ____LocalClient_isHD_7 = data[12] or data[11]
                 else
-                    ____LocalClient_isHD_3 = data[8]
+                    local ____LocalClient_isDE_6
+                    if LocalClient.isDE then
+                        ____LocalClient_isDE_6 = data[13] or data[11]
+                    else
+                        ____LocalClient_isDE_6 = data[11]
+                    end
+                    ____LocalClient_isHD_7 = ____LocalClient_isDE_6
                 end
-                return ____setmetatable_6({
-                    impactOffsetZ = ____LocalClient_isHD_0,
-                    launchOffsetX = ____data__2_4,
-                    launchOffsetY = ____data__3_5,
-                    launchOffsetZ = ____LocalClient_isHD_1,
-                    launchVisualOffsetX = ____LocalClient_isHD_2,
-                    launchVisualOffsetY = ____LocalClient_isHD_3
+                return ____setmetatable_10({
+                    impactOffsetZ = ____LocalClient_isHD_1,
+                    launchOffsetX = ____data__3_8,
+                    launchOffsetY = ____data__4_9,
+                    launchOffsetZ = ____LocalClient_isHD_3,
+                    launchVisualOffsetX = ____LocalClient_isHD_5,
+                    launchVisualOffsetY = ____LocalClient_isHD_7
                 }, METATABLE)
             end
         ),

package/engine/internal/unit-missile-launch.lua

@@ -22,19 +22,19 @@ local targetAttribute = attribute()
 local impactDelayAttribute = attribute()
 local passedTimeAttribute = attribute()
 local instantOrderIds = luaSetOf(
-    orderId("avatar"),
-    orderId("berserk"),
-    orderId("divineshield"),
-    orderId("immolation"),
-    orderId("moveslot0"),
-    orderId("moveslot1"),
-    orderId("moveslot2"),
-    orderId("moveslot3"),
-    orderId("moveslot4"),
-    orderId("moveslot5"),
-    orderId("unavatar"),
-    orderId("undivineshield"),
-    orderId("unimmolation")
+    852086,
+    852100,
+    852090,
+    852177,
+    852002,
+    852003,
+    852004,
+    852005,
+    852006,
+    852007,
+    852087,
+    852091,
+    852178
 )
 ---
 -- @internal For use by internal systems only.

package/engine/internal/unit.d.ts

@@ -139,6 +139,7 @@ export declare class Unit extends Handle<junit> {
     private _fields?;
     private getEvent;
     constructor(handle: junit);
+    private saveData;
     protected onDestroy(): HandleDestructor;
     addAttackHandler(condition: AttackHandlerCondition, action: AttackHandlerAction): AttackHandler;
     removeAttackHandler(handler: AttackHandler): boolean;
@@ -291,7 +292,6 @@ export declare class Unit extends Handle<junit> {
     set waygateDestination(v: Vec2);
     get waygateDestination(): Vec2;
     get abilities(): ReadonlyArray<UnitAbility>;
-    get onUnitInRange(): Record<number, Event<[Unit]>>;
     get onManaEqual(): Record<number, Event<[Unit, number]>>;
     get manaEvent(): Record<Operator, Record<number, Event<[Unit]>>>;
     get targetAcquiredEvent(): Event;
@@ -321,7 +321,7 @@ export declare class Unit extends Handle<junit> {
     static readonly constructionStartEvent: UnitTriggerEvent<[]>;
     static readonly onUpgradeFinish: UnitTriggerEvent<[]>;
     static readonly onSpellEffect: EventDispatcher<[Unit, number], [Unit]>;
-    static readonly onTargetCast: EventDispatcher<[Unit, number, Item | Unit | Destructable], [Unit, Item | Unit | Destructable]>;
+    static readonly onTargetCast: EventDispatcher<[Unit, number, Destructable | Unit | Item], [Unit, Destructable | Unit | Item]>;
     static readonly onCastPrepare: AbilityEventDispatcher<[]>;
     static readonly onCast: AbilityEventDispatcher<[]>;
     static readonly onPointCastPrepare: AbilityEventDispatcher<[number, number]>;
@@ -348,15 +348,7 @@ export declare class Unit extends Handle<junit> {
     static itemDroppedEvent: UnitTriggerEvent<[Item]>;
     static itemPickedUpEvent: UnitTriggerEvent<[Item]>;
     static itemUsedEvent: 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<[
-        unit: Unit,
-        item: Item,
-        slotFrom: 0 | 1 | 2 | 3 | 4 | 5,
-        slotTo: 0 | 1 | 2 | 3 | 4 | 5
-    ]>;
     static get onCreate(): EventDispatcher<[Unit], [Unit]>;
     static get destroyEvent(): EventDispatcher<[Unit], [Unit]>;
     getField(field: junitintegerfield | junitrealfield): number;

package/engine/internal/unit.lua

@@ -47,12 +47,10 @@ local checkNotNull = ____preconditions.checkNotNull
 local ____constants = require("engine.constants")
 local HEALTH_REGENERATION_RATE_BONUS_PER_STRENGTH_POINT = ____constants.HEALTH_REGENERATION_RATE_BONUS_PER_STRENGTH_POINT
 local MANA_REGENERATION_RATE_BONUS_PER_INTELLIGENCE_POINT = ____constants.MANA_REGENERATION_RATE_BONUS_PER_INTELLIGENCE_POINT
-local ____arrays = require("utility.arrays")
-local forEach = ____arrays.forEach
-local ____math = require("math")
-local min = ____math.min
 local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
-local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local isItemIgnoredInEvents = ____ignore_2Devents_2Ditems.isItemIgnoredInEvents
+local ____owner_2Dcache = require("engine.internal.item.owner-cache")
+local ownerByItem = ____owner_2Dcache.ownerByItem
 local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
 local attackTypeToNative = ____attack_2Dtype.attackTypeToNative
 local nativeToAttackType = ____attack_2Dtype.nativeToAttackType
@@ -64,6 +62,8 @@ local ____ability = require("engine.internal.item.ability")
 local doUnitAbilityAction = ____ability.doUnitAbilityAction
 local ____synchronization = require("engine.synchronization")
 local synchronizer = ____synchronization.synchronizer
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
@@ -381,15 +381,27 @@ local modifiers = {
     end,
     armor = function(unit, value)
         if UnitAddAbility(unit, armorBonusAbilityId) then
-            assert(UnitMakeAbilityPermanent(unit, true, armorBonusAbilityId))
+            assert(
+                UnitMakeAbilityPermanent(unit, true, armorBonusAbilityId),
+                "armor bonus ability must be made permanent",
+                unit
+            )
         end
-        local ability = assert(BlzGetUnitAbility(unit, armorBonusAbilityId))
-        assert(BlzSetAbilityRealLevelField(
-            ability,
-            armorBonusField,
-            0,
-            BlzGetAbilityRealLevelField(ability, armorBonusField, 0) + value
-        ))
+        local ability = assert(
+            BlzGetUnitAbility(unit, armorBonusAbilityId),
+            "armor bonus ability must be existing",
+            unit
+        )
+        assert(
+            BlzSetAbilityRealLevelField(
+                ability,
+                armorBonusField,
+                0,
+                BlzGetAbilityRealLevelField(ability, armorBonusField, 0) + value
+            ),
+            "armor bonus ability field must be set",
+            unit
+        )
     end
 }
 local getters = {
@@ -578,8 +590,6 @@ __TS__SetDescriptor(
     },
     true
 )
-local unitInventorySize = UnitInventorySize
-local unitItemInSlot = UnitItemInSlot
 local getItemAbility = BlzGetItemAbility
 local getUnitAbility = BlzGetUnitAbility
 local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
@@ -597,8 +607,8 @@ local function retrieveAbility(unit, ability, abilityId)
             ____exports.Unit:of(unit)
         )
     end
-    for i = 0, unitInventorySize(unit) - 1 do
-        local item = unitItemInSlot(unit, i)
+    for i = 0, UnitInventorySize(unit) - 1 do
+        local item = UnitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
             return ItemAbility:of(
                 ability,
@@ -643,13 +653,17 @@ local fieldSetters = {
 }
 local dummies = {}
 for ____, player in ipairs(Player.all) do
-    local dummy = assert(createUnit(
-        player.handle,
-        dummyUnitId,
-        0,
-        0,
-        270
-    ))
+    local dummy = assert(
+        createUnit(
+            player.handle,
+            dummyUnitId,
+            0,
+            0,
+            270
+        ),
+        "dummy must be created",
+        player
+    )
     ShowUnit(dummy, false)
     dummies[player] = dummy
 end
@@ -692,41 +706,57 @@ function Unit.prototype.____constructor(self, handle)
     nextSyncId = ____nextSyncId_1 + 1
     self.syncId = ____nextSyncId_1
     self._owner = Player:of(getOwningPlayer(handle))
-    assert(unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId))
-    assert(unitAddAbility(handle, morphDetectAbilityId))
+    assert(
+        unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId),
+        "leave detection ability must be added",
+        self
+    )
+    assert(
+        unitAddAbility(handle, morphDetectAbilityId),
+        "morph detection ability must be added",
+        self
+    )
     if unitAddAbility(
         handle,
         fourCC("Amrf")
     ) then
-        assert(unitRemoveAbility(
-            handle,
-            fourCC("Amrf")
-        ))
+        assert(
+            unitRemoveAbility(
+                handle,
+                fourCC("Amrf")
+            ),
+            "fly ability must be removed after addition",
+            self
+        )
     end
     unitBySyncId[self.syncId] = self
     local ____ = self.abilities
 end
-function Unit.prototype.getEvent(self, event, collector)
-    self.events = self.events or ({})
-    local eventId = GetHandleId(event)
-    if not self.events[eventId] then
-        self.events[eventId] = __TS__New(
+function Unit.prototype.getEvent(self, jevent, collector)
+    self.events = self.events or __TS__New(LinkedMap)
+    local eventId = GetHandleId(jevent)
+    local event = self.events:get(eventId)
+    if event == nil then
+        event = __TS__New(
             TriggerEvent,
             function(trigger)
-                TriggerRegisterUnitEvent(trigger, self.handle, event)
+                TriggerRegisterUnitEvent(trigger, self.handle, jevent)
             end,
             collector or (function() return {} end)
         )
+        self.events:put(eventId, event)
     end
-    return self.events[eventId]
+    return event
+end
+function Unit.prototype.saveData(self)
+    local handle = self.handle
+    self[108] = self[108] or getUnitX(handle)
+    self[109] = self[109] or getUnitY(handle)
+    self._owner = self._owner or Player:of(getOwningPlayer(handle))
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
-    self[108] = getUnitX(handle)
-    self[109] = getUnitY(handle)
-    if not self._owner then
-        self._owner = Player:of(getOwningPlayer(handle))
-    end
+    self:saveData()
     local abilities = self.abilities
     for ____, ability in ipairs(abilities) do
         ability:destroy()
@@ -744,7 +774,9 @@ function Unit.prototype.onDestroy(self)
     end
     local eventsToDestroy = self._eventsToDestroy
     if eventsToDestroy ~= nil then
-        forEach(eventsToDestroy, "destroy")
+        for ____, event in ipairs(eventsToDestroy) do
+            event:destroy()
+        end
     end
     if getUnitAbilityLevel(handle, leaveDetectAbilityId) > 0 then
         unitRemoveAbility(handle, leaveDetectAbilityId)
@@ -762,7 +794,11 @@ function Unit.prototype.addAttackHandler(self, condition, action)
     self._attackHandlers = handlers
     if #handlers == 1 then
         local handle = self.handle
-        assert(unitAddAbility(handle, attackHandlerAbilityId) and UnitMakeAbilityPermanent(handle, true, attackHandlerAbilityId))
+        assert(
+            unitAddAbility(handle, attackHandlerAbilityId) and UnitMakeAbilityPermanent(handle, true, attackHandlerAbilityId),
+            "attack handler ability must be added",
+            self
+        )
     end
     return handler
 end
@@ -921,7 +957,7 @@ function Unit.prototype.dropItemSlot(self, item, slot)
     return UnitDropItemSlot(self.handle, item.handle, slot)
 end
 function Unit.prototype.itemInSlot(self, slot)
-    return Item:of(unitItemInSlot(self.handle, slot))
+    return Item:of(UnitItemInSlot(self.handle, slot))
 end
 function Unit.prototype.addAbility(self, abilityId)
     local ability = UnitAbility:of(
@@ -1279,7 +1315,7 @@ __TS__SetDescriptor(
     Unit.prototype,
     "isStunned",
     {get = function(self)
-        return getUnitCurrentOrder(self.handle) == orderId("stunned")
+        return getUnitCurrentOrder(self.handle) == 851973
     end},
     true
 )
@@ -1841,7 +1877,7 @@ __TS__SetDescriptor(
     Unit.prototype,
     "pathingCollisionRange",
     {get = function(self)
-        return 16 * (min(
+        return 16 * (math.min(
             getUnitCollisionSize(self.handle) // 16,
             3
         ) + 1)
@@ -1951,30 +1987,6 @@ __TS__SetDescriptor(
     end},
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "onUnitInRange",
-    {get = function(self)
-        local handle = self.handle
-        local onUnitInRange = setmetatable(
-            {},
-            {__index = function(self, value)
-                local event = __TS__New(
-                    TriggerEvent,
-                    function(trigger)
-                        TriggerRegisterUnitInRangeSimple(trigger, value, handle)
-                    end,
-                    function() return ____exports.Unit:of(handle) end
-                )
-                rawset(self, value, event)
-                return event
-            end}
-        )
-        rawset(self, "onUnitInRange", onUnitInRange)
-        return onUnitInRange
-    end},
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "onManaEqual",
@@ -2132,7 +2144,7 @@ Unit.onResurrect = __TS__New(
         ____exports.Unit.deathEvent:addListener(function(unit)
             dead[unit] = true
         end)
-        ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
+        ____exports.Unit.onImmediateOrder[852056]:addListener(function(unit)
             if dead[unit] and not IsUnitType(unit.handle, UNIT_TYPE_DEAD) then
                 dead[unit] = false
                 invoke(event, unit)
@@ -2149,7 +2161,7 @@ Unit.morphEvent = __TS__New(
                 invoke(event, unit)
             end
         end
-        ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
+        ____exports.Unit.onImmediateOrder[852056]:addListener(function(unit)
             if getUnitAbilityLevel(unit.handle, morphDetectAbilityId) == 0 then
                 Timer:run(ifNotLeft, unit)
             end
@@ -2616,7 +2628,7 @@ Unit.itemDroppedEvent = __TS__New(
     function()
         local unit = getTriggerUnit()
         local item = getManipulatedItem()
-        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+        if getUnitTypeId(unit) ~= dummyUnitId and not isItemIgnoredInEvents(item) then
             return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
@@ -2628,10 +2640,10 @@ Unit.itemPickedUpEvent = __TS__New(
     function()
         local unitHandle = getTriggerUnit()
         local itemHandle = getManipulatedItem()
-        if getUnitTypeId(unitHandle) ~= dummyUnitId and not (ignoreEventsItems[itemHandle] ~= nil) then
+        if getUnitTypeId(unitHandle) ~= dummyUnitId and not isItemIgnoredInEvents(itemHandle) then
             local unit = ____exports.Unit:of(unitHandle)
             local item = Item:of(itemHandle)
-            if item.owner ~= unit then
+            if ownerByItem[item] ~= unit then
                 return unit, item
             end
         end
@@ -2644,17 +2656,12 @@ Unit.itemUsedEvent = __TS__New(
     function()
         local unit = getTriggerUnit()
         local item = getManipulatedItem()
-        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+        if getUnitTypeId(unit) ~= dummyUnitId and not isItemIgnoredInEvents(item) then
             return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
 )
-Unit.itemStackedEvent = __TS__New(
-    ____exports.UnitTriggerEvent,
-    EVENT_PLAYER_UNIT_STACK_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(BlzGetStackingItemTarget()), Item:of(BlzGetStackingItemSource()) end
-)
 __TS__ObjectDefineProperty(
     Unit,
     "itemChargesChangedEvent",
@@ -2670,51 +2677,6 @@ __TS__ObjectDefineProperty(
         return event
     end}
 )
-__TS__ObjectDefineProperty(
-    Unit,
-    "itemUseOrderEvent",
-    {get = function(self)
-        local event = __TS__New(Event)
-        for order = orderId("useslot0"), orderId("useslot5") do
-            local slot = order - orderId("useslot0")
-            local function listener(unit)
-                local item = unit.items[slot + 1]
-                if item ~= nil then
-                    invoke(event, unit, item)
-                end
-            end
-            self.onImmediateOrder[order]:addListener(listener)
-            self.onTargetOrder[order]:addListener(listener)
-            self.onPointOrder[order]:addListener(listener)
-        end
-        rawset(self, "itemUseOrderEvent", event)
-        return event
-    end}
-)
-__TS__ObjectDefineProperty(
-    Unit,
-    "itemMoveOrderEvent",
-    {get = function(self)
-        local event = __TS__New(Event)
-        for order = orderId("moveslot0"), orderId("moveslot5") do
-            local slotTo = order - orderId("moveslot0")
-            self.onTargetOrder[order]:addListener(function(unit, item)
-                local slotFrom = unit.items:findSlot(item)
-                if slotFrom ~= nil then
-                    invoke(
-                        event,
-                        unit,
-                        item,
-                        slotFrom,
-                        slotTo
-                    )
-                end
-            end)
-        end
-        rawset(self, "itemMoveOrderEvent", event)
-        return event
-    end}
-)
 __TS__ObjectDefineProperty(
     Unit,
     "onCreate",
@@ -2761,11 +2723,7 @@ Unit.synchronize = synchronizer(
             function(____, id) return fourCC(id) end
         )
     end)
-    for ____, leaveOrderId in ipairs({
-        orderId("undefend"),
-        orderId("magicundefense"),
-        orderId("unimmolation")
-    }) do
+    for ____, leaveOrderId in ipairs({852056, 852479, 852178}) do
         ____exports.Unit.onImmediateOrder[leaveOrderId]:addListener(function(unit)
             local handle = unit.handle
             for i = 1, #leaveAbilityIds do
@@ -2773,7 +2731,8 @@ Unit.synchronize = synchronizer(
                     return
                 end
             end
-            unit:destroy()
+            unit:saveData()
+            Timer:run(unit, "destroy")
         end)
     end
 end)(Unit)