warscript 0.0.1-dev.ee2345e → 0.0.1-dev.f0a9ffe

package/engine/text-tag.d.ts

@@ -1,5 +1,7 @@
 /** @noSelfInFile */
 import { Color } from "../core/types/color";
+import { Unit } from "./internal/unit";
+import { AbstractDestroyable, Destructor } from "../destroyable";
 export type TextTagPreset = {
     fadepoint: number;
     lifespan: number;
@@ -10,9 +12,39 @@ export type TextTagPreset = {
     velocityY: number;
     color: Color;
 };
-export declare class TextTag {
-    private readonly handle;
+declare const enum TextTagPropertyKey {
+    UNIT = 100,
+    HANDLE = 101,
+    CONFIGURATION = 102,
+    TEXT = 103,
+    FONT_SIZE = 104,
+    COLOR = 105,
+    X = 106,
+    Y = 107
+}
+export declare class TextTag extends AbstractDestroyable {
+    private readonly [TextTagPropertyKey.HANDLE];
+    private [TextTagPropertyKey.CONFIGURATION]?;
+    private [TextTagPropertyKey.TEXT]?;
+    private [TextTagPropertyKey.FONT_SIZE]?;
+    private [TextTagPropertyKey.COLOR]?;
+    private [TextTagPropertyKey.UNIT]?;
+    private [TextTagPropertyKey.X]?;
+    private [TextTagPropertyKey.Y]?;
     private constructor();
+    protected onDestroy(): Destructor;
+    get text(): string;
+    set text(text: string);
+    get fontSize(): number;
+    set fontSize(fontSize: number);
+    get color(): Color;
+    set color(color: Color);
+    get unit(): Unit | undefined;
+    set unit(unit: Unit | undefined);
+    get x(): number;
+    set x(x: number);
+    get y(): number;
+    set y(y: number);
     static BASE: Readonly<TextTagPreset>;
     static BASH: Readonly<TextTagPreset>;
     static CRITICAL_STRIKE: Readonly<TextTagPreset>;
@@ -22,4 +54,6 @@ export declare class TextTag {
     static MISS: Readonly<TextTagPreset>;
     static SHADOW_STRIKE: Readonly<TextTagPreset>;
     static flash(configuration: Readonly<TextTagPreset>, text: string, x: number, y: number, z?: number): void;
+    static create(configuration: Readonly<TextTagPreset>, text: string, unit: Unit): TextTag;
 }
+export {};

package/engine/text-tag.lua

@@ -1,9 +1,16 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectAssign = ____lualib.__TS__ObjectAssign
 local ____exports = {}
 local ____color = require("core.types.color")
 local Color = ____color.Color
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local createTextTag = CreateTextTag
 local destroyTextTag = DestroyTextTag
 local setTextTagText = SetTextTagText
@@ -18,16 +25,7 @@ local setTextTagAge = SetTextTagAge
 local setTextTagLifespan = SetTextTagLifespan
 local setTextTagFadepoint = SetTextTagFadepoint
 local DEFAULT_FONT_SIZE = 0.024
-____exports.TextTag = __TS__Class()
-local TextTag = ____exports.TextTag
-TextTag.name = "TextTag"
-function TextTag.prototype.____constructor(self, handle)
-    self.handle = handle
-end
-function TextTag.flash(self, configuration, text, x, y, z)
-    local textTag = createTextTag()
-    setTextTagText(textTag, text, DEFAULT_FONT_SIZE)
-    setTextTagPos(textTag, x + configuration.offsetX, y + configuration.offsetY, (z or 0) + configuration.offsetZ)
+local function applyConfiguration(textTag, configuration)
     setTextTagFadepoint(textTag, configuration.fadepoint)
     setTextTagLifespan(textTag, configuration.lifespan)
     local color = configuration.color
@@ -42,6 +40,168 @@ function TextTag.flash(self, configuration, text, x, y, z)
     setTextTagPermanent(textTag, false)
     setTextTagVisibility(textTag, true)
 end
+local unitTextTags = setmetatable({}, {__mode = "k"})
+____exports.TextTag = __TS__Class()
+local TextTag = ____exports.TextTag
+TextTag.name = "TextTag"
+__TS__ClassExtends(TextTag, AbstractDestroyable)
+function TextTag.prototype.____constructor(self, handle)
+    AbstractDestroyable.prototype.____constructor(self)
+    self[101] = handle
+end
+function TextTag.prototype.onDestroy(self)
+    destroyTextTag(self[101])
+    unitTextTags[self] = nil
+    return AbstractDestroyable.prototype.onDestroy(self)
+end
+function TextTag.flash(self, configuration, text, x, y, z)
+    local textTag = createTextTag()
+    setTextTagText(textTag, text, DEFAULT_FONT_SIZE)
+    setTextTagPos(textTag, x + configuration.offsetX, y + configuration.offsetY, (z or 0) + configuration.offsetZ)
+    applyConfiguration(textTag, configuration)
+end
+function TextTag.create(self, configuration, text, unit)
+    local handle = createTextTag()
+    setTextTagText(handle, text, DEFAULT_FONT_SIZE)
+    setTextTagPosUnit(handle, unit.handle, configuration.offsetZ)
+    applyConfiguration(handle, configuration)
+    setTextTagPermanent(handle, true)
+    local textTag = __TS__New(____exports.TextTag, handle)
+    textTag[100] = unit
+    textTag[102] = configuration
+    unitTextTags[textTag] = true
+    return textTag
+end
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "text",
+    {
+        get = function(self)
+            return self[103] or ""
+        end,
+        set = function(self, text)
+            setTextTagText(self[101], text, self[104] or DEFAULT_FONT_SIZE)
+            self[103] = text
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "fontSize",
+    {
+        get = function(self)
+            return self[104] or DEFAULT_FONT_SIZE
+        end,
+        set = function(self, fontSize)
+            setTextTagText(self[101], self[103] or "", DEFAULT_FONT_SIZE)
+            self[104] = fontSize
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "color",
+    {
+        get = function(self)
+            return self[105] or Color.white
+        end,
+        set = function(self, color)
+            setTextTagColor(
+                self[101],
+                color.r,
+                color.g,
+                color.b,
+                color.a
+            )
+            self[105] = color
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "unit",
+    {
+        get = function(self)
+            return self[100]
+        end,
+        set = function(self, unit)
+            if unit ~= nil then
+                setTextTagPosUnit(self[101], unit.handle, 0)
+                self[106] = nil
+                self[107] = nil
+                unitTextTags[self] = true
+            elseif self[100] ~= nil then
+                local unit = self[100]
+                local x = unit.x
+                local y = unit.y
+                setTextTagPos(self[101], x, y, 0)
+                self[106] = x
+                self[107] = y
+                unitTextTags[self] = nil
+            end
+            self[100] = unit
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "x",
+    {
+        get = function(self)
+            local ____self__106_2 = self[106]
+            if ____self__106_2 == nil then
+                local ____opt_0 = self[100]
+                ____self__106_2 = ____opt_0 and ____opt_0.x
+            end
+            return ____self__106_2 or 0
+        end,
+        set = function(self, x)
+            local ____self__101_6 = self[101]
+            local ____x_7 = x
+            local ____self__107_5 = self[107]
+            if ____self__107_5 == nil then
+                local ____opt_3 = self[100]
+                ____self__107_5 = ____opt_3 and ____opt_3.y
+            end
+            setTextTagPos(____self__101_6, ____x_7, ____self__107_5 or 0, 0)
+            self[106] = x
+            self[100] = nil
+            unitTextTags[self] = nil
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "y",
+    {
+        get = function(self)
+            local ____self__107_10 = self[107]
+            if ____self__107_10 == nil then
+                local ____opt_8 = self[100]
+                ____self__107_10 = ____opt_8 and ____opt_8.y
+            end
+            return ____self__107_10 or 0
+        end,
+        set = function(self, y)
+            local ____self__101_14 = self[101]
+            local ____self__106_13 = self[106]
+            if ____self__106_13 == nil then
+                local ____opt_11 = self[100]
+                ____self__106_13 = ____opt_11 and ____opt_11.x
+            end
+            setTextTagPos(____self__101_14, ____self__106_13 or 0, y, 0)
+            self[107] = y
+            self[100] = nil
+            unitTextTags[self] = nil
+        end
+    },
+    true
+)
 TextTag.BASE = {
     fadepoint = 2,
     lifespan = 3,
@@ -106,4 +266,9 @@ TextTag.SHADOW_STRIKE = __TS__ObjectAssign(
         lifespan = 5
     }
 )
+Timer.onPeriod[1 / 64]:addListener(function()
+    for textTag in pairs(unitTextTags) do
+        setTextTagPosUnit(textTag[101], textTag[100].handle, textTag[102].offsetZ)
+    end
+end)
 return ____exports

package/engine/unit.d.ts

@@ -1,9 +1,11 @@
 /** @noSelfInFile */
 import "./internal/unit";
+import "./internal/unit/order";
 import "./internal/unit/ability";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";
 import "./internal/unit/expiration-timer";
+import "./internal/unit/item";
 import "./internal/unit+ability";
 import "./internal/unit+damage";
 import "./internal/unit+rally";
@@ -15,6 +17,8 @@ import "./internal/unit-missile-launch";
 import "./internal/unit/ghost-counter";
 import "./internal/unit/invulnerability-counter";
 import "./internal/unit/detach-missiles";
+import "./internal/unit/main-selected";
+import "./internal/unit/add-item-to-slot-init";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -1,9 +1,11 @@
 local ____exports = {}
 require("engine.internal.unit")
+require("engine.internal.unit.order")
 require("engine.internal.unit.ability")
 require("engine.internal.unit.allowed-targets")
 require("engine.internal.unit.buff")
 require("engine.internal.unit.expiration-timer")
+require("engine.internal.unit.item")
 require("engine.internal.unit+ability")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")
@@ -15,11 +17,12 @@ require("engine.internal.unit-missile-launch")
 require("engine.internal.unit.ghost-counter")
 require("engine.internal.unit.invulnerability-counter")
 require("engine.internal.unit.detach-missiles")
+require("engine.internal.unit.main-selected")
+require("engine.internal.unit.add-item-to-slot-init")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")
-    local Unit = ____unit.Unit
-    ____exports.Unit = Unit
+    ____exports.Unit = ____unit.Unit
 end
 do
     local ____export = require("engine.internal.unit+damage")
@@ -29,4 +32,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/event.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
-export type EventListener<T extends any[]> = (...args: T) => void;
+export type EventListener<T extends any[]> = (this: void, ...args: T) => void;
 export declare const enum EventListenerPriority {
     LOWEST = 0,
     LOW = 1,
@@ -38,7 +37,7 @@ export type EventDispatchTable<EventType extends Event<any>, KeyType extends num
 };
 export type DispatchingEvent<P extends any[], T extends Event<P> = Event<P>, S extends Event<P> = Event<P>> = T & EventDispatchTable<S>;
 export declare const createDispatchingEvent: {
-    <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (...args: EventParameters<T>) => number, ...createEvent: [...(Event<any> extends S ? [(() => S)?] : [() => S])]): DispatchingEvent<EventParameters<T>, T>;
+    <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (this: void, ...args: EventParameters<T>) => number, invokeEvent?: (this: void, event: S, ...args: EventParameters<T>) => unknown, ...createEvent: [...(Event<any> extends S ? [((this: void) => S)?] : [(this: void) => S])]): DispatchingEvent<EventParameters<T>, T, S>;
 };
 export declare class DependentInitializingEvent<T extends any[], R extends any[]> extends InitializingEvent<R, EventListener<T>> {
     constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false] | [true, ...R]>);

package/event.lua

@@ -146,8 +146,13 @@ function TriggerEvent.prototype.____constructor(self, r, c)
         end
     )
 end
-____exports.createDispatchingEvent = function(underlyingEvent, extractKey, createEvent)
-    local actualCreateEvent = createEvent or (function() return __TS__New(____exports.Event) end)
+____exports.createDispatchingEvent = function(underlyingEvent, extractKey, invokeEvent, createEvent)
+    if invokeEvent == nil then
+        invokeEvent = ____exports.Event.invoke
+    end
+    if createEvent == nil then
+        createEvent = function() return __TS__New(____exports.Event) end
+    end
     local initialized = false
     return setmetatable(
         {},
@@ -157,17 +162,16 @@ ____exports.createDispatchingEvent = function(underlyingEvent, extractKey, creat
                     return underlyingEvent[id]
                 end
                 if not initialized then
-                    local invoke = ____exports.Event.invoke
                     underlyingEvent:addListener(function(...)
                         local key = extractKey(...)
                         local event = rawget(self, key)
                         if event then
-                            invoke(event, ...)
+                            invokeEvent(event, ...)
                         end
                     end)
                     initialized = true
                 end
-                local event = actualCreateEvent()
+                local event = createEvent()
                 rawset(self, id, event)
                 return event
             end,

package/index.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import "./types";
+import "./patch-lua";
 import "./patch-lualib";
 import "./patch-natives";
 import "./global/math";

package/index.lua

@@ -1,5 +1,6 @@
 local ____exports = {}
 require("types")
+require("patch-lua")
 require("patch-lualib")
 require("patch-natives")
 require("global.math")