warscript 0.0.1-dev.ee2345e → 0.0.1-dev.f024cc2

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;
 }

package/core/types/playerCamera.lua

@@ -3,33 +3,49 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
+local ____preconditions = require("utility.preconditions")
+local check = ____preconditions.check
+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 getHandleId = GetHandleId
 local setCameraField = SetCameraField
 local getCameraField = GetCameraField
 local setCameraPosition = SetCameraPosition
+local getCameraEyePositionX = GetCameraEyePositionX
+local getCameraEyePositionY = GetCameraEyePositionY
+local getCameraEyePositionZ = GetCameraEyePositionZ
 local getCameraTargetPositionX = GetCameraTargetPositionX
 local getCameraTargetPositionY = GetCameraTargetPositionY
 local resetToGameCamera = ResetToGameCamera
+local cos = math.cos
 local deg = math.deg
-local localPlayer = GetLocalPlayer()
+local sin = math.sin
 local memoized = {}
 ____exports.PlayerCamera = __TS__Class()
 local PlayerCamera = ____exports.PlayerCamera
 PlayerCamera.name = "PlayerCamera"
 function PlayerCamera.prototype.____constructor(self, player)
     local id = getHandleId(player)
-    if memoized[id] then
-        error("Double-constructor run player camera!")
-    end
+    check(memoized[id] == nil)
     memoized[id] = self
     self.player = player
-    self.isLocal = player == localPlayer
+    self.isLocal = player == PLAYER_LOCAL_HANDLE
 end
 function PlayerCamera.prototype.reset(self)
     if self.isLocal then
         resetToGameCamera(0)
     end
 end
+function PlayerCamera.isUnitInView(self, unit)
+    local ____, ____, isInView = ____exports.worldCoordinatesToFrame(unit.x, unit.y, unit.z)
+    return isInView
+end
 function PlayerCamera.of(self, player)
     return memoized[getHandleId(player)] or __TS__New(____exports.PlayerCamera, player)
 end
@@ -159,4 +175,62 @@ __TS__SetDescriptor(
     },
     true
 )
+local cameraEyeX = 0
+local cameraEyeY = 0
+local cameraEyeZ = 0
+local cameraAngleOfAttack = 0
+local cameraAngleOfAttackCos = 0
+local cameraAngleOfAttackSin = 0
+local cameraRotation = 0
+local cameraRotationCos = 0
+local cameraRotationSin = 0
+local cameraAngleOfAttackCosRotationCos = 0
+local cameraAngleOfAttackCosRotationSin = 0
+local cameraAngleOfAttackSinRotationCos = 0
+local cameraAngleOfAttackSinRotationSin = 0
+local yCenterScreenShift = 0
+local scaleFactor = 0
+local frameMinX = 0
+local frameMaxX = 0
+local isCameraViewPrecalculated = false
+local function precalculateCameraView()
+    cameraEyeX = getCameraEyePositionX()
+    cameraEyeY = getCameraEyePositionY()
+    cameraEyeZ = getCameraEyePositionZ()
+    cameraAngleOfAttack = getCameraField(CAMERA_FIELD_ANGLE_OF_ATTACK)
+    cameraAngleOfAttackCos = cos(cameraAngleOfAttack)
+    cameraAngleOfAttackSin = sin(cameraAngleOfAttack)
+    cameraRotation = getCameraField(CAMERA_FIELD_ROTATION)
+    cameraRotationCos = cos(cameraRotation)
+    cameraRotationSin = sin(cameraRotation)
+    cameraAngleOfAttackCosRotationCos = cameraAngleOfAttackCos * cameraRotationCos
+    cameraAngleOfAttackCosRotationSin = cameraAngleOfAttackCos * cameraRotationSin
+    cameraAngleOfAttackSinRotationCos = cameraAngleOfAttackSin * cameraRotationCos
+    cameraAngleOfAttackSinRotationSin = cameraAngleOfAttackSin * cameraRotationSin
+    yCenterScreenShift = 0.1284 * cameraAngleOfAttackCos
+    local cameraFieldOfView = getCameraField(CAMERA_FIELD_FIELD_OF_VIEW)
+    scaleFactor = 0.0524 * cameraFieldOfView ^ 3 - 0.0283 * cameraFieldOfView ^ 2 + 1.061 * cameraFieldOfView
+    frameMinX, frameMaxX = getFrameMinXMaxX()
+    isCameraViewPrecalculated = true
+end
+Timer.onPeriod[1 / 64]:addListener(
+    4,
+    function()
+        isCameraViewPrecalculated = false
+    end
+)
+---
+-- @internal For use by internal systems only.
+____exports.worldCoordinatesToFrame = function(x, y, z)
+    if not isCameraViewPrecalculated then
+        precalculateCameraView()
+    end
+    local dx = x - cameraEyeX
+    local dy = y - cameraEyeY
+    local dz = z - cameraEyeZ
+    local xPrime = scaleFactor * (-cameraAngleOfAttackCosRotationCos * dx - cameraAngleOfAttackCosRotationSin * dy - cameraAngleOfAttackSin * dz)
+    local frameX = 0.4 + (cameraRotationCos * dy - cameraRotationSin * dx) / xPrime
+    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
 return ____exports

package/core/types/sound.d.ts

@@ -1,6 +1,7 @@
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Unit } from "./unit";
+import { SoundEax } from "../../engine/object-data/auxiliary/sound-eax";
 export declare enum SoundChannel {
     General = 0,
     UnitSelection = 1,
@@ -18,16 +19,7 @@ export declare enum SoundChannel {
     Birth = 13,
     Fire = 14
 }
-export declare enum SoundEax {
-    Default = "DefaultEAXON",
-    Acknowledgements = "HeroAcksEAX",
-    Environment = "DoodadsEAX",
-    Drums = "KotoDrumsEAX",
-    Attacks = "CombatSoundsEAX",
-    Abilities = "SpellsEAX",
-    Missiles = "MissilesEAX"
-}
-export type SoundPreset = Readonly<{
+export type SoundSettings = Readonly<{
     channel?: SoundChannel;
     eax?: SoundEax;
     fadeInRate?: number;
@@ -36,19 +28,19 @@ export type SoundPreset = Readonly<{
     volume?: number;
     pitch?: number;
 }>;
-export type Sound3DPreset = SoundPreset & Readonly<{
+export type Sound3DSettings = SoundSettings & Readonly<{
     stopWhenOutOfRange?: boolean;
     minDistance?: number;
     maxDistance?: number;
     distanceCutoff?: number;
 }>;
-export declare namespace SoundPreset {
-    const UI: SoundPreset;
-    const Music: SoundPreset;
-    const Attack: Sound3DPreset;
-    const Ability: Sound3DPreset;
-    const AbilityLooping: Sound3DPreset;
-    const Missile: Sound3DPreset;
+export declare namespace SoundSettings {
+    const UI: SoundSettings;
+    const Music: SoundSettings;
+    const Attack: Sound3DSettings;
+    const Ability: Sound3DSettings;
+    const AbilityLooping: Sound3DSettings;
+    const Missile: Sound3DSettings;
 }
 export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
     private _volume?;
@@ -58,12 +50,13 @@ export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
     start(milliseconds?: number): void;
     stop(fadeOut?: boolean): void;
     restart(milliseconds?: number): void;
-    static play(fileName: string, preset: SoundPreset): void;
-    static create(fileName: string, preset: SoundPreset): Sound;
+    static play(fileName: string, preset: SoundSettings): void;
+    static create(fileName: string, preset: SoundSettings): Sound;
 }
 export declare class Sound3D extends Sound {
-    static playAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): void;
-    static playOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): void;
-    static createAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): Sound3D;
-    static createOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): Sound3D;
+    static playAtPosition(fileName: string, preset: Sound3DSettings, x?: number, y?: number, z?: number): void;
+    static playOnUnit(fileName: string, preset: Sound3DSettings, unit: Unit): void;
+    static playFromLabel(label: string, preset: Sound3DSettings, ...positionOrUnit: [Unit] | [number, number, number?]): void;
+    static createAtPosition(fileName: string, preset: Sound3DSettings, x?: number, y?: number, z?: number): Sound3D;
+    static createOnUnit(fileName: string, preset: Sound3DSettings, unit: Unit): Sound3D;
 }

package/core/types/sound.lua

@@ -5,15 +5,18 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
+local ____sound_2Dpreset = require("engine.object-data.entry.sound-preset")
+local SoundPreset = ____sound_2Dpreset.SoundPreset
+local ____random = require("engine.random")
+local randomInteger = ____random.randomInteger
 local createSound = CreateSound
+local createSoundFromLabel = CreateSoundFromLabel
 local setSoundPitch = SetSoundPitch
 local setSoundChannel = SetSoundChannel
 local setSoundPosition = SetSoundPosition
 local setSoundVolume = SetSoundVolume
 local setSoundDistances = SetSoundDistances
 local setSoundDistanceCutoff = SetSoundDistanceCutoff
-local setSoundConeAngles = SetSoundConeAngles
-local setSoundConeOrientation = SetSoundConeOrientation
 local startSound = StartSound
 local setSoundPlayPosition = SetSoundPlayPosition
 local stopSound = StopSound
@@ -50,29 +53,21 @@ ____exports.SoundChannel.Birth = 13
 ____exports.SoundChannel[____exports.SoundChannel.Birth] = "Birth"
 ____exports.SoundChannel.Fire = 14
 ____exports.SoundChannel[____exports.SoundChannel.Fire] = "Fire"
-____exports.SoundEax = SoundEax or ({})
-____exports.SoundEax.Default = "DefaultEAXON"
-____exports.SoundEax.Acknowledgements = "HeroAcksEAX"
-____exports.SoundEax.Environment = "DoodadsEAX"
-____exports.SoundEax.Drums = "KotoDrumsEAX"
-____exports.SoundEax.Attacks = "CombatSoundsEAX"
-____exports.SoundEax.Abilities = "SpellsEAX"
-____exports.SoundEax.Missiles = "MissilesEAX"
-____exports.SoundPreset = {}
-local SoundPreset = ____exports.SoundPreset
+____exports.SoundSettings = {}
+local SoundSettings = ____exports.SoundSettings
 do
-    SoundPreset.UI = {channel = ____exports.SoundChannel.UI, eax = ____exports.SoundEax.Default, fadeInRate = 12700, fadeOutRate = 12700}
-    SoundPreset.Music = {
+    SoundSettings.UI = {channel = ____exports.SoundChannel.UI, eax = "DefaultEAXON", fadeInRate = 12700, fadeOutRate = 12700}
+    SoundSettings.Music = {
         channel = ____exports.SoundChannel.Music,
-        eax = ____exports.SoundEax.Default,
+        eax = "DefaultEAXON",
         fadeInRate = 12700,
         fadeOutRate = 12700,
         looping = true
     }
-    SoundPreset.Attack = {channel = ____exports.SoundChannel.Combat, eax = ____exports.SoundEax.Attacks, fadeInRate = 10, fadeOutRate = 10}
-    SoundPreset.Ability = {
+    SoundSettings.Attack = {channel = ____exports.SoundChannel.Combat, eax = "CombatSoundsEAX", fadeInRate = 10, fadeOutRate = 10}
+    SoundSettings.Ability = {
         channel = ____exports.SoundChannel.Animations,
-        eax = ____exports.SoundEax.Abilities,
+        eax = "SpellsEAX",
         stopWhenOutOfRange = true,
         volume = 127,
         fadeInRate = 1,
@@ -82,9 +77,9 @@ do
         maxDistance = 3500,
         distanceCutoff = 3000
     }
-    SoundPreset.AbilityLooping = {
+    SoundSettings.AbilityLooping = {
         channel = ____exports.SoundChannel.Birth,
-        eax = ____exports.SoundEax.Abilities,
+        eax = "SpellsEAX",
         looping = true,
         stopWhenOutOfRange = true,
         volume = 127,
@@ -95,9 +90,9 @@ do
         maxDistance = 3000,
         distanceCutoff = 3000
     }
-    SoundPreset.Missile = {
+    SoundSettings.Missile = {
         channel = ____exports.SoundChannel.Animations,
-        eax = ____exports.SoundEax.Missiles,
+        eax = "MissilesEAX",
         stopWhenOutOfRange = true,
         volume = 127,
         fadeInRate = 1,
@@ -108,6 +103,29 @@ do
         distanceCutoff = 3000
     }
 end
+local customSoundPresetDataByLabel = postcompile(function()
+    local customSoundPresetDataByLabel = {}
+    for ____, soundPreset in ipairs(SoundPreset:getAll()) do
+        if soundPreset.isCustom then
+            customSoundPresetDataByLabel[soundPreset.id] = {
+                filePaths = soundPreset.filePaths,
+                volume = soundPreset.volume,
+                pitch = soundPreset.pitch,
+                channel = soundPreset.channel,
+                minimumDistance = soundPreset.minimumDistance,
+                maximumDistance = soundPreset.maximumDistance,
+                distanceCutoff = soundPreset.distanceCutoff,
+                eax = soundPreset.eax
+            }
+        end
+    end
+    return customSoundPresetDataByLabel
+end)
+---
+-- @internal For use by internal systems only.
+____exports.isSoundLabelCustom = function(label)
+    return customSoundPresetDataByLabel[label] ~= nil
+end
 local function createPresetSound(fileName, preset)
     local ____fileName_1 = fileName
     local ____preset_looping_0 = preset.looping
@@ -121,7 +139,7 @@ local function createPresetSound(fileName, preset)
         true,
         preset.fadeInRate or 12700,
         preset.fadeOutRate or 12700,
-        preset.eax or ____exports.SoundEax.Default
+        preset.eax or "DefaultEAXON"
     )
     setSoundChannel(sound, preset.channel or ____exports.SoundChannel.General)
     setSoundVolume(sound, preset.volume or 127)
@@ -144,7 +162,7 @@ local function createPreset3DSound(fileName, preset)
         ____preset_stopWhenOutOfRange_3,
         preset.fadeInRate or 12700,
         preset.fadeOutRate or 12700,
-        preset.eax or ____exports.SoundEax.Default
+        preset.eax or "DefaultEAXON"
     )
     setSoundChannel(sound, preset.channel or ____exports.SoundChannel.General)
     setSoundVolume(sound, preset.volume or 127)
@@ -153,6 +171,53 @@ local function createPreset3DSound(fileName, preset)
     setSoundDistanceCutoff(sound, preset.distanceCutoff or 1500)
     return sound
 end
+local function createPreset3DSoundFromLabel(label, preset)
+    local customSoundPresetData = customSoundPresetDataByLabel[label]
+    if customSoundPresetData == nil then
+        local ____label_7 = label
+        local ____preset_looping_5 = preset.looping
+        if ____preset_looping_5 == nil then
+            ____preset_looping_5 = false
+        end
+        local ____preset_stopWhenOutOfRange_6 = preset.stopWhenOutOfRange
+        if ____preset_stopWhenOutOfRange_6 == nil then
+            ____preset_stopWhenOutOfRange_6 = true
+        end
+        return createSoundFromLabel(
+            ____label_7,
+            ____preset_looping_5,
+            true,
+            ____preset_stopWhenOutOfRange_6,
+            preset.fadeInRate or 12700,
+            preset.fadeOutRate or 12700
+        )
+    else
+        local ____customSoundPresetData_filePaths_index_10 = customSoundPresetData.filePaths[randomInteger(#customSoundPresetData.filePaths - 1) + 1]
+        local ____preset_looping_8 = preset.looping
+        if ____preset_looping_8 == nil then
+            ____preset_looping_8 = false
+        end
+        local ____preset_stopWhenOutOfRange_9 = preset.stopWhenOutOfRange
+        if ____preset_stopWhenOutOfRange_9 == nil then
+            ____preset_stopWhenOutOfRange_9 = true
+        end
+        local sound = createSound(
+            ____customSoundPresetData_filePaths_index_10,
+            ____preset_looping_8,
+            true,
+            ____preset_stopWhenOutOfRange_9,
+            preset.fadeInRate or 12700,
+            preset.fadeOutRate or 12700,
+            customSoundPresetData.eax
+        )
+        setSoundChannel(sound, customSoundPresetData.channel)
+        setSoundVolume(sound, customSoundPresetData.volume)
+        setSoundPitch(sound, customSoundPresetData.pitch)
+        setSoundDistances(sound, customSoundPresetData.minimumDistance, customSoundPresetData.maximumDistance)
+        setSoundDistanceCutoff(sound, customSoundPresetData.distanceCutoff)
+        return sound
+    end
+end
 ____exports.Sound = __TS__Class()
 local Sound = ____exports.Sound
 Sound.name = "Sound"
@@ -225,6 +290,16 @@ function Sound3D.playOnUnit(self, fileName, preset, unit)
     startSound(sound)
     killSoundWhenDone(sound)
 end
+function Sound3D.playFromLabel(self, label, preset, unitOrX, y, z)
+    local sound = createPreset3DSoundFromLabel(label, preset)
+    if type(unitOrX) ~= "number" then
+        attachSoundToUnit(sound, unitOrX.handle)
+    else
+        setSoundPosition(sound, unitOrX, y or 0, z or 0)
+    end
+    startSound(sound)
+    killSoundWhenDone(sound)
+end
 function Sound3D.createAtPosition(self, fileName, preset, x, y, z)
     if x == nil then
         x = 0

package/core/types/timer.d.ts

@@ -1,29 +1,29 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
+import { AbstractDestroyable, Destructor } from "../../destroyable";
 declare const enum TimerPropertyKey {
     HANDLE = 0,
-    DESTROYED = 1,
-    DESTROY_ON_EXPIRATION = 2,
-    CALLBACK = 3,
-    ARGS_LENGTH = 4
+    DESTROY_ON_EXPIRATION = 1,
+    CALLBACK = 2,
+    ARGS_LENGTH = 3
 }
-export declare class Timer implements Destroyable {
+export declare class Timer extends AbstractDestroyable {
     private readonly [TimerPropertyKey.HANDLE];
-    private [TimerPropertyKey.DESTROYED]?;
     private [TimerPropertyKey.DESTROY_ON_EXPIRATION]?;
     private [TimerPropertyKey.CALLBACK]?;
     private [TimerPropertyKey.ARGS_LENGTH]?;
     private constructor();
     get handle(): jtimer;
     start<Args extends any[]>(timeout: number, periodic: boolean, callback: (...args: Args) => void, ...args: Args): void;
+    onDestroy(): Destructor;
     get elapsed(): number;
     get remaining(): number;
     get timeout(): number;
     pause(): void;
     resume(): void;
-    destroy(): void;
     static create(): Timer;
-    static run<Args extends any[]>(callback: (...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): void;
+    static run<Args extends any[]>(callback: (this: void, ...args: Args) => void, ...args: Args): void;
     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;

package/core/types/timer.lua

@@ -1,6 +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__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__Promise = ____lualib.__TS__Promise
 local ____exports = {}
@@ -9,8 +10,8 @@ local Event = ____event.Event
 local InitializingEvent = ____event.InitializingEvent
 local ____objectPool = require("util.objectPool")
 local ObjectPool = ____objectPool.ObjectPool
-local ____exception = require("exception")
-local IllegalStateException = ____exception.IllegalStateException
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local createTimer = CreateTimer
 local timerStart = TimerStart
 local pauseTimer = PauseTimer
@@ -23,6 +24,7 @@ local getHandleId = GetHandleId
 local ____pcall = _G.pcall
 local ____print = _G.print
 local select = _G.select
+local ____type = _G.type
 local safeCall = warpack.safeCall
 local corunning = coroutine.running
 local coresume = coroutine.resume
@@ -35,14 +37,14 @@ local timerByHandleId = {}
 local function timerSafeCall()
     local timer = timerByHandleId[getHandleId(getExpiredTimer())]
     if timer ~= nil then
-        if timer[2] then
+        if timer[1] then
             timer:destroy()
         end
-        local callback = timer[3]
+        local callback = timer[2]
         if callback ~= nil then
             safeCall(
                 callback,
-                ____unpack(timer, 4 + 1, 4 + (timer[4] or 0))
+                ____unpack(timer, 3 + 1, 3 + (timer[3] or 0))
             )
         end
     end
@@ -50,46 +52,46 @@ end
 ____exports.Timer = __TS__Class()
 local Timer = ____exports.Timer
 Timer.name = "Timer"
+__TS__ClassExtends(Timer, AbstractDestroyable)
 function Timer.prototype.____constructor(self)
+    AbstractDestroyable.prototype.____constructor(self)
     self[0] = get()
     timerByHandleId[getHandleId(self[0])] = self
 end
 function Timer.prototype.start(self, timeout, periodic, callback, ...)
-    self[3] = callback
+    self[2] = callback
     local argsLength = select("#", ...)
-    self[4] = argsLength
+    self[3] = argsLength
     for i = 1, argsLength do
-        self[4 + i] = (select(i, ...))
+        self[3 + i] = (select(i, ...))
     end
     timerStart(self.handle, timeout, periodic, timerSafeCall)
 end
+function Timer.prototype.onDestroy(self)
+    local handle = self[0]
+    timerByHandleId[getHandleId(handle)] = nil
+    release(handle)
+    return AbstractDestroyable.prototype.onDestroy(self)
+end
 function Timer.prototype.pause(self)
     pauseTimer(self[0])
 end
 function Timer.prototype.resume(self)
     resumeTimer(self[0])
 end
-function Timer.prototype.destroy(self)
-    if self[1] then
-        error(
-            __TS__New(IllegalStateException, "Double-destroy run for timer"),
-            0
-        )
-    end
-    local handle = self[0]
-    timerByHandleId[getHandleId(handle)] = nil
-    release(handle)
-    self[1] = true
-end
 function Timer.create(self)
     return __TS__New(____exports.Timer)
 end
-function Timer.run(self, callback, ...)
-    ____exports.Timer:simple(0, callback, ...)
+function Timer.run(self, objectOrCallback, keyOrFirstArg, ...)
+    if ____type(objectOrCallback) == "function" then
+        ____exports.Timer:simple(0, objectOrCallback, keyOrFirstArg, ...)
+    else
+        ____exports.Timer:simple(0, objectOrCallback[keyOrFirstArg], objectOrCallback, ...)
+    end
 end
 function Timer.simple(self, timeout, callback, ...)
     local timer = __TS__New(____exports.Timer)
-    timer[2] = true
+    timer[1] = true
     timer:start(timeout, false, callback, ...)
     return timer
 end

package/core/types/unit.lua

@@ -21,4 +21,12 @@ do
         end
     end
 end
+do
+    local ____export = require("engine.internal.unit+rally")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 return ____exports

package/core/util.d.ts

@@ -54,7 +54,7 @@ declare global {
     function fourCC(id: string): number;
 }
 declare namespace inner {
-    const orderId: (id: "blink" | "stop" | "load" | "sleep" | "absorb" | "acidbomb" | "acolyteharvest" | "ambush" | "ancestralspirit" | "ancestralspirittarget" | "animatedead" | "antimagicshell" | "attack" | "attackground" | "attackonce" | "attributemodskill" | "auraunholy" | "auravampiric" | "autodispel" | "autodispeloff" | "autodispelon" | "autoentangle" | "autoentangleinstant" | "autoharvestgold" | "autoharvestlumber" | "avatar" | "avengerform" | "awaken" | "banish" | "barkskin" | "barkskinoff" | "barkskinon" | "battleroar" | "battlestations" | "bearform" | "berserk" | "blackarrow" | "blackarrowoff" | "blackarrowon" | "blight" | "blizzard" | "bloodlust" | "bloodlustoff" | "bloodluston" | "board" | "breathoffire" | "breathoffrost" | "build" | "burrow" | "cannibalize" | "carrionscarabs" | "carrionscarabsinstant" | "carrionscarabsoff" | "carrionscarabson" | "carrionswarm" | "chainlightning" | "channel" | "charm" | "chemicalrage" | "cloudoffog" | "clusterrockets" | "coldarrows" | "coldarrowstarg" | "controlmagic" | "corporealform" | "corrosivebreath" | "coupleinstant" | "coupletarget" | "creepanimatedead" | "creepdevour" | "creepheal" | "creephealoff" | "creephealon" | "creepthunderbolt" | "creepthunderclap" | "cripple" | "curse" | "curseoff" | "curseon" | "cyclone" | "darkconversion" | "darkportal" | "darkritual" | "darksummoning" | "deathanddecay" | "deathcoil" | "deathpact" | "decouple" | "defend" | "detectaoe" | "detonate" | "devour" | "devourmagic" | "disassociate" | "disenchant" | "dismount" | "dispel" | "divineshield" | "doom" | "drain" | "dreadlordinferno" | "dropitem" | "drunkenhaze" | "earthquake" | "eattree" | "elementalfury" | "ensnare" | "ensnareoff" | "ensnareon" | "entangle" | "entangleinstant" | "entanglingroots" | "etherealform" | "evileye" | "faeriefire" | "faeriefireoff" | "faeriefireon" | "fanofknives" | "farsight" | "fingerofdeath" | "firebolt" | "flamestrike" | "flamingarrows" | "flamingarrowstarg" | "flamingattack" | "flamingattacktarg" | "flare" | "forceboard" | "forceofnature" | "forkedlightning" | "freezingbreath" | "frenzy" | "frenzyoff" | "frenzyon" | "frostarmor" | "frostarmoroff" | "frostarmoron" | "frostnova" | "getitem" | "gold2lumber" | "grabtree" | "harvest" | "heal" | "healingspray" | "healingward" | "healingwave" | "healoff" | "healon" | "hex" | "holdposition" | "holybolt" | "howlofterror" | "humanbuild" | "immolation" | "impale" | "incineratearrow" | "incineratearrowoff" | "incineratearrowon" | "inferno" | "innerfire" | "innerfireoff" | "innerfireon" | "instant" | "invisibility" | "lavamonster" | "lightningshield" | "loadarcher" | "loadcorpse" | "loadcorpseinstant" | "locustswarm" | "lumber2gold" | "magicdefense" | "magicleash" | "magicundefense" | "manaburn" | "manaflareoff" | "manaflareon" | "manashieldoff" | "manashieldon" | "massteleport" | "mechanicalcritter" | "metamorphosis" | "militia" | "militiaconvert" | "militiaoff" | "militiaunconvert" | "mindrot" | "mirrorimage" | "monsoon" | "mount" | "mounthippogryph" | "move" | "moveAI" | "nagabuild" | "neutraldetectaoe" | "neutralinteract" | "neutralspell" | "nightelfbuild" | "orcbuild" | "parasite" | "parasiteoff" | "parasiteon" | "patrol" | "patrolAI" | "phaseshift" | "phaseshiftinstant" | "phaseshiftoff" | "phaseshifton" | "phoenixfire" | "phoenixmorph" | "poisonarrows" | "poisonarrowstarg" | "polymorph" | "possession" | "preservation" | "purge" | "rainofchaos" | "rainoffire" | "raisedead" | "raisedeadoff" | "raisedeadon" | "ravenform" | "recharge" | "rechargeoff" | "rechargeon" | "rejuvination" | "renew" | "renewoff" | "renewon" | "repair" | "repairoff" | "repairon" | "replenish" | "replenishlife" | "replenishlifeoff" | "replenishlifeon" | "replenishmana" | "replenishmanaoff" | "replenishmanaon" | "replenishoff" | "replenishon" | "request_hero" | "requestsacrifice" | "restoration" | "restorationoff" | "restorationon" | "resumebuild" | "resumeharvesting" | "resurrection" | "returnresources" | "revenge" | "revive" | "roar" | "robogoblin" | "root" | "sacrifice" | "sanctuary" | "scout" | "selfdestruct" | "selfdestructoff" | "selfdestructon" | "sentinel" | "follow" | "smart" | "setrally" | "shadowsight" | "shadowstrike" | "shockwave" | "silence" | "slow" | "slowoff" | "slowon" | "soulburn" | "soulpreservation" | "spellshield" | "spellshieldaoe" | "spellsteal" | "spellstealoff" | "spellstealon" | "spies" | "spiritlink" | "spiritofvengeance" | "spirittroll" | "spiritwolf" | "stampede" | "standdown" | "starfall" | "stasistrap" | "steal" | "stomp" | "stoneform" | "stunned" | "submerge" | "summonfactory" | "summongrizzly" | "summonphoenix" | "summonquillbeast" | "summonwareagle" | "tankdroppilot" | "tankloadpilot" | "tankpilot" | "taunt" | "thunderbolt" | "thunderclap" | "tornado" | "townbelloff" | "townbellon" | "tranquility" | "transmute" | "unavatar" | "unavengerform" | "unbearform" | "unburrow" | "uncoldarrows" | "uncorporealform" | "undeadbuild" | "undefend" | "undivineshield" | "unetherealform" | "unflamingarrows" | "unflamingattack" | "unholyfrenzy" | "unimmolation" | "unload" | "unloadall" | "unloadallcorpses" | "unloadallinstant" | "unpoisonarrows" | "unravenform" | "unrobogoblin" | "unroot" | "unstableconcoction" | "unstoneform" | "unsubmerge" | "unsummon" | "unwindwalk" | "vengeance" | "vengeanceinstant" | "vengeanceoff" | "vengeanceon" | "volcano" | "voodoo" | "ward" | "waterelemental" | "wateryminion" | "web" | "weboff" | "webon" | "whirlwind" | "windwalk" | "wispharvest") => number;
+    const orderId: (id: "blink" | "stop" | "load" | "sleep" | "absorb" | "acidbomb" | "acolyteharvest" | "ambush" | "ancestralspirit" | "ancestralspirittarget" | "animatedead" | "antimagicshell" | "attack" | "attackground" | "attackonce" | "attributemodskill" | "auraunholy" | "auravampiric" | "autodispel" | "autodispeloff" | "autodispelon" | "autoentangle" | "autoentangleinstant" | "autoharvestgold" | "autoharvestlumber" | "avatar" | "avengerform" | "awaken" | "banish" | "barkskin" | "barkskinoff" | "barkskinon" | "battleroar" | "battlestations" | "bearform" | "berserk" | "blackarrow" | "blackarrowoff" | "blackarrowon" | "blight" | "blizzard" | "bloodlust" | "bloodlustoff" | "bloodluston" | "board" | "breathoffire" | "breathoffrost" | "build" | "burrow" | "cannibalize" | "carrionscarabs" | "carrionscarabsinstant" | "carrionscarabsoff" | "carrionscarabson" | "carrionswarm" | "chainlightning" | "channel" | "charm" | "chemicalrage" | "cloudoffog" | "clusterrockets" | "coldarrows" | "coldarrowstarg" | "controlmagic" | "corporealform" | "corrosivebreath" | "coupleinstant" | "coupletarget" | "creepanimatedead" | "creepdevour" | "creepheal" | "creephealoff" | "creephealon" | "creepthunderbolt" | "creepthunderclap" | "cripple" | "curse" | "curseoff" | "curseon" | "cyclone" | "darkconversion" | "darkportal" | "darkritual" | "darksummoning" | "deathanddecay" | "deathcoil" | "deathpact" | "decouple" | "defend" | "detectaoe" | "detonate" | "devour" | "devourmagic" | "disassociate" | "disenchant" | "dismount" | "dispel" | "divineshield" | "doom" | "drain" | "dreadlordinferno" | "dropitem" | "moveslot0" | "moveslot1" | "moveslot2" | "moveslot3" | "moveslot4" | "moveslot5" | "useslot0" | "useslot1" | "useslot2" | "useslot3" | "useslot4" | "useslot5" | "drunkenhaze" | "earthquake" | "eattree" | "elementalfury" | "ensnare" | "ensnareoff" | "ensnareon" | "entangle" | "entangleinstant" | "entanglingroots" | "etherealform" | "evileye" | "faeriefire" | "faeriefireoff" | "faeriefireon" | "fanofknives" | "farsight" | "fingerofdeath" | "firebolt" | "flamestrike" | "flamingarrows" | "flamingarrowstarg" | "flamingattack" | "flamingattacktarg" | "flare" | "forceboard" | "forceofnature" | "forkedlightning" | "freezingbreath" | "frenzy" | "frenzyoff" | "frenzyon" | "frostarmor" | "frostarmoroff" | "frostarmoron" | "frostnova" | "getitem" | "gold2lumber" | "grabtree" | "harvest" | "heal" | "healingspray" | "healingward" | "healingwave" | "healoff" | "healon" | "hex" | "holdposition" | "holybolt" | "howlofterror" | "humanbuild" | "immolation" | "impale" | "incineratearrow" | "incineratearrowoff" | "incineratearrowon" | "inferno" | "innerfire" | "innerfireoff" | "innerfireon" | "instant" | "invisibility" | "lavamonster" | "lightningshield" | "loadarcher" | "loadcorpse" | "loadcorpseinstant" | "locustswarm" | "lumber2gold" | "magicdefense" | "magicleash" | "magicundefense" | "manaburn" | "manaflareoff" | "manaflareon" | "manashieldoff" | "manashieldon" | "massteleport" | "mechanicalcritter" | "metamorphosis" | "militia" | "militiaconvert" | "militiaoff" | "militiaunconvert" | "mindrot" | "mirrorimage" | "monsoon" | "mount" | "mounthippogryph" | "move" | "moveAI" | "nagabuild" | "neutraldetectaoe" | "neutralinteract" | "neutralspell" | "nightelfbuild" | "orcbuild" | "parasite" | "parasiteoff" | "parasiteon" | "patrol" | "patrolAI" | "phaseshift" | "phaseshiftinstant" | "phaseshiftoff" | "phaseshifton" | "phoenixfire" | "phoenixmorph" | "poisonarrows" | "poisonarrowstarg" | "polymorph" | "possession" | "preservation" | "purge" | "rainofchaos" | "rainoffire" | "raisedead" | "raisedeadoff" | "raisedeadon" | "ravenform" | "recharge" | "rechargeoff" | "rechargeon" | "rejuvination" | "renew" | "renewoff" | "renewon" | "repair" | "repairoff" | "repairon" | "replenish" | "replenishlife" | "replenishlifeoff" | "replenishlifeon" | "replenishmana" | "replenishmanaoff" | "replenishmanaon" | "replenishoff" | "replenishon" | "request_hero" | "requestsacrifice" | "restoration" | "restorationoff" | "restorationon" | "resumebuild" | "resumeharvesting" | "resurrection" | "returnresources" | "revenge" | "revive" | "roar" | "robogoblin" | "root" | "sacrifice" | "sanctuary" | "scout" | "selfdestruct" | "selfdestructoff" | "selfdestructon" | "sentinel" | "follow" | "smart" | "setrally" | "shadowsight" | "shadowstrike" | "shockwave" | "silence" | "slow" | "slowoff" | "slowon" | "soulburn" | "soulpreservation" | "spellshield" | "spellshieldaoe" | "spellsteal" | "spellstealoff" | "spellstealon" | "spies" | "spiritlink" | "spiritofvengeance" | "spirittroll" | "spiritwolf" | "stampede" | "standdown" | "starfall" | "stasistrap" | "steal" | "stomp" | "stoneform" | "stunned" | "submerge" | "summonfactory" | "summongrizzly" | "summonphoenix" | "summonquillbeast" | "summonwareagle" | "tankdroppilot" | "tankloadpilot" | "tankpilot" | "taunt" | "thunderbolt" | "thunderclap" | "tornado" | "townbelloff" | "townbellon" | "tranquility" | "transmute" | "unavatar" | "unavengerform" | "unbearform" | "unburrow" | "uncoldarrows" | "uncorporealform" | "undeadbuild" | "undefend" | "undivineshield" | "unetherealform" | "unflamingarrows" | "unflamingattack" | "unholyfrenzy" | "unimmolation" | "unload" | "unloadall" | "unloadallcorpses" | "unloadallinstant" | "unpoisonarrows" | "unravenform" | "unrobogoblin" | "unroot" | "unstableconcoction" | "unstoneform" | "unsubmerge" | "unsummon" | "unwindwalk" | "vengeance" | "vengeanceinstant" | "vengeanceoff" | "vengeanceon" | "volcano" | "voodoo" | "ward" | "waterelemental" | "wateryminion" | "web" | "weboff" | "webon" | "whirlwind" | "windwalk" | "wispharvest") => number;
 }
 declare global {
     function orderId(...args: Parameters<typeof inner.orderId>): ReturnType<typeof inner.orderId>;

package/core/util.lua

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__StringPadEnd = ____lualib.__TS__StringPadEnd
 local ____exports = {}
 local ns = {}
 do
@@ -14,7 +16,10 @@ do
         if type(id) == "number" then
             return id
         else
-            local numid = string.unpack(">I4", id)
+            local numid = string.unpack(
+                ">I4",
+                __TS__StringPadEnd(id, 4, "\0")
+            )
             return numid
         end
     end
@@ -196,6 +201,18 @@ do
             drain = 852487,
             dreadlordinferno = 852224,
             dropitem = 852001,
+            moveslot0 = 852002,
+            moveslot1 = 852003,
+            moveslot2 = 852004,
+            moveslot3 = 852005,
+            moveslot4 = 852006,
+            moveslot5 = 852007,
+            useslot0 = 852008,
+            useslot1 = 852009,
+            useslot2 = 852010,
+            useslot3 = 852011,
+            useslot4 = 852012,
+            useslot5 = 852013,
             drunkenhaze = 852585,
             earthquake = 852121,
             eattree = 852146,

package/decl/index.d.ts

@@ -3,6 +3,7 @@
 /// <reference path="./native.d.ts"/>
 /// <reference types="warpack-types/warpack"/>
 /// <reference types="lua-types/5.3"/>
+/// <reference types="@warscript/language-extensions" />
 
 declare function setmetatable<
     T extends object,