warscript 0.0.1-dev.e4a5fce → 0.0.1-dev.e5e97e8

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/config.d.ts

@@ -0,0 +1,5 @@
+/** @noSelfInFile */
+export declare class WarscriptConfig {
+    private constructor();
+    static AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH: boolean;
+}

package/config.lua

@@ -0,0 +1,10 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local ____exports = {}
+____exports.WarscriptConfig = __TS__Class()
+local WarscriptConfig = ____exports.WarscriptConfig
+WarscriptConfig.name = "WarscriptConfig"
+function WarscriptConfig.prototype.____constructor(self)
+end
+WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH = true
+return ____exports

package/core/types/effect.d.ts

@@ -8,6 +8,7 @@ declare const enum EffectPropertyKey {
     ROLL = 102
 }
 export type EffectParameters = {
+    readonly delay?: number;
     readonly scale?: number;
     readonly color?: PlayerColor;
     readonly pitch?: number;
@@ -29,12 +30,10 @@ export declare class Effect extends Handle<jeffect> {
     set pitch(pitch: number);
     get roll(): number;
     set roll(roll: number);
-    static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, pos: Vec2): T;
-    static createTarget<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, target: Widget, attachPoint: string): T;
+    static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), modelPath: string, xOrWidget: number | Widget, yOrAttachmentPoint?: number | string, parameters?: EffectParameters): T;
     static flash(modelPath: string, ...args: [
         ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint?: string],
         ...parametersOrDuration: [parametersOrDuration?: EffectParameters | number] | [duration?: number, parameters?: EffectParameters]
     ]): void;
-    static flashTarget(model: string, target: Widget, attachPoint: string, duration?: number): void;
 }
 export {};

package/core/types/effect.lua

@@ -1,10 +1,10 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
-local dummyPlayer
+local dummyPlayer, addSpecialEffectInternal, flash
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____playerColor = require("core.types.playerColor")
@@ -119,10 +119,18 @@ local function setSpecialEffectColor(effect, color)
     dummyPlayer.color = dummyColor
 end
 local setters = {scale = setSpecialEffectScale, color = setSpecialEffectColor, pitch = setSpecialEffectPitchDegrees, roll = setSpecialEffectRollDegrees}
+local setterProperties = {"scale", "color", "pitch", "roll"}
 dummyPlayer = Player.neutralExtra
 local temporaryEffects = {}
 local temporaryEffectsDurations = {}
 local temporaryEffectsCount = 0
+local delayedEffectsModelPath = {}
+local delayedEffectsXOrWidget = {}
+local delayedEffectsYOrAttachmentPoint = {}
+local delayedEffectsDuration = {}
+local delayedEffectsParameters = {}
+local delayedEffectsDelay = {}
+local delayedEffectsCount = 0
 local period = 1 / 32
 Timer.onPeriod[period]:addListener(function()
     local i = 1
@@ -131,12 +139,36 @@ Timer.onPeriod[period]:addListener(function()
         if duration <= 0 then
             destroyEffect(temporaryEffects[i])
             temporaryEffects[i] = temporaryEffects[temporaryEffectsCount]
+            temporaryEffectsDurations[i] = temporaryEffectsDurations[temporaryEffectsCount]
             temporaryEffectsCount = temporaryEffectsCount - 1
         else
             temporaryEffectsDurations[i] = duration - period
             i = i + 1
         end
     end
+    i = 1
+    while i <= delayedEffectsCount do
+        local delay = delayedEffectsDelay[i]
+        if delay <= 0 then
+            flash(
+                delayedEffectsModelPath[i],
+                delayedEffectsXOrWidget[i],
+                delayedEffectsYOrAttachmentPoint[i],
+                delayedEffectsDuration[i],
+                delayedEffectsParameters[i]
+            )
+            delayedEffectsModelPath[i] = delayedEffectsModelPath[delayedEffectsCount]
+            delayedEffectsXOrWidget[i] = delayedEffectsXOrWidget[delayedEffectsCount]
+            delayedEffectsYOrAttachmentPoint[i] = delayedEffectsYOrAttachmentPoint[delayedEffectsCount]
+            delayedEffectsDuration[i] = delayedEffectsDuration[delayedEffectsCount]
+            delayedEffectsParameters[i] = delayedEffectsParameters[delayedEffectsCount]
+            delayedEffectsDelay[i] = delayedEffectsDelay[delayedEffectsCount]
+            delayedEffectsCount = delayedEffectsCount - 1
+        else
+            delayedEffectsDelay[i] = delay - period
+            i = i + 1
+        end
+    end
 end)
 ____exports.Effect = __TS__Class()
 local Effect = ____exports.Effect
@@ -146,66 +178,44 @@ function Effect.prototype.onDestroy(self)
     destroyEffect(self.handle)
     return Handle.prototype.onDestroy(self)
 end
-function Effect.create(self, model, pos)
-    return self:of(addSpecialEffect(model, pos.x, pos.y))
-end
-function Effect.createTarget(self, model, target, attachPoint)
-    return self:of(addSpecialEffectTarget(model, target.handle, attachPoint))
+function Effect.create(self, modelPath, xOrWidget, yOrAttachmentPoint, parameters)
+    local effect = self:of(addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters))
+    if parameters ~= nil then
+        effect[100] = parameters.color
+        effect[101] = parameters.pitch
+        effect[102] = parameters.roll
+    end
+    return effect
 end
 function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, parametersOrDuration, parameters)
     if type(parametersOrDuration) ~= "number" then
         parameters = parametersOrDuration
         parametersOrDuration = nil
     end
-    local coordinatesProvided = type(xOrWidget) == "number"
-    local isPositional = coordinatesProvided or (parameters and parameters.detached) == true
-    local x = not isPositional and 0 or (coordinatesProvided and xOrWidget or xOrWidget.x)
-    local y = not isPositional and 0 or (coordinatesProvided and yOrOrAttachmentPoint or xOrWidget.y)
-    local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint or "origin")
-    if isPositional and not coordinatesProvided and (parameters and parameters.scale) == nil and __TS__InstanceOf(xOrWidget, Unit) then
-        setSpecialEffectScale(effect, xOrWidget.scale)
-    end
-    if parameters ~= nil then
-        for key, value in ____pairs(parameters) do
-            if key ~= "zOffset" and key ~= "detached" and key ~= "scaleZOffset" then
-                setters[key](effect, value)
-            end
-        end
-        if isPositional and parameters.zOffset ~= nil then
-            moveLocation(location, x, y)
-            local z = __TS__InstanceOf(xOrWidget, Unit) and getLocationZ(location) + xOrWidget.flyHeight or getLocationZ(location)
-            BlzSetSpecialEffectZ(
-                effect,
-                z + parameters.zOffset * (parameters.scaleZOffset and getSpecialEffectScale(effect) or 1)
-            )
-        end
-    end
-    if parametersOrDuration ~= nil and parametersOrDuration > 0 then
-        temporaryEffectsCount = temporaryEffectsCount + 1
-        temporaryEffects[temporaryEffectsCount] = effect
-        temporaryEffectsDurations[temporaryEffectsCount] = parametersOrDuration
+    if parameters and (parameters.delay or 0) > 0 then
+        delayedEffectsCount = delayedEffectsCount + 1
+        delayedEffectsModelPath[delayedEffectsCount] = modelPath
+        delayedEffectsXOrWidget[delayedEffectsCount] = xOrWidget
+        delayedEffectsYOrAttachmentPoint[delayedEffectsCount] = yOrOrAttachmentPoint
+        delayedEffectsDuration[delayedEffectsCount] = parametersOrDuration
+        delayedEffectsParameters[delayedEffectsCount] = parameters
+        delayedEffectsDelay[delayedEffectsCount] = parameters.delay
         return
     end
-    destroyEffect(effect)
-end
-function Effect.flashTarget(self, model, target, attachPoint, duration)
-    local effect = addSpecialEffectTarget(model, target.handle, attachPoint)
-    if effect ~= nil then
-        if duration and duration > 0 then
-            temporaryEffectsCount = temporaryEffectsCount + 1
-            temporaryEffects[temporaryEffectsCount] = effect
-            temporaryEffectsDurations[temporaryEffectsCount] = duration
-        else
-            destroyEffect(effect)
-        end
-    end
+    flash(
+        modelPath,
+        xOrWidget,
+        yOrOrAttachmentPoint,
+        parametersOrDuration,
+        parameters
+    )
 end
 __TS__SetDescriptor(
     Effect.prototype,
     "color",
     {
         get = function(self)
-            return self[100] or PlayerColor.black
+            return self[100] or PlayerColor.red
         end,
         set = function(self, color)
             setSpecialEffectColor(self.handle, color)
@@ -255,4 +265,41 @@ __TS__SetDescriptor(
     },
     true
 )
+addSpecialEffectInternal = function(modelPath, xOrWidget, yOrAttachmentPoint, parameters)
+    local coordinatesProvided = type(xOrWidget) == "number"
+    local isPositional = coordinatesProvided or (parameters and parameters.detached) == true
+    local x = not isPositional and 0 or (coordinatesProvided and xOrWidget or xOrWidget.x)
+    local y = not isPositional and 0 or (coordinatesProvided and yOrAttachmentPoint or xOrWidget.y)
+    local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrAttachmentPoint or "origin")
+    if parameters ~= nil then
+        if isPositional and parameters.scale == nil and __TS__InstanceOf(xOrWidget, Unit) then
+            setSpecialEffectScale(effect, xOrWidget.scale)
+        end
+        for ____, property in ipairs(setterProperties) do
+            local value = parameters[property]
+            if value ~= nil then
+                setters[property](effect, value)
+            end
+        end
+        if isPositional and parameters.zOffset ~= nil then
+            moveLocation(location, x, y)
+            local z = __TS__InstanceOf(xOrWidget, Unit) and getLocationZ(location) + xOrWidget.flyHeight or getLocationZ(location)
+            setSpecialEffectZ(
+                effect,
+                z + parameters.zOffset * (parameters.scaleZOffset and getSpecialEffectScale(effect) or 1)
+            )
+        end
+    end
+    return effect
+end
+flash = function(modelPath, xOrWidget, yOrAttachmentPoint, duration, parameters)
+    local effect = addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters)
+    if duration ~= nil and duration > 0 then
+        temporaryEffectsCount = temporaryEffectsCount + 1
+        temporaryEffects[temporaryEffectsCount] = effect
+        temporaryEffectsDurations[temporaryEffectsCount] = duration
+        return
+    end
+    destroyEffect(effect)
+end
 return ____exports

package/core/types/frame.lua

@@ -15,13 +15,20 @@ 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 frameClick = BlzFrameClick
 local frameGetEnable = BlzFrameGetEnable
 local frameIsVisible = BlzFrameIsVisible
 local frameSetEnable = BlzFrameSetEnable
 local frameSetScale = BlzFrameSetScale
-local getCameraTargetPositionX = GetCameraTargetPositionX
-local getCameraTargetPositionY = GetCameraTargetPositionY
 local ____rawget = _G.rawget
 local rawset = _G.rawset
 local invoke = Event.invoke
@@ -344,27 +351,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,
@@ -938,16 +939,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 +961,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/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]>;

package/core/types/player.lua

@@ -21,14 +21,34 @@ 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 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
+}
 ____exports.Player = __TS__Class()
 local Player = ____exports.Player
 Player.name = "Player"
@@ -83,6 +103,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 +148,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 +201,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 +272,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]
@@ -367,13 +390,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}
 )
@@ -383,7 +425,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 +435,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 +445,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,7 +481,7 @@ __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

package/core/types/playerCamera.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+import type { Unit } from "../../engine/internal/unit";
 export declare class PlayerCamera {
     private readonly player;
     private readonly isLocal;
@@ -28,5 +29,6 @@ export declare class PlayerCamera {
     get roll(): number;
     set roll(v: number);
     reset(): void;
+    static isUnitInView(unit: Unit): boolean;
     static of(player: jplayer): PlayerCamera;
 }