warscript 0.0.1-dev.dbb3984 → 0.0.1-dev.dd8349d

package/engine/unit.lua

@@ -17,6 +17,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.dbb3984",
+    "version": "0.0.1-dev.dd8349d",
     "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/lazy.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export declare const lazyRecord: <K extends keyof any, V>(initializer: (key: K) => V) => Readonly<Record<K, V>>;

package/utility/lazy.lua

@@ -0,0 +1,14 @@
+local ____exports = {}
+local rawset = _G.rawset
+local setmetatable = _G.setmetatable
+____exports.lazyRecord = function(initializer)
+    return setmetatable(
+        {},
+        {__index = function(self, key)
+            local value = initializer(key)
+            rawset(self, key, value)
+            return value
+        end}
+    )
+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,8 @@
 /** @noSelfInFile */
 import { Flatten, TupleOf } from "./types";
+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,13 @@
 local ____exports = {}
 local select = _G.select
+local setmetatable = _G.setmetatable
+local weakKeysMetatable = {__mode = "k"}
+____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 +30,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)