warscript 0.0.1-dev.0eca47c → 0.0.1-dev.0efff64

package/net/socket.d.ts

@@ -1,9 +1,15 @@
 /** @noSelfInFile */
 import { Event } from "../event";
 import { Player } from "../core/types/player";
+declare const enum SocketPropertyKey {
+    ID = 0,
+    CHUNK_ID = 1
+}
 export declare class Socket {
-    private readonly id;
+    private readonly [SocketPropertyKey.ID];
+    private readonly [SocketPropertyKey.CHUNK_ID];
     readonly onMessage: Event<[Player, string]>;
     constructor();
     send(data: string): void;
 }
+export {};

package/net/socket.lua

@@ -7,6 +7,11 @@ local Event = ____event.Event
 local ____network = require("network")
 local send = ____network.send
 local onReceive = ____network.onReceive
+local MAX_PAYLOAD_LENGTH = ____network.MAX_PAYLOAD_LENGTH
+local ____math = require("math")
+local ceil = ____math.ceil
+local stringSub = string.sub
+local tableConcat = table.concat
 local nextId = 0
 ____exports.Socket = __TS__Class()
 local Socket = ____exports.Socket
@@ -14,13 +19,49 @@ Socket.name = "Socket"
 function Socket.prototype.____constructor(self)
     local ____tostring_0 = tostring
     nextId = nextId + 1
-    self.id = ____tostring_0(nextId)
+    self[0] = ____tostring_0(nextId)
+    local ____tostring_1 = tostring
+    nextId = nextId + 1
+    self[1] = ____tostring_1(nextId)
     self.onMessage = __TS__New(Event)
-    onReceive[self.id]:addListener(function(sender, data)
-        Event.invoke(self.onMessage, sender, data)
+    local chunksByPlayer = {}
+    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)
+            )
+        else
+            Event.invoke(self.onMessage, sender, data)
+        end
+    end)
+    onReceive[self[1]]:addListener(function(sender, data)
+        local chunks = chunksByPlayer[sender]
+        if chunks == nil then
+            chunks = {}
+            chunksByPlayer[sender] = chunks
+        end
+        chunks[#chunks + 1] = data
     end)
 end
 function Socket.prototype.send(self, data)
-    send(self.id, data)
+    local chunks = ceil(#data / MAX_PAYLOAD_LENGTH) - 1
+    local offset = 1
+    for _ = 0, chunks - 1 do
+        local nextOffset = offset + MAX_PAYLOAD_LENGTH
+        send(
+            self[1],
+            stringSub(data, offset, nextOffset - 1)
+        )
+        offset = nextOffset
+    end
+    send(
+        self[0],
+        stringSub(data, offset)
+    )
 end
 return ____exports

package/network.d.ts

@@ -2,6 +2,7 @@
 import { Event } from "./event";
 import { Player } from "./core/types/player";
 import { Operation, OperationContinue, OperationMonitor } from "./operation";
+export declare const MAX_PAYLOAD_LENGTH = 255;
 export declare const onReceive: {
     [prefix: string]: Event<[Player, string]>;
 } & {

package/network.lua

@@ -25,6 +25,7 @@ local concat = table.concat
 local pack = string.pack
 local sub = string.sub
 local ____unpack = string.unpack
+____exports.MAX_PAYLOAD_LENGTH = 255
 ____exports.onReceive = setmetatable(
     {},
     {__index = function(self, prefix)
@@ -42,11 +43,11 @@ ____exports.onReceive = setmetatable(
     end}
 )
 function ____exports.send(id, payload)
-    if #payload > 255 then
+    if #payload > ____exports.MAX_PAYLOAD_LENGTH then
         error(
             __TS__New(
                 IllegalArgumentException,
-                "payload length must be <= 256, but was " .. tostring(#payload)
+                (("payload length must be <= " .. tostring(____exports.MAX_PAYLOAD_LENGTH)) .. ", but was ") .. tostring(#payload)
             ),
             0
         )

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")
@@ -30,6 +29,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local ____assert = _G.assert
 local ____pairs = _G.pairs
 ____exports.BuffDefinition = __TS__Class()
@@ -462,7 +463,7 @@ local buffs = setmetatable(
     {
         __mode = "k",
         __index = function(self, unit)
-            local ____table = {}
+            local ____table = __TS__New(LinkedMap)
             self[unit] = ____table
             return ____table
         end
@@ -495,7 +496,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
     end
     local constructor = self.constructor
     local instances = buffs[unit]
-    local instance = instances[constructor]
+    local instance = instances:get(constructor)
     if instance then
         instance:destroy()
         if not instance.destroyed then
@@ -508,7 +509,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
             )
         end
     end
-    instances[constructor] = self
+    instances:put(constructor, self)
     if preset then
         local unitHandle = unit.handle
         local slowPoisonMethod = not preset.positive and not preset.magic
@@ -587,13 +588,13 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getInstance(self, unit)
-    return buffs[unit][self]
+    return buffs[unit]:get(self)
 end
 function Buff.isApplied(self, unit)
-    return buffs[unit][self] ~= nil
+    return buffs[unit]:get(self) ~= nil
 end
 function Buff.ifApplied(self, unit, action)
-    local instance = buffs[unit][self]
+    local instance = buffs[unit]:get(self)
     if instance then
         ____assert(__TS__InstanceOf(instance, self))
         action(instance)
@@ -616,7 +617,7 @@ function Buff.prototype.destroy(self)
     if self.preset then
         self.unit:removeAbility(self.preset.buffId)
     end
-    buffs[self.unit][self.constructor] = nil
+    buffs[self.unit]:remove(self.constructor)
     self.destroyed = true
 end
 function Buff.prototype.onDispel(self, source)
@@ -756,14 +757,14 @@ 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)
     end
 end)
-Unit.onItemPickup:addListener(function(unit, item)
-    if item.powerup and item:hasAbility(fourCC("APdi")) then
+Unit.itemPickedUpEvent:addListener(function(unit, item)
+    if item.isPowerUp and item:hasAbility(fourCC("APdi")) then
     end
 end)
 return ____exports

package/objutil/object.lua

@@ -153,7 +153,7 @@ end
 function ObjectDefinition.getLevelArrayFieldValue(self, level, value, values)
     return type(values) == "function" and values(level, value) or (__TS__ArrayIsArray(values[1]) and values[1] or values)
 end
-____exports.ObjectType = ObjectType or ({})
+____exports.ObjectType = ____exports.ObjectType or ({})
 ____exports.ObjectType.ABILITY = 0
 ____exports.ObjectType[____exports.ObjectType.ABILITY] = "ABILITY"
 ____exports.ObjectType.ITEM = 1

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/operation.lua

@@ -22,10 +22,7 @@ OperationMonitor.name = "OperationMonitor"
 __TS__ClassExtends(OperationMonitor, __TS__Promise)
 function OperationMonitor.prototype.____constructor(self, operation, ...)
     local args = {...}
-    __TS__Promise.prototype.____constructor(
-        self,
-        table.unpack(args)
-    )
+    __TS__Promise.prototype.____constructor(self, ...)
     self.o = operation
 end
 function OperationMonitor.prototype.cancel(self)

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.0eca47c",
+    "version": "0.0.1-dev.0efff64",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -22,13 +22,13 @@
     },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.4",
+        "@warscript/tstl-plugin": "^0.0.6",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.2c4e71e"
+        "warpack": "0.0.1-dev.e490aaf"
     },
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^8.13.0",
-        "@typescript-eslint/parser": "^8.13.0",
+        "@typescript-eslint/eslint-plugin": "^8.61.1",
+        "@typescript-eslint/parser": "^8.61.1",
         "async": "^3.2.6",
         "copyfiles": "^2.4.1",
         "eslint": "^9.14.0",

package/patch-lua.lua

@@ -0,0 +1,25 @@
+local error = _G.error
+local getmetatable = _G.getmetatable
+local ipairs = _G.ipairs
+local select = _G.select
+local tostring = _G.tostring
+local tableconcat = table.concat
+
+_G.ipairs = function(t)
+    local metatable = getmetatable(t)
+    if metatable and metatable.__ipairs then
+        return metatable.__ipairs(t)
+    end
+    return ipairs(t)
+end
+
+_G.assert = function(v, ...)
+    if not v then
+        local args = {}
+        for i = 1, select("#", ...) do
+            args[i] = tostring(select(i, ...))
+        end
+        error(tableconcat(args, " "))
+    end
+    return v, ...
+end

package/patch-lualib.lua

@@ -3,7 +3,7 @@ local lualib = _G.require("lualib_bundle")
 local next = _G.next
 local ____type = _G.type
 lualib.__TS__ArrayIsArray = function(value)
-    return ____type(value) == "table" and (value[1] ~= nil or ({next(value)}) == nil) and value.constructor == nil
+    return ____type(value) == "table" and (value[1] ~= nil or (next(value)) == nil) and value.constructor == nil
 end
 local __TS__SetDescriptor = lualib.__TS__SetDescriptor
 lualib.__TS__ObjectDefineProperty = function(target, key, desc)

package/property.d.ts

@@ -0,0 +1,55 @@
+/** @noSelfInFile */
+import { Player } from "./core/types/player";
+import { Event } from "./event";
+export declare class PersistentPropertiesConfig {
+    static defaultFileName: string;
+}
+declare const enum PropertyPropertyKey {
+    DEFAULT_VALUE = 0,
+    VALUE = 1,
+    IS_CHANGED = 2
+}
+export declare class Property<T> {
+    readonly valueChangeEvent: Event<[newValue: T, oldValue: T]>;
+    private [PropertyPropertyKey.DEFAULT_VALUE];
+    private [PropertyPropertyKey.VALUE];
+    private [PropertyPropertyKey.IS_CHANGED]?;
+    constructor(defaultValue: T);
+    get defaultValue(): T;
+    set defaultValue(defaultValue: T);
+    get value(): T;
+    set value(value: T);
+    get isChanged(): boolean;
+    reset(): boolean;
+    set(value: T): boolean;
+    get(): T;
+}
+declare const enum PlayerPropertyPropertyKey {
+    DEFAULT_VALUE = 0,
+    VALUE_BY_PLAYER = 1,
+    IS_CHANGED_BY_PLAYER = 2
+}
+export declare class PlayerProperty<T> {
+    readonly valueChangeEvent: Event<[player: Player, newValue: T, oldValue: T]>;
+    private readonly [PlayerPropertyPropertyKey.DEFAULT_VALUE];
+    private readonly [PlayerPropertyPropertyKey.VALUE_BY_PLAYER];
+    private readonly [PlayerPropertyPropertyKey.IS_CHANGED_BY_PLAYER];
+    constructor(defaultValue: T);
+    isChanged(player: Player): boolean;
+    reset(player: Player): boolean;
+    set(player: Player, value: T): boolean;
+    get(player: Player): T;
+}
+export declare class PersistentProperty<T extends undefined | boolean | number | string> extends Property<T> {
+    readonly id: number;
+    constructor(id: number, defaultValue: T, valueChangeEventListener?: (newValue: T, oldValue: T) => void);
+    reset(): boolean;
+    set(value: T): boolean;
+}
+export declare class PersistentPlayerProperty<T extends string | number | boolean> extends PlayerProperty<T> {
+    readonly id: number;
+    constructor(id: number, initialValue: T, valueChangeEventListener?: (player: Player, newValue: T, oldValue: T) => void);
+    reset(player: Player): boolean;
+    set(player: Player, value: T): boolean;
+}
+export {};