warscript 0.0.1-dev.e196516 → 0.0.1-dev.e49ec00

package/engine/text-tag.lua

@@ -2,6 +2,7 @@ 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")
@@ -46,10 +47,10 @@ TextTag.name = "TextTag"
 __TS__ClassExtends(TextTag, AbstractDestroyable)
 function TextTag.prototype.____constructor(self, handle)
     AbstractDestroyable.prototype.____constructor(self)
-    self.handle = handle
+    self[101] = handle
 end
 function TextTag.prototype.onDestroy(self)
-    destroyTextTag(self.handle)
+    destroyTextTag(self[101])
     unitTextTags[self] = nil
     return AbstractDestroyable.prototype.onDestroy(self)
 end
@@ -66,11 +67,141 @@ function TextTag.create(self, configuration, text, unit)
     applyConfiguration(handle, configuration)
     setTextTagPermanent(handle, true)
     local textTag = __TS__New(____exports.TextTag, handle)
-    textTag[100] = unit.handle
-    textTag[101] = configuration
+    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,
@@ -137,7 +268,7 @@ TextTag.SHADOW_STRIKE = __TS__ObjectAssign(
 )
 Timer.onPeriod[1 / 64]:addListener(function()
     for textTag in pairs(unitTextTags) do
-        setTextTagPosUnit(textTag.handle, textTag[100], textTag[101].offsetZ)
+        setTextTagPosUnit(textTag[101], textTag[100].handle, textTag[102].offsetZ)
     end
 end)
 return ____exports

package/engine/unit.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import "./internal/unit";
+import "./internal/unit/order";
 import "./internal/unit/ability";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";

package/engine/unit.lua

@@ -1,5 +1,6 @@
 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")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.e196516",
+    "version": "0.0.1-dev.e49ec00",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",

package/utility/functions.d.ts

@@ -4,3 +4,6 @@ export declare const apply: {
     <T, ConsumerParameters extends any[], K extends KeysOfType<T, (...parameters: ConsumerParameters) => void>>(object: T, key: K, ...parameters: ConsumerParameters): T;
 };
 export declare const identity: <T>(value: T) => T;
+export declare const firstArgument: <T>(value: T) => T;
+export declare const secondArgument: <T>(_: unknown, value: T) => T;
+export declare const thirdArgument: <T>(_first: unknown, _second: unknown, value: T) => T;

package/utility/functions.lua

@@ -88,4 +88,7 @@ ____exports.apply = function(object, transform, ...)
     return object
 end
 ____exports.identity = function(value) return value end
+____exports.firstArgument = ____exports.identity
+____exports.secondArgument = function(_, value) return value end
+____exports.thirdArgument = function(_first, _second, value) return value end
 return ____exports

package/core/types/order.d.ts

@@ -1,26 +0,0 @@
-/** @noSelfInFile */
-import { Unit } from "./unit";
-import { Item } from "./item";
-import { Destructable } from "./destructable";
-export type Order = {
-    id: number;
-    startX: number;
-    startY: number;
-    issueTime: number;
-} & ({
-    type: "immediate";
-} | {
-    type: "point";
-    targetX: number;
-    targetY: number;
-} | {
-    type: "target";
-    target: Unit | Item | Destructable;
-});
-declare module "../../engine/internal/unit" {
-    interface Unit {
-        readonly currentOrder: Order;
-        readonly lastOrder: Order;
-        issueOrder(order: Order): void;
-    }
-}

package/core/types/order.lua

@@ -1,65 +0,0 @@
-local ____lualib = require("lualib_bundle")
-local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
-local ____exports = {}
-local ____unit = require("core.types.unit")
-local Unit = ____unit.Unit
-local ____game = require("core.game")
-local elapsedTime = ____game.elapsedTime
-local getUnitCurrentOrder = GetUnitCurrentOrder
-local orders = setmetatable({}, {__mode = "k"})
-Unit.onImmediateOrder:addListener(function(unit, orderId)
-    orders[unit] = {
-        id = orderId,
-        startX = unit.x,
-        startY = unit.y,
-        issueTime = elapsedTime(),
-        type = "immediate"
-    }
-end)
-Unit.onPointOrder:addListener(function(unit, orderId, x, y)
-    orders[unit] = {
-        id = orderId,
-        startX = unit.x,
-        startY = unit.y,
-        issueTime = elapsedTime(),
-        type = "point",
-        targetX = x,
-        targetY = y
-    }
-end)
-Unit.onTargetOrder:addListener(function(unit, orderId, target)
-    orders[unit] = {
-        id = orderId,
-        startX = unit.x,
-        startY = unit.y,
-        issueTime = elapsedTime(),
-        type = "target",
-        target = target
-    }
-end)
-__TS__ObjectDefineProperty(
-    Unit.prototype,
-    "currentOrder",
-    {get = function(self)
-        local currentOrderId = getUnitCurrentOrder(self.handle)
-        local lastOrder = orders[self]
-        return lastOrder and (lastOrder.id == currentOrderId or currentOrderId == orderId("patrolAI") and lastOrder.id == orderId("patrol")) and lastOrder or ({id = 0, type = "immediate"})
-    end}
-)
-__TS__ObjectDefineProperty(
-    Unit.prototype,
-    "lastOrder",
-    {get = function(self)
-        return orders[self] or ({id = 0, type = "immediate"})
-    end}
-)
-Unit.prototype.issueOrder = function(self, order)
-    if order.type == "immediate" then
-        IssueImmediateOrderById(self.handle, order.id)
-    elseif order.type == "point" then
-        IssuePointOrderById(self.handle, order.id, order.targetX, order.targetY)
-    else
-        IssueTargetOrderById(self.handle, order.id, order.target.handle)
-    end
-end
-return ____exports