warscript 0.0.1-dev.6745db1 → 0.0.1-dev.685e1bc

package/attributes.d.ts

@@ -13,5 +13,6 @@ export declare namespace Attribute {
 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

@@ -20,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.lua

@@ -19,13 +19,28 @@ 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
@@ -127,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"
@@ -305,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)
@@ -936,16 +985,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)
@@ -955,9 +1007,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/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,7 +46,6 @@ 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;
@@ -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,20 +23,40 @@ 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"
 __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)
@@ -85,6 +105,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 +150,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 +203,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 +302,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, color)
             SetPlayerColor(self.handle, color.handle)
+            Event.invoke(playerColorChangedEvent, self)
         end
     },
     true
@@ -341,7 +365,7 @@ __TS__SetDescriptor(
     Player.prototype,
     "isUser",
     {get = function(self)
-        return GetPlayerController(self.handle) == MAP_CONTROL_USER
+        return self.controller == MAP_CONTROL_USER
     end},
     true
 )
@@ -349,7 +373,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
 )
@@ -357,17 +381,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,
@@ -375,7 +412,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}
 )
@@ -385,7 +422,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 +432,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 +442,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 +478,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

package/core/types/playerCamera.lua

@@ -13,6 +13,8 @@ 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 ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
+local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
 local getHandleId = GetHandleId
 local setCameraField = SetCameraField
 local getCameraField = GetCameraField
@@ -26,6 +28,7 @@ local resetToGameCamera = ResetToGameCamera
 local cos = math.cos
 local deg = math.deg
 local sin = math.sin
+local sqrt = math.sqrt
 local memoized = {}
 ____exports.PlayerCamera = __TS__Class()
 local PlayerCamera = ____exports.PlayerCamera
@@ -233,4 +236,45 @@ ____exports.worldCoordinatesToFrame = function(x, y, z)
     local frameY = 0.42625 - yCenterScreenShift + (cameraAngleOfAttackSinRotationCos * dx + cameraAngleOfAttackSinRotationSin * dy - cameraAngleOfAttackCos * dz) / xPrime
     return frameX, frameY, xPrime < 0 and frameX >= frameMinX and frameX <= frameMaxX and frameY >= FRAME_MIN_Y and frameY <= FRAME_MAX_Y
 end
+---
+-- @internal For use by internal systems only.
+____exports.frameCoordinatesToWorld = function(x, y)
+    if not isCameraViewPrecalculated then
+        precalculateCameraView()
+    end
+    local a = (x - 0.4) * scaleFactor
+    local b = (0.42625 - yCenterScreenShift - y) * scaleFactor
+    local nx = 1 / sqrt(1 + a * a + b * b)
+    local ny = sqrt(1 - (1 + b * b) * nx * nx)
+    local nz = sqrt(1 - nx * nx - ny * ny)
+    if a > 0 then
+        ny = -ny
+    end
+    if b < 0 then
+        nz = -nz
+    end
+    local nxPrime = cameraAngleOfAttackCosRotationCos * nx - cameraRotationSin * ny + cameraAngleOfAttackSinRotationCos * nz
+    local nyPrime = cameraAngleOfAttackCosRotationSin * nx + cameraRotationCos * ny + cameraAngleOfAttackSinRotationSin * nz
+    local nzPrime = -cameraAngleOfAttackSin * nx + cameraAngleOfAttackCos * nz
+    local zGuess = getTerrainZ(cameraEyeX, cameraEyeY)
+    local xGuess = cameraEyeX + nxPrime * (cameraEyeZ - zGuess) / nzPrime
+    local yGuess = cameraEyeY + nyPrime * (cameraEyeZ - zGuess) / nzPrime
+    local zWorld = getTerrainZ(xGuess, yGuess)
+    local deltaZ = zWorld - zGuess
+    zGuess = zWorld
+    local zWorldOld = zWorld
+    local deltaZOld = deltaZ
+    local i = 0
+    while (deltaZ > 1 or deltaZ < -1) and i < 50 do
+        xGuess = cameraEyeX + nxPrime * (cameraEyeZ - zGuess) / nzPrime
+        yGuess = cameraEyeY + nyPrime * (cameraEyeZ - zGuess) / nzPrime
+        zWorld = getTerrainZ(xGuess, yGuess)
+        deltaZ = zWorld - zGuess
+        zGuess = (deltaZOld * zWorld - deltaZ * zWorldOld) / (deltaZOld - deltaZ)
+        zWorldOld = zWorld
+        deltaZOld = deltaZ
+        i = i + 1
+    end
+    return xGuess, yGuess, zWorld, i < 50
+end
 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,10 +1,20 @@
 /** @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;
     readonly z: undefined;
     protected constructor(id: number, x: number, y: number, z: undefined);
+    get up(): TileCell;
+    get down(): TileCell;
+    get left(): TileCell;
+    get right(): TileCell;
+    get terrainTypeId(): number;
+    set terrainTypeId(terrainTypeId: number);
+    get terrainVariance(): number;
+    set terrainVariance(terrainVariance: number);
+    randomizeTerrainVariance(): void;
     isInRangeOf(x: number, y: number, range: number): boolean;
     isInRangeOf(tileCell: TileCell, range: number): boolean;
     static getInRect(minX: number, minY: number, maxX: number, maxY: number): TileCell[];

package/core/types/tileCell.lua

@@ -1,7 +1,14 @@
 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
 local abs = math.abs
 local ____type = math.type
 local ult = math.ult
@@ -9,13 +16,27 @@ 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
     self.z = z
     tileCellById[id] = self
 end
+function TileCell.prototype.randomizeTerrainVariance(self)
+    local x = self.x
+    local y = self.y
+    setTerrainType(
+        x,
+        y,
+        getTerrainType(x, y),
+        -1,
+        1,
+        1
+    )
+end
 function TileCell.prototype.isInRangeOf(self, x, y, range)
     if range == nil then
         range = y
@@ -97,4 +118,80 @@ function TileCell.of(x, y)
         nil
     )
 end
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "up",
+    {get = function(self)
+        return ____exports.TileCell.of(self.x, self.y + 128)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "down",
+    {get = function(self)
+        return ____exports.TileCell.of(self.x, self.y - 128)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "left",
+    {get = function(self)
+        return ____exports.TileCell.of(self.x - 128, self.y)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "right",
+    {get = function(self)
+        return ____exports.TileCell.of(self.x + 128, self.y)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "terrainTypeId",
+    {
+        get = function(self)
+            return getTerrainType(self.x, self.y)
+        end,
+        set = function(self, terrainTypeId)
+            local x = self.x
+            local y = self.y
+            setTerrainType(
+                x,
+                y,
+                terrainTypeId,
+                getTerrainVariance(x, y),
+                1,
+                1
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "terrainVariance",
+    {
+        get = function(self)
+            return getTerrainVariance(self.x, self.y)
+        end,
+        set = function(self, terrainVariance)
+            local x = self.x
+            local y = self.y
+            setTerrainType(
+                x,
+                y,
+                getTerrainType(x, y),
+                terrainVariance,
+                1,
+                1
+            )
+        end
+    },
+    true
+)
 return ____exports

package/core/types/timer.d.ts

@@ -1,6 +1,7 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
 import { AbstractDestroyable, Destructor } from "../../destroyable";
+import { CallbackId } from "../../utility/callback-array";
 declare const enum TimerPropertyKey {
     HANDLE = 0,
     DESTROY_ON_EXPIRATION = 1,
@@ -22,8 +23,8 @@ export declare class Timer extends AbstractDestroyable {
     pause(): void;
     resume(): void;
     static create(): Timer;
-    static run<T, K extends KeysOfType<T, (this: T, ...args: any) => any>>(object: T, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): void;
-    static run<Args extends any[]>(callback: (this: void, ...args: Args) => void, ...args: Args): void;
+    static run<T, K extends KeysOfType<T, (this: T, ...args: any) => any>>(object: T, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): CallbackId;
+    static run<Args extends any[]>(callback: (this: void, ...args: Args) => void, ...args: Args): CallbackId;
     static simple<Args extends any[]>(timeout: number, callback: (...args: Args) => void, ...args: Args): Timer;
     static periodic<Args extends any[]>(period: number, callback: (this: void, timer: Timer, ...args: Args) => void, ...args: Args): Timer;
     static counted(period: number, count: number, callback: (this: void, timer: Timer) => void): Timer;