warscript 0.0.1-dev.e4a5fce → 0.0.1-dev.e6c3dde

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,5 +1,6 @@
 /** @noSelfInFile */
 import "./internal/unit";
+import "./internal/unit/order";
 import "./internal/unit/ability";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";
@@ -17,6 +18,7 @@ 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,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")
@@ -17,6 +18,7 @@ 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")

package/objutil/buff.lua

@@ -20,7 +20,6 @@ local AbilityDefinitionInnerFire = ____ability.AbilityDefinitionInnerFire
 local AbilityDefinitionSearingArrows = ____ability.AbilityDefinitionSearingArrows
 local AbilityDefinitionSlowPoison = ____ability.AbilityDefinitionSlowPoison
 local ____unit = require("core.types.unit")
-local AttackType = ____unit.AttackType
 local DamageType = ____unit.DamageType
 local Unit = ____unit.Unit
 local ____dummy = require("core.dummy")
@@ -756,7 +755,7 @@ for ____, pointDispelAbilityId in ipairs(pointDispelAbilityIds) do
     end)
 end
 Unit.onDamaging:addListener(function(source, target, event)
-    if event.amount == 0 and event.attackType == AttackType.SPELL and event.damageType == DamageType.NORMAL and not event.isAttack then
+    if event.amount == 0 and event.attackType == 0 and event.damageType == DamageType.NORMAL and not event.isAttack then
         Timer:run(function()
             checkBuffs(target, true, source)
         end)

package/objutil/unit.lua

@@ -11,6 +11,8 @@ local ____exports = {}
 local ____object = require("objutil.object")
 local ObjectDefinition = ____object.ObjectDefinition
 local idgen = require("objutil.idgen")
+local ____config = require("config")
+local WarscriptConfig = ____config.WarscriptConfig
 local attackTypes = setmetatable(
     {
         normal = "normal",
@@ -593,6 +595,9 @@ __TS__SetDescriptor(
         end,
         set = function(self, v)
             self:setStringField("umdl", v)
+            if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor", "")
+            end
         end
     },
     true
@@ -606,6 +611,9 @@ __TS__SetDescriptor(
         end,
         set = function(self, v)
             self.object:setField("umdl:hd", v)
+            if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self.object:setField("upor:hd", "")
+            end
         end
     },
     true

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.e4a5fce",
+    "version": "0.0.1-dev.e6c3dde",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.880fc91"
+        "warpack": "0.0.1-dev.fa5e065"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/utility/arrays.d.ts

@@ -22,6 +22,7 @@ export declare const mapToLuaSet: {
     <T, R extends AnyNotNil>(array: readonly T[], transform: (value: T) => R): LuaSet<R>;
     <T, K extends KeysOfType<T, AnyNotNil>>(array: readonly T[], key: K): LuaSet<T[K] extends AnyNotNil ? T[K] : never>;
 };
+export declare const flatten: <T>(array: readonly (readonly T[])[]) => T[];
 export declare const flatMap: {
     <T, R>(array: readonly T[], transform: (value: T) => readonly R[]): R[];
     <T, K extends KeysOfType<T, readonly any[]>>(array: readonly T[], key: K): (T[K] extends readonly (infer R)[] ? R : never)[];

package/utility/arrays.lua

@@ -3,6 +3,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____exception = require("exception")
 local IllegalArgumentException = ____exception.IllegalArgumentException
+local ____functions = require("utility.functions")
+local identity = ____functions.identity
 local mathMax = math.max
 local mathMin = math.min
 local select = _G.select
@@ -120,6 +122,7 @@ ____exports.mapToLuaSet = function(array, transform)
     end
     return result
 end
+____exports.flatten = function(array) return ____exports.flatMap(array, identity) end
 ____exports.flatMap = function(array, transform)
     local result = {}
     local k = 1

package/utility/functions.d.ts

@@ -3,3 +3,4 @@ export declare const apply: {
     <T, ConsumerParameters extends any[]>(object: T, consumer: (value: T, ...parameters: ConsumerParameters) => void, ...parameters: ConsumerParameters): T;
     <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;

package/utility/functions.lua

@@ -87,4 +87,5 @@ ____exports.apply = function(object, transform, ...)
     end
     return object
 end
+____exports.identity = function(value) return value end
 return ____exports

package/utility/linked-set.d.ts

@@ -50,6 +50,7 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
     protected __pairs(this: LinkedSet<T>): LuaIterator<T | undefined, IteratorState<T>>;
 }
 export declare const emptyLinkedSet: <T extends AnyNotNil>() => ReadonlyLinkedSet<T>;
+export declare const mutableLinkedSet: <T extends AnyNotNil>() => LinkedSet<T>;
 export declare const mutableLinkedSetOf: <T extends AnyNotNil>(...elements: ReadonlyArray<T>) => LinkedSet<T>;
 export declare const mutableLinkedSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LinkedSet<T>;
 export declare const linkedSetOf: <T extends AnyNotNil>(...elements: ReadonlyArray<T>) => ReadonlyLinkedSet<T>;

package/utility/linked-set.lua

@@ -177,6 +177,9 @@ local EMPTY_LINKED_SET = __TS__New(EmptyLinkedSet)
 ____exports.emptyLinkedSet = function()
     return EMPTY_LINKED_SET
 end
+____exports.mutableLinkedSet = function()
+    return __TS__New(____exports.LinkedSet)
+end
 ____exports.mutableLinkedSetOf = function(...)
     local linkedSet = __TS__New(____exports.LinkedSet)
     for i = 1, select("#", ...) do

package/utility/lua-maps.d.ts

@@ -1,5 +1,9 @@
 /** @noSelfInFile */
 import { Flatten, TupleOf } from "./types";
+export declare const emptyLuaMap: <K extends AnyNotNil, V>() => ReadonlyLuaMap<K, V>;
+export declare const mutableLuaMap: <K extends AnyNotNil, V>() => LuaMap<K, V>;
+export declare const mutableWeakLuaMap: <K extends AnyNotNil, V>() => LuaMap<K, V>;
 export declare const luaMapOf: <K extends AnyNotNil, V>(...pairs: Flatten<TupleOf<[K, V], 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40>>) => LuaMap<K, V>;
 export declare const luaMapInvert: <K extends AnyNotNil, V extends AnyNotNil>(luaMap: LuaMap<K, V>) => LuaMap<V, K>;
 export declare const mapValues: <K extends AnyNotNil, V1, V2>(luaMap: LuaMap<K, V1>, transform: (value: V1) => V2) => LuaMap<K, V2>;
+export declare const getOrPut: <K extends AnyNotNil, V>(luaMap: LuaMap<K, V>, key: K, defaultValue: () => V) => V;

package/utility/lua-maps.lua

@@ -1,5 +1,17 @@
 local ____exports = {}
 local select = _G.select
+local setmetatable = _G.setmetatable
+local weakKeysMetatable = {__mode = "k"}
+local EMPTY_LUA_MAP = {}
+____exports.emptyLuaMap = function()
+    return EMPTY_LUA_MAP
+end
+____exports.mutableLuaMap = function()
+    return {}
+end
+____exports.mutableWeakLuaMap = function()
+    return setmetatable({}, weakKeysMetatable)
+end
 ____exports.luaMapOf = function(...)
     local luaMap = {}
     for i = 1, select("#", ...), 2 do
@@ -22,4 +34,12 @@ ____exports.mapValues = function(luaMap, transform)
     end
     return result
 end
+____exports.getOrPut = function(luaMap, key, defaultValue)
+    local value = luaMap[key]
+    if value == nil then
+        value = defaultValue()
+        luaMap[key] = value
+    end
+    return value
+end
 return ____exports

package/utility/lua-sets.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+export declare const mutableLuaSet: <T extends AnyNotNil>() => LuaSet<T>;
 export declare const luaSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LuaSet<T>;
 export declare const luaSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LuaSet<T>;
 export declare const luaSetIntersection: <T extends AnyNotNil>(firstLuaSet: ReadonlyLuaSet<T>, secondLuaSet: ReadonlyLuaSet<T>) => LuaSet<T>;

package/utility/lua-sets.lua

@@ -1,5 +1,8 @@
 local ____exports = {}
 local select = _G.select
+____exports.mutableLuaSet = function()
+    return {}
+end
 ____exports.luaSetOf = function(...)
     local luaSet = {}
     for i = 1, select("#", ...) do

package/utility/reflection.lua

@@ -5,21 +5,25 @@ local checkNotNull = ____preconditions.checkNotNull
 -- @internal For use by internal systems only.
 ____exports.implementReadonlyNumberIndexSupplier = function(clazz, supplier)
     local metatable = checkNotNull(getmetatable(clazz))
-    local originalIndex = checkNotNull(metatable.__index)
+    local originalIndex = checkNotNull(rawget(metatable, "__index"))
     local memoizedValueByKey = {}
-    metatable.__index = setmetatable(
-        memoizedValueByKey,
-        {__index = function(self, key)
+    rawset(
+        metatable,
+        "__index",
+        function(self, key)
             if type(key) == "number" then
-                local value = supplier(key)
-                memoizedValueByKey[key] = value
+                local value = memoizedValueByKey[key]
+                if value == nil then
+                    value = supplier(key)
+                    memoizedValueByKey[key] = value
+                end
                 return value
             end
             if type(originalIndex) == "function" then
                 return originalIndex(self, key)
             end
             return originalIndex[key]
-        end}
+        end
     )
 end
 ____exports.getClass = function(object)

package/core/types/order.d.ts

@@ -1,25 +0,0 @@
-/** @noSelfInFile */
-import { Unit } from "./unit";
-import { Item } from "./item";
-import { Destructable } from "./destructable";
-export type Order = {
-    id: number;
-    startX: number;
-    startY: 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,55 +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 getUnitCurrentOrder = GetUnitCurrentOrder
-local orders = setmetatable({}, {__mode = "k"})
-Unit.onImmediateOrder:addListener(function(unit, orderId)
-    orders[unit] = {id = orderId, startX = unit.x, startY = unit.y, type = "immediate"}
-end)
-Unit.onPointOrder:addListener(function(unit, orderId, x, y)
-    orders[unit] = {
-        id = orderId,
-        startX = unit.x,
-        startY = unit.y,
-        type = "point",
-        targetX = x,
-        targetY = y
-    }
-end)
-Unit.onTargetOrder:addListener(function(unit, orderId, target)
-    orders[unit] = {
-        id = orderId,
-        startX = unit.x,
-        startY = unit.y,
-        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