warscript 0.0.1-dev.f0a9ffe → 0.0.1-dev.f0daa48

package/engine/standard/fields/unit.lua

@@ -1,7 +1,20 @@
 local ____exports = {}
 local ____unit = require("engine.object-field.unit")
 local UnitClassificationsField = ____unit.UnitClassificationsField
+local UnitFloatField = ____unit.UnitFloatField
+local UnitFlyHeightField = ____unit.UnitFlyHeightField
+local UnitHealthRegenerationTypeField = ____unit.UnitHealthRegenerationTypeField
+local UnitIntegerField = ____unit.UnitIntegerField
 local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
-____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
-____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
+local UnitScalingValueField = ____unit.UnitScalingValueField
+____exports.PROPULSION_WINDOW_UNIT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
+____exports.CLASSIFICATIONS_UNIT_FIELD = UnitClassificationsField:create(fourCC("utyp"))
+____exports.FLY_HEIGHT_UNIT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
+____exports.SCALING_VALUE_UNIT_FIELD = UnitScalingValueField:create(fourCC("usca"))
+____exports.HEALTH_REGENERATION_RATE_UNIT_FIELD = UnitFloatField:create(fourCC("uhpr"))
+____exports.MANA_REGENERATION_RATE_UNIT_FIELD = UnitFloatField:create(fourCC("umpr"))
+____exports.HEALTH_REGENERATION_TYPE_UNIT_FIELD = UnitHealthRegenerationTypeField:create(fourCC("uhrt"))
+____exports.STRENGTH_UNIT_FIELD = UnitIntegerField:create(fourCC("ustc"))
+____exports.AGILITY_UNIT_FIELD = UnitIntegerField:create(fourCC("uagc"))
+____exports.INTELLIGENCE_UNIT_FIELD = UnitIntegerField:create(fourCC("uinc"))
 return ____exports

package/engine/synchronization.d.ts

@@ -0,0 +1,11 @@
+/** @noSelfInFile */
+import { Player } from "../core/types/player";
+import { Event } from "../event";
+export declare const synchronizer: <T, K extends number>(getSyncId: (object: T) => K, getObject: (syncId: K) => T | undefined) => ((player: Player, object: T | undefined) => Promise<T | undefined>);
+export declare class ObjectBus<T, K extends number> {
+    private readonly getSyncId;
+    readonly event: Event<[Player, T | undefined]>;
+    private readonly syncSlider;
+    constructor(getSyncId: (object: T) => K, getObject: (syncId: K) => T | undefined);
+    send(object: T | undefined): void;
+}

package/engine/synchronization.lua

@@ -0,0 +1,77 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
+local __TS__Promise = ____lualib.__TS__Promise
+local __TS__Class = ____lualib.__TS__Class
+local ____exports = {}
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____math = require("math")
+local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
+local MINIMUM_INTEGER = ____math.MINIMUM_INTEGER
+local ____linked_2Dset = require("utility.linked-set")
+local LinkedSet = ____linked_2Dset.LinkedSet
+local ____event = require("event")
+local Event = ____event.Event
+local eventInvoke = Event.invoke
+local createFrameByType = BlzCreateFrameByType
+local createTrigger = CreateTrigger
+local getOriginFrame = BlzGetOriginFrame
+local getTriggerFrameValue = BlzGetTriggerFrameValue
+local getTriggerPlayer = GetTriggerPlayer
+local frameSetMinMaxValue = BlzFrameSetMinMaxValue
+local frameSetValue = BlzFrameSetValue
+local triggerAddAction = TriggerAddAction
+local triggerRegisterFrameEvent = BlzTriggerRegisterFrameEvent
+____exports.synchronizer = function(getSyncId, getObject)
+    local queue = __TS__New(LinkedSet)
+    local socket = __TS__New(____exports.ObjectBus, getSyncId, getObject)
+    socket.event:addListener(function(_, object)
+        local ____opt_0 = queue:pop()
+        if ____opt_0 ~= nil then
+            ____opt_0(object)
+        end
+    end)
+    local function executor(____, resolve)
+        queue:add(resolve)
+    end
+    return function(player, object)
+        if player.isLocal then
+            socket:send(object)
+        end
+        return __TS__New(__TS__Promise, executor)
+    end
+end
+____exports.ObjectBus = __TS__Class()
+local ObjectBus = ____exports.ObjectBus
+ObjectBus.name = "ObjectBus"
+function ObjectBus.prototype.____constructor(self, getSyncId, getObject)
+    self.getSyncId = getSyncId
+    local syncSlider = createFrameByType(
+        "SLIDER",
+        "Synchronizer",
+        getOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0),
+        "",
+        0
+    )
+    frameSetMinMaxValue(syncSlider, MINIMUM_INTEGER, MAXIMUM_INTEGER)
+    self.syncSlider = syncSlider
+    local event = __TS__New(Event)
+    local trigger = createTrigger()
+    triggerRegisterFrameEvent(trigger, syncSlider, FRAMEEVENT_SLIDER_VALUE_CHANGED)
+    triggerAddAction(
+        trigger,
+        function()
+            eventInvoke(
+                event,
+                Player:of(getTriggerPlayer()),
+                getObject(getTriggerFrameValue())
+            )
+        end
+    )
+    self.event = event
+end
+function ObjectBus.prototype.send(self, object)
+    local syncId = object ~= nil and self.getSyncId(object) or 0
+    frameSetValue(self.syncSlider, syncId)
+end
+return ____exports

package/engine/text-tag.d.ts

@@ -23,7 +23,7 @@ declare const enum TextTagPropertyKey {
     Y = 107
 }
 export declare class TextTag extends AbstractDestroyable {
-    private readonly [TextTagPropertyKey.HANDLE];
+    private [TextTagPropertyKey.HANDLE]?;
     private [TextTagPropertyKey.CONFIGURATION]?;
     private [TextTagPropertyKey.TEXT]?;
     private [TextTagPropertyKey.FONT_SIZE]?;

package/engine/text-tag.lua

@@ -11,6 +11,12 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____destroyable = require("destroyable")
 local AbstractDestroyable = ____destroyable.AbstractDestroyable
+local ____playerCamera = require("core.types.playerCamera")
+local worldCoordinatesToFrame = ____playerCamera.worldCoordinatesToFrame
+local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
+local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
 local createTextTag = CreateTextTag
 local destroyTextTag = DestroyTextTag
 local setTextTagText = SetTextTagText
@@ -24,6 +30,13 @@ local setTextTagPermanent = SetTextTagPermanent
 local setTextTagAge = SetTextTagAge
 local setTextTagLifespan = SetTextTagLifespan
 local setTextTagFadepoint = SetTextTagFadepoint
+local isUnitHidden = IsUnitHidden
+local isUnitLoaded = IsUnitLoaded
+local isUnitVisible = IsUnitVisible
+local getUnitFlyHeight = GetUnitFlyHeight
+local getUnitX = GetUnitX
+local getUnitY = GetUnitY
+local unitAlive = UnitAlive
 local DEFAULT_FONT_SIZE = 0.024
 local function applyConfiguration(textTag, configuration)
     setTextTagFadepoint(textTag, configuration.fadepoint)
@@ -41,6 +54,33 @@ local function applyConfiguration(textTag, configuration)
     setTextTagVisibility(textTag, true)
 end
 local unitTextTags = setmetatable({}, {__mode = "k"})
+local function ensureHandle(textTag)
+    local handle = textTag[101]
+    if handle == nil then
+        handle = createTextTag()
+        applyConfiguration(handle, textTag[102])
+        setTextTagPermanent(handle, true)
+        setTextTagText(handle, textTag[103] or "", textTag[104] or DEFAULT_FONT_SIZE)
+        local color = textTag[105]
+        if color ~= nil then
+            setTextTagColor(
+                handle,
+                color.r,
+                color.g,
+                color.b,
+                color.a
+            )
+        end
+        local unit = textTag[100]
+        if unit ~= nil then
+            setTextTagPosUnit(handle, unit.handle, textTag[102].offsetZ)
+        else
+            setTextTagPos(handle, textTag[106] or 0, textTag[107] or 0, 0)
+        end
+        textTag[101] = handle
+    end
+    return handle
+end
 ____exports.TextTag = __TS__Class()
 local TextTag = ____exports.TextTag
 TextTag.name = "TextTag"
@@ -50,7 +90,11 @@ function TextTag.prototype.____constructor(self, handle)
     self[101] = handle
 end
 function TextTag.prototype.onDestroy(self)
-    destroyTextTag(self[101])
+    local handle = self[101]
+    if handle ~= nil then
+        destroyTextTag(handle)
+        self[101] = nil
+    end
     unitTextTags[self] = nil
     return AbstractDestroyable.prototype.onDestroy(self)
 end
@@ -61,14 +105,11 @@ function TextTag.flash(self, configuration, text, x, y, z)
     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)
+    local textTag = __TS__New(____exports.TextTag)
+    textTag[103] = text
     textTag[100] = unit
     textTag[102] = configuration
+    ensureHandle(textTag)
     unitTextTags[textTag] = true
     return textTag
 end
@@ -80,7 +121,11 @@ __TS__SetDescriptor(
             return self[103] or ""
         end,
         set = function(self, text)
-            setTextTagText(self[101], text, self[104] or DEFAULT_FONT_SIZE)
+            setTextTagText(
+                ensureHandle(self),
+                text,
+                self[104] or DEFAULT_FONT_SIZE
+            )
             self[103] = text
         end
     },
@@ -94,7 +139,11 @@ __TS__SetDescriptor(
             return self[104] or DEFAULT_FONT_SIZE
         end,
         set = function(self, fontSize)
-            setTextTagText(self[101], self[103] or "", DEFAULT_FONT_SIZE)
+            setTextTagText(
+                ensureHandle(self),
+                self[103] or "",
+                fontSize
+            )
             self[104] = fontSize
         end
     },
@@ -109,7 +158,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, color)
             setTextTagColor(
-                self[101],
+                ensureHandle(self),
                 color.r,
                 color.g,
                 color.b,
@@ -129,7 +178,11 @@ __TS__SetDescriptor(
         end,
         set = function(self, unit)
             if unit ~= nil then
-                setTextTagPosUnit(self[101], unit.handle, 0)
+                setTextTagPosUnit(
+                    ensureHandle(self),
+                    unit.handle,
+                    0
+                )
                 self[106] = nil
                 self[107] = nil
                 unitTextTags[self] = true
@@ -137,7 +190,12 @@ __TS__SetDescriptor(
                 local unit = self[100]
                 local x = unit.x
                 local y = unit.y
-                setTextTagPos(self[101], x, y, 0)
+                setTextTagPos(
+                    ensureHandle(self),
+                    x,
+                    y,
+                    0
+                )
                 self[106] = x
                 self[107] = y
                 unitTextTags[self] = nil
@@ -160,14 +218,14 @@ __TS__SetDescriptor(
             return ____self__106_2 or 0
         end,
         set = function(self, x)
-            local ____self__101_6 = self[101]
+            local ____ensureHandle_result_6 = ensureHandle(self)
             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)
+            setTextTagPos(____ensureHandle_result_6, ____x_7, ____self__107_5 or 0, 0)
             self[106] = x
             self[100] = nil
             unitTextTags[self] = nil
@@ -188,13 +246,13 @@ __TS__SetDescriptor(
             return ____self__107_10 or 0
         end,
         set = function(self, y)
-            local ____self__101_14 = self[101]
+            local ____ensureHandle_result_14 = ensureHandle(self)
             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)
+            setTextTagPos(____ensureHandle_result_14, ____self__106_13 or 0, y, 0)
             self[107] = y
             self[100] = nil
             unitTextTags[self] = nil
@@ -268,7 +326,24 @@ TextTag.SHADOW_STRIKE = __TS__ObjectAssign(
 )
 Timer.onPeriod[1 / 64]:addListener(function()
     for textTag in pairs(unitTextTags) do
-        setTextTagPosUnit(textTag[101], textTag[100].handle, textTag[102].offsetZ)
+        local unit = textTag[100].handle
+        local x = getUnitX(unit)
+        local y = getUnitY(unit)
+        local ____, ____, isInView = worldCoordinatesToFrame(
+            x,
+            y,
+            getUnitFlyHeight(unit) + getTerrainZ(x, y)
+        )
+        if isInView and not isUnitHidden(unit) and not isUnitLoaded(unit) and isUnitVisible(unit, PLAYER_LOCAL_HANDLE) and unitAlive(unit) then
+            setTextTagPosUnit(
+                ensureHandle(textTag),
+                unit,
+                textTag[102].offsetZ
+            )
+        elseif textTag[101] ~= nil then
+            destroyTextTag(textTag[101])
+            textTag[101] = nil
+        end
     end
 end)
 return ____exports

package/engine/unit.d.ts

@@ -19,6 +19,11 @@ 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/attributes";
+import "./internal/unit/fly-height";
+import "./internal/unit/scale";
+import "./internal/unit/interrupts";
+import "./internal/unit/range-event";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -19,6 +19,11 @@ 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.attributes")
+require("engine.internal.unit.fly-height")
+require("engine.internal.unit.scale")
+require("engine.internal.unit.interrupts")
+require("engine.internal.unit.range-event")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/lualib_bundle.lua

@@ -653,7 +653,6 @@ do
         self.state = 0
         self.fulfilledCallbacks = {}
         self.rejectedCallbacks = {}
-        self.finallyCallbacks = {}
         local success, ____error = ____pcall(
             executor,
             nil,
@@ -703,14 +702,40 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
-        if onFinally then
-            local ____self_finallyCallbacks_2 = self.finallyCallbacks
-            ____self_finallyCallbacks_2[#____self_finallyCallbacks_2 + 1] = onFinally
-            if self.state ~= 0 then
-                onFinally(nil)
-            end
+        if type(onFinally) ~= "function" then
+            return self["then"](self, onFinally, onFinally)
         end
-        return self
+        return self["then"](
+            self,
+            function(____, x)
+                local ____self_2 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_2["then"](
+                    ____self_2,
+                    function() return x end
+                )
+            end,
+            function(____, e)
+                local ____self_3 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_3["then"](
+                    ____self_3,
+                    function()
+                        error(e, 0)
+                    end
+                )
+            end
+        )
     end
     function __TS__Promise.prototype.resolve(self, value)
         if isPromiseLike(value) then
@@ -734,22 +759,11 @@ do
     end
     function __TS__Promise.prototype.invokeCallbacks(self, callbacks, value)
         local callbacksLength = #callbacks
-        local finallyCallbacks = self.finallyCallbacks
-        local finallyCallbacksLength = #finallyCallbacks
         if callbacksLength ~= 0 then
             for i = 1, callbacksLength - 1 do
                 callbacks[i](callbacks, value)
             end
-            if finallyCallbacksLength == 0 then
-                return callbacks[callbacksLength](callbacks, value)
-            end
-            callbacks[callbacksLength](callbacks, value)
-        end
-        if finallyCallbacksLength ~= 0 then
-            for i = 1, finallyCallbacksLength - 1 do
-                finallyCallbacks[i](finallyCallbacks)
-            end
-            return finallyCallbacks[finallyCallbacksLength](finallyCallbacks)
+            return callbacks[callbacksLength](callbacks, value)
         end
     end
     function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)
@@ -904,8 +918,10 @@ local function __TS__ObjectAssign(target, ...)
     local sources = {...}
     for i = 1, #sources do
         local source = sources[i]
-        for key in pairs(source) do
-            target[key] = source[key]
+        if type(source) == "table" then
+            for key in pairs(source) do
+                target[key] = source[key]
+            end
         end
     end
     return target
@@ -1011,6 +1027,13 @@ do
             metatable = {}
             setmetatable(target, metatable)
         end
+        if not isPrototype and not rawget(metatable, "_isOwnDescriptorMetatable") then
+            local instanceMetatable = {}
+            instanceMetatable._isOwnDescriptorMetatable = true
+            setmetatable(instanceMetatable, metatable)
+            setmetatable(target, instanceMetatable)
+            metatable = instanceMetatable
+        end
         local value = rawget(target, key)
         if value ~= nil then
             rawset(target, key, nil)
@@ -1383,46 +1406,70 @@ do
         return self:entries()
     end
     function Map.prototype.entries(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local items = self.items
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = {key, items[key]}}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = {key, items[key]}}
             end
         }
     end
     function Map.prototype.keys(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
     function Map.prototype.values(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local items = self.items
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = items[key]}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = items[key]}
             end
         }
     end
@@ -1999,44 +2046,68 @@ do
         return self:values()
     end
     function Set.prototype.entries(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = {key, key}}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = {key, key}}
             end
         }
     end
     function Set.prototype.keys(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
     function Set.prototype.values(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
@@ -2241,7 +2312,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             end
             local result = string.gsub(
                 trace,
-                "(%S+)%.lua:(%d+)",
+                "([^%s<]+)%.lua:(%d+)",
                 function(file, line) return replacer(nil, file .. ".lua", file .. ".ts", line) end
             )
             local function stringReplacer(____, file, line)

package/net/socket.lua

@@ -28,13 +28,13 @@ function Socket.prototype.____constructor(self)
     onReceive[self[0]]:addListener(function(sender, data)
         local chunks = chunksByPlayer[sender]
         if chunks ~= nil then
+            chunksByPlayer[sender] = nil
             chunks[#chunks + 1] = data
             Event.invoke(
                 self.onMessage,
                 sender,
                 tableConcat(chunks)
             )
-            chunksByPlayer[sender] = nil
         else
             Event.invoke(self.onMessage, sender, data)
         end