warscript 0.0.1-dev.1a5c0c0 → 0.0.1-dev.1b0add9

package/core/types/effect.d.ts

@@ -4,15 +4,22 @@ import { Widget } from "./widget";
 import { PlayerColor } from "./playerColor";
 declare const enum EffectPropertyKey {
     COLOR = 100,
-    PITCH = 101
+    PITCH = 101,
+    ROLL = 102
 }
 export type EffectParameters = {
     readonly scale?: number;
     readonly color?: PlayerColor;
+    readonly pitch?: number;
+    readonly roll?: number;
+    readonly detached?: boolean;
+    readonly zOffset?: number;
+    readonly scaleZOffset?: boolean;
 };
 export declare class Effect extends Handle<jeffect> {
     private [EffectPropertyKey.COLOR]?;
     private [EffectPropertyKey.PITCH]?;
+    private [EffectPropertyKey.ROLL]?;
     protected onDestroy(): HandleDestructor;
     get color(): PlayerColor;
     set color(color: PlayerColor);
@@ -20,11 +27,13 @@ export declare class Effect extends Handle<jeffect> {
     set scale(scale: number);
     get pitch(): number;
     set pitch(pitch: number);
+    get roll(): number;
+    set roll(roll: number);
     static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, pos: Vec2): T;
     static createTarget<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, target: Widget, attachPoint: string): T;
     static flash(modelPath: string, ...args: [
-        ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint: string],
-        ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]
+        ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint?: string],
+        ...parametersOrDuration: [parametersOrDuration?: EffectParameters | number] | [duration?: number, parameters?: EffectParameters]
     ]): void;
     static flashTarget(model: string, target: Widget, attachPoint: string, duration?: number): void;
 }

package/core/types/effect.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local dummyPlayer
@@ -12,6 +13,8 @@ local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
 local ____pairs = _G.pairs
 local select = _G.select
 local mathRad = math.rad
@@ -22,10 +25,28 @@ local getSpecialEffectScale = BlzGetSpecialEffectScale
 local playSpecialEffect = BlzPlaySpecialEffect
 local setSpecialEffectScale = BlzSetSpecialEffectScale
 local setSpecialEffectPitch = BlzSetSpecialEffectPitch
+local setSpecialEffectRoll = BlzSetSpecialEffectRoll
 local setSpecialEffectColorByPlayer = BlzSetSpecialEffectColorByPlayer
 local specialEffectAddSubAnimation = BlzSpecialEffectAddSubAnimation
 local specialEffectClearSubAnimations = BlzSpecialEffectClearSubAnimations
 local specialEffectRemoveSubAnimation = BlzSpecialEffectRemoveSubAnimation
+local setSpecialEffectZ = BlzSetSpecialEffectZ
+local getLocationZ = GetLocationZ
+local getUnitZ = BlzGetUnitZ
+local moveLocation = MoveLocation
+local location = Location(0, 0)
+local function setSpecialEffectPitchDegrees(effect, pitch)
+    setSpecialEffectPitch(
+        effect,
+        -mathRad(pitch)
+    )
+end
+local function setSpecialEffectRollDegrees(effect, pitch)
+    setSpecialEffectRoll(
+        effect,
+        -mathRad(pitch)
+    )
+end
 local animTypeByAnimationName = {
     attack = ANIM_TYPE_ATTACK,
     birth = ANIM_TYPE_BIRTH,
@@ -97,7 +118,7 @@ local function setSpecialEffectColor(effect, color)
     setSpecialEffectColorByPlayer(effect, dummyPlayer.handle)
     dummyPlayer.color = dummyColor
 end
-local setters = {scale = setSpecialEffectScale, color = setSpecialEffectColor}
+local setters = {scale = setSpecialEffectScale, color = setSpecialEffectColor, pitch = setSpecialEffectPitchDegrees, roll = setSpecialEffectRollDegrees}
 dummyPlayer = Player.neutralExtra
 local temporaryEffects = {}
 local temporaryEffectsDurations = {}
@@ -136,10 +157,27 @@ function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, paramete
         parameters = parametersOrDuration
         parametersOrDuration = nil
     end
-    local effect = type(xOrWidget) == "number" and addSpecialEffect(modelPath, xOrWidget, yOrOrAttachmentPoint) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint)
+    local coordinatesProvided = type(xOrWidget) == "number"
+    local isPositional = coordinatesProvided or (parameters and parameters.detached) == true
+    local x = not isPositional and 0 or (coordinatesProvided and xOrWidget or xOrWidget.x)
+    local y = not isPositional and 0 or (coordinatesProvided and yOrOrAttachmentPoint or xOrWidget.y)
+    local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint or "origin")
+    if isPositional and not coordinatesProvided and (parameters and parameters.scale) == nil and __TS__InstanceOf(xOrWidget, Unit) then
+        setSpecialEffectScale(effect, xOrWidget.scale)
+    end
     if parameters ~= nil then
         for key, value in ____pairs(parameters) do
-            setters[key](effect, value)
+            if key ~= "zOffset" and key ~= "detached" and key ~= "scaleZOffset" then
+                setters[key](effect, value)
+            end
+        end
+        if isPositional and parameters.zOffset ~= nil then
+            moveLocation(location, x, y)
+            local z = __TS__InstanceOf(xOrWidget, Unit) and getLocationZ(location) + xOrWidget.flyHeight or getLocationZ(location)
+            BlzSetSpecialEffectZ(
+                effect,
+                z + parameters.zOffset * (parameters.scaleZOffset and getSpecialEffectScale(effect) or 1)
+            )
         end
     end
     if parametersOrDuration ~= nil and parametersOrDuration > 0 then
@@ -197,13 +235,24 @@ __TS__SetDescriptor(
             return self[101] or 0
         end,
         set = function(self, pitch)
-            setSpecialEffectPitch(
-                self.handle,
-                -mathRad(pitch)
-            )
+            setSpecialEffectPitchDegrees(self.handle, pitch)
             self[101] = pitch
         end
     },
     true
 )
+__TS__SetDescriptor(
+    Effect.prototype,
+    "roll",
+    {
+        get = function(self)
+            return self[102] or 0
+        end,
+        set = function(self, roll)
+            setSpecialEffectRollDegrees(self.handle, roll)
+            self[102] = roll
+        end
+    },
+    true
+)
 return ____exports

package/core/types/frame.d.ts

@@ -31,6 +31,7 @@ export declare class Frame extends Handle<jframehandle> {
     static readonly WORLD: Frame;
     static readonly CHAT: Frame;
     static readonly TIME_OF_DAY_CLOCK: Frame;
+    private static readonly SIMPLE_FRAME_TEST_CHILD;
     static get uiScale(): number;
     static get leftBorder(): Frame;
     static get rightBorder(): Frame;
@@ -79,6 +80,8 @@ export declare class Frame extends Handle<jframehandle> {
     get onMouseLeave(): FrameEvent;
     get onMouseUp(): FrameEvent;
     get onMouseWheel(): FrameEvent<[number]>;
+    get mouseEnterLocalEvent(): Event;
+    get mouseLeaveLocalEvent(): Event;
     get popupMenuItemChangeEvent(): FrameEvent<[
         popupMenu: Frame,
         previousValue: number,

package/core/types/frame.lua

@@ -122,6 +122,7 @@ do
     FramePoint.BOTTOM = FRAMEPOINT_BOTTOM
     FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
 end
+local tooltipByFrame = setmetatable({}, {__mode = "k"})
 ____exports.Frame = __TS__Class()
 local Frame = ____exports.Frame
 Frame.name = "Frame"
@@ -242,6 +243,7 @@ function Frame.prototype.setTextColor(self, color)
 end
 function Frame.prototype.setTooltip(self, tooltip)
     BlzFrameSetTooltip(self.handle, tooltip.handle)
+    tooltipByFrame[self] = tooltip
 end
 function Frame.prototype.setMinMaxValue(self, minValue, maxValue)
     BlzFrameSetMinMaxValue(self.handle, minValue, maxValue)
@@ -310,6 +312,7 @@ Frame.CONSOLE_BOTTOM_BAR = ____exports.Frame:byName("ConsoleBottomBar")
 Frame.WORLD = ____exports.Frame:byOrigin(ORIGIN_FRAME_WORLD_FRAME)
 Frame.CHAT = ____exports.Frame:byOrigin(ORIGIN_FRAME_CHAT_MSG)
 Frame.TIME_OF_DAY_CLOCK = ____exports.Frame.GAME_UI:getChild(5):getChild(0)
+Frame.SIMPLE_FRAME_TEST_CHILD = ____exports.Frame:createByType("SIMPLEFRAME", "SimpleFrameTestParent", ____exports.Frame.CONSOLE_UI)
 __TS__ObjectDefineProperty(
     Frame,
     "uiScale",
@@ -618,6 +621,62 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Frame.prototype,
+    "mouseEnterLocalEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        if not (tooltipByFrame[self] ~= nil) then
+            ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
+            local tooltip = ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent == self and ____exports.Frame:createByType("SIMPLEFRAME", "", ____exports.Frame.CONSOLE_UI) or ____exports.Frame:createByType("FRAME", "", ____exports.Frame.GAME_UI)
+            ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
+            self:setTooltip(tooltip)
+        end
+        local isMouseInside = false
+        Timer.onPeriod[1 / 64]:addListener(function()
+            local tooltip = tooltipByFrame[self]
+            if tooltip and tooltip.visible then
+                if not isMouseInside then
+                    isMouseInside = true
+                    Event.invoke(event)
+                end
+            else
+                isMouseInside = false
+            end
+        end)
+        rawset(self, "mouseEnterLocalEvent", event)
+        return event
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Frame.prototype,
+    "mouseLeaveLocalEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        if not (tooltipByFrame[self] ~= nil) then
+            ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
+            local tooltip = ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent == self and ____exports.Frame:createByType("SIMPLEFRAME", "", ____exports.Frame.CONSOLE_UI) or ____exports.Frame:createByType("FRAME", "", ____exports.Frame.GAME_UI)
+            ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
+            self:setTooltip(tooltip)
+        end
+        local isMouseInside = false
+        Timer.onPeriod[1 / 64]:addListener(function()
+            local tooltip = tooltipByFrame[self]
+            if tooltip and tooltip.visible then
+                isMouseInside = true
+            else
+                if isMouseInside then
+                    isMouseInside = false
+                    Event.invoke(event)
+                end
+            end
+        end)
+        rawset(self, "mouseLeaveLocalEvent", event)
+        return event
+    end},
+    true
+)
 __TS__SetDescriptor(
     Frame.prototype,
     "popupMenuItemChangeEvent",

package/engine/buff.d.ts

@@ -8,6 +8,7 @@ import { BuffResistanceType } from "./object-data/auxiliary/buff-resistance-type
 import { AbilityBooleanField, AbilityBooleanLevelField, AbilityCombatClassificationsLevelField, AbilityDependentValue, AbilityEnumLevelField, AbilityIntegerField, AbilityIntegerLevelField, AbilityNumberField, AbilityNumberLevelField } from "./object-field/ability";
 import { CombatClassifications } from "./object-data/auxiliary/combat-classification";
 import { IsExactlyAny, Prohibit, ReadonlyNonEmptyArray } from "../utility/types";
+import { EffectParameters } from "../core/types/effect";
 import { UnitBehavior } from "./behaviour/unit";
 import type { Widget } from "../core/types/widget";
 import { Destructor } from "../destroyable";
@@ -250,8 +251,12 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     get duration(): number;
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);
-    flashEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    flashEffect(...parameters: [
+        ...widgetOrXY: [] | [Widget] | [x: number, x: number],
+        ...parametersOrDuration: [] | [EffectParameters] | [number]
+    ]): void;
     flashSpecialEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    protected onCreate(): void;
     protected onDestroy(): Destructor;
     static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;
     static getByTypeId<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, unit: Unit, typeId: ApplicableBuffTypeId): T | undefined;

package/engine/buff.lua

@@ -46,6 +46,10 @@ local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
 local ____ability_2Dduration = require("engine.internal.mechanics.ability-duration")
 local getAbilityDuration = ____ability_2Dduration.getAbilityDuration
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____destructable = require("core.types.destructable")
+local Destructable = ____destructable.Destructable
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -482,6 +486,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         timer:start(duration, false, expireBuff, self)
         self._timer = timer
     end
+    self:onCreate()
 end
 function Buff.prototype.getUnitBonus(self, bonusType)
     local ____opt_36 = self._bonusIdByBonusType
@@ -496,26 +501,30 @@ function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
     end
     bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self._unit, bonusType, bonusIdByBonusType[bonusType], value)
 end
-function Buff.prototype.flashEffect(self, widgetOrDuration, duration)
-    local isWidgetProvided = type(widgetOrDuration) == "table"
-    local ____Effect_40 = Effect
-    local ____Effect_flash_41 = Effect.flash
-    local ____array_39 = __TS__SparseArrayNew(
-        self[104],
-        isWidgetProvided and widgetOrDuration or self._unit,
-        stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
-    )
-    local ____isWidgetProvided_38
-    if isWidgetProvided then
-        ____isWidgetProvided_38 = duration
+function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
+    if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
+        Effect:flash(self[104], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
-        ____isWidgetProvided_38 = widgetOrDuration
+        local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
+        local ____Effect_40 = Effect
+        local ____Effect_flash_41 = Effect.flash
+        local ____array_39 = __TS__SparseArrayNew(
+            self[104],
+            isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
+            stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
+        )
+        local ____isWidgetProvided_38
+        if isWidgetProvided then
+            ____isWidgetProvided_38 = yOrParametersOrDuration
+        else
+            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
+        end
+        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
+        ____Effect_flash_41(
+            ____Effect_40,
+            __TS__SparseArraySpread(____array_39)
+        )
     end
-    __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
-    ____Effect_flash_41(
-        ____Effect_40,
-        __TS__SparseArraySpread(____array_39)
-    )
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
     local isWidgetProvided = type(widgetOrDuration) == "table"
@@ -538,6 +547,8 @@ function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
         __TS__SparseArraySpread(____array_43)
     )
 end
+function Buff.prototype.onCreate(self)
+end
 function Buff.prototype.onDestroy(self)
     local unit = self._unit
     if getUnitAbility(unit.handle, self.typeId) == self.handle then

package/engine/internal/ability.d.ts

@@ -49,6 +49,8 @@ export declare class UnitAbility extends Ability {
     readonly owner: Unit;
     private readonly u;
     constructor(handle: jability, typeId: number, owner: Unit);
+    incrementHideCounter(): void;
+    decrementHideCounter(): void;
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;

package/engine/internal/ability.lua

@@ -32,6 +32,7 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
+local unitHideAbility = BlzUnitHideAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -357,6 +358,12 @@ function UnitAbility.prototype.____constructor(self, handle, typeId, owner)
     self.owner = owner
     self.u = owner.handle
 end
+function UnitAbility.prototype.incrementHideCounter(self)
+    unitHideAbility(self.u, self.typeId, true)
+end
+function UnitAbility.prototype.decrementHideCounter(self)
+    unitHideAbility(self.u, self.typeId, false)
+end
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",

package/engine/internal/unit/ability.lua

@@ -26,11 +26,8 @@ local getSpellTargetUnit = GetSpellTargetUnit
 local getSpellTargetX = GetSpellTargetX
 local getSpellTargetY = GetSpellTargetY
 local getTriggerUnit = GetTriggerUnit
-local getUnitAbility = BlzGetUnitAbility
-local unitAddAbility = UnitAddAbility
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
-local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
         return __TS__New(
@@ -39,17 +36,6 @@ local function retrieveAbility(unit, ability, abilityId)
             Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then

package/engine/internal/unit/item.d.ts

@@ -11,6 +11,7 @@ export interface UnitItems extends ReadonlyArray<Item | undefined> {
 }
 export declare class UnitItems {
     constructor(handle: junit);
+    findSlot(item: Item): 0 | 1 | 2 | 3 | 4 | 5 | undefined;
     protected __newindex(slot: number, item: Item | undefined): void;
     protected __index(key: string | number): unknown;
     protected __len(): number;

package/engine/internal/unit/item.lua

@@ -30,6 +30,16 @@ UnitItems.name = "UnitItems"
 function UnitItems.prototype.____constructor(self, handle)
     handleByUnitItems[self] = handle
 end
+function UnitItems.prototype.findSlot(self, item)
+    local handle = handleByUnitItems[self]
+    local itemHandle = item.handle
+    for slot = 0, unitInventorySize(handle) - 1 do
+        if itemHandle == unitItemInSlot(handle, slot) then
+            return slot
+        end
+    end
+    return nil
+end
 function UnitItems.prototype.__newindex(self, slot, item)
     local handle = handleByUnitItems[self]
     if slot < 1 or slot > unitInventorySize(handle) then

package/engine/internal/unit/main-selected.d.ts

@@ -0,0 +1,13 @@
+/** @noSelfInFile */
+import { Player } from "../../../core/types/player";
+import { Event } from "../../../event";
+declare module "../unit" {
+    namespace Unit {
+        const mainSelectedUnitChangeEvent: Event<[Player]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const getMainSelectedOf: (player: Player) => Unit | undefined;
+    }
+}

package/engine/internal/unit/main-selected.lua

@@ -0,0 +1,51 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____math = require("math")
+local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
+local MINIMUM_INTEGER = ____math.MINIMUM_INTEGER
+local ____local_2Dclient = require("engine.local-client")
+local LocalClient = ____local_2Dclient.LocalClient
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____event = require("event")
+local Event = ____event.Event
+local mainSelectedUnitChangeEvent = __TS__New(Event)
+rawset(Unit, "mainSelectedUnitChangeEvent", mainSelectedUnitChangeEvent)
+local mainSelectedUnitByPlayer = {}
+local syncSlider = BlzCreateFrameByType(
+    "SLIDER",
+    "UnitSyncId",
+    BlzGetOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0),
+    "",
+    0
+)
+BlzFrameSetMinMaxValue(syncSlider, MINIMUM_INTEGER, MAXIMUM_INTEGER)
+LocalClient.mainSelectedUnitChangeEvent:addListener(function()
+    local ____opt_0 = LocalClient.mainSelectedUnit
+    local syncId = ____opt_0 and ____opt_0.syncId
+    BlzFrameSetValue(syncSlider, syncId or 0)
+end)
+local trg = CreateTrigger()
+BlzTriggerRegisterFrameEvent(trg, syncSlider, FRAMEEVENT_SLIDER_VALUE_CHANGED)
+TriggerAddAction(
+    trg,
+    function()
+        local player = Player:of(GetTriggerPlayer())
+        local mainSelectedUnit = Unit:getBySyncId(BlzGetTriggerFrameValue())
+        if mainSelectedUnit ~= mainSelectedUnitByPlayer[player] then
+            mainSelectedUnitByPlayer[player] = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, player)
+        end
+    end
+)
+rawset(
+    Unit,
+    "getMainSelectedOf",
+    function(player)
+        return mainSelectedUnitByPlayer[player]
+    end
+)
+return ____exports

package/engine/internal/unit.d.ts

@@ -94,14 +94,19 @@ export declare class UnitWeapon {
     set missileSpeed(missileSpeed: number);
 }
 declare const enum UnitPropertyKey {
-    IS_PAUSED = 100,
-    STUN_COUNTER = 101,
-    DELAY_HEALTH_CHECKS_COUNTER = 102,
-    DELAY_HEALTH_CHECKS_HEALTH_BONUS = 103,
-    PREVENT_DEATH_HEALTH_BONUS = 104,
-    IS_TEAM_GLOW_HIDDEN = 105
+    SYNC_ID = 100,
+    IS_PAUSED = 101,
+    STUN_COUNTER = 102,
+    DELAY_HEALTH_CHECKS_COUNTER = 103,
+    DELAY_HEALTH_CHECKS_HEALTH_BONUS = 104,
+    PREVENT_DEATH_HEALTH_BONUS = 105,
+    IS_TEAM_GLOW_HIDDEN = 106
 }
+export type UnitSyncId = number & {
+    readonly __unitSyncId: unique symbol;
+};
 export declare class Unit extends Handle<junit> {
+    readonly syncId: UnitSyncId;
     private [UnitPropertyKey.IS_PAUSED]?;
     private [UnitPropertyKey.STUN_COUNTER]?;
     private [UnitPropertyKey.DELAY_HEALTH_CHECKS_COUNTER]?;
@@ -327,6 +332,12 @@ export declare class Unit extends Handle<junit> {
     static itemPickedUpEvent: UnitTriggerEvent<[Item]>;
     static itemUsedEvent: UnitTriggerEvent<[Item]>;
     static itemStackedEvent: UnitTriggerEvent<[Item]>;
+    static get itemMovedEvent(): 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;
@@ -337,5 +348,6 @@ export declare class Unit extends Handle<junit> {
     setField(field: junitbooleanfield, value: boolean): boolean;
     setField(field: junitstringfield, value: string): boolean;
     toString(): string;
+    static getBySyncId(syncId: UnitSyncId): Unit | undefined;
 }
 export {};

package/engine/internal/unit.lua

@@ -562,17 +562,6 @@ local function retrieveAbility(unit, ability, abilityId)
             ____exports.Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                ____exports.Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
@@ -630,15 +619,15 @@ for ____, player in ipairs(Player.all) do
     dummies[player] = dummy
 end
 local function delayHealthChecksCallback(unit)
-    local counter = (unit[102] or 0) - 1
+    local counter = (unit[103] or 0) - 1
     if counter ~= 0 then
-        unit[102] = counter
+        unit[103] = counter
         return
     end
-    unit[102] = nil
-    local healthBonus = unit[103]
+    unit[103] = nil
+    local healthBonus = unit[104]
     if healthBonus ~= nil then
-        unit[103] = nil
+        unit[104] = nil
         local handle = unit.handle
         BlzSetUnitMaxHP(
             handle,
@@ -646,12 +635,17 @@ local function delayHealthChecksCallback(unit)
         )
     end
 end
+local nextSyncId = 1
+local unitBySyncId = setmetatable({}, {__mode = "k"})
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
 __TS__ClassExtends(Unit, Handle)
 function Unit.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
+    local ____nextSyncId_0 = nextSyncId
+    nextSyncId = ____nextSyncId_0 + 1
+    self.syncId = ____nextSyncId_0
     self._owner = Player:of(getOwningPlayer(handle))
     assert(unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId))
     assert(unitAddAbility(handle, morphDetectAbilityId))
@@ -664,6 +658,7 @@ function Unit.prototype.____constructor(self, handle)
             fourCC("Amrf")
         ))
     end
+    unitBySyncId[self.syncId] = self
     local ____ = self.abilities
 end
 function Unit.prototype.getEvent(self, event, collector)
@@ -749,8 +744,8 @@ function Unit.prototype.addModifier(self, property, modifier)
     end}
 end
 function Unit.prototype.hasCombatClassification(self, combatClassification)
-    local ____combatClassification_0 = combatClassification
-    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_0 == ____combatClassification_0
+    local ____combatClassification_1 = combatClassification
+    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_1 == ____combatClassification_1
 end
 function Unit.prototype.addClassification(self, classification)
     return unitAddType(self.handle, classification)
@@ -768,13 +763,13 @@ function Unit.prototype.isInvisibleTo(self, player)
     return isUnitInvisible(self.handle, player.handle)
 end
 function Unit.prototype.isInRangeOf(self, x, y, range)
-    local ____temp_1
+    local ____temp_2
     if type(x) == "number" then
-        ____temp_1 = isUnitInRangeXY(self.handle, x, y, range)
+        ____temp_2 = isUnitInRangeXY(self.handle, x, y, range)
     else
-        ____temp_1 = isUnitInRange(self.handle, x.handle, y)
+        ____temp_2 = isUnitInRange(self.handle, x.handle, y)
     end
-    return ____temp_1
+    return ____temp_2
 end
 function Unit.prototype.isAllyOf(self, unit)
     return isUnitAlly(
@@ -801,7 +796,7 @@ function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
 function Unit.prototype.delayHealthChecks(self)
-    self[102] = (self[102] or 0) + 1
+    self[103] = (self[103] or 0) + 1
     Timer:run(delayHealthChecksCallback, self)
 end
 function Unit.prototype.setPosition(self, x, y)
@@ -818,14 +813,14 @@ function Unit.prototype.kill(self)
     killUnit(self.handle)
 end
 function Unit.prototype.revive(self, x, y, doEffect)
-    local ____ReviveHero_4 = ReviveHero
-    local ____array_3 = __TS__SparseArrayNew(self.handle, x, y)
-    local ____doEffect_2 = doEffect
-    if ____doEffect_2 == nil then
-        ____doEffect_2 = false
+    local ____ReviveHero_5 = ReviveHero
+    local ____array_4 = __TS__SparseArrayNew(self.handle, x, y)
+    local ____doEffect_3 = doEffect
+    if ____doEffect_3 == nil then
+        ____doEffect_3 = false
     end
-    __TS__SparseArrayPush(____array_3, ____doEffect_2)
-    ____ReviveHero_4(__TS__SparseArraySpread(____array_3))
+    __TS__SparseArrayPush(____array_4, ____doEffect_3)
+    ____ReviveHero_5(__TS__SparseArraySpread(____array_4))
 end
 function Unit.prototype.healTarget(self, target, amount)
     if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -995,18 +990,18 @@ function Unit.prototype.unpauseEx(self)
     self:decrementStunCounter()
 end
 function Unit.prototype.incrementStunCounter(self)
-    local stunCounter = self[101] or 0
-    if not self[100] or stunCounter >= 0 then
+    local stunCounter = self[102] or 0
+    if not self[101] or stunCounter >= 0 then
         BlzPauseUnitEx(self.handle, true)
     end
-    self[101] = stunCounter + 1
+    self[102] = stunCounter + 1
 end
 function Unit.prototype.decrementStunCounter(self)
-    local stunCounter = self[101] or 0
-    if not self[100] or stunCounter >= 1 then
+    local stunCounter = self[102] or 0
+    if not self[101] or stunCounter >= 1 then
         BlzPauseUnitEx(self.handle, false)
     end
-    self[101] = stunCounter - 1
+    self[102] = stunCounter - 1
 end
 function Unit.create(self, owner, id, x, y, facing, skinId)
     local handle = skinId and BlzCreateUnitWithSkin(
@@ -1134,6 +1129,9 @@ end
 function Unit.prototype.__tostring(self)
     return (((self.constructor.name .. "$") .. util.id2s(self.typeId)) .. "@") .. tostring(getHandleId(self.handle))
 end
+function Unit.getBySyncId(self, syncId)
+    return unitBySyncId[syncId]
+end
 __TS__SetDescriptor(
     Unit.prototype,
     "_deltas",
@@ -1391,17 +1389,17 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[105]
+            return not self[106]
         end,
         set = function(self, isTeamGlowVisible)
             showUnitTeamGlow(self.handle, isTeamGlowVisible)
-            local ____temp_5
+            local ____temp_6
             if not isTeamGlowVisible then
-                ____temp_5 = true
+                ____temp_6 = true
             else
-                ____temp_5 = nil
+                ____temp_6 = nil
             end
-            self[105] = ____temp_5
+            self[106] = ____temp_6
         end
     },
     true
@@ -1411,7 +1409,7 @@ __TS__SetDescriptor(
     "color",
     {set = function(self, color)
         setUnitColor(self.handle, color.handle)
-        if self[105] then
+        if self[106] then
             showUnitTeamGlow(self.handle, false)
         end
     end},
@@ -1435,14 +1433,14 @@ __TS__SetDescriptor(
     "maxHealth",
     {
         get = function(self)
-            return BlzGetUnitMaxHP(self.handle) - (self[103] or 0) - (self[104] or 0)
+            return BlzGetUnitMaxHP(self.handle) - (self[104] or 0) - (self[105] or 0)
         end,
         set = function(self, maxHealth)
-            if maxHealth < 1 and self[102] ~= nil then
-                self[103] = (self[103] or 0) + (1 - maxHealth)
+            if maxHealth < 1 and self[103] ~= nil then
+                self[104] = (self[104] or 0) + (1 - maxHealth)
                 maxHealth = 1
             end
-            BlzSetUnitMaxHP(self.handle, maxHealth + (self[104] or 0))
+            BlzSetUnitMaxHP(self.handle, maxHealth + (self[105] or 0))
         end
     },
     true
@@ -1484,10 +1482,10 @@ __TS__SetDescriptor(
     "health",
     {
         get = function(self)
-            return GetWidgetLife(self.handle) - (self[104] or 0)
+            return GetWidgetLife(self.handle) - (self[105] or 0)
         end,
         set = function(self, health)
-            SetWidgetLife(self.handle, health + (self[104] or 0))
+            SetWidgetLife(self.handle, health + (self[105] or 0))
         end
     },
     true
@@ -1698,17 +1696,17 @@ __TS__SetDescriptor(
         set = function(self, isPaused)
             local handle = self.handle
             if isPaused and not IsUnitPaused(handle) then
-                self[100] = true
-                for _ = self[101] or 0, -1 do
+                self[101] = true
+                for _ = self[102] or 0, -1 do
                     BlzPauseUnitEx(handle, true)
                 end
                 PauseUnit(handle, true)
             elseif not isPaused and IsUnitPaused(handle) then
                 PauseUnit(handle, false)
-                for _ = self[101] or 0, -1 do
+                for _ = self[102] or 0, -1 do
                     BlzPauseUnitEx(handle, false)
                 end
-                self[100] = nil
+                self[101] = nil
             end
         end
     },
@@ -2127,25 +2125,25 @@ Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
         local function listener(unit, id)
-            local ____GetSpellTargetUnit_result_8
+            local ____GetSpellTargetUnit_result_9
             if GetSpellTargetUnit() then
-                ____GetSpellTargetUnit_result_8 = ____exports.Unit:of(GetSpellTargetUnit())
+                ____GetSpellTargetUnit_result_9 = ____exports.Unit:of(GetSpellTargetUnit())
             else
-                local ____GetSpellTargetItem_result_7
+                local ____GetSpellTargetItem_result_8
                 if GetSpellTargetItem() then
-                    ____GetSpellTargetItem_result_7 = Item:of(GetSpellTargetItem())
+                    ____GetSpellTargetItem_result_8 = Item:of(GetSpellTargetItem())
                 else
-                    local ____GetSpellTargetDestructable_result_6
+                    local ____GetSpellTargetDestructable_result_7
                     if GetSpellTargetDestructable() then
-                        ____GetSpellTargetDestructable_result_6 = Destructable:of(GetSpellTargetDestructable())
+                        ____GetSpellTargetDestructable_result_7 = Destructable:of(GetSpellTargetDestructable())
                     else
-                        ____GetSpellTargetDestructable_result_6 = nil
+                        ____GetSpellTargetDestructable_result_7 = nil
                     end
-                    ____GetSpellTargetItem_result_7 = ____GetSpellTargetDestructable_result_6
+                    ____GetSpellTargetItem_result_8 = ____GetSpellTargetDestructable_result_7
                 end
-                ____GetSpellTargetUnit_result_8 = ____GetSpellTargetItem_result_7
+                ____GetSpellTargetUnit_result_9 = ____GetSpellTargetItem_result_8
             end
-            local target = ____GetSpellTargetUnit_result_8
+            local target = ____GetSpellTargetUnit_result_9
             if target then
                 invoke(event, unit, id, target)
             end
@@ -2472,7 +2470,7 @@ Unit.onDamage = __TS__New(
                 invoke(event, source, target, evData)
                 if evData[0] ~= nil and target.health - evData.amount < 0.405 then
                     local bonusHealth = math.ceil(evData.amount)
-                    target[104] = (target[104] or 0) + bonusHealth
+                    target[105] = (target[105] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2486,7 +2484,7 @@ Unit.onDamage = __TS__New(
                             evData[0],
                             table.unpack(evData, 1 + 1, 1 + (evData[1] or 0))
                         )
-                        target[104] = (target[104] or 0) - bonusHealth
+                        target[105] = (target[105] or 0) - bonusHealth
                         SetWidgetLife(
                             target.handle,
                             GetWidgetLife(target.handle) - bonusHealth
@@ -2538,6 +2536,30 @@ Unit.itemStackedEvent = __TS__New(
     EVENT_PLAYER_UNIT_STACK_ITEM,
     function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
 )
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemMovedEvent",
+    {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, "itemMovedEvent", event)
+        return event
+    end}
+)
 __TS__ObjectDefineProperty(
     Unit,
     "onCreate",

package/engine/local-client.lua

@@ -115,7 +115,7 @@ __TS__ObjectDefineProperty(
         end
         tableSort(localSelectedUnits, compareUnitsSelectionPriority)
         local mainSelectedUnitIndex
-        if selectionButtons then
+        if selectionButtons and #localSelectedUnits > 1 then
             local maxButtonWidth = 0
             for i = 0, #selectionButtons - 1 do
                 local width = selectionButtons[i + 1].width
@@ -131,8 +131,9 @@ __TS__ObjectDefineProperty(
             localSelectedUnits[i] = nil
         end
         if mainSelectedUnitChangeEvent ~= nil and mainSelectedUnit ~= previousMainSelectedUnit then
-            Event.invoke(mainSelectedUnitChangeEvent, previousMainSelectedUnit, mainSelectedUnit)
+            local previousPreviousMainSelectedUnit = previousMainSelectedUnit
             previousMainSelectedUnit = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, previousPreviousMainSelectedUnit, previousMainSelectedUnit)
         end
         return mainSelectedUnit
     end}

package/engine/object-data/auxiliary/sound-preset-name.d.ts

@@ -4,5 +4,9 @@ export declare const enum SoundPresetName {
     ABOMINATION_PISSED = "AbominationPissed",
     ABOMINATION_READY = "AbominationReady",
     ABOMINATION_WAR_CRY = "AbominationWarcry",
-    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood"
+    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood",
+    IMPALE = "Impale",
+    IMPALE_HIT = "ImpaleHit",
+    IMPALE_LAND = "ImpaleLand",
+    IMPALE_CAST = "ImpaleCast"
 }

package/engine/unit.d.ts

@@ -16,6 +16,7 @@ import "./internal/unit-missile-launch";
 import "./internal/unit/ghost-counter";
 import "./internal/unit/invulnerability-counter";
 import "./internal/unit/detach-missiles";
+import "./internal/unit/main-selected";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -16,6 +16,7 @@ require("engine.internal.unit-missile-launch")
 require("engine.internal.unit.ghost-counter")
 require("engine.internal.unit.invulnerability-counter")
 require("engine.internal.unit.detach-missiles")
+require("engine.internal.unit.main-selected")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.1a5c0c0",
+    "version": "0.0.1-dev.1b0add9",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",

package/utility/arrays.d.ts

@@ -32,7 +32,10 @@ export declare const flatMapToLuaSet: {
 };
 export declare const mapIndexed: <T, R>(array: readonly T[], transform: (index: number, value: T) => R) => R[];
 export declare const associate: <T, K extends AnyNotNil, V>(array: readonly T[], keySelector: (value: T) => K, valueSelector: (value: T) => V) => LuaMap<K, V>;
-export declare const associateBy: <K extends AnyNotNil, V>(array: readonly V[], keySelector: (value: V) => K) => LuaMap<K, V>;
+export declare const associateBy: {
+    <K extends AnyNotNil, V>(array: readonly V[], keySelector: (value: V) => K): LuaMap<K, V>;
+    <K extends KeysOfType<V, AnyNotNil>, V>(array: readonly V[], keySelector: K): LuaMap<V[K] extends AnyNotNil ? V[K] : never, V>;
+};
 export declare const associateByIndexed: <K extends AnyNotNil, V>(array: readonly V[], keySelector: (index: number, value: V) => K) => LuaMap<K, V>;
 export declare const associateWith: <K extends AnyNotNil, V>(array: readonly K[], valueSelector: (value: K) => V) => LuaMap<K, V>;
 export declare const associateWithIndexed: <K extends AnyNotNil, V>(array: readonly K[], valueSelector: (index: number, value: K) => V) => LuaMap<K, V>;
@@ -41,6 +44,10 @@ export declare const average: (array: readonly number[]) => number;
 export declare const sum: (array: readonly number[]) => number;
 export declare const product: (array: readonly number[]) => number;
 export declare const max: (array: readonly number[]) => number;
+export declare const maxBy: {
+    <T, Args extends any[]>(array: readonly T[], selector: (value: T, ...args: Args) => number, ...args: Args): T | undefined;
+    <T, K extends KeysOfType<T, number>>(array: readonly T[], key: K): T | undefined;
+};
 export declare const intersperse: <T>(array: readonly T[], delimiter: T) => T[];
 export declare const zip: <T, R, V>(array: readonly T[], otherArray: readonly R[], transform: (value: T, otherValue: R) => V) => V[];
 export declare const chunked: <T>(array: readonly T[], size: number) => T[][];

package/utility/arrays.lua

@@ -178,9 +178,16 @@ ____exports.associate = function(array, keySelector, valueSelector)
 end
 ____exports.associateBy = function(array, keySelector)
     local result = {}
-    for i = 1, #array do
-        local value = array[i]
-        result[keySelector(value)] = value
+    if type(keySelector) == "function" then
+        for i = 1, #array do
+            local value = array[i]
+            result[keySelector(value)] = value
+        end
+    else
+        for i = 1, #array do
+            local value = array[i]
+            result[value[keySelector]] = value
+        end
     end
     return result
 end
@@ -251,6 +258,30 @@ ____exports.max = function(array)
     end
     return mathMax(table.unpack(array))
 end
+____exports.maxBy = function(array, selector, ...)
+    local result = nil
+    local maxValue = -math.huge
+    if type(selector) == "function" then
+        for i = 1, #array do
+            local element = array[i]
+            local value = selector(element, ...)
+            if value > maxValue then
+                result = element
+                maxValue = value
+            end
+        end
+    else
+        for i = 1, #array do
+            local element = array[i]
+            local value = element[selector]
+            if value > maxValue then
+                result = element
+                maxValue = value
+            end
+        end
+    end
+    return result
+end
 ____exports.intersperse = function(array, delimiter)
     local result = {}
     local length = #array