warscript 0.0.1-dev.f5421e8 → 0.0.1-dev.f594e71

package/attributes.d.ts

@@ -1,12 +1,18 @@
 /** @noSelfInFile */
+declare const marker: {};
 export type Attribute<T> = {
     readonly __attribute: unique symbol;
     readonly __type: T;
+    readonly __marker: typeof marker;
 } & symbol;
+export declare const attribute: <T>() => Attribute<T>;
+export declare const isAttribute: (value: unknown) => value is Attribute<unknown>;
 export declare namespace Attribute {
     const create: <T>() => Attribute<T>;
 }
 export declare class AttributesHolder {
     readonly get: (<T>(attribute: Attribute<T>) => T | undefined) & LuaExtension<"TableGetMethod">;
     readonly set: (<T>(attribute: Attribute<T>, value: T | undefined) => void) & LuaExtension<"TableSetMethod">;
+    getOrPut<T>(attribute: Attribute<T>, defaultValue: () => T): T;
 }
+export {};

package/attributes.lua

@@ -1,11 +1,18 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local ____exports = {}
+local marker = {}
+____exports.attribute = function()
+    return {__marker = marker}
+end
+____exports.isAttribute = function(value)
+    return type(value) == "table" and rawget(value, "__marker") == marker
+end
 ____exports.Attribute = {}
 local Attribute = ____exports.Attribute
 do
     Attribute.create = function()
-        return {}
+        return {__marker = marker}
     end
 end
 ____exports.AttributesHolder = __TS__Class()
@@ -13,4 +20,13 @@ local AttributesHolder = ____exports.AttributesHolder
 AttributesHolder.name = "AttributesHolder"
 function AttributesHolder.prototype.____constructor(self)
 end
+function AttributesHolder.prototype.getOrPut(self, attribute, defaultValue)
+    local value = self[attribute]
+    if value ~= nil then
+        return value
+    end
+    value = defaultValue()
+    self[attribute] = value
+    return value
+end
 return ____exports

package/core/types/frame.d.ts

@@ -80,6 +80,7 @@ export declare class Frame extends Handle<jframehandle> {
     get onMouseLeave(): FrameEvent;
     get onMouseUp(): FrameEvent;
     get onMouseWheel(): FrameEvent<[number]>;
+    private trackMouseLocally;
     get mouseEnterLocalEvent(): Event;
     get mouseLeaveLocalEvent(): Event;
     get popupMenuItemChangeEvent(): FrameEvent<[

package/core/types/frame.lua

@@ -15,13 +15,32 @@ 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 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 getCameraTargetPositionX = GetCameraTargetPositionX
-local getCameraTargetPositionY = GetCameraTargetPositionY
+local getHandleId = GetHandleId
+local getOriginFrame = BlzGetOriginFrame
+local location = Location
 local ____rawget = _G.rawget
 local rawset = _G.rawset
 local invoke = Event.invoke
@@ -123,6 +142,79 @@ do
     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"
@@ -155,6 +247,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
@@ -301,7 +405,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)
@@ -344,27 +458,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,
@@ -626,24 +734,8 @@ __TS__SetDescriptor(
     "mouseEnterLocalEvent",
     {get = function(self)
         local event = __TS__New(Event)
-        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
-        local isMouseInside = false
-        Timer.onPeriod[1 / 64]:addListener(function()
-            local tooltip = tooltipByFrame[self]
-            if tooltip and tooltip.visible then
-                if not isMouseInside then
-                    isMouseInside = true
-                    Event.invoke(event)
-                end
-            else
-                isMouseInside = false
-            end
-        end)
+        self:trackMouseLocally()
+        mouseEnterLocalEventByFrame[self] = event
         rawset(self, "mouseEnterLocalEvent", event)
         return event
     end},
@@ -654,24 +746,8 @@ __TS__SetDescriptor(
     "mouseLeaveLocalEvent",
     {get = function(self)
         local event = __TS__New(Event)
-        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
-        local isMouseInside = false
-        Timer.onPeriod[1 / 64]:addListener(function()
-            local tooltip = tooltipByFrame[self]
-            if tooltip and tooltip.visible then
-                isMouseInside = true
-            else
-                if isMouseInside then
-                    isMouseInside = false
-                    Event.invoke(event)
-                end
-            end
-        end)
+        self:trackMouseLocally()
+        mouseLeaveLocalEventByFrame[self] = event
         rawset(self, "mouseLeaveLocalEvent", event)
         return event
     end},
@@ -938,16 +1014,19 @@ __TS__ObjectDefineProperty(
         local event = __TS__New(Event)
         local syncX = 0
         local syncY = 0
-        local syncCamX = getCameraTargetPositionX()
-        local syncCamY = getCameraTargetPositionY()
+        local syncFrameX = 0
+        local syncFrameY = 0
         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()
+                syncFrameX, syncFrameY = worldCoordinatesToFrame(
+                    x,
+                    y,
+                    getTerrainZ(x, y)
+                )
                 lastX = x
                 lastY = y
                 invoke(event, x, y)
@@ -957,9 +1036,8 @@ __TS__ObjectDefineProperty(
             if syncX == 0 and syncY == 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(syncFrameX, syncFrameY)
+            if isDefinite and (x ~= lastX or y ~= lastY) then
                 lastX = x
                 lastY = y
                 invoke(event, x, y)

package/core/types/handle.lua

@@ -15,6 +15,8 @@ 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 = {}
@@ -58,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
@@ -66,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/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/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 {};

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 = {}
@@ -21,20 +21,43 @@ local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
 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 playerNative = _G.Player
+local setPlayerAbilityAvailable = SetPlayerAbilityAvailable
+local setPlayerAlliance = SetPlayerAlliance
+local setPlayerRaceSkin = SetPlayerRaceSkin
 local setPlayerTechMaxAllowed = SetPlayerTechMaxAllowed
 local setPlayerTechResearched = SetPlayerTechResearched
-local setPlayerAbilityAvailable = SetPlayerAbilityAvailable
-local playerNative = _G.Player
+local triggerRegisterPlayerAllianceChange = TriggerRegisterPlayerAllianceChange
+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"
 __TS__ClassExtends(Player, Handle)
 function Player.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
+    self.slotState = GetPlayerSlotState(self.handle)
     self.id = GetPlayerId(handle)
 end
 function Player.prototype.onDestroy(self)
@@ -67,6 +90,9 @@ function Player.prototype.deselect(self, unit)
         SelectUnit(unit.handle, false)
     end
 end
+function Player.prototype.setRaceSkin(self, racePreference)
+    setPlayerRaceSkin(self.handle, racePreference)
+end
 function Player.prototype.forceUIKey(self, key)
     if self.isLocal then
         ForceUIKey(key)
@@ -83,6 +109,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
@@ -122,14 +154,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)
         )
@@ -178,7 +207,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)
@@ -249,7 +278,7 @@ Player.all = (function()
     end
     return all
 end)()
-Player["local"] = ____exports.Player:of(GetLocalPlayer())
+Player["local"] = ____exports.Player:of(PLAYER_LOCAL_HANDLE)
 Player.neutralPassive = ____exports.Player.all[PLAYER_NEUTRAL_PASSIVE + 1]
 Player.neutralAggressive = ____exports.Player.all[PLAYER_NEUTRAL_AGGRESSIVE + 1]
 Player.neutralVictim = ____exports.Player.all[bj_PLAYER_NEUTRAL_VICTIM + 1]
@@ -277,6 +306,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, color)
             SetPlayerColor(self.handle, color.handle)
+            Event.invoke(playerColorChangedEvent, self)
         end
     },
     true
@@ -339,7 +369,7 @@ __TS__SetDescriptor(
     Player.prototype,
     "isUser",
     {get = function(self)
-        return GetPlayerController(self.handle) == MAP_CONTROL_USER
+        return self.controller == MAP_CONTROL_USER
     end},
     true
 )
@@ -347,7 +377,7 @@ __TS__SetDescriptor(
     Player.prototype,
     "isPlaying",
     {get = function(self)
-        return GetPlayerSlotState(self.handle) == PLAYER_SLOT_STATE_PLAYING
+        return self.slotState == PLAYER_SLOT_STATE_PLAYING
     end},
     true
 )
@@ -355,17 +385,30 @@ __TS__SetDescriptor(
     Player.prototype,
     "controller",
     {get = function(self)
-        return GetPlayerController(self.handle)
+        local controller = GetPlayerController(self.handle)
+        rawset(self, "controller", controller)
+        return controller
     end},
     true
 )
-__TS__SetDescriptor(
-    Player.prototype,
-    "slotState",
+__TS__ObjectDefineProperty(
+    Player,
+    "allianceChangedEvent",
     {get = function(self)
-        return GetPlayerSlotState(self.handle)
-    end},
-    true
+        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,
@@ -373,7 +416,7 @@ __TS__ObjectDefineProperty(
     {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}
 )
@@ -383,7 +426,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}
 )
@@ -393,7 +436,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}
 )
@@ -403,7 +446,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
@@ -439,10 +482,17 @@ __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
+____exports.Player.onLeave:addListener(
+    999999,
+    function(player)
+        rawset(player, "slotState", PLAYER_SLOT_STATE_LEFT)
+    end
+)
 return ____exports