warscript 0.0.1-dev.c37d12c → 0.0.1-dev.c47d565

package/core/types/frame.lua

@@ -15,13 +15,34 @@ local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates")
+local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
+local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
+local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
+local ____playerCamera = require("core.types.playerCamera")
+local frameCoordinatesToWorld = ____playerCamera.frameCoordinatesToWorld
+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 getCameraTargetPositionX = GetCameraTargetPositionX
-local getCameraTargetPositionY = GetCameraTargetPositionY
+local getHandleId = GetHandleId
+local getLocalClientHeight = BlzGetLocalClientHeight
+local getMouseScreenPosX = BlzGetMouseScreenPosX
+local getMouseScreenPosY = BlzGetMouseScreenPosY
+local getOriginFrame = BlzGetOriginFrame
+local location = Location
+local pixelToFrameX = BlzPixelToFrameX
+local pixelToFrameY = BlzPixelToFrameY
 local ____rawget = _G.rawget
 local rawset = _G.rawset
 local invoke = Event.invoke
@@ -62,8 +83,10 @@ local function updateBorders()
     local width4by3 = (w - h / 600 * 800) / 2
     local pxtodpi = 0.6 / h
     BlzFrameSetAbsPoint(leftBorder, FRAMEPOINT_TOPLEFT, -width4by3 * pxtodpi, 0.6)
+    BlzFrameSetScale(leftBorder, 1)
     BlzFrameSetSize(leftBorder, 0.001, 0.6)
     BlzFrameSetAbsPoint(rightBorder, FRAMEPOINT_TOPRIGHT, (-width4by3 + w) * pxtodpi, 0.6)
+    BlzFrameSetScale(rightBorder, 1)
     BlzFrameSetSize(rightBorder, 0.001, 0.6)
 end
 local worldFrame = BlzGetOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0)
@@ -120,6 +143,80 @@ do
     FramePoint.BOTTOM = FRAMEPOINT_BOTTOM
     FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
 end
+local tooltipByFrame = setmetatable({}, {__mode = "k"})
+local isMouseInsideLocallyByFrame = mutableLuaMap()
+local mouseEnterLocalEventByFrame = mutableLuaMap()
+local mouseLeaveLocalEventByFrame = mutableLuaMap()
+local isLocalMouseTrackingStarted = false
+--- Reused across ticks to avoid per-tick allocations: only the first `leftFrameCount` /
+-- `enteredFrameCount` entries are meaningful, stale entries beyond them are never read and are
+-- kept collectable by the weak values mode.
+local leftFrames = setmetatable({}, {__mode = "v"})
+local enteredFrames = setmetatable({}, {__mode = "v"})
+--- All frames share a single poll which invokes every mouse leave event before any mouse enter
+-- event within the same tick. With a poll per event, the invocation order would depend on the
+-- event creation order instead, breaking listeners relying on the natural "leave the old frame,
+-- then enter the new frame" order.
+local function startLocalMouseTracking()
+    if isLocalMouseTrackingStarted then
+        return
+    end
+    isLocalMouseTrackingStarted = true
+    Timer.onPeriod[1 / 64]:addListener(function()
+        local leftFrameCount = 0
+        local enteredFrameCount = 0
+        for frame, wasMouseInside in pairs(isMouseInsideLocallyByFrame) do
+            local tooltip = tooltipByFrame[frame]
+            local isMouseInside = tooltip ~= nil and tooltip.visible
+            if isMouseInside ~= wasMouseInside then
+                isMouseInsideLocallyByFrame[frame] = isMouseInside
+                if isMouseInside then
+                    enteredFrames[enteredFrameCount + 1] = frame
+                    enteredFrameCount = enteredFrameCount + 1
+                else
+                    leftFrames[leftFrameCount + 1] = frame
+                    leftFrameCount = leftFrameCount + 1
+                end
+            end
+        end
+        for i = 1, leftFrameCount do
+            local event = mouseLeaveLocalEventByFrame[leftFrames[i]]
+            if event ~= nil then
+                Event.invoke(event)
+            end
+        end
+        for i = 1, enteredFrameCount do
+            local event = mouseEnterLocalEventByFrame[enteredFrames[i]]
+            if event ~= nil then
+                Event.invoke(event)
+            end
+        end
+    end)
+end
+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"
@@ -152,6 +249,18 @@ function Frame.prototype.getEvent(self, eventType, c)
     end
     return self.events[eventId]
 end
+function Frame.prototype.trackMouseLocally(self)
+    if not (tooltipByFrame[self] ~= nil) then
+        ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
+        local tooltip = ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent == self and ____exports.Frame:createByType("SIMPLEFRAME", "", ____exports.Frame.CONSOLE_UI) or ____exports.Frame:createByType("FRAME", "", ____exports.Frame.GAME_UI)
+        ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
+        self:setTooltip(tooltip)
+    end
+    if not (isMouseInsideLocallyByFrame[self] ~= nil) then
+        isMouseInsideLocallyByFrame[self] = false
+        startLocalMouseTracking()
+    end
+end
 function Frame.prototype.hide(self)
     self.hideCounter = self.hideCounter + 1
     if self.hideCounter > 0 then
@@ -240,6 +349,7 @@ function Frame.prototype.setTextColor(self, color)
 end
 function Frame.prototype.setTooltip(self, tooltip)
     BlzFrameSetTooltip(self.handle, tooltip.handle)
+    tooltipByFrame[self] = tooltip
 end
 function Frame.prototype.setMinMaxValue(self, minValue, maxValue)
     BlzFrameSetMinMaxValue(self.handle, minValue, maxValue)
@@ -267,7 +377,16 @@ function Frame.createSimple(self, name, parent, createContext)
     ))
 end
 function Frame.create(self, name, parent, priority, createContext)
-    return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
+    if parent == ____exports.Frame.CONSOLE_UI_BACKDROP then
+        local helper = ____exports.Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD.handle
+        BlzFrameSetScale(helper, 1)
+        local frame = BlzCreateFrame(name, helper, priority or 0, createContext or 0)
+        BlzFrameSetScale(helper, ____exports.Frame.uiScale)
+        BlzFrameSetParent(frame, ____exports.Frame.CONSOLE_UI_BACKDROP.handle)
+        return self:of(frame)
+    else
+        return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
+    end
 end
 function Frame.createByType(self, typeName, name, parent, inherits, createContext)
     return self:of(BlzCreateFrameByType(
@@ -288,14 +407,35 @@ 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)
 Frame.CONSOLE_UI_BACKDROP = ____exports.Frame:byName("ConsoleUIBackdrop")
+Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD = ____exports.Frame:createByType("FRAME", "ConsoleUIBackdropUIScaleHelperChild", ____exports.Frame.CONSOLE_UI_BACKDROP)
+Frame.CONSOLE_TOP_BAR = ____exports.Frame:byName("ConsoleTopBar")
+Frame.CONSOLE_BOTTOM_BAR = ____exports.Frame:byName("ConsoleBottomBar")
 Frame.WORLD = ____exports.Frame:byOrigin(ORIGIN_FRAME_WORLD_FRAME)
 Frame.CHAT = ____exports.Frame:byOrigin(ORIGIN_FRAME_CHAT_MSG)
 Frame.TIME_OF_DAY_CLOCK = ____exports.Frame.GAME_UI:getChild(5):getChild(0)
+Frame.SIMPLE_FRAME_TEST_CHILD = ____exports.Frame:createByType("SIMPLEFRAME", "SimpleFrameTestParent", ____exports.Frame.CONSOLE_UI)
+__TS__ObjectDefineProperty(
+    Frame,
+    "uiScale",
+    {get = function(self)
+        return ____exports.Frame.CONSOLE_BOTTOM_BAR.width / 0.8
+    end}
+)
 __TS__ObjectDefineProperty(
     Frame,
     "leftBorder",
@@ -320,27 +460,21 @@ __TS__ObjectDefineProperty(
     Frame,
     "minX",
     {get = function(self)
-        local w = BlzGetLocalClientWidth()
-        local h = BlzGetLocalClientHeight()
-        local width4by3 = (w - h / 600 * 800) / 2
-        local pxtodpi = 0.6 / h
-        return -width4by3 * pxtodpi
+        local minX = getFrameMinXMaxX()
+        return minX
     end}
 )
 __TS__ObjectDefineProperty(
     Frame,
     "maxX",
     {get = function(self)
-        local w = BlzGetLocalClientWidth()
-        local h = BlzGetLocalClientHeight()
-        local width4by3 = (w - h / 600 * 800) / 2
-        local pxtodpi = 0.6 / h
-        return (-width4by3 + w) * pxtodpi
+        local ____, maxX = getFrameMinXMaxX()
+        return maxX
     end}
 )
 Frame.centerX = 0.4
-Frame.minY = 0
-Frame.maxY = 0.6
+Frame.minY = FRAME_MIN_Y
+Frame.maxY = FRAME_MAX_Y
 Frame.centerY = 0.3
 __TS__SetDescriptor(
     Frame.prototype,
@@ -597,6 +731,30 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Frame.prototype,
+    "mouseEnterLocalEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        self:trackMouseLocally()
+        mouseEnterLocalEventByFrame[self] = event
+        rawset(self, "mouseEnterLocalEvent", event)
+        return event
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Frame.prototype,
+    "mouseLeaveLocalEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        self:trackMouseLocally()
+        mouseLeaveLocalEventByFrame[self] = event
+        rawset(self, "mouseLeaveLocalEvent", event)
+        return event
+    end},
+    true
+)
 __TS__SetDescriptor(
     Frame.prototype,
     "popupMenuItemChangeEvent",
@@ -699,6 +857,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Frame.prototype,
+    "children",
+    {get = function(self)
+        local children = {}
+        for i = 0, self:getChildrenCount() - 1 do
+            children[i + 1] = self:getChild(i)
+        end
+        return children
+    end},
+    true
+)
 __TS__ObjectDefineProperty(
     Frame,
     "onKeyPress",
@@ -820,7 +990,7 @@ __TS__ObjectDefineProperty(
 )
 __TS__ObjectDefineProperty(
     Frame,
-    "onMouseMove",
+    "mouseMoveEvent",
     {get = function(self)
         local event = __TS__New(
             TriggerEvent,
@@ -834,46 +1004,32 @@ __TS__ObjectDefineProperty(
             ) end,
             function() return Player:of(GetTriggerPlayer()), BlzGetTriggerPlayerMouseX(), BlzGetTriggerPlayerMouseY() end
         )
-        rawset(____exports.Frame, "onMouseMove", event)
+        rawset(____exports.Frame, "mouseMoveEvent", event)
         return event
     end}
 )
 __TS__ObjectDefineProperty(
     Frame,
-    "onMouseMoveLocal",
+    "mouseMoveLocalEvent",
     {get = function(self)
-        local invoke = Event.invoke
         local event = __TS__New(Event)
-        local syncX = 0
-        local syncY = 0
-        local syncCamX = getCameraTargetPositionX()
-        local syncCamY = getCameraTargetPositionY()
-        local lastX = syncX
-        local lastY = syncY
-        self.onMouseMove:addListener(function(player, x, y)
-            if player.isLocal then
-                syncX = x
-                syncY = y
-                syncCamX = getCameraTargetPositionX()
-                syncCamY = getCameraTargetPositionY()
-                lastX = x
-                lastY = y
-                invoke(event, x, y)
-            end
-        end)
+        local lastX = 0
+        local lastY = 0
         Timer.onPeriod[1 / 64]:addListener(function()
-            if syncX == 0 and syncY == 0 then
+            if getLocalClientHeight() == 0 then
                 return
             end
-            local x = syncX + (getCameraTargetPositionX() - syncCamX)
-            local y = syncY + (getCameraTargetPositionY() - syncCamY)
-            if x ~= lastX or y ~= lastY then
+            local x, y, ____, isDefinite = frameCoordinatesToWorld(
+                pixelToFrameX(getMouseScreenPosX()),
+                pixelToFrameY(getMouseScreenPosY())
+            )
+            if isDefinite and (x ~= lastX or y ~= lastY) then
                 lastX = x
                 lastY = y
                 invoke(event, x, y)
             end
         end)
-        rawset(____exports.Frame, "onMouseMoveLocal", event)
+        rawset(____exports.Frame, "mouseMoveLocalEvent", event)
         return event
     end}
 )

package/core/types/group.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Widget } from "./widget";
 import { Unit } from "../../engine/internal/unit";

package/core/types/handle.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
+import { AttributesHolder } from "../../attributes";
 export type HandleConstructor<H extends jhandle, T extends Handle<H>, Args extends any[]> = new (handle: H, ...args: Args) => T;
 export type HandleDestructor = {
     readonly __handleDestructor: unique symbol;
@@ -11,7 +12,7 @@ type NoOverride = {
 declare const enum HandlePropertyKey {
     STATE = 0
 }
-export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> implements Destroyable {
+export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> extends AttributesHolder implements Destroyable {
     readonly handle: H;
     private [HandlePropertyKey.STATE]?;
     private onDestroyEvent?;

package/core/types/handle.lua

@@ -1,5 +1,6 @@
 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__Delete = ____lualib.__TS__Delete
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -12,13 +13,19 @@ local getClass = ____reflection.getClass
 local getSuperclass = ____reflection.getSuperclass
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local ____attributes = require("attributes")
+local AttributesHolder = ____attributes.AttributesHolder
+local ____preconditions = require("utility.preconditions")
+local checkNotNull = ____preconditions.checkNotNull
 local getHandleId = GetHandleId
 local onCreateEventByHandleConstructor = {}
 local onDestroyEventByHandleConstructor = {}
 ____exports.Handle = __TS__Class()
 local Handle = ____exports.Handle
 Handle.name = "Handle"
+__TS__ClassExtends(Handle, AttributesHolder)
 function Handle.prototype.____constructor(self, handle)
+    AttributesHolder.prototype.____constructor(self)
     self[0] = 0
     local id = getHandleId(handle)
     local clazz = self.constructor
@@ -53,6 +60,9 @@ function Handle.invokeOnCreateEvent(self, clazz, handle)
         Event.invoke(onCreateEvent, handle)
     end
 end
+function Handle.isWrapped(self, handle)
+    return self.memoized[getHandleId(handle)] ~= nil
+end
 function Handle.prototype.__tostring(self)
     return (self.constructor.name .. "@") .. tostring(getHandleId(self.handle))
 end
@@ -61,17 +71,12 @@ function Handle.prototype.onDestroy(self, ...)
     return nil
 end
 function Handle.prototype.destroy(self, ...)
+    if self[0] == 2 or self[0] == 3 then
+        return nil
+    end
     local clazz = self.constructor
     local id = getHandleId(self.handle)
-    if not clazz.memoized[id] then
-        error(
-            __TS__New(
-                IllegalStateException,
-                "Double-destroy run for handle " .. tostring(id)
-            ),
-            0
-        )
-    end
+    checkNotNull(clazz.memoized[id])
     self[0] = 2
     if self.onDestroyEvent then
         Event.invoke(self.onDestroyEvent)

package/core/types/image.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Color } from "./color";

package/core/types/item.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
 import { Item } from "../../engine/internal/item";
 import "../../engine/internal/item+owner";
+import "../../engine/internal/item/fields";
 export { Item };

package/core/types/item.lua

@@ -2,5 +2,6 @@ local ____exports = {}
 local ____item = require("engine.internal.item")
 local Item = ____item.Item
 require("engine.internal.item+owner")
+require("engine.internal.item.fields")
 ____exports.Item = Item
 return ____exports

package/core/types/missile.d.ts

@@ -5,7 +5,7 @@ export declare class Missile implements Destroyable {
     readonly retarget: (this: void, target: Unit | Vec2) => void;
     private readonly update;
     protected constructor(effect: jeffect, retarget: (this: void, target: Unit | Vec2) => void, update: (this: Missile) => boolean);
-    static launch(config: Readonly<{
+    static launch<T extends any[]>(config: Readonly<{
         art: string;
         scale?: number;
         acceleration?: number;
@@ -15,7 +15,7 @@ export declare class Missile implements Destroyable {
         maxSpeed?: number;
         sourceOffset?: Vec2;
         targetOffset?: Vec2;
-    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean) => void): Missile;
+    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean, ...parameters: T) => void, ...parameters: T): Missile;
     destroy(): void;
 }
 export declare namespace Missile {

package/core/types/missile.lua

@@ -41,7 +41,8 @@ function Missile.prototype.____constructor(self, effect, retarget, update)
     end
     head = self
 end
-function Missile.launch(self, config, source, target, onArrival)
+function Missile.launch(self, config, source, target, onArrival, ...)
+    local parameters = {...}
     local ____opt_0 = config.sourceOffset
     local offsetX = ____opt_0 and ____opt_0.x or 0
     local ____opt_2 = config.sourceOffset
@@ -142,7 +143,12 @@ function Missile.launch(self, config, source, target, onArrival)
             visualPositionArcY = currentVisualTargetY
             visualPositionArcZ = currentVisualTargetZ
             retarget = false
-            safeCall(onArrival, self, true)
+            safeCall(
+                onArrival,
+                self,
+                true,
+                table.unpack(parameters)
+            )
             return not retarget
         end
         if arcVSpeed ~= 0 and (currentTargetX ~= initialTargetX or currentTargetY ~= initialTargetY) then

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;
@@ -16,6 +28,7 @@ export declare class Player extends Handle<jplayer> {
     static readonly neutralExtra: Player;
     private static events;
     readonly id: number;
+    readonly slotState: jplayerslotstate;
     constructor(handle: jplayer);
     onDestroy(): HandleDestructor;
     toString(): string;
@@ -33,15 +46,17 @@ export declare class Player extends Handle<jplayer> {
     get isUser(): boolean;
     get isPlaying(): boolean;
     get controller(): jmapcontrol;
-    get slotState(): jplayerslotstate;
     clearSelection(): void;
     selectSingle(unit: Unit): void;
     select(unit: Unit): void;
     deselect(unit: Unit): void;
+    setRaceSkin(racePreference: jracepreference): void;
     forceUIKey(key: string): void;
     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 +65,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 +82,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 {};