warscript 0.0.1-dev.d1328b7 → 0.0.1-dev.d18f377

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, roll)
+    setSpecialEffectRoll(
+        effect,
+        -mathRad(roll)
+    )
+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/behaviour/ability/emulate-impact.d.ts

@@ -0,0 +1,6 @@
+/** @noSelfInFile */
+import { AbilityBehavior } from "../ability";
+import { Unit } from "../../internal/unit";
+export declare abstract class EmulateImpactAbilityBehavior extends AbilityBehavior {
+    protected emulateImpact(caster: Unit): void;
+}

package/engine/behaviour/ability/emulate-impact.lua

@@ -0,0 +1,29 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+local ____ability = require("engine.standard.fields.ability")
+local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
+local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTEGER_LEVEL_FIELD
+____exports.EmulateImpactAbilityBehavior = __TS__Class()
+local EmulateImpactAbilityBehavior = ____exports.EmulateImpactAbilityBehavior
+EmulateImpactAbilityBehavior.name = "EmulateImpactAbilityBehavior"
+__TS__ClassExtends(EmulateImpactAbilityBehavior, AbilityBehavior)
+function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
+    local abilityTypeId = self.ability.typeId
+    local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
+    local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
+    if caster:getAbilityRemainingCooldown(abilityTypeId) ~= 0 or caster.mana < manaCost then
+        return
+    end
+    caster.mana = caster.mana - manaCost
+    if cooldown == 0 then
+        caster:interruptCast(self.ability.typeId)
+    else
+        caster:startAbilityCooldown(self.ability.typeId, cooldown)
+    end
+    AbilityBehavior:forAll(self.ability, "onImpact", caster)
+end
+return ____exports

package/engine/behaviour/ability/instant-impact.d.ts

@@ -1,6 +1,6 @@
 /** @noSelfInFile */
-import { AbilityBehavior } from "../ability";
 import { Unit } from "../../internal/unit";
-export declare class InstantImpactAbilityBehavior extends AbilityBehavior {
+import { EmulateImpactAbilityBehavior } from "./emulate-impact";
+export declare class InstantImpactAbilityBehavior extends EmulateImpactAbilityBehavior {
     onCastingStart(caster: Unit): void;
 }

package/engine/behaviour/ability/instant-impact.lua

@@ -2,28 +2,13 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
-local ____ability = require("engine.behaviour.ability")
-local AbilityBehavior = ____ability.AbilityBehavior
-local ____ability = require("engine.standard.fields.ability")
-local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
-local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTEGER_LEVEL_FIELD
+local ____emulate_2Dimpact = require("engine.behaviour.ability.emulate-impact")
+local EmulateImpactAbilityBehavior = ____emulate_2Dimpact.EmulateImpactAbilityBehavior
 ____exports.InstantImpactAbilityBehavior = __TS__Class()
 local InstantImpactAbilityBehavior = ____exports.InstantImpactAbilityBehavior
 InstantImpactAbilityBehavior.name = "InstantImpactAbilityBehavior"
-__TS__ClassExtends(InstantImpactAbilityBehavior, AbilityBehavior)
+__TS__ClassExtends(InstantImpactAbilityBehavior, EmulateImpactAbilityBehavior)
 function InstantImpactAbilityBehavior.prototype.onCastingStart(self, caster)
-    local abilityTypeId = self.ability.typeId
-    local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
-    local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
-    if caster:getAbilityRemainingCooldown(abilityTypeId) ~= 0 or caster.mana < manaCost then
-        return
-    end
-    caster.mana = caster.mana - manaCost
-    if cooldown == 0 then
-        caster:interruptCast(self.ability.typeId)
-    else
-        caster:startAbilityCooldown(self.ability.typeId, cooldown)
-    end
-    AbilityBehavior:forAll(self.ability, "onImpact", caster)
+    self:emulateImpact(caster)
 end
 return ____exports

package/engine/behaviour/ability/on-command-impact.d.ts

@@ -0,0 +1,8 @@
+/** @noSelfInFile */
+import { Unit } from "../../internal/unit";
+import { EmulateImpactAbilityBehavior } from "./emulate-impact";
+import { Ability } from "../../internal/ability";
+export declare class OnCommandImpactAbilityBehavior extends EmulateImpactAbilityBehavior {
+    constructor(ability: Ability);
+    onCommand(caster: Unit): void;
+}

package/engine/behaviour/ability/on-command-impact.lua

@@ -0,0 +1,18 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____emulate_2Dimpact = require("engine.behaviour.ability.emulate-impact")
+local EmulateImpactAbilityBehavior = ____emulate_2Dimpact.EmulateImpactAbilityBehavior
+____exports.OnCommandImpactAbilityBehavior = __TS__Class()
+local OnCommandImpactAbilityBehavior = ____exports.OnCommandImpactAbilityBehavior
+OnCommandImpactAbilityBehavior.name = "OnCommandImpactAbilityBehavior"
+__TS__ClassExtends(OnCommandImpactAbilityBehavior, EmulateImpactAbilityBehavior)
+function OnCommandImpactAbilityBehavior.prototype.____constructor(self, ability)
+    EmulateImpactAbilityBehavior.prototype.____constructor(self, ability)
+    self:registerCommandEvent()
+end
+function OnCommandImpactAbilityBehavior.prototype.onCommand(self, caster)
+    self:emulateImpact(caster)
+end
+return ____exports

package/engine/behaviour/ability/remove-buffs.d.ts

@@ -0,0 +1,16 @@
+/** @noSelfInFile */
+import { AbilityBehavior } from "../ability";
+import { Unit } from "../../internal/unit";
+import { Ability } from "../../internal/ability";
+import { AbilityDependentValue } from "../../object-field/ability";
+import { BuffPolarity } from "../../object-data/auxiliary/buff-polarity";
+import { BuffResistanceType } from "../../object-data/auxiliary/buff-resistance-type";
+export declare class RemoveBuffsSelfAbilityBehavior extends AbilityBehavior {
+    private readonly polarity?;
+    private readonly resistanceType?;
+    private readonly includeExpirationTimers?;
+    private readonly includeAuras?;
+    private readonly autoDispel?;
+    constructor(ability: Ability, polarity?: AbilityDependentValue<BuffPolarity> | undefined, resistanceType?: AbilityDependentValue<BuffResistanceType> | undefined, includeExpirationTimers?: AbilityDependentValue<boolean> | undefined, includeAuras?: AbilityDependentValue<boolean> | undefined, autoDispel?: AbilityDependentValue<boolean> | undefined);
+    onImpact(caster: Unit): void;
+}

package/engine/behaviour/ability/remove-buffs.lua

@@ -0,0 +1,28 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+____exports.RemoveBuffsSelfAbilityBehavior = __TS__Class()
+local RemoveBuffsSelfAbilityBehavior = ____exports.RemoveBuffsSelfAbilityBehavior
+RemoveBuffsSelfAbilityBehavior.name = "RemoveBuffsSelfAbilityBehavior"
+__TS__ClassExtends(RemoveBuffsSelfAbilityBehavior, AbilityBehavior)
+function RemoveBuffsSelfAbilityBehavior.prototype.____constructor(self, ability, polarity, resistanceType, includeExpirationTimers, includeAuras, autoDispel)
+    AbilityBehavior.prototype.____constructor(self, ability)
+    self.polarity = polarity
+    self.resistanceType = resistanceType
+    self.includeExpirationTimers = includeExpirationTimers
+    self.includeAuras = includeAuras
+    self.autoDispel = autoDispel
+end
+function RemoveBuffsSelfAbilityBehavior.prototype.onImpact(self, caster)
+    caster:removeBuffs(
+        self:resolveCurrentAbilityDependentValue(self.polarity),
+        self:resolveCurrentAbilityDependentValue(self.resistanceType),
+        self:resolveCurrentAbilityDependentValue(self.includeExpirationTimers),
+        self:resolveCurrentAbilityDependentValue(self.includeAuras),
+        self:resolveCurrentAbilityDependentValue(self.autoDispel)
+    )
+end
+return ____exports

package/engine/behaviour/ability.d.ts

@@ -9,22 +9,26 @@ import { Destructable } from "../../core/types/destructable";
 import { EffectParameters } from "../../core/types/effect";
 import { AbilityDependentValue } from "../object-field/ability";
 export type AbilityBehaviorConstructor<Args extends any[]> = new (ability: Ability, ...args: Args) => AbilityBehavior;
+export type AbilityBehaviorParameters = {
+    isExclusiveOnImpactHandler?: boolean;
+};
 export declare abstract class AbilityBehavior<Parameters extends {
     periodicActionParameters?: any[];
     missileParameters?: any[];
 } = {}> extends Behavior<Ability, NonNullable<Parameters["periodicActionParameters"]>> {
-    constructor(ability: Ability);
+    constructor(ability: Ability, parameters?: AbilityBehaviorParameters);
+    protected registerCommandEvent(orderTypeStringId?: string): void;
     get ability(): Ability;
-    protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
+    protected resolveCurrentAbilityDependentValue<T extends boolean | number | string | undefined>(value: AbilityDependentValue<T>): T;
     protected flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashSpecialEffect(...args: [...pointOrWidget: [x: number, y: number] | [widget: Widget], duration?: number]): void;
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
-    protected launchMissile(source: Unit, target: Unit, ...parameters: NonNullable<Parameters["missileParameters"]>): void;
     onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;
     onUnitGainAbility(_unit: Unit): void;
     onUnitLoseAbility(_unit: Unit): void;
+    onCommand(caster: Unit, orderTypeStringId: string): void;
     onCastingStart(caster: Unit): void;
     onCastingFinish(caster: Unit): void;
     onChannelingStart(caster: Unit): void;

package/engine/behaviour/ability.lua

@@ -4,6 +4,7 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
+local createUnitEventListener
 local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
 local ____unit = require("engine.unit")
@@ -24,21 +25,27 @@ local ____ability = require("engine.object-field.ability")
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
-local ____missile = require("core.types.missile")
-local Missile = ____missile.Missile
 local createBehaviorFunctionsByAbilityTypeId = {}
-local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
-    if success then
-        abilityBehavior:onMissileArrival(...)
+local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
+local function createZeroTimerUnitEventListener(key)
+    local unitEventListener = createUnitEventListener(key)
+    return function(unit, ability, ...)
+        Timer:run(unitEventListener, unit, ability, ...)
     end
 end
-local ____class_0 = __TS__Class()
-____class_0.name = ""
-function ____class_0.prototype.____constructor(self, abilityBehavior)
+createUnitEventListener = function(key)
+    return function(unit, ability, ...)
+        ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
+    end
+end
+local registeredCommandEventIds = {}
+local ____class_2 = __TS__Class()
+____class_2.name = ""
+function ____class_2.prototype.____constructor(self, abilityBehavior)
     self.abilityBehavior = abilityBehavior
 end
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "art",
     {get = function(self)
         return MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.abilityBehavior.ability, 0)
@@ -46,7 +53,7 @@ __TS__SetDescriptor(
     true
 )
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "arc",
     {get = function(self)
         return MISSILE_ARC_ABILITY_FLOAT_FIELD:getValue(self.abilityBehavior.ability)
@@ -54,7 +61,7 @@ __TS__SetDescriptor(
     true
 )
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "speed",
     {get = function(self)
         return MISSILE_SPEED_ABILITY_INTEGER_FIELD:getValue(self.abilityBehavior.ability)
@@ -65,8 +72,21 @@ ____exports.AbilityBehavior = __TS__Class()
 local AbilityBehavior = ____exports.AbilityBehavior
 AbilityBehavior.name = "AbilityBehavior"
 __TS__ClassExtends(AbilityBehavior, Behavior)
-function AbilityBehavior.prototype.____constructor(self, ability)
+function AbilityBehavior.prototype.____constructor(self, ability, parameters)
     Behavior.prototype.____constructor(self, ability)
+    if parameters and parameters.isExclusiveOnImpactHandler then
+        exclusiveOnImpactHandlerAbilityBehaviorByAbility[ability] = self
+    end
+end
+function AbilityBehavior.prototype.registerCommandEvent(self, orderTypeStringId)
+    if orderTypeStringId == nil then
+        orderTypeStringId = self.ability.orderTypeStringId
+    end
+    local commandEventId = (tostring(self.ability.typeId) .. "#") .. orderTypeStringId
+    if not (registeredCommandEventIds[commandEventId] ~= nil) then
+        registeredCommandEventIds[commandEventId] = true
+        Unit.abilityCommandEvent[self.ability.typeId][orderTypeStringId]:addListener(createUnitEventListener("onCommand"))
+    end
 end
 function AbilityBehavior.prototype.resolveCurrentAbilityDependentValue(self, value)
     return resolveCurrentAbilityDependentValue(self.ability, value)
@@ -104,22 +124,14 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
         )
     end
 end
-function AbilityBehavior.prototype.launchMissile(self, source, target, ...)
-    Missile:launch(
-        self.missileLaunchConfig,
-        source,
-        target,
-        invokeOnMissileArrival,
-        self,
-        ...
-    )
-end
 function AbilityBehavior.prototype.onMissileArrival(self, ...)
 end
 function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
 end
 function AbilityBehavior.prototype.onUnitLoseAbility(self, _unit)
 end
+function AbilityBehavior.prototype.onCommand(self, caster, orderTypeStringId)
+end
 function AbilityBehavior.prototype.onCastingStart(self, caster)
 end
 function AbilityBehavior.prototype.onCastingFinish(self, caster)
@@ -179,7 +191,7 @@ __TS__SetDescriptor(
     end},
     true
 )
-AbilityBehavior.MissileLaunchConfig = ____class_0
+AbilityBehavior.MissileLaunchConfig = ____class_2
 __TS__SetDescriptor(
     AbilityBehavior.prototype,
     "missileLaunchConfig",
@@ -191,17 +203,6 @@ __TS__SetDescriptor(
     true
 );
 (function(self)
-    local function createUnitEventListener(key)
-        return function(unit, ability, ...)
-            ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
-        end
-    end
-    local function createZeroTimerUnitEventListener(key)
-        local unitEventListener = createUnitEventListener(key)
-        return function(unit, ability, ...)
-            Timer:run(unitEventListener, unit, ability, ...)
-        end
-    end
     Unit.abilityGainedEvent:addListener(createUnitEventListener("onUnitGainAbility"))
     Unit.abilityLostEvent:addListener(createUnitEventListener("onUnitLoseAbility"))
     Unit.abilityCastingStartEvent:addListener(createUnitEventListener("onCastingStart"))

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

@@ -12,7 +12,8 @@ export declare abstract class Ability extends Handle<jability> {
     protected constructor(handle: jability, typeId: number);
     toString(): string;
     get parentTypeId(): number;
-    get orderId(): number;
+    get orderTypeStringId(): string;
+    get orderTypeId(): number;
     abstract readonly owner: Unit | Item;
     getSnapshot(): AbilitySnapshot;
     hasField(field: jabilityfield | number): boolean;

package/engine/internal/ability.lua

@@ -296,10 +296,18 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Ability.prototype,
-    "orderId",
+    "orderTypeStringId",
     {get = function(self)
         local field = orderIdFieldByParentTypeId[self.parentTypeId]
-        return order2orderId(field ~= nil and getAbilityStringLevelField(self.handle, ABILITY_SLF_BASE_ORDER_ID_NCL6, self.level) or (orders[self.parentTypeId] or ""))
+        return field ~= nil and getAbilityStringLevelField(self.handle, field, self.level) or (orders[self.parentTypeId] or "")
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Ability.prototype,
+    "orderTypeId",
+    {get = function(self)
+        return order2orderId(self.orderTypeStringId)
     end},
     true
 )

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

@@ -3,7 +3,7 @@ import { Ability } from "../ability";
 import { Destructable } from "../../../core/types/destructable";
 import { Item } from "../item";
 import { Widget } from "../../../core/types/widget";
-import { DispatchingEvent } from "../../../event";
+import { DispatchingEvent, Event } from "../../../event";
 declare module "../unit" {
     namespace Unit {
         const abilityCastingStartEvent: DispatchingEvent<[Unit, Ability]>;
@@ -141,3 +141,12 @@ declare module "../unit" {
         const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
+declare module "../unit" {
+    namespace Unit {
+        const abilityCommandEvent: {
+            readonly [abilityTypeId: number]: {
+                readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
+            };
+        };
+    }
+}

package/engine/internal/unit/ability.lua

@@ -15,8 +15,15 @@ local UnitTriggerEvent = ____unit.UnitTriggerEvent
 local ____event = require("event")
 local createDispatchingEvent = ____event.createDispatchingEvent
 local DependentInitializingEvent = ____event.DependentInitializingEvent
+local Event = ____event.Event
+local InitializingEvent = ____event.InitializingEvent
 local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
+local ____lazy = require("utility.lazy")
+local lazyRecord = ____lazy.lazyRecord
+local eventInvoke = Event.invoke
+local condition = Condition
+local createTrigger = CreateTrigger
 local getItemAbility = BlzGetItemAbility
 local getSpellAbility = GetSpellAbility
 local getSpellAbilityId = GetSpellAbilityId
@@ -26,11 +33,10 @@ local getSpellTargetUnit = GetSpellTargetUnit
 local getSpellTargetX = GetSpellTargetX
 local getSpellTargetY = GetSpellTargetY
 local getTriggerUnit = GetTriggerUnit
-local getUnitAbility = BlzGetUnitAbility
-local unitAddAbility = UnitAddAbility
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterCommandEvent = TriggerRegisterCommandEvent
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
-local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
         return __TS__New(
@@ -39,17 +45,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
@@ -366,4 +361,31 @@ rawset(
         extractAbilityTypeId
     )
 )
+rawset(
+    Unit,
+    "abilityCommandEvent",
+    lazyRecord(function(abilityTypeId)
+        return lazyRecord(function(orderTypeStringId)
+            return __TS__New(
+                InitializingEvent,
+                function(event)
+                    local trigger = createTrigger()
+                    triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
+                    triggerAddCondition(
+                        trigger,
+                        condition(function()
+                            local unit = Unit:of(getTriggerUnit())
+                            if unit ~= nil then
+                                local ability = unit:getAbilityById(abilityTypeId)
+                                if ability ~= nil then
+                                    eventInvoke(event, unit, ability, orderTypeStringId)
+                                end
+                            end
+                        end)
+                    )
+                end
+            )
+        end)
+    end)
+)
 return ____exports

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

@@ -1,5 +1,11 @@
 /** @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

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____player = require("core.types.player")
 local Player = ____player.Player
@@ -8,6 +10,10 @@ 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",
@@ -27,7 +33,12 @@ BlzTriggerRegisterFrameEvent(trg, syncSlider, FRAMEEVENT_SLIDER_VALUE_CHANGED)
 TriggerAddAction(
     trg,
     function()
-        mainSelectedUnitByPlayer[Player:of(GetTriggerPlayer())] = Unit:getBySyncId(BlzGetTriggerFrameValue())
+        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(

package/engine/internal/unit.d.ts

@@ -332,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;

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
@@ -2547,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/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/object-field/ability.d.ts

@@ -130,5 +130,5 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
     protected getNativeFieldValue(instance: Ability, level: number): CombatClassifications;
     protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
 }
-export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
-export declare const resolveCurrentAbilityDependentValue: <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>) => ValueType;
+export type AbilityDependentValue<ValueType extends boolean | number | string | undefined> = ValueType | AbilityField<NonNullable<ValueType>> | AbilityLevelField<NonNullable<ValueType>> | ((ability: Ability) => ValueType);
+export declare const resolveCurrentAbilityDependentValue: <ValueType extends boolean | number | string | undefined>(ability: Ability, value: AbilityDependentValue<ValueType>) => ValueType;

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.d1328b7",
+    "version": "0.0.1-dev.d18f377",
     "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

package/utility/lazy.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export declare const lazyRecord: <K extends keyof any, V>(initializer: (key: K) => V) => Readonly<Record<K, V>>;

package/utility/lazy.lua

@@ -0,0 +1,14 @@
+local ____exports = {}
+local rawset = _G.rawset
+local setmetatable = _G.setmetatable
+____exports.lazyRecord = function(initializer)
+    return setmetatable(
+        {},
+        {__index = function(self, key)
+            local value = initializer(key)
+            rawset(self, key, value)
+            return value
+        end}
+    )
+end
+return ____exports