warscript 0.0.1-dev.b530e1f → 0.0.1-dev.b9f7033

package/attributes.d.ts

@@ -0,0 +1,17 @@
+/** @noSelfInFile */
+declare const marker: {};
+export type Attribute<T> = {
+    readonly __attribute: unique symbol;
+    readonly __type: T;
+    readonly __marker: typeof marker;
+} & symbol;
+export declare const attribute: <T>() => Attribute<T>;
+export declare const isAttribute: (value: unknown) => value is Attribute<unknown>;
+export declare namespace Attribute {
+    const create: <T>() => Attribute<T>;
+}
+export declare class AttributesHolder {
+    readonly get: (<T>(attribute: Attribute<T>) => T | undefined) & LuaExtension<"TableGetMethod">;
+    readonly set: (<T>(attribute: Attribute<T>, value: T | undefined) => void) & LuaExtension<"TableSetMethod">;
+}
+export {};

package/attributes.lua

@@ -0,0 +1,23 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local ____exports = {}
+local marker = {}
+____exports.attribute = function()
+    return {__marker = marker}
+end
+____exports.isAttribute = function(value)
+    return type(value) == "table" and rawget(value, "__marker") == marker
+end
+____exports.Attribute = {}
+local Attribute = ____exports.Attribute
+do
+    Attribute.create = function()
+        return {__marker = marker}
+    end
+end
+____exports.AttributesHolder = __TS__Class()
+local AttributesHolder = ____exports.AttributesHolder
+AttributesHolder.name = "AttributesHolder"
+function AttributesHolder.prototype.____constructor(self)
+end
+return ____exports

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/binarywriter.lua

@@ -1,6 +1,8 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local ____exports = {}
+local ____preconditions = require("utility.preconditions")
+local requireNotNull = ____preconditions.requireNotNull
 local pack = string.pack
 local concat = table.concat
 local ____unpack = table.unpack
@@ -25,60 +27,70 @@ function BinaryWriter.prototype.write(self, fmt, value)
     self.i = i
 end
 function BinaryWriter.prototype.writeBytes(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "c" .. tostring(#value)
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeDouble(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "d"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeFloat(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "f"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeInt16(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "h"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeInt32(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "i4"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeInt8(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "b"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeString(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "z"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeUInt16(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "H"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeUInt32(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "I4"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeUInt8(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "B"
     self.v[i] = value

package/config.d.ts

@@ -0,0 +1,5 @@
+/** @noSelfInFile */
+export declare class WarscriptConfig {
+    private constructor();
+    static AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH: boolean;
+}

package/config.lua

@@ -0,0 +1,10 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local ____exports = {}
+____exports.WarscriptConfig = __TS__Class()
+local WarscriptConfig = ____exports.WarscriptConfig
+WarscriptConfig.name = "WarscriptConfig"
+function WarscriptConfig.prototype.____constructor(self)
+end
+WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH = true
+return ____exports

package/core/types/effect.d.ts

@@ -4,15 +4,23 @@ import { Widget } from "./widget";
 import { PlayerColor } from "./playerColor";
 declare const enum EffectPropertyKey {
     COLOR = 100,
-    PITCH = 101
+    PITCH = 101,
+    ROLL = 102
 }
 export type EffectParameters = {
+    readonly delay?: number;
     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,12 +28,12 @@ export declare class Effect extends Handle<jeffect> {
     set scale(scale: number);
     get pitch(): number;
     set pitch(pitch: 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;
+    get roll(): number;
+    set roll(roll: number);
+    static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), modelPath: string, xOrWidget: number | Widget, yOrAttachmentPoint?: number | string, parameters?: EffectParameters): 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;
 }
 export {};

package/core/types/effect.lua

@@ -2,8 +2,9 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
-local dummyPlayer
+local dummyPlayer, addSpecialEffectInternal, flash
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____playerColor = require("core.types.playerColor")
@@ -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,11 +118,19 @@ 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}
+local setterProperties = {"scale", "color", "pitch", "roll"}
 dummyPlayer = Player.neutralExtra
 local temporaryEffects = {}
 local temporaryEffectsDurations = {}
 local temporaryEffectsCount = 0
+local delayedEffectsModelPath = {}
+local delayedEffectsXOrWidget = {}
+local delayedEffectsYOrAttachmentPoint = {}
+local delayedEffectsDuration = {}
+local delayedEffectsParameters = {}
+local delayedEffectsDelay = {}
+local delayedEffectsCount = 0
 local period = 1 / 32
 Timer.onPeriod[period]:addListener(function()
     local i = 1
@@ -110,12 +139,36 @@ Timer.onPeriod[period]:addListener(function()
         if duration <= 0 then
             destroyEffect(temporaryEffects[i])
             temporaryEffects[i] = temporaryEffects[temporaryEffectsCount]
+            temporaryEffectsDurations[i] = temporaryEffectsDurations[temporaryEffectsCount]
             temporaryEffectsCount = temporaryEffectsCount - 1
         else
             temporaryEffectsDurations[i] = duration - period
             i = i + 1
         end
     end
+    i = 1
+    while i <= delayedEffectsCount do
+        local delay = delayedEffectsDelay[i]
+        if delay <= 0 then
+            flash(
+                delayedEffectsModelPath[i],
+                delayedEffectsXOrWidget[i],
+                delayedEffectsYOrAttachmentPoint[i],
+                delayedEffectsDuration[i],
+                delayedEffectsParameters[i]
+            )
+            delayedEffectsModelPath[i] = delayedEffectsModelPath[delayedEffectsCount]
+            delayedEffectsXOrWidget[i] = delayedEffectsXOrWidget[delayedEffectsCount]
+            delayedEffectsYOrAttachmentPoint[i] = delayedEffectsYOrAttachmentPoint[delayedEffectsCount]
+            delayedEffectsDuration[i] = delayedEffectsDuration[delayedEffectsCount]
+            delayedEffectsParameters[i] = delayedEffectsParameters[delayedEffectsCount]
+            delayedEffectsDelay[i] = delayedEffectsDelay[delayedEffectsCount]
+            delayedEffectsCount = delayedEffectsCount - 1
+        else
+            delayedEffectsDelay[i] = delay - period
+            i = i + 1
+        end
+    end
 end)
 ____exports.Effect = __TS__Class()
 local Effect = ____exports.Effect
@@ -125,49 +178,44 @@ function Effect.prototype.onDestroy(self)
     destroyEffect(self.handle)
     return Handle.prototype.onDestroy(self)
 end
-function Effect.create(self, model, pos)
-    return self:of(addSpecialEffect(model, pos.x, pos.y))
-end
-function Effect.createTarget(self, model, target, attachPoint)
-    return self:of(addSpecialEffectTarget(model, target.handle, attachPoint))
+function Effect.create(self, modelPath, xOrWidget, yOrAttachmentPoint, parameters)
+    local effect = self:of(addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters))
+    if parameters ~= nil then
+        effect[100] = parameters.color
+        effect[101] = parameters.pitch
+        effect[102] = parameters.roll
+    end
+    return effect
 end
 function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, parametersOrDuration, parameters)
     if type(parametersOrDuration) ~= "number" then
         parameters = parametersOrDuration
         parametersOrDuration = nil
     end
-    local effect = type(xOrWidget) == "number" and addSpecialEffect(modelPath, xOrWidget, yOrOrAttachmentPoint) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint)
-    if parameters ~= nil then
-        for key, value in ____pairs(parameters) do
-            setters[key](effect, value)
-        end
-    end
-    if parametersOrDuration ~= nil and parametersOrDuration > 0 then
-        temporaryEffectsCount = temporaryEffectsCount + 1
-        temporaryEffects[temporaryEffectsCount] = effect
-        temporaryEffectsDurations[temporaryEffectsCount] = parametersOrDuration
+    if parameters and (parameters.delay or 0) > 0 then
+        delayedEffectsCount = delayedEffectsCount + 1
+        delayedEffectsModelPath[delayedEffectsCount] = modelPath
+        delayedEffectsXOrWidget[delayedEffectsCount] = xOrWidget
+        delayedEffectsYOrAttachmentPoint[delayedEffectsCount] = yOrOrAttachmentPoint
+        delayedEffectsDuration[delayedEffectsCount] = parametersOrDuration
+        delayedEffectsParameters[delayedEffectsCount] = parameters
+        delayedEffectsDelay[delayedEffectsCount] = parameters.delay
         return
     end
-    destroyEffect(effect)
-end
-function Effect.flashTarget(self, model, target, attachPoint, duration)
-    local effect = addSpecialEffectTarget(model, target.handle, attachPoint)
-    if effect ~= nil then
-        if duration and duration > 0 then
-            temporaryEffectsCount = temporaryEffectsCount + 1
-            temporaryEffects[temporaryEffectsCount] = effect
-            temporaryEffectsDurations[temporaryEffectsCount] = duration
-        else
-            destroyEffect(effect)
-        end
-    end
+    flash(
+        modelPath,
+        xOrWidget,
+        yOrOrAttachmentPoint,
+        parametersOrDuration,
+        parameters
+    )
 end
 __TS__SetDescriptor(
     Effect.prototype,
     "color",
     {
         get = function(self)
-            return self[100] or PlayerColor.black
+            return self[100] or PlayerColor.red
         end,
         set = function(self, color)
             setSpecialEffectColor(self.handle, color)
@@ -197,13 +245,61 @@ __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
+)
+addSpecialEffectInternal = function(modelPath, xOrWidget, yOrAttachmentPoint, parameters)
+    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 yOrAttachmentPoint or xOrWidget.y)
+    local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrAttachmentPoint or "origin")
+    if parameters ~= nil then
+        if isPositional and parameters.scale == nil and __TS__InstanceOf(xOrWidget, Unit) then
+            setSpecialEffectScale(effect, xOrWidget.scale)
+        end
+        for ____, property in ipairs(setterProperties) do
+            local value = parameters[property]
+            if value ~= nil then
+                setters[property](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)
+            setSpecialEffectZ(
+                effect,
+                z + parameters.zOffset * (parameters.scaleZOffset and getSpecialEffectScale(effect) or 1)
+            )
+        end
+    end
+    return effect
+end
+flash = function(modelPath, xOrWidget, yOrAttachmentPoint, duration, parameters)
+    local effect = addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters)
+    if duration ~= nil and duration > 0 then
+        temporaryEffectsCount = temporaryEffectsCount + 1
+        temporaryEffects[temporaryEffectsCount] = effect
+        temporaryEffectsDurations[temporaryEffectsCount] = duration
+        return
+    end
+    destroyEffect(effect)
+end
 return ____exports

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;