warscript 0.0.1-dev.ee2345e → 0.0.1-dev.f967846

package/attributes.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export type Attribute<T> = {
     readonly __attribute: unique symbol;

package/binaryreader.d.ts

@@ -3,6 +3,7 @@ export declare class BinaryReader {
     private readonly s;
     private i;
     constructor(data: string);
+    toString(): string;
     read(fmt: string): any;
     readBytes(size: number): string;
     readDouble(): number;

package/binaryreader.lua

@@ -9,6 +9,9 @@ function BinaryReader.prototype.____constructor(self, data)
     self.i = 1
     self.s = data
 end
+function BinaryReader.prototype.__tostring(self)
+    return self.s
+end
 function BinaryReader.prototype.read(self, fmt)
     local value, pos = ____unpack(">" .. fmt, self.s, self.i)
     self.i = pos

package/core/types/frame.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Player } from "./player";
@@ -26,9 +25,14 @@ export declare class Frame extends Handle<jframehandle> {
     static readonly GAME_UI: Frame;
     static readonly CONSOLE_UI: Frame;
     static readonly CONSOLE_UI_BACKDROP: Frame;
+    private static readonly CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD;
+    static readonly CONSOLE_TOP_BAR: Frame;
+    static readonly CONSOLE_BOTTOM_BAR: Frame;
     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;
     static get minX(): number;
@@ -76,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,
@@ -105,6 +111,7 @@ export declare class Frame extends Handle<jframehandle> {
     enable(): void;
     addText(text: string): void;
     clearAllPoints(): void;
+    get children(): Frame[];
     getChild(index: number): Frame;
     getChildrenCount(): number;
     setSize(width: number, height: number): void;

package/core/types/frame.lua

@@ -62,8 +62,10 @@ local function updateBorders()
     local width4by3 = (w - h / 600 * 800) / 2
     local pxtodpi = 0.6 / h
     BlzFrameSetAbsPoint(leftBorder, FRAMEPOINT_TOPLEFT, -width4by3 * pxtodpi, 0.6)
+    BlzFrameSetScale(leftBorder, 1)
     BlzFrameSetSize(leftBorder, 0.001, 0.6)
     BlzFrameSetAbsPoint(rightBorder, FRAMEPOINT_TOPRIGHT, (-width4by3 + w) * pxtodpi, 0.6)
+    BlzFrameSetScale(rightBorder, 1)
     BlzFrameSetSize(rightBorder, 0.001, 0.6)
 end
 local worldFrame = BlzGetOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0)
@@ -120,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"
@@ -240,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)
@@ -267,7 +271,16 @@ function Frame.createSimple(self, name, parent, createContext)
     ))
 end
 function Frame.create(self, name, parent, priority, createContext)
-    return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
+    if parent == ____exports.Frame.CONSOLE_UI_BACKDROP then
+        local helper = ____exports.Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD.handle
+        BlzFrameSetScale(helper, 1)
+        local frame = BlzCreateFrame(name, helper, priority or 0, createContext or 0)
+        BlzFrameSetScale(helper, ____exports.Frame.uiScale)
+        BlzFrameSetParent(frame, ____exports.Frame.CONSOLE_UI_BACKDROP.handle)
+        return self:of(frame)
+    else
+        return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
+    end
 end
 function Frame.createByType(self, typeName, name, parent, inherits, createContext)
     return self:of(BlzCreateFrameByType(
@@ -293,9 +306,20 @@ end
 Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
 Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)
 Frame.CONSOLE_UI_BACKDROP = ____exports.Frame:byName("ConsoleUIBackdrop")
+Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD = ____exports.Frame:createByType("FRAME", "ConsoleUIBackdropUIScaleHelperChild", ____exports.Frame.CONSOLE_UI_BACKDROP)
+Frame.CONSOLE_TOP_BAR = ____exports.Frame:byName("ConsoleTopBar")
+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",
+    {get = function(self)
+        return ____exports.Frame.CONSOLE_BOTTOM_BAR.width / 0.8
+    end}
+)
 __TS__ObjectDefineProperty(
     Frame,
     "leftBorder",
@@ -597,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",
@@ -699,6 +779,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Frame.prototype,
+    "children",
+    {get = function(self)
+        local children = {}
+        for i = 0, self:getChildrenCount() - 1 do
+            children[i + 1] = self:getChild(i)
+        end
+        return children
+    end},
+    true
+)
 __TS__ObjectDefineProperty(
     Frame,
     "onKeyPress",

package/core/types/group.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Widget } from "./widget";
 import { Unit } from "../../engine/internal/unit";

package/core/types/image.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Color } from "./color";

package/core/types/missile.d.ts

@@ -5,7 +5,7 @@ export declare class Missile implements Destroyable {
     readonly retarget: (this: void, target: Unit | Vec2) => void;
     private readonly update;
     protected constructor(effect: jeffect, retarget: (this: void, target: Unit | Vec2) => void, update: (this: Missile) => boolean);
-    static launch(config: Readonly<{
+    static launch<T extends any[]>(config: Readonly<{
         art: string;
         scale?: number;
         acceleration?: number;
@@ -15,7 +15,7 @@ export declare class Missile implements Destroyable {
         maxSpeed?: number;
         sourceOffset?: Vec2;
         targetOffset?: Vec2;
-    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean) => void): Missile;
+    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean, ...parameters: T) => void, ...parameters: T): Missile;
     destroy(): void;
 }
 export declare namespace Missile {

package/core/types/missile.lua

@@ -41,7 +41,8 @@ function Missile.prototype.____constructor(self, effect, retarget, update)
     end
     head = self
 end
-function Missile.launch(self, config, source, target, onArrival)
+function Missile.launch(self, config, source, target, onArrival, ...)
+    local parameters = {...}
     local ____opt_0 = config.sourceOffset
     local offsetX = ____opt_0 and ____opt_0.x or 0
     local ____opt_2 = config.sourceOffset
@@ -142,7 +143,12 @@ function Missile.launch(self, config, source, target, onArrival)
             visualPositionArcY = currentVisualTargetY
             visualPositionArcZ = currentVisualTargetZ
             retarget = false
-            safeCall(onArrival, self, true)
+            safeCall(
+                onArrival,
+                self,
+                true,
+                table.unpack(parameters)
+            )
             return not retarget
         end
         if arcVSpeed ~= 0 and (currentTargetX ~= initialTargetX or currentTargetY ~= initialTargetY) then

package/core/types/unit.lua

@@ -21,4 +21,12 @@ do
         end
     end
 end
+do
+    local ____export = require("engine.internal.unit+rally")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 return ____exports

package/core/util.d.ts

@@ -54,7 +54,7 @@ declare global {
     function fourCC(id: string): number;
 }
 declare namespace inner {
-    const orderId: (id: "blink" | "stop" | "load" | "sleep" | "absorb" | "acidbomb" | "acolyteharvest" | "ambush" | "ancestralspirit" | "ancestralspirittarget" | "animatedead" | "antimagicshell" | "attack" | "attackground" | "attackonce" | "attributemodskill" | "auraunholy" | "auravampiric" | "autodispel" | "autodispeloff" | "autodispelon" | "autoentangle" | "autoentangleinstant" | "autoharvestgold" | "autoharvestlumber" | "avatar" | "avengerform" | "awaken" | "banish" | "barkskin" | "barkskinoff" | "barkskinon" | "battleroar" | "battlestations" | "bearform" | "berserk" | "blackarrow" | "blackarrowoff" | "blackarrowon" | "blight" | "blizzard" | "bloodlust" | "bloodlustoff" | "bloodluston" | "board" | "breathoffire" | "breathoffrost" | "build" | "burrow" | "cannibalize" | "carrionscarabs" | "carrionscarabsinstant" | "carrionscarabsoff" | "carrionscarabson" | "carrionswarm" | "chainlightning" | "channel" | "charm" | "chemicalrage" | "cloudoffog" | "clusterrockets" | "coldarrows" | "coldarrowstarg" | "controlmagic" | "corporealform" | "corrosivebreath" | "coupleinstant" | "coupletarget" | "creepanimatedead" | "creepdevour" | "creepheal" | "creephealoff" | "creephealon" | "creepthunderbolt" | "creepthunderclap" | "cripple" | "curse" | "curseoff" | "curseon" | "cyclone" | "darkconversion" | "darkportal" | "darkritual" | "darksummoning" | "deathanddecay" | "deathcoil" | "deathpact" | "decouple" | "defend" | "detectaoe" | "detonate" | "devour" | "devourmagic" | "disassociate" | "disenchant" | "dismount" | "dispel" | "divineshield" | "doom" | "drain" | "dreadlordinferno" | "dropitem" | "drunkenhaze" | "earthquake" | "eattree" | "elementalfury" | "ensnare" | "ensnareoff" | "ensnareon" | "entangle" | "entangleinstant" | "entanglingroots" | "etherealform" | "evileye" | "faeriefire" | "faeriefireoff" | "faeriefireon" | "fanofknives" | "farsight" | "fingerofdeath" | "firebolt" | "flamestrike" | "flamingarrows" | "flamingarrowstarg" | "flamingattack" | "flamingattacktarg" | "flare" | "forceboard" | "forceofnature" | "forkedlightning" | "freezingbreath" | "frenzy" | "frenzyoff" | "frenzyon" | "frostarmor" | "frostarmoroff" | "frostarmoron" | "frostnova" | "getitem" | "gold2lumber" | "grabtree" | "harvest" | "heal" | "healingspray" | "healingward" | "healingwave" | "healoff" | "healon" | "hex" | "holdposition" | "holybolt" | "howlofterror" | "humanbuild" | "immolation" | "impale" | "incineratearrow" | "incineratearrowoff" | "incineratearrowon" | "inferno" | "innerfire" | "innerfireoff" | "innerfireon" | "instant" | "invisibility" | "lavamonster" | "lightningshield" | "loadarcher" | "loadcorpse" | "loadcorpseinstant" | "locustswarm" | "lumber2gold" | "magicdefense" | "magicleash" | "magicundefense" | "manaburn" | "manaflareoff" | "manaflareon" | "manashieldoff" | "manashieldon" | "massteleport" | "mechanicalcritter" | "metamorphosis" | "militia" | "militiaconvert" | "militiaoff" | "militiaunconvert" | "mindrot" | "mirrorimage" | "monsoon" | "mount" | "mounthippogryph" | "move" | "moveAI" | "nagabuild" | "neutraldetectaoe" | "neutralinteract" | "neutralspell" | "nightelfbuild" | "orcbuild" | "parasite" | "parasiteoff" | "parasiteon" | "patrol" | "patrolAI" | "phaseshift" | "phaseshiftinstant" | "phaseshiftoff" | "phaseshifton" | "phoenixfire" | "phoenixmorph" | "poisonarrows" | "poisonarrowstarg" | "polymorph" | "possession" | "preservation" | "purge" | "rainofchaos" | "rainoffire" | "raisedead" | "raisedeadoff" | "raisedeadon" | "ravenform" | "recharge" | "rechargeoff" | "rechargeon" | "rejuvination" | "renew" | "renewoff" | "renewon" | "repair" | "repairoff" | "repairon" | "replenish" | "replenishlife" | "replenishlifeoff" | "replenishlifeon" | "replenishmana" | "replenishmanaoff" | "replenishmanaon" | "replenishoff" | "replenishon" | "request_hero" | "requestsacrifice" | "restoration" | "restorationoff" | "restorationon" | "resumebuild" | "resumeharvesting" | "resurrection" | "returnresources" | "revenge" | "revive" | "roar" | "robogoblin" | "root" | "sacrifice" | "sanctuary" | "scout" | "selfdestruct" | "selfdestructoff" | "selfdestructon" | "sentinel" | "follow" | "smart" | "setrally" | "shadowsight" | "shadowstrike" | "shockwave" | "silence" | "slow" | "slowoff" | "slowon" | "soulburn" | "soulpreservation" | "spellshield" | "spellshieldaoe" | "spellsteal" | "spellstealoff" | "spellstealon" | "spies" | "spiritlink" | "spiritofvengeance" | "spirittroll" | "spiritwolf" | "stampede" | "standdown" | "starfall" | "stasistrap" | "steal" | "stomp" | "stoneform" | "stunned" | "submerge" | "summonfactory" | "summongrizzly" | "summonphoenix" | "summonquillbeast" | "summonwareagle" | "tankdroppilot" | "tankloadpilot" | "tankpilot" | "taunt" | "thunderbolt" | "thunderclap" | "tornado" | "townbelloff" | "townbellon" | "tranquility" | "transmute" | "unavatar" | "unavengerform" | "unbearform" | "unburrow" | "uncoldarrows" | "uncorporealform" | "undeadbuild" | "undefend" | "undivineshield" | "unetherealform" | "unflamingarrows" | "unflamingattack" | "unholyfrenzy" | "unimmolation" | "unload" | "unloadall" | "unloadallcorpses" | "unloadallinstant" | "unpoisonarrows" | "unravenform" | "unrobogoblin" | "unroot" | "unstableconcoction" | "unstoneform" | "unsubmerge" | "unsummon" | "unwindwalk" | "vengeance" | "vengeanceinstant" | "vengeanceoff" | "vengeanceon" | "volcano" | "voodoo" | "ward" | "waterelemental" | "wateryminion" | "web" | "weboff" | "webon" | "whirlwind" | "windwalk" | "wispharvest") => number;
+    const orderId: (id: "blink" | "stop" | "load" | "sleep" | "absorb" | "acidbomb" | "acolyteharvest" | "ambush" | "ancestralspirit" | "ancestralspirittarget" | "animatedead" | "antimagicshell" | "attack" | "attackground" | "attackonce" | "attributemodskill" | "auraunholy" | "auravampiric" | "autodispel" | "autodispeloff" | "autodispelon" | "autoentangle" | "autoentangleinstant" | "autoharvestgold" | "autoharvestlumber" | "avatar" | "avengerform" | "awaken" | "banish" | "barkskin" | "barkskinoff" | "barkskinon" | "battleroar" | "battlestations" | "bearform" | "berserk" | "blackarrow" | "blackarrowoff" | "blackarrowon" | "blight" | "blizzard" | "bloodlust" | "bloodlustoff" | "bloodluston" | "board" | "breathoffire" | "breathoffrost" | "build" | "burrow" | "cannibalize" | "carrionscarabs" | "carrionscarabsinstant" | "carrionscarabsoff" | "carrionscarabson" | "carrionswarm" | "chainlightning" | "channel" | "charm" | "chemicalrage" | "cloudoffog" | "clusterrockets" | "coldarrows" | "coldarrowstarg" | "controlmagic" | "corporealform" | "corrosivebreath" | "coupleinstant" | "coupletarget" | "creepanimatedead" | "creepdevour" | "creepheal" | "creephealoff" | "creephealon" | "creepthunderbolt" | "creepthunderclap" | "cripple" | "curse" | "curseoff" | "curseon" | "cyclone" | "darkconversion" | "darkportal" | "darkritual" | "darksummoning" | "deathanddecay" | "deathcoil" | "deathpact" | "decouple" | "defend" | "detectaoe" | "detonate" | "devour" | "devourmagic" | "disassociate" | "disenchant" | "dismount" | "dispel" | "divineshield" | "doom" | "drain" | "dreadlordinferno" | "dropitem" | "moveslot0" | "moveslot1" | "moveslot2" | "moveslot3" | "moveslot4" | "moveslot5" | "drunkenhaze" | "earthquake" | "eattree" | "elementalfury" | "ensnare" | "ensnareoff" | "ensnareon" | "entangle" | "entangleinstant" | "entanglingroots" | "etherealform" | "evileye" | "faeriefire" | "faeriefireoff" | "faeriefireon" | "fanofknives" | "farsight" | "fingerofdeath" | "firebolt" | "flamestrike" | "flamingarrows" | "flamingarrowstarg" | "flamingattack" | "flamingattacktarg" | "flare" | "forceboard" | "forceofnature" | "forkedlightning" | "freezingbreath" | "frenzy" | "frenzyoff" | "frenzyon" | "frostarmor" | "frostarmoroff" | "frostarmoron" | "frostnova" | "getitem" | "gold2lumber" | "grabtree" | "harvest" | "heal" | "healingspray" | "healingward" | "healingwave" | "healoff" | "healon" | "hex" | "holdposition" | "holybolt" | "howlofterror" | "humanbuild" | "immolation" | "impale" | "incineratearrow" | "incineratearrowoff" | "incineratearrowon" | "inferno" | "innerfire" | "innerfireoff" | "innerfireon" | "instant" | "invisibility" | "lavamonster" | "lightningshield" | "loadarcher" | "loadcorpse" | "loadcorpseinstant" | "locustswarm" | "lumber2gold" | "magicdefense" | "magicleash" | "magicundefense" | "manaburn" | "manaflareoff" | "manaflareon" | "manashieldoff" | "manashieldon" | "massteleport" | "mechanicalcritter" | "metamorphosis" | "militia" | "militiaconvert" | "militiaoff" | "militiaunconvert" | "mindrot" | "mirrorimage" | "monsoon" | "mount" | "mounthippogryph" | "move" | "moveAI" | "nagabuild" | "neutraldetectaoe" | "neutralinteract" | "neutralspell" | "nightelfbuild" | "orcbuild" | "parasite" | "parasiteoff" | "parasiteon" | "patrol" | "patrolAI" | "phaseshift" | "phaseshiftinstant" | "phaseshiftoff" | "phaseshifton" | "phoenixfire" | "phoenixmorph" | "poisonarrows" | "poisonarrowstarg" | "polymorph" | "possession" | "preservation" | "purge" | "rainofchaos" | "rainoffire" | "raisedead" | "raisedeadoff" | "raisedeadon" | "ravenform" | "recharge" | "rechargeoff" | "rechargeon" | "rejuvination" | "renew" | "renewoff" | "renewon" | "repair" | "repairoff" | "repairon" | "replenish" | "replenishlife" | "replenishlifeoff" | "replenishlifeon" | "replenishmana" | "replenishmanaoff" | "replenishmanaon" | "replenishoff" | "replenishon" | "request_hero" | "requestsacrifice" | "restoration" | "restorationoff" | "restorationon" | "resumebuild" | "resumeharvesting" | "resurrection" | "returnresources" | "revenge" | "revive" | "roar" | "robogoblin" | "root" | "sacrifice" | "sanctuary" | "scout" | "selfdestruct" | "selfdestructoff" | "selfdestructon" | "sentinel" | "follow" | "smart" | "setrally" | "shadowsight" | "shadowstrike" | "shockwave" | "silence" | "slow" | "slowoff" | "slowon" | "soulburn" | "soulpreservation" | "spellshield" | "spellshieldaoe" | "spellsteal" | "spellstealoff" | "spellstealon" | "spies" | "spiritlink" | "spiritofvengeance" | "spirittroll" | "spiritwolf" | "stampede" | "standdown" | "starfall" | "stasistrap" | "steal" | "stomp" | "stoneform" | "stunned" | "submerge" | "summonfactory" | "summongrizzly" | "summonphoenix" | "summonquillbeast" | "summonwareagle" | "tankdroppilot" | "tankloadpilot" | "tankpilot" | "taunt" | "thunderbolt" | "thunderclap" | "tornado" | "townbelloff" | "townbellon" | "tranquility" | "transmute" | "unavatar" | "unavengerform" | "unbearform" | "unburrow" | "uncoldarrows" | "uncorporealform" | "undeadbuild" | "undefend" | "undivineshield" | "unetherealform" | "unflamingarrows" | "unflamingattack" | "unholyfrenzy" | "unimmolation" | "unload" | "unloadall" | "unloadallcorpses" | "unloadallinstant" | "unpoisonarrows" | "unravenform" | "unrobogoblin" | "unroot" | "unstableconcoction" | "unstoneform" | "unsubmerge" | "unsummon" | "unwindwalk" | "vengeance" | "vengeanceinstant" | "vengeanceoff" | "vengeanceon" | "volcano" | "voodoo" | "ward" | "waterelemental" | "wateryminion" | "web" | "weboff" | "webon" | "whirlwind" | "windwalk" | "wispharvest") => number;
 }
 declare global {
     function orderId(...args: Parameters<typeof inner.orderId>): ReturnType<typeof inner.orderId>;

package/core/util.lua

@@ -196,6 +196,12 @@ do
             drain = 852487,
             dreadlordinferno = 852224,
             dropitem = 852001,
+            moveslot0 = 852002,
+            moveslot1 = 852003,
+            moveslot2 = 852004,
+            moveslot3 = 852005,
+            moveslot4 = 852006,
+            moveslot5 = 852007,
             drunkenhaze = 852585,
             earthquake = 852121,
             eattree = 852146,

package/decl/index.d.ts

@@ -3,6 +3,7 @@
 /// <reference path="./native.d.ts"/>
 /// <reference types="warpack-types/warpack"/>
 /// <reference types="lua-types/5.3"/>
+/// <reference types="@warscript/language-extensions" />
 
 declare function setmetatable<
     T extends object,

package/engine/ability.d.ts

@@ -2,4 +2,4 @@
 import { AbilityTypeId } from "./object-data/entry/ability-type";
 import { UnitAbility } from "./internal/ability";
 import { Player } from "../core/types/player";
-export declare const castAbility: (owner: Player, abilityTypeId: AbilityTypeId, ...args: [x: number, y: number] | [number, x: number, y: number] | [(ability: UnitAbility) => void, x: number, y: number]) => void;
+export declare const castAbility: (owner: Player, abilityTypeId: AbilityTypeId, ...args: [...levelOrAbilityConsumer: [number] | [(ability: UnitAbility) => void] | [], x: number, y: number]) => void;

package/engine/behavior.d.ts

@@ -1,12 +1,12 @@
 /** @noSelfInFile */
 import { AbstractDestroyable, Destructor } from "../destroyable";
-export type BehaviorConstructor<T extends Behavior<any>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
+export type BehaviorConstructor<T extends Behavior<AnyNotNil>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
 declare const enum BehaviorPropertyKey {
     PREVIOUS_BEHAVIOR = 0,
     NEXT_BEHAVIOR = 1,
     TIMER = 2
 }
-export declare abstract class Behavior<T, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
+export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
     protected readonly object: T;
     private [BehaviorPropertyKey.PREVIOUS_BEHAVIOR]?;
     private [BehaviorPropertyKey.NEXT_BEHAVIOR]?;
@@ -16,13 +16,13 @@ export declare abstract class Behavior<T, PeriodicActionParameters extends any[]
     protected onPeriod(...parameters: PeriodicActionParameters): void;
     protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;
     protected stopPeriodicAction(): void;
-    static count<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, limit?: number): number;
-    static getFirst<T extends Behavior<any>, ConstructorParameters extends any[], Count extends [number] | []>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, ...[count]: Count): Count extends [number] ? T[] : T | undefined;
-    static getLast<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
-    static getAll<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T[];
-    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, consumer: (behavior: T, ...parameters: ConsumerParameters) => any, ...parameters: ConsumerParameters): number;
-    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (...args: any) => any ? Parameters<T[K]> : never): number;
-    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
-    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (...args: any) => any ? Parameters<T[K]> : never): number;
+    static count<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, limit?: number): number;
+    static getFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], CountOrPredicate extends [number] | [] | [(behavior: T, ...args: PredicateArgs) => boolean, ...PredicateArgs], PredicateArgs extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, ...[countOrPredicate]: CountOrPredicate): CountOrPredicate extends [number] ? T[] : T | undefined;
+    static getLast<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
+    static getAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], PredicateArgs extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, predicate?: (this: void, behavior: T, ...args: PredicateArgs) => boolean, ...predicateArgs: PredicateArgs): T[];
+    static forFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => any, ...parameters: ConsumerParameters): number;
+    static forFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
+    static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
+    static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
 }
 export {};

package/engine/behavior.lua

@@ -83,11 +83,11 @@ function Behavior.count(self, object, limit)
     end
     return behaviorsCount
 end
-function Behavior.getFirst(self, object, count)
+function Behavior.getFirst(self, object, countOrPredicate, ...)
     local behavior = firstBehaviorByObject[object]
-    if count == nil then
+    if type(countOrPredicate) ~= "number" then
         while behavior ~= nil do
-            if __TS__InstanceOf(behavior, self) then
+            if __TS__InstanceOf(behavior, self) and (countOrPredicate == nil or countOrPredicate(behavior, ...)) then
                 return behavior
             end
             behavior = behavior[1]
@@ -96,7 +96,7 @@ function Behavior.getFirst(self, object, count)
     end
     local behaviors = {}
     local behaviorsCount = 0
-    while behavior ~= nil and behaviorsCount < count do
+    while behavior ~= nil and behaviorsCount < countOrPredicate do
         if __TS__InstanceOf(behavior, self) then
             behaviorsCount = behaviorsCount + 1
             behaviors[behaviorsCount] = behavior
@@ -115,12 +115,12 @@ function Behavior.getLast(self, object)
     end
     return nil
 end
-function Behavior.getAll(self, object)
+function Behavior.getAll(self, object, predicate, ...)
     local behaviors = {}
     local behaviorsCount = 0
     local behavior = firstBehaviorByObject[object]
     while behavior ~= nil do
-        if __TS__InstanceOf(behavior, self) then
+        if __TS__InstanceOf(behavior, self) and (predicate == nil or predicate(behavior, ...)) then
             behaviorsCount = behaviorsCount + 1
             behaviors[behaviorsCount] = behavior
         end

package/engine/behaviour/ability/apply-buff.d.ts

@@ -1,11 +1,9 @@
 /** @noSelfInFile */
 import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
-import { Buff, BuffConstructor, BuffParameters, BuffTypeIdSelectionPolicy } from "../../buff";
+import { Buff, BuffConstructor, BuffParameters, BuffPolarityParameterType, BuffResistanceTypeParameterType, BuffTypeIdSelectionPolicy } from "../../buff";
 import { Unit } from "../../internal/unit";
 import { ApplicableBuffTypeId } from "../../object-data/entry/buff-type/applicable";
-import { BuffResistanceType } from "../../object-data/auxiliary/buff-resistance-type";
-import { BuffPolarity } from "../../object-data/auxiliary/buff-polarity";
 import { Widget } from "../../../core/types/widget";
 type BuffParametersType<T extends BuffConstructor> = BuffParameters & Omit<BuffAdditionalParametersType<T>, keyof BuffParameters>;
 type BuffAdditionalParametersType<T extends BuffConstructor> = T extends BuffConstructor<Buff<infer AdditionalParameters>> ? AdditionalParameters : never;
@@ -17,8 +15,8 @@ export declare abstract class ApplyBuffAbilityBehavior<T extends BuffConstructor
             typeIds: [ApplicableBuffTypeId, ...ApplicableBuffTypeId[]],
             typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
         ],
-        polarity: BuffPolarity,
-        resistanceType: BuffResistanceType,
+        polarity: BuffPolarityParameterType,
+        resistanceType: BuffResistanceTypeParameterType,
         parameters?: BuffParametersType<T>
     ]);
 }

package/engine/behaviour/ability/apply-unit-behavior.d.ts

@@ -3,14 +3,19 @@ import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
 import { UnitBehavior } from "../unit";
 import { Unit } from "../../internal/unit";
+import { MutableKeys } from "../../../utility/types";
 import { AbilityDependentValue } from "../../object-field/ability";
+type UnitBehaviorParameters<T extends UnitBehavior> = Partial<{
+    [K in MutableKeys<T> & KeysOfType<T, boolean | number | string>]: T[K] extends boolean | number | string ? AbilityDependentValue<T[K]> : never;
+}>;
 export declare class ApplyUnitBehaviorAbilityBehavior<T extends UnitBehavior> extends AbilityBehavior {
     private readonly unitBehaviorConstructor;
     private readonly parameters?;
     private readonly keys?;
     private unitBehavior?;
-    constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: Partial<{ [K in keyof T & { [P in keyof T]-?: (<T_1>() => T_1 extends { [Q in P]: T[P]; } ? 1 : 2) extends <T_2>() => T_2 extends { -readonly [Q_1 in P]: T[P]; } ? 1 : 2 ? P : never; }[keyof T] & KeysOfType<T, string | number | boolean>]: T[K] extends string | number | boolean ? AbilityDependentValue<T[K]> : never; }> | undefined);
+    constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: UnitBehaviorParameters<T> | undefined);
     update(): void;
     onUnitGainAbility(unit: Unit): void;
     onUnitLoseAbility(): void;
 }
+export {};

package/engine/behaviour/ability/damage.d.ts

@@ -4,22 +4,44 @@ import { Ability } from "../../internal/ability";
 import { Unit } from "../../internal/unit";
 import { AbilityDependentValue } from "../../object-field/ability";
 import { Widget } from "../../../core/types/widget";
-export declare class DamageSelfAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>);
+import { AttackType, DamageType, WeaponType } from "../../internal/unit+damage";
+export type DamageAbilityBehaviorParameters = {
+    damagePerStrength?: AbilityDependentValue<number>;
+    damagePerAgility?: AbilityDependentValue<number>;
+    damagePerIntelligence?: AbilityDependentValue<number>;
+    attackType?: AttackType;
+    damageType?: DamageType;
+    weaponType?: WeaponType;
+};
+export type DamageAreaAbilityBehaviorParameters = DamageAbilityBehaviorParameters & {
+    maximumDamage?: AbilityDependentValue<number>;
+};
+declare abstract class DamageAbilityBehavior<T extends DamageAbilityBehaviorParameters = DamageAbilityBehaviorParameters> extends AbilityBehavior {
+    protected readonly damage: AbilityDependentValue<number>;
+    protected readonly parameters?: T | undefined;
+    protected constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: T | undefined);
+    protected calculateDamage(caster: Unit): number;
+}
+export declare class DamageSelfAbilityBehavior extends DamageAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAbilityBehaviorParameters);
     onImpact(caster: Unit): void;
 }
-export declare class DamageTargetAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>);
+export declare class DamageTargetAbilityBehavior extends DamageAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAbilityBehaviorParameters);
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
 }
-export declare class DamageTargetAreaAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    private readonly maximumDamage?;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number> | undefined);
+declare abstract class DamageAreaAbilityBehavior extends DamageAbilityBehavior<DamageAreaAbilityBehaviorParameters> {
+    protected constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
+    protected damageArea(caster: Unit, x: number, y: number): void;
+}
+export declare class DamageSelfAreaAbilityBehavior extends DamageAreaAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
+    onImpact(caster: Unit): void;
+}
+export declare class DamageTargetAreaAbilityBehavior extends DamageAreaAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
     onNoTargetImpact(caster: Unit): void;
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
     onPointTargetImpact(caster: Unit, x: number, y: number): void;
-    private damageArea;
 }
+export {};