warscript 0.0.1-dev.eda504c → 0.0.1-dev.edf7fad

package/core/types/frame.lua

@@ -24,11 +24,23 @@ local frameCoordinatesToWorld = ____playerCamera.frameCoordinatesToWorld
 local worldCoordinatesToFrame = ____playerCamera.worldCoordinatesToFrame
 local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
 local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
+local ____lua_2Dsets = require("utility.lua-sets")
+local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
+local ____socket = require("net.socket")
+local Socket = ____socket.Socket
+local ____lua_2Dmaps = require("utility.lua-maps")
+local getOrPut = ____lua_2Dmaps.getOrPut
+local luaMapInvert = ____lua_2Dmaps.luaMapInvert
+local luaMapOf = ____lua_2Dmaps.luaMapOf
+local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
 local frameClick = BlzFrameClick
 local frameGetEnable = BlzFrameGetEnable
 local frameIsVisible = BlzFrameIsVisible
 local frameSetEnable = BlzFrameSetEnable
 local frameSetScale = BlzFrameSetScale
+local getHandleId = GetHandleId
+local getOriginFrame = BlzGetOriginFrame
+local location = Location
 local ____rawget = _G.rawget
 local rawset = _G.rawset
 local invoke = Event.invoke
@@ -130,6 +142,30 @@ do
     FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
 end
 local tooltipByFrame = setmetatable({}, {__mode = "k"})
+local keyByAsyncInitOriginFrameType = luaMapOf(ORIGIN_FRAME_PORTRAIT_HP_TEXT, "hp", ORIGIN_FRAME_PORTRAIT_MANA_TEXT, "mana")
+local asyncInitOriginFrameTypeByKey = luaMapInvert(keyByAsyncInitOriginFrameType)
+local seenAsyncInitOriginFrameTypes = mutableLuaSet()
+local seenAsyncInitOriginFrameTypesSocket = __TS__New(Socket)
+local seenPlayersByAsyncInitOriginFrameType = mutableLuaMap()
+seenAsyncInitOriginFrameTypesSocket.onMessage:addListener(function(player, key)
+    local asyncInitOriginFrameType = asyncInitOriginFrameTypeByKey[key]
+    if asyncInitOriginFrameType ~= nil then
+        getOrPut(seenPlayersByAsyncInitOriginFrameType, asyncInitOriginFrameType, mutableLuaSet)[player] = true
+    end
+end)
+local function haveAllPlayersSeenAsyncInitOriginFrameType(frame)
+    local players = seenPlayersByAsyncInitOriginFrameType[frame]
+    if players == nil then
+        return false
+    end
+    for ____, player in ipairs(Player.all) do
+        if player.isUser and player.isPlaying and not (players[player] ~= nil) then
+            return false
+        end
+    end
+    keyByAsyncInitOriginFrameType[frame] = nil
+    return true
+end
 ____exports.Frame = __TS__Class()
 local Frame = ____exports.Frame
 Frame.name = "Frame"
@@ -308,7 +344,17 @@ function Frame.byOrigin(self, frameType, index)
     if index == nil then
         index = 0
     end
-    return self:of(BlzGetOriginFrame(frameType, index))
+    local frame = getOriginFrame(frameType, index)
+    local asyncInitOriginFrameTypeKey = keyByAsyncInitOriginFrameType[frameType]
+    if index == 0 and asyncInitOriginFrameTypeKey ~= nil and not haveAllPlayersSeenAsyncInitOriginFrameType(frameType) then
+        if getHandleId(frame) == 0 or seenAsyncInitOriginFrameTypes[frameType] ~= nil then
+            location(0, 0)
+        else
+            seenAsyncInitOriginFrameTypes[frameType] = true
+            seenAsyncInitOriginFrameTypesSocket:send(asyncInitOriginFrameTypeKey)
+        end
+    end
+    return self:of(frame)
 end
 Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
 Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)

package/core/types/player.d.ts

@@ -7,6 +7,18 @@ import { UpgradeId } from "../../engine/object-data/entry/upgrade";
 interface Unit {
     handle: junit;
 }
+export declare const enum PlayerAllianceType {
+    PASSIVE = 0,
+    RESCUABLE = 1,
+    HELP_REQUEST = 2,
+    HELP_RESPONSE = 3,
+    SHARED_XP = 4,
+    SHARED_SPELLS = 5,
+    SHARED_VISION = 6,
+    SHARED_VISION_FORCED = 7,
+    SHARED_CONTROL = 8,
+    SHARED_ADVANCED_CONTROL = 9
+}
 export declare class Player extends Handle<jplayer> {
     static readonly all: Player[];
     static readonly local: Player;
@@ -42,6 +54,8 @@ export declare class Player extends Handle<jplayer> {
     forceUICancel(): void;
     isAllyOf(other: Player): boolean;
     isEnemyOf(other: Player): boolean;
+    setAlliance(other: Player, type: PlayerAllianceType, value: boolean): void;
+    getAlliance(other: Player, type: PlayerAllianceType): boolean;
     setAbilityAvailable(abilityId: number, available: boolean): void;
     getMaximumUpgradeLevel(upgradeId: UpgradeId): number;
     setMaximumUpgradeLevel(upgradeId: UpgradeId, maximumLevel: number): void;
@@ -50,6 +64,7 @@ export declare class Player extends Handle<jplayer> {
     setUpgradeLevel(upgradeId: UpgradeId, level: number): void;
     private static getEvent;
     private static getMouseEvent;
+    static get allianceChangedEvent(): Readonly<Record<PlayerAllianceType, Event<[Player]>>>;
     static get onLeave(): Event<[Player]>;
     static get onMouseDown(): Event<[Player, jmousebuttontype]>;
     static get onMouseUp(): Event<[Player, jmousebuttontype]>;
@@ -66,6 +81,7 @@ export declare class Player extends Handle<jplayer> {
         };
     };
     static get onChat(): Event<[player: Player, message: string]>;
+    static readonly colorChangedEvent: Event<[Player]>;
     static byId(id: number): Player | undefined;
 }
 export {};

package/core/types/player.lua

@@ -1,7 +1,7 @@
 local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 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__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local ____exports = {}
@@ -23,14 +23,33 @@ local ____math = require("math")
 local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
 local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
 local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
+local ____lazy = require("utility.lazy")
+local lazyRecord = ____lazy.lazyRecord
+local getPlayerAlliance = GetPlayerAlliance
 local getPlayerColor = GetPlayerColor
 local getPlayerName = GetPlayerName
 local getPlayerTechCount = GetPlayerTechCount
 local getPlayerTechMaxAllowed = GetPlayerTechMaxAllowed
+local getTriggerPlayer = GetTriggerPlayer
+local setPlayerAlliance = SetPlayerAlliance
 local setPlayerTechMaxAllowed = SetPlayerTechMaxAllowed
 local setPlayerTechResearched = SetPlayerTechResearched
 local setPlayerAbilityAvailable = SetPlayerAbilityAvailable
+local triggerRegisterPlayerAllianceChange = TriggerRegisterPlayerAllianceChange
 local playerNative = _G.Player
+local nativeByPlayerAllianceType = {
+    [0] = ALLIANCE_PASSIVE,
+    [1] = ALLIANCE_RESCUABLE,
+    [2] = ALLIANCE_HELP_REQUEST,
+    [3] = ALLIANCE_HELP_RESPONSE,
+    [4] = ALLIANCE_SHARED_XP,
+    [5] = ALLIANCE_SHARED_SPELLS,
+    [6] = ALLIANCE_SHARED_VISION,
+    [7] = ALLIANCE_SHARED_VISION_FORCED,
+    [8] = ALLIANCE_SHARED_CONTROL,
+    [9] = ALLIANCE_SHARED_ADVANCED_CONTROL
+}
+local playerColorChangedEvent = __TS__New(Event)
 ____exports.Player = __TS__Class()
 local Player = ____exports.Player
 Player.name = "Player"
@@ -85,6 +104,12 @@ end
 function Player.prototype.isEnemyOf(self, other)
     return IsPlayerEnemy(self.handle, other.handle)
 end
+function Player.prototype.setAlliance(self, other, ____type, value)
+    setPlayerAlliance(self.handle, other.handle, nativeByPlayerAllianceType[____type], value)
+end
+function Player.prototype.getAlliance(self, other, ____type)
+    return getPlayerAlliance(self.handle, other.handle, nativeByPlayerAllianceType[____type])
+end
 function Player.prototype.setAbilityAvailable(self, abilityId, available)
     setPlayerAbilityAvailable(self.handle, abilityId, available)
 end
@@ -124,14 +149,11 @@ function Player.getMouseEvent(self, event, collector)
         self.events[eventId] = __TS__New(
             TriggerEvent,
             function(trigger)
-                Timer:simple(
-                    0,
-                    function()
-                        for ____, player in ipairs(____exports.Player.all) do
-                            TriggerRegisterPlayerEvent(trigger, player.handle, event)
-                        end
+                Timer:run(function()
+                    for ____, player in ipairs(____exports.Player.all) do
+                        TriggerRegisterPlayerEvent(trigger, player.handle, event)
                     end
-                )
+                end)
             end,
             collector or (function() return {} end)
         )
@@ -180,7 +202,7 @@ function Player.getKeyEvent(self, isDown)
     TriggerAddCondition(
         trigger,
         Condition(function()
-            local player = ____exports.Player:of(GetTriggerPlayer())
+            local player = ____exports.Player:of(getTriggerPlayer())
             local key = BlzGetTriggerPlayerKey()
             local metaKey = BlzGetTriggerPlayerMetaKey()
             Event.invoke(event, player, key, metaKey)
@@ -279,6 +301,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, color)
             SetPlayerColor(self.handle, color.handle)
+            Event.invoke(playerColorChangedEvent, self)
         end
     },
     true
@@ -369,13 +392,32 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    Player,
+    "allianceChangedEvent",
+    {get = function(self)
+        local event = lazyRecord(function(____type)
+            return __TS__New(
+                TriggerEvent,
+                function(trigger)
+                    for ____, player in ipairs(____exports.Player.all) do
+                        triggerRegisterPlayerAllianceChange(trigger, player.handle, nativeByPlayerAllianceType[____type])
+                    end
+                end,
+                function() return ____exports.Player:of(getTriggerPlayer()) end
+            )
+        end)
+        rawset(self, "allianceChangedEvent", event)
+        return event
+    end}
+)
 __TS__ObjectDefineProperty(
     Player,
     "onLeave",
     {get = function(self)
         return ____exports.Player:getEvent(
             EVENT_PLAYER_LEAVE,
-            function() return ____exports.Player:of(GetTriggerPlayer()) end
+            function() return ____exports.Player:of(getTriggerPlayer()) end
         )
     end}
 )
@@ -385,7 +427,7 @@ __TS__ObjectDefineProperty(
     {get = function(self)
         return ____exports.Player:getMouseEvent(
             EVENT_PLAYER_MOUSE_DOWN,
-            function() return ____exports.Player:of(GetTriggerPlayer()), BlzGetTriggerPlayerMouseButton() end
+            function() return ____exports.Player:of(getTriggerPlayer()), BlzGetTriggerPlayerMouseButton() end
         )
     end}
 )
@@ -395,7 +437,7 @@ __TS__ObjectDefineProperty(
     {get = function(self)
         return ____exports.Player:getMouseEvent(
             EVENT_PLAYER_MOUSE_UP,
-            function() return ____exports.Player:of(GetTriggerPlayer()), BlzGetTriggerPlayerMouseButton() end
+            function() return ____exports.Player:of(getTriggerPlayer()), BlzGetTriggerPlayerMouseButton() end
         )
     end}
 )
@@ -405,7 +447,7 @@ __TS__ObjectDefineProperty(
     {get = function(self)
         return ____exports.Player:getMouseEvent(
             EVENT_PLAYER_MOUSE_MOVE,
-            function() return ____exports.Player:of(GetTriggerPlayer()), vec2(
+            function() return ____exports.Player:of(getTriggerPlayer()), vec2(
                 BlzGetTriggerPlayerMouseX(),
                 BlzGetTriggerPlayerMouseY()
             ) end
@@ -441,10 +483,11 @@ __TS__ObjectDefineProperty(
                     TriggerRegisterPlayerChatEvent(trigger, player.handle, "", false)
                 end
             end,
-            function() return ____exports.Player:of(GetTriggerPlayer()), GetEventPlayerChatString() end
+            function() return ____exports.Player:of(getTriggerPlayer()), GetEventPlayerChatString() end
         )
         rawset(self, "onChat", event)
         return event
     end}
 )
+Player.colorChangedEvent = playerColorChangedEvent
 return ____exports

package/core/types/sound.lua

@@ -22,7 +22,7 @@ local setSoundPlayPosition = SetSoundPlayPosition
 local stopSound = StopSound
 local attachSoundToUnit = AttachSoundToUnit
 local killSoundWhenDone = KillSoundWhenDone
-____exports.SoundChannel = SoundChannel or ({})
+____exports.SoundChannel = ____exports.SoundChannel or ({})
 ____exports.SoundChannel.General = 0
 ____exports.SoundChannel[____exports.SoundChannel.General] = "General"
 ____exports.SoundChannel.UnitSelection = 1

package/core/types/tileCell.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
-export declare class TileCell implements Readonly<Vec2> {
+import { AttributesHolder } from "../../attributes";
+export declare class TileCell extends AttributesHolder implements Readonly<Vec2> {
     private readonly id;
     readonly x: number;
     readonly y: number;

package/core/types/tileCell.lua

@@ -1,8 +1,11 @@
 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 ____exports = {}
+local ____attributes = require("attributes")
+local AttributesHolder = ____attributes.AttributesHolder
 local getTerrainType = GetTerrainType
 local setTerrainType = SetTerrainType
 local getTerrainVariance = GetTerrainVariance
@@ -13,7 +16,9 @@ local tileCellById = {}
 ____exports.TileCell = __TS__Class()
 local TileCell = ____exports.TileCell
 TileCell.name = "TileCell"
+__TS__ClassExtends(TileCell, AttributesHolder)
 function TileCell.prototype.____constructor(self, id, x, y, z)
+    AttributesHolder.prototype.____constructor(self)
     self.id = id
     self.x = x
     self.y = y

package/destroyable.d.ts

@@ -10,6 +10,7 @@ export interface Destroyable {
     destroy(): void;
 }
 export declare abstract class AbstractDestroyable implements Destroyable {
+    get isDestroyed(): boolean;
     /**
      * An overriding function should always call the super one at the end of it,
      * in the following manner: `return super.onDestroy()`.

package/destroyable.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
@@ -28,4 +29,12 @@ function AbstractDestroyable.prototype.destroy(self)
     end
     return true
 end
+__TS__SetDescriptor(
+    AbstractDestroyable.prototype,
+    "isDestroyed",
+    {get = function(self)
+        return stateByDestroyable[self] ~= nil
+    end},
+    true
+)
 return ____exports

package/engine/behavior.d.ts

@@ -1,6 +1,11 @@
 /** @noSelfInFile */
 import { AbstractDestroyable, Destructor } from "../destroyable";
 import { Event } from "../event";
+export declare const enum BehaviorPriority {
+    HIGH = 0,
+    MEDIUM = 1,
+    LOW = 2
+}
 export type BehaviorConstructor<T extends Behavior<AnyNotNil>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
 declare const enum BehaviorPropertyKey {
     PREVIOUS_BEHAVIOR = 0,
@@ -9,12 +14,15 @@ declare const enum BehaviorPropertyKey {
 }
 export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
     protected readonly object: T;
+    readonly priority: BehaviorPriority;
     private [BehaviorPropertyKey.PREVIOUS_BEHAVIOR]?;
     private [BehaviorPropertyKey.NEXT_BEHAVIOR]?;
     private [BehaviorPropertyKey.TIMER]?;
-    protected constructor(object: T);
+    constructor(object: T, priority?: BehaviorPriority);
     protected onDestroy(): Destructor;
-    protected registerEvent<K extends string, Args extends any[]>(this: Behavior<any, PeriodicActionParameters> & Record<K, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, listener: K): void;
+    protected registerGlobalEvent<K extends string, Args extends any[]>(this: Behavior<any, PeriodicActionParameters> & Record<K, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, listener: K): void;
+    protected deregisterGlobalEvent(event: Event<any>): boolean;
+    protected registerEvent<K extends string, Args extends any[]>(this: Behavior<any, PeriodicActionParameters> & Record<K, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractObject: (...args: Args) => T | undefined, listener: K): void;
     protected deregisterEvent(event: Event<any>): boolean;
     protected onPeriod(...parameters: PeriodicActionParameters): void;
     protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;