warscript 0.0.1-dev.ba37a78 → 0.0.1-dev.bcab4e5

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
+            chunks[#chunks + 1] = data
+            Event.invoke(
+                self.onMessage,
+                sender,
+                tableConcat(chunks)
+            )
+            chunksByPlayer[sender] = nil
+        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/ability.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { LevelFieldValueProvider, ObjectDefinition } from "./object";
 export declare namespace AbilityDefinition {

package/objutil/buff.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ObjectDefinition } from "./object";
 import { Unit } from "../core/types/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,13 +755,13 @@ 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)
+Unit.itemPickedUpEvent:addListener(function(unit, item)
     if item.powerup and item:hasAbility(fourCC("APdi")) then
     end
 end)

package/objutil/object.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 export type LevelFieldValueProvider<T> = T | T[] | ((level: number, value: T) => T);
 export declare namespace ObjectDefinition {

package/objutil/unit.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ObjectDefinition } from "./object";
 import { AbilityDefinition } from "./ability";

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.ba37a78",
+    "version": "0.0.1-dev.bcab4e5",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -22,23 +22,22 @@
     },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.1",
-        "typescript-to-lua": "^1.24.1",
+        "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.5bdabe5"
+        "warpack": "0.0.1-dev.fa5e065"
     },
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.59.11",
-        "@typescript-eslint/parser": "^5.59.11",
-        "async": "^3.2.0",
+        "@typescript-eslint/eslint-plugin": "^8.13.0",
+        "@typescript-eslint/parser": "^8.13.0",
+        "async": "^3.2.6",
         "copyfiles": "^2.4.1",
-        "eslint": "^8.42.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-prettier": "^3.4.0",
-        "prettier": "^2.8.8",
-        "rimraf": "^5.0.5",
-        "ts-node": "^10.9.1",
-        "tsc-watch": "^4.2.9"
+        "eslint": "^9.14.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.2.1",
+        "prettier": "^3.3.3",
+        "rimraf": "^6.0.1",
+        "ts-node": "^10.9.2",
+        "tsc-watch": "^6.2.0"
     },
     "publishConfig": {
         "access": "public",

package/patch-lua.lua

@@ -0,0 +1,10 @@
+local getmetatable = _G.getmetatable
+local ipairs = _G.ipairs
+
+_G.ipairs = function(t)
+    local metatable = getmetatable(t)
+    if metatable and metatable.__ipairs then
+        return metatable.__ipairs(t)
+    end
+    return ipairs(t)
+end

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 {};

package/property.lua

@@ -0,0 +1,374 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local savePropertyValues
+local ____binaryreader = require("binaryreader")
+local BinaryReader = ____binaryreader.BinaryReader
+local ____binarywriter = require("binarywriter")
+local BinaryWriter = ____binarywriter.BinaryWriter
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____event = require("event")
+local Event = ____event.Event
+local file = require("file")
+local ____network = require("network")
+local synchronize = ____network.synchronize
+local base64 = require("utility.base64")
+local lzw = require("utility.lzw")
+local ____preconditions = require("utility.preconditions")
+local ____require = ____preconditions.require
+local invoke = Event.invoke
+____exports.PersistentPropertiesConfig = __TS__Class()
+local PersistentPropertiesConfig = ____exports.PersistentPropertiesConfig
+PersistentPropertiesConfig.name = "PersistentPropertiesConfig"
+function PersistentPropertiesConfig.prototype.____constructor(self)
+end
+PersistentPropertiesConfig.defaultFileName = ""
+____exports.Property = __TS__Class()
+local Property = ____exports.Property
+Property.name = "Property"
+function Property.prototype.____constructor(self, defaultValue)
+    self.valueChangeEvent = __TS__New(Event)
+    self[0] = defaultValue
+    self[1] = defaultValue
+end
+function Property.prototype.reset(self)
+    if self[2] then
+        self[2] = nil
+        local defaultValue = self[0]
+        local oldValue = self[1]
+        if defaultValue ~= oldValue then
+            self[1] = defaultValue
+            invoke(self.valueChangeEvent, defaultValue, oldValue)
+        end
+        return true
+    end
+    return false
+end
+function Property.prototype.set(self, value)
+    self[2] = true
+    local oldValue = self[1]
+    self[1] = value
+    if value ~= oldValue then
+        invoke(self.valueChangeEvent, value, oldValue)
+        return true
+    end
+    return false
+end
+function Property.prototype.get(self)
+    return self[1]
+end
+__TS__SetDescriptor(
+    Property.prototype,
+    "defaultValue",
+    {
+        get = function(self)
+            return self[0]
+        end,
+        set = function(self, defaultValue)
+            local oldDefaultValue = self[0]
+            if defaultValue ~= oldDefaultValue then
+                self[0] = defaultValue
+                if not self[2] then
+                    self[1] = defaultValue
+                    invoke(self.valueChangeEvent, defaultValue, oldDefaultValue)
+                end
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Property.prototype,
+    "value",
+    {
+        get = function(self)
+            return self:get()
+        end,
+        set = function(self, value)
+            self:set(value)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Property.prototype,
+    "isChanged",
+    {get = function(self)
+        return self[2] == true
+    end},
+    true
+)
+____exports.PlayerProperty = __TS__Class()
+local PlayerProperty = ____exports.PlayerProperty
+PlayerProperty.name = "PlayerProperty"
+function PlayerProperty.prototype.____constructor(self, defaultValue)
+    self.valueChangeEvent = __TS__New(Event)
+    self[0] = defaultValue
+    self[1] = {}
+    self[2] = {}
+end
+function PlayerProperty.prototype.isChanged(self, player)
+    return self[2][player] ~= nil
+end
+function PlayerProperty.prototype.reset(self, player)
+    if self[2][player] ~= nil then
+        self[2][player] = nil
+        local initialValue = self[0]
+        local oldValue = self[1][player]
+        self[1][player] = nil
+        if initialValue ~= oldValue then
+            invoke(self.valueChangeEvent, player, initialValue, oldValue)
+        end
+        return true
+    end
+    return false
+end
+function PlayerProperty.prototype.set(self, player, value)
+    self[2][player] = true
+    local oldValue = self[1][player]
+    self[1][player] = value
+    if value ~= oldValue then
+        invoke(self.valueChangeEvent, player, value, oldValue)
+        return true
+    end
+    return false
+end
+function PlayerProperty.prototype.get(self, player)
+    local ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0
+    if self[2][player] ~= nil then
+        ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0 = self[1][player]
+    else
+        ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0 = self[0]
+    end
+    return ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0
+end
+local NULL_VALUE = {}
+local loadedValueById
+local loadedValueByIdByPlayer = {}
+local localValueById = {}
+local persistentPropertyById = {}
+local persistentPlayerPropertyById = {}
+____exports.PersistentProperty = __TS__Class()
+local PersistentProperty = ____exports.PersistentProperty
+PersistentProperty.name = "PersistentProperty"
+__TS__ClassExtends(PersistentProperty, ____exports.Property)
+function PersistentProperty.prototype.____constructor(self, id, defaultValue, valueChangeEventListener)
+    PersistentProperty.____super.prototype.____constructor(self, defaultValue)
+    self.id = id
+    ____require(not (persistentPropertyById[id] ~= nil) and not (persistentPlayerPropertyById[id] ~= nil))
+    persistentPropertyById[id] = self
+    if valueChangeEventListener ~= nil then
+        self.valueChangeEvent:addListener(valueChangeEventListener)
+    end
+    local value = loadedValueById and loadedValueById[id]
+    if value ~= nil then
+        local ____self_set_4 = self.set
+        local ____temp_3
+        if value == NULL_VALUE then
+            ____temp_3 = nil
+        else
+            ____temp_3 = value
+        end
+        ____self_set_4(self, ____temp_3)
+    end
+end
+function PersistentProperty.prototype.reset(self)
+    if PersistentProperty.____super.prototype.reset(self) then
+        localValueById[self.id] = nil
+        savePropertyValues()
+        return true
+    end
+    return false
+end
+function PersistentProperty.prototype.set(self, value)
+    if PersistentProperty.____super.prototype.set(self, value) then
+        localValueById[self.id] = value == nil and NULL_VALUE or value
+        savePropertyValues()
+        return true
+    end
+    return false
+end
+____exports.PersistentPlayerProperty = __TS__Class()
+local PersistentPlayerProperty = ____exports.PersistentPlayerProperty
+PersistentPlayerProperty.name = "PersistentPlayerProperty"
+__TS__ClassExtends(PersistentPlayerProperty, ____exports.PlayerProperty)
+function PersistentPlayerProperty.prototype.____constructor(self, id, initialValue, valueChangeEventListener)
+    PersistentPlayerProperty.____super.prototype.____constructor(self, initialValue)
+    self.id = id
+    ____require(not (persistentPropertyById[id] ~= nil) and not (persistentPlayerPropertyById[id] ~= nil))
+    persistentPlayerPropertyById[id] = self
+    if valueChangeEventListener ~= nil then
+        self.valueChangeEvent:addListener(valueChangeEventListener)
+    end
+    for ____, player in ipairs(Player.all) do
+        local ____opt_5 = loadedValueByIdByPlayer and loadedValueByIdByPlayer[player]
+        local value = ____opt_5 and ____opt_5[id]
+        if value ~= nil then
+            local ____self_set_10 = self.set
+            local ____temp_9
+            if value == NULL_VALUE then
+                ____temp_9 = nil
+            else
+                ____temp_9 = value
+            end
+            ____self_set_10(self, player, ____temp_9)
+        end
+    end
+end
+function PersistentPlayerProperty.prototype.reset(self, player)
+    if PersistentPlayerProperty.____super.prototype.reset(self, player) then
+        if player.isLocal then
+            localValueById[self.id] = nil
+        end
+        savePropertyValues(player)
+        return true
+    end
+    return false
+end
+function PersistentPlayerProperty.prototype.set(self, player, value)
+    if PersistentPlayerProperty.____super.prototype.set(self, player, value) then
+        if player.isLocal then
+            localValueById[self.id] = value
+        end
+        savePropertyValues(player)
+        return true
+    end
+    return false
+end
+savePropertyValues = function(player)
+    if player ~= nil and not player.isLocal or loadedValueById == nil or loadedValueByIdByPlayer[Player["local"]] == nil then
+        return
+    end
+    local writer = __TS__New(BinaryWriter)
+    writer:writeUInt32(0)
+    local size = 0
+    for ____ in pairs(localValueById) do
+        size = size + 1
+    end
+    writer:writeUInt32(size)
+    for id, value in pairs(localValueById) do
+        writer:writeInt32(id)
+        if value == NULL_VALUE then
+            writer:writeUInt8(0)
+        elseif value == false then
+            writer:writeUInt8(1)
+        elseif value == true then
+            writer:writeUInt8(2)
+        elseif type(value) == "number" then
+            if math.type(value) == "integer" then
+                writer:writeUInt8(3)
+                writer:writeInt32(value)
+            else
+                writer:writeUInt8(4)
+                writer:writeFloat(value)
+            end
+        else
+            writer:writeUInt8(5)
+            writer:writeUInt32(#value)
+            writer:writeBytes(value)
+        end
+    end
+    file.write(
+        ____exports.PersistentPropertiesConfig.defaultFileName,
+        base64.encode(lzw.compress(tostring(writer)))
+    )
+end
+local function loadPropertyValues(fileData, player)
+    do
+        local function ____catch(_)
+            return true, {}
+        end
+        local ____try, ____hasReturned, ____returnValue = pcall(function()
+            local valueById = {}
+            local reader = __TS__New(
+                BinaryReader,
+                lzw.decompress(base64.decode(fileData))
+            )
+            reader:readUInt32()
+            local size = reader:readUInt32()
+            for _ = 1, size do
+                local id = reader:readInt32()
+                local dataType = reader:readUInt8()
+                if dataType == 0 then
+                    valueById[id] = NULL_VALUE
+                elseif dataType == 1 then
+                    valueById[id] = false
+                elseif dataType == 2 then
+                    valueById[id] = true
+                elseif dataType == 3 then
+                    valueById[id] = reader:readInt32()
+                elseif dataType == 4 then
+                    valueById[id] = reader:readFloat()
+                elseif dataType == 5 then
+                    valueById[id] = reader:readBytes(reader:readUInt32())
+                end
+            end
+            for id, value in pairs(valueById) do
+                local persistentProperty = persistentPropertyById[id]
+                if persistentProperty ~= nil then
+                    if not persistentProperty.isChanged then
+                        local ____persistentProperty_set_12 = persistentProperty.set
+                        local ____temp_11
+                        if value == NULL_VALUE then
+                            ____temp_11 = nil
+                        else
+                            ____temp_11 = value
+                        end
+                        ____persistentProperty_set_12(persistentProperty, ____temp_11)
+                    end
+                elseif player ~= nil then
+                    local persistentPlayerProperty = persistentPlayerPropertyById[id]
+                    if persistentPlayerProperty ~= nil then
+                        if not persistentPlayerProperty:isChanged(player) then
+                            local ____persistentPlayerProperty_set_15 = persistentPlayerProperty.set
+                            local ____player_14 = player
+                            local ____temp_13
+                            if value == NULL_VALUE then
+                                ____temp_13 = nil
+                            else
+                                ____temp_13 = value
+                            end
+                            ____persistentPlayerProperty_set_15(persistentPlayerProperty, ____player_14, ____temp_13)
+                        end
+                    elseif player.isLocal then
+                        localValueById[id] = value
+                    end
+                else
+                    localValueById[id] = value
+                end
+            end
+            return true, valueById
+        end)
+        if not ____try then
+            ____hasReturned, ____returnValue = ____catch(____hasReturned)
+        end
+        if ____hasReturned then
+            return ____returnValue
+        end
+    end
+end
+Timer:run(function()
+    local data = file.read(____exports.PersistentPropertiesConfig.defaultFileName) or ""
+    loadedValueById = loadPropertyValues(data)
+    for ____, player in ipairs(Player.all) do
+        local ____self_16 = synchronize(player, data)
+        ____self_16["then"](
+            ____self_16,
+            function(____, synchronizedData)
+                loadedValueByIdByPlayer[player] = loadPropertyValues(synchronizedData, player)
+                savePropertyValues(player)
+            end,
+            function()
+                loadedValueByIdByPlayer[player] = {}
+                savePropertyValues(player)
+            end
+        )
+    end
+end)
+return ____exports