warscript 0.0.1-dev.ffaa090 → 0.0.1-dev.fff719b

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,13 +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 playFromLabel(label: string, preset: Sound3DPreset, ...positionOrUnit: [Unit] | [number, number, number?]): 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,6 +5,10 @@ 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
@@ -49,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,
@@ -81,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,
@@ -94,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,
@@ -107,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
@@ -120,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)
@@ -143,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,29 +172,51 @@ local function createPreset3DSound(fileName, preset)
     return sound
 end
 local function createPreset3DSoundFromLabel(label, preset)
-    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
+    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
-    local sound = createSoundFromLabel(
-        ____label_7,
-        ____preset_looping_5,
-        true,
-        ____preset_stopWhenOutOfRange_6,
-        preset.fadeInRate or 12700,
-        preset.fadeOutRate or 12700
-    )
-    setSoundChannel(sound, preset.channel or ____exports.SoundChannel.General)
-    setSoundVolume(sound, preset.volume or 127)
-    setSoundPitch(sound, preset.pitch or 1)
-    setSoundDistances(sound, preset.minDistance or 600, preset.maxDistance or 8000)
-    setSoundDistanceCutoff(sound, preset.distanceCutoff or 1500)
-    return sound
 end
 ____exports.Sound = __TS__Class()
 local Sound = ____exports.Sound

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,29 +1,30 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
+import { AbstractDestroyable, Destructor } from "../../destroyable";
+import { CallbackId } from "../../utility/callback-array";
 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): 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;

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,13 @@ 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 ____callback_2Darray = require("utility.callback-array")
+local addCallback = ____callback_2Darray.addCallback
+local callbackArray = ____callback_2Darray.callbackArray
+local consumeCallback = ____callback_2Darray.consumeCallback
+local consumeCallbacks = ____callback_2Darray.consumeCallbacks
 local createTimer = CreateTimer
 local timerStart = TimerStart
 local pauseTimer = PauseTimer
@@ -23,6 +29,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,61 +42,76 @@ 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
 end
+local zeroTimerScheduled = false
+local zeroTimerCallbacks = callbackArray()
+---
+-- @internal For use by internal systems only.
+____exports.consumeZeroTimerCallback = function(id)
+    consumeCallback(zeroTimerCallbacks, id)
+end
+local function invokeZeroTimerCallbacks()
+    zeroTimerScheduled = false
+    consumeCallbacks(zeroTimerCallbacks)
+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 not zeroTimerScheduled then
+        zeroTimerScheduled = true
+        ____exports.Timer:simple(0, invokeZeroTimerCallbacks)
+    end
+    if ____type(objectOrCallback) == "function" then
+        return addCallback(zeroTimerCallbacks, objectOrCallback, keyOrFirstArg, ...)
+    else
+        return addCallback(zeroTimerCallbacks, 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