warscript 0.0.1-dev.48e5280 → 0.0.1-dev.4b6e45a

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

@@ -34,74 +34,102 @@ local DEFAULT_VALUES = {
     launchVisualOffsetY = ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y
 }
 local METATABLE = {__index = DEFAULT_VALUES}
+local rawDataByUnitTypeId = postcompile(function()
+    return associate(
+        UnitType:getAll(),
+        function(unitType) return unitType.id end,
+        function(unitType)
+            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.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)
+local function resolveData(data)
+    local ____setmetatable_10 = setmetatable
+    local ____LocalClient_isHD_1
+    if LocalClient.isHD then
+        ____LocalClient_isHD_1 = data[1] or data[0]
+    else
+        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__3_8 = data[3]
+    local ____data__4_9 = data[4]
+    local ____LocalClient_isHD_3
+    if LocalClient.isHD then
+        ____LocalClient_isHD_3 = data[6] or data[5]
+    else
+        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_5
+    if LocalClient.isHD then
+        ____LocalClient_isHD_5 = data[9] or data[8]
+    else
+        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_7
+    if LocalClient.isHD then
+        ____LocalClient_isHD_7 = data[12] or data[11]
+    else
+        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_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
 ---
 -- @internal For use by internal systems only.
-____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = (function()
-    return setmetatable(
-        mapValues(
-            postcompile(function()
-                return associate(
-                    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
-                        }
-                    end
-                )
-            end),
-            function(data)
-                local ____setmetatable_6 = setmetatable
-                local ____LocalClient_isHD_0
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_0 = data[1] or data[0]
-                else
-                    ____LocalClient_isHD_0 = data[0]
-                end
-                local ____data__2_4 = data[2]
-                local ____data__3_5 = data[3]
-                local ____LocalClient_isHD_1
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_1 = data[5] or data[4]
-                else
-                    ____LocalClient_isHD_1 = data[4]
-                end
-                local ____LocalClient_isHD_2
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_2 = data[7] or data[6]
-                else
-                    ____LocalClient_isHD_2 = data[6]
-                end
-                local ____LocalClient_isHD_3
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_3 = data[9] or data[8]
-                else
-                    ____LocalClient_isHD_3 = data[8]
-                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
-                }, METATABLE)
-            end
-        ),
-        {__index = function(self)
-            return DEFAULT_VALUES
-        end}
-    )
-end)()
+____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = setmetatable(
+    mapValues(rawDataByUnitTypeId, resolveData),
+    {__index = function(self)
+        return DEFAULT_VALUES
+    end}
+)
+warpack.afterMapInit(function()
+    for unitTypeId, data in pairs(rawDataByUnitTypeId) do
+        ____exports.MISSILE_DATA_BY_UNIT_TYPE_ID[unitTypeId] = resolveData(data)
+    end
+end)
 return ____exports

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

@@ -12,6 +12,7 @@ import { Widget } from "../../core/types/widget";
 import type { UnitTypeId } from "../object-data/entry/unit-type";
 import { CombatClassification, CombatClassifications } from "../object-data/auxiliary/combat-classification";
 import { MovementType } from "../object-data/auxiliary/movement-type";
+import { UnitWeaponType } from "../object-data/auxiliary/unit-weapon-type";
 import { UnitAttribute } from "../object-data/auxiliary/unit-attribute";
 import { AttackType } from "../object-data/auxiliary/attack-type";
 import { AttributesHolder } from "../../attributes";
@@ -88,6 +89,8 @@ export declare class UnitWeapon {
     set damage([minimumDamage, maximumDamage]: [number, number]);
     get allowedTargetCombatClassifications(): CombatClassifications;
     set allowedTargetCombatClassifications(allowedTargetCombatClassifications: CombatClassifications);
+    get type(): UnitWeaponType;
+    set type(type: UnitWeaponType);
     get damageBase(): number;
     set damageBase(damageBase: number);
     get damageDiceCount(): number;
@@ -162,7 +165,7 @@ export declare class Unit extends Handle<junit> {
     isVisibleTo(player: Player): boolean;
     isInvisibleTo(player: Player): boolean;
     isInRangeOf(x: number, y: number, range: number): boolean;
-    isInRangeOf(unit: Unit, range: number): boolean;
+    isInRangeOf(widget: Widget, range: number): boolean;
     isAllyOf(unit: Unit): boolean;
     isEnemyOf(unit: Unit): boolean;
     playAnimation(...parameters: [animation: number] | [animation: string, rarity?: jraritycontrol]): void;
@@ -321,7 +324,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 +351,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

@@ -7,10 +7,10 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ArraySetLength = ____lualib.__TS__ArraySetLength
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
 local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
 local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
-local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
@@ -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
@@ -481,6 +479,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "type",
+    {
+        get = function(self)
+            return BlzGetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_WEAPON_TYPE, self.index)
+        end,
+        set = function(self, ____type)
+            BlzSetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_WEAPON_TYPE, self.index, ____type)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitWeapon.prototype,
     "damageBase",
@@ -592,8 +603,6 @@ __TS__SetDescriptor(
     },
     true
 )
-local unitInventorySize = UnitInventorySize
-local unitItemInSlot = UnitItemInSlot
 local getItemAbility = BlzGetItemAbility
 local getUnitAbility = BlzGetUnitAbility
 local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
@@ -611,8 +620,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,
@@ -778,7 +787,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)
@@ -848,13 +859,19 @@ function Unit.prototype.isInvisibleTo(self, player)
     return isUnitInvisible(self.handle, player.handle)
 end
 function Unit.prototype.isInRangeOf(self, x, y, range)
-    local ____temp_3
+    local ____temp_4
     if type(x) == "number" then
-        ____temp_3 = isUnitInRangeXY(self.handle, x, y, range)
+        ____temp_4 = isUnitInRangeXY(self.handle, x, y, range)
     else
-        ____temp_3 = isUnitInRange(self.handle, x.handle, y)
+        local ____temp_3
+        if __TS__InstanceOf(x, ____exports.Unit) then
+            ____temp_3 = isUnitInRange(self.handle, x.handle, y)
+        else
+            ____temp_3 = isUnitInRangeXY(self.handle, x.x, x.y, range)
+        end
+        ____temp_4 = ____temp_3
     end
-    return ____temp_3
+    return ____temp_4
 end
 function Unit.prototype.isAllyOf(self, unit)
     return isUnitAlly(
@@ -889,7 +906,7 @@ function Unit.prototype.chooseWeapon(self, target)
         return firstWeapon
     end
     local secondWeapon = self.secondWeapon
-    if secondWeapon.isEnabled and target:isAllowedTarget(target, secondWeapon.allowedTargetCombatClassifications) then
+    if secondWeapon.isEnabled and target:isAllowedTarget(self, secondWeapon.allowedTargetCombatClassifications) then
         return secondWeapon
     end
     return nil
@@ -912,14 +929,14 @@ function Unit.prototype.kill(self)
     killUnit(self.handle)
 end
 function Unit.prototype.revive(self, x, y, doEffect)
-    local ____ReviveHero_6 = ReviveHero
-    local ____array_5 = __TS__SparseArrayNew(self.handle, x, y)
-    local ____doEffect_4 = doEffect
-    if ____doEffect_4 == nil then
-        ____doEffect_4 = false
+    local ____ReviveHero_7 = ReviveHero
+    local ____array_6 = __TS__SparseArrayNew(self.handle, x, y)
+    local ____doEffect_5 = doEffect
+    if ____doEffect_5 == nil then
+        ____doEffect_5 = false
     end
-    __TS__SparseArrayPush(____array_5, ____doEffect_4)
-    ____ReviveHero_6(__TS__SparseArraySpread(____array_5))
+    __TS__SparseArrayPush(____array_6, ____doEffect_5)
+    ____ReviveHero_7(__TS__SparseArraySpread(____array_6))
 end
 function Unit.prototype.healTarget(self, target, amount)
     if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -959,7 +976,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(
@@ -995,6 +1012,9 @@ function Unit.prototype.removeAbility(self, abilityTypeId)
         if abilities[i].typeId == abilityTypeId then
             local ability = abilities[i]
             tremove(abilities, i)
+            if ability.state == 2 then
+                break
+            end
             ability:destroy()
             return true
         end
@@ -1317,7 +1337,7 @@ __TS__SetDescriptor(
     Unit.prototype,
     "isStunned",
     {get = function(self)
-        return getUnitCurrentOrder(self.handle) == orderId("stunned")
+        return getUnitCurrentOrder(self.handle) == 851973
     end},
     true
 )
@@ -1493,13 +1513,13 @@ __TS__SetDescriptor(
         end,
         set = function(self, isTeamGlowVisible)
             BlzShowUnitTeamGlow(self.handle, isTeamGlowVisible)
-            local ____temp_7
+            local ____temp_8
             if not isTeamGlowVisible then
-                ____temp_7 = true
+                ____temp_8 = true
             else
-                ____temp_7 = nil
+                ____temp_8 = nil
             end
-            self[107] = ____temp_7
+            self[107] = ____temp_8
         end
     },
     true
@@ -1879,7 +1899,7 @@ __TS__SetDescriptor(
     Unit.prototype,
     "pathingCollisionRange",
     {get = function(self)
-        return 16 * (min(
+        return 16 * (math.min(
             getUnitCollisionSize(self.handle) // 16,
             3
         ) + 1)
@@ -2146,7 +2166,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)
@@ -2163,7 +2183,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
@@ -2204,25 +2224,25 @@ Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
         local function listener(unit, id)
-            local ____GetSpellTargetUnit_result_10
+            local ____GetSpellTargetUnit_result_11
             if GetSpellTargetUnit() then
-                ____GetSpellTargetUnit_result_10 = ____exports.Unit:of(GetSpellTargetUnit())
+                ____GetSpellTargetUnit_result_11 = ____exports.Unit:of(GetSpellTargetUnit())
             else
-                local ____GetSpellTargetItem_result_9
+                local ____GetSpellTargetItem_result_10
                 if GetSpellTargetItem() then
-                    ____GetSpellTargetItem_result_9 = Item:of(GetSpellTargetItem())
+                    ____GetSpellTargetItem_result_10 = Item:of(GetSpellTargetItem())
                 else
-                    local ____GetSpellTargetDestructable_result_8
+                    local ____GetSpellTargetDestructable_result_9
                     if GetSpellTargetDestructable() then
-                        ____GetSpellTargetDestructable_result_8 = Destructable:of(GetSpellTargetDestructable())
+                        ____GetSpellTargetDestructable_result_9 = Destructable:of(GetSpellTargetDestructable())
                     else
-                        ____GetSpellTargetDestructable_result_8 = nil
+                        ____GetSpellTargetDestructable_result_9 = nil
                     end
-                    ____GetSpellTargetItem_result_9 = ____GetSpellTargetDestructable_result_8
+                    ____GetSpellTargetItem_result_10 = ____GetSpellTargetDestructable_result_9
                 end
-                ____GetSpellTargetUnit_result_10 = ____GetSpellTargetItem_result_9
+                ____GetSpellTargetUnit_result_11 = ____GetSpellTargetItem_result_10
             end
-            local target = ____GetSpellTargetUnit_result_10
+            local target = ____GetSpellTargetUnit_result_11
             if target then
                 invoke(event, unit, id, target)
             end
@@ -2630,7 +2650,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
@@ -2642,10 +2662,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
@@ -2658,17 +2678,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",
@@ -2684,51 +2699,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",
@@ -2775,11 +2745,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

package/engine/lightning.lua

@@ -264,8 +264,8 @@ Timer.onPeriod[UPDATE_PERIOD]:addListener(function()
         local sourceUnitFacing = rad(getUnitFacing(sourceUnit) - 90)
         local sourceUnitFacingCos = cos(sourceUnitFacing)
         local sourceUnitFacingSin = sin(sourceUnitFacing)
-        local sourceUnitOffsetX = sourceUnitMissileData.launchOffsetX + sourceUnitMissileData.launchVisualOffsetX + lightning[103]
-        local sourceUnitOffsetY = sourceUnitMissileData.launchOffsetY + sourceUnitMissileData.launchVisualOffsetY + lightning[104]
+        local sourceUnitOffsetX = sourceUnitMissileData.launchOffsetX + sourceUnitMissileData.launchVisualOffsetY + lightning[103]
+        local sourceUnitOffsetY = sourceUnitMissileData.launchOffsetY + sourceUnitMissileData.launchVisualOffsetX + lightning[104]
         moveLightningEx(
             lightning.handle,
             lightning[100],
@@ -283,8 +283,8 @@ Timer.onPeriod[UPDATE_PERIOD]:addListener(function()
         local sourceUnitFacing = rad(getUnitFacing(sourceUnit) - 90)
         local sourceUnitFacingCos = cos(sourceUnitFacing)
         local sourceUnitFacingSin = sin(sourceUnitFacing)
-        local sourceUnitOffsetX = sourceUnitMissileData.launchOffsetX + sourceUnitMissileData.launchVisualOffsetX + lightning[103]
-        local sourceUnitOffsetY = sourceUnitMissileData.launchOffsetY + sourceUnitMissileData.launchVisualOffsetY + lightning[104]
+        local sourceUnitOffsetX = sourceUnitMissileData.launchOffsetX + sourceUnitMissileData.launchVisualOffsetY + lightning[103]
+        local sourceUnitOffsetY = sourceUnitMissileData.launchOffsetY + sourceUnitMissileData.launchVisualOffsetX + lightning[104]
         moveLightningEx(
             lightning.handle,
             lightning[100],

package/engine/local-client.d.ts

@@ -9,15 +9,41 @@ export declare class LocalClient {
     static readonly locale: string;
     static get width(): number;
     static get height(): number;
+    static get isSD(): boolean;
     static get isHD(): boolean;
+    static get isDE(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
+    static get isMinimized(): boolean;
     static pingMinimap(x: number, y: number, duration: number, ...parameters: [] | [red: number, green: number, blue: number, flashy?: boolean] | [color: Color, flashy?: boolean]): void;
+    /** Local input state; do not use to branch synchronized game logic. */
+    static isKeyPressed(key: joskeytype): boolean;
+    /** Local input state. Uses the same modifier mask as Player key events. */
+    static isMetaKeyPressed(key: oskeymeta): boolean;
+    /** Local input state. */
+    static isMouseButtonPressed(button: jmousebuttontype): boolean;
+    static get mouseScreenX(): number;
+    static get mouseScreenY(): number;
+    static screenToFrameX(x: number): number;
+    static screenToFrameY(y: number): number;
+    static frameToScreenX(x: number): number;
+    static frameToScreenY(y: number): number;
+    static get mouseFrameX(): number;
+    static get mouseFrameY(): number;
     static get mouseFocusUnit(): Async<Unit> | undefined;
+    /**
+     * Local selection sampled every 1/64 second; undefined before the first tick. Among
+     * several selected units, the one the portrait shows, identified by its health and
+     * mana; units with identical values cannot be told apart.
+     */
     static get mainSelectedUnit(): Async<Unit> | undefined;
     static get mainSelectedUnitChangeEvent(): Event<[
         previousMainSelectedUnit: Unit | undefined,
         newMainSelectedUnit: Unit | undefined
     ]>;
+    static get isInTargetingMode(): boolean;
+    static readonly targetingModeEnterEvent: Event<[]>;
+    static readonly targetingModeLeaveEvent: Event<[]>;
+    static readonly targetingModeStateChangeEvent: Event<[]>;
     static readonly onDisconnect: TriggerEvent<[]>;
 }