warscript 0.0.1-dev.d842bb6 → 0.0.1-dev.dd8349d

package/engine/object-data/entry/buff-type.lua

@@ -6,6 +6,8 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____arrays = require("utility.arrays")
 local array = ____arrays.array
+local ____reflection = require("utility.reflection")
+local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNumberIndexSupplier
 local ____entry = require("engine.object-data.entry")
 local ObjectDataEntry = ____entry.ObjectDataEntry
 local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
@@ -94,10 +96,10 @@ __TS__SetDescriptor(
     "lightningTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("flig")
+            return self:getObjectDataEntryNumericIdsField("flig")
         end,
         set = function(self, lightningTypeIds)
-            self:setObjectDataEntryIdsField("flig", lightningTypeIds)
+            self:setObjectDataEntryNumericIdsField("flig", lightningTypeIds)
         end
     },
     true
@@ -285,32 +287,14 @@ __TS__SetDescriptor(
     },
     true
 )
-local function makeBaseBuffType(id)
-    local BaseBuffType = __TS__Class()
-    BaseBuffType.name = "BaseBuffType"
-    __TS__ClassExtends(BaseBuffType, ____exports.BuffType)
-    BaseBuffType.BASE_ID = id
-    return BaseBuffType
-end
-____exports.AvatarBuffType = __TS__Class()
-local AvatarBuffType = ____exports.AvatarBuffType
-AvatarBuffType.name = "AvatarBuffType"
-__TS__ClassExtends(
-    AvatarBuffType,
-    makeBaseBuffType(fourCC("BHav"))
-)
-____exports.DevotionAuraBuffType = __TS__Class()
-local DevotionAuraBuffType = ____exports.DevotionAuraBuffType
-DevotionAuraBuffType.name = "DevotionAuraBuffType"
-__TS__ClassExtends(
-    DevotionAuraBuffType,
-    makeBaseBuffType(fourCC("BHad"))
-)
-____exports.DivineShieldBuffType = __TS__Class()
-local DivineShieldBuffType = ____exports.DivineShieldBuffType
-DivineShieldBuffType.name = "DivineShieldBuffType"
-__TS__ClassExtends(
-    DivineShieldBuffType,
-    makeBaseBuffType(fourCC("BHds"))
+implementReadonlyNumberIndexSupplier(
+    ____exports.BuffType,
+    function(id)
+        local ____class_0 = __TS__Class()
+        ____class_0.name = ____class_0.name
+        __TS__ClassExtends(____class_0, ____exports.BuffType)
+        ____class_0.BASE_ID = id
+        return ____class_0
+    end
 )
 return ____exports

package/engine/object-data/entry/destructible-type.d.ts

@@ -2,7 +2,7 @@
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
-export type DestructibleTypeId = ObjectDataEntryId & {
+export type DestructibleTypeId = ObjectDataEntryId & number & {
     readonly __destructibleTypeId: unique symbol;
 };
 export declare abstract class DestructibleType extends ObjectDataEntry<DestructibleTypeId> {

package/engine/object-data/entry/item-type.d.ts

@@ -2,7 +2,7 @@
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
 import type { AbilityTypeId } from "./ability-type";
-export type ItemTypeId = ObjectDataEntryId & {
+export type ItemTypeId = ObjectDataEntryId & number & {
     readonly __itemTypeId: unique symbol;
 };
 export declare class ItemType extends ObjectDataEntry<ItemTypeId> {

package/engine/object-data/entry/item-type.lua

@@ -27,10 +27,10 @@ __TS__SetDescriptor(
     "abilityTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("iabi")
+            return self:getObjectDataEntryNumericIdsField("iabi")
         end,
         set = function(self, abilityTypeIds)
-            self:setObjectDataEntryIdsField("iabi", abilityTypeIds)
+            self:setObjectDataEntryNumericIdsField("iabi", abilityTypeIds)
         end
     },
     true
@@ -261,10 +261,10 @@ __TS__SetDescriptor(
     "cooldownGroupId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdField("icid")
+            return self:getObjectDataEntryNumericIdField("icid")
         end,
         set = function(self, cooldownGroupId)
-            self:setObjectDataEntryIdField("icid", cooldownGroupId)
+            self:setObjectDataEntryNumericIdField("icid", cooldownGroupId)
         end
     },
     true

package/engine/object-data/entry/lightning-type.d.ts

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
 import { Color } from "../../../core/types/color";
-export type LightningTypeId = ObjectDataEntryId & {
+export type LightningTypeId = ObjectDataEntryId & number & {
     readonly __lightningTypeId: unique symbol;
 };
 export type StandardLightningTypeId = LightningTypeId & {

package/engine/object-data/entry/sound-preset.d.ts

@@ -0,0 +1,33 @@
+/** @noSelfInFile */
+import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { SoundEax } from "../auxiliary/sound-eax";
+export type SoundPresetId = ObjectDataEntryId & string & {
+    readonly __soundPresetId: unique symbol;
+};
+export type StandardSoundPresetId = SoundPresetId & {
+    readonly __standardSoundPresetId: unique symbol;
+};
+export declare class SoundPreset extends ObjectDataEntry<SoundPresetId> {
+    static readonly BASE_ID: SoundPresetId;
+    private static nextId;
+    protected static generateId(): string;
+    protected static getObjectData(map: WarMap): WarObjects;
+    get filePaths(): string[];
+    set filePaths(filePaths: string[]);
+    get volume(): number;
+    set volume(volume: number);
+    get pitch(): number;
+    set pitch(pitch: number);
+    get priority(): number;
+    set priority(priority: number);
+    get channel(): number;
+    set channel(channel: number);
+    get minimumDistance(): number;
+    set minimumDistance(minimumDistance: number);
+    get maximumDistance(): number;
+    set maximumDistance(maximumDistance: number);
+    get distanceCutoff(): number;
+    set distanceCutoff(distanceCutoff: number);
+    get eax(): SoundEax;
+    set eax(eax: SoundEax);
+}

package/engine/object-data/entry/sound-preset.lua

@@ -0,0 +1,140 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____entry = require("engine.object-data.entry")
+local ObjectDataEntry = ____entry.ObjectDataEntry
+____exports.SoundPreset = __TS__Class()
+local SoundPreset = ____exports.SoundPreset
+SoundPreset.name = "SoundPreset"
+__TS__ClassExtends(SoundPreset, ObjectDataEntry)
+function SoundPreset.generateId(self)
+    local ____self_0, ____nextId_1 = self, "nextId"
+    local ____self_nextId_2 = ____self_0[____nextId_1]
+    ____self_0[____nextId_1] = ____self_nextId_2 + 1
+    return "CustomSound" .. tostring(____self_nextId_2)
+end
+function SoundPreset.getObjectData(self, map)
+    return map.objects.sound
+end
+SoundPreset.BASE_ID = "BlizzardWave"
+SoundPreset.nextId = 0
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "filePaths",
+    {
+        get = function(self)
+            return self:getStringsField("FileNames")
+        end,
+        set = function(self, filePaths)
+            self:setStringsField("FileNames", filePaths)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "volume",
+    {
+        get = function(self)
+            return self:getNumberField("Volume")
+        end,
+        set = function(self, volume)
+            self:setNumberField("Volume", volume)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "pitch",
+    {
+        get = function(self)
+            return self:getNumberField("Pitch")
+        end,
+        set = function(self, pitch)
+            self:setNumberField("Pitch", pitch)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "priority",
+    {
+        get = function(self)
+            return self:getNumberField("Priority")
+        end,
+        set = function(self, priority)
+            self:setNumberField("Priority", priority)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "channel",
+    {
+        get = function(self)
+            return self:getNumberField("Channel")
+        end,
+        set = function(self, channel)
+            self:setNumberField("Channel", channel)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "minimumDistance",
+    {
+        get = function(self)
+            return self:getNumberField("MinDistance")
+        end,
+        set = function(self, minimumDistance)
+            self:setNumberField("MinDistance", minimumDistance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "maximumDistance",
+    {
+        get = function(self)
+            return self:getNumberField("MaxDistance")
+        end,
+        set = function(self, maximumDistance)
+            self:setNumberField("MaxDistance", maximumDistance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "distanceCutoff",
+    {
+        get = function(self)
+            return self:getNumberField("DistanceCutoff")
+        end,
+        set = function(self, distanceCutoff)
+            self:setNumberField("DistanceCutoff", distanceCutoff)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "eax",
+    {
+        get = function(self)
+            return self:getStringField("EAXFlags")
+        end,
+        set = function(self, eax)
+            self:setStringField("EAXFlags", eax)
+        end
+    },
+    true
+)
+return ____exports

package/engine/object-data/entry/unit-type.d.ts

@@ -13,7 +13,7 @@ import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
 import { AttackType } from "../auxiliary/attack-type";
-export type UnitTypeId = ObjectDataEntryId & {
+export type UnitTypeId = ObjectDataEntryId & number & {
     readonly __unitTypeId: unique symbol;
 };
 export type StandardUnitTypeId = UnitTypeId & {
@@ -23,8 +23,8 @@ export declare class UnitTypeWeapon {
     private readonly unitType;
     private readonly index;
     private constructor();
-    get attackType(): AttackType;
-    set attackType(attackType: AttackType);
+    get attackType(): AttackType | undefined;
+    set attackType(attackType: AttackType | undefined);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
     get cooldown(): number;
@@ -55,6 +55,7 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     protected static readonly idGenerator: ObjectDataEntryIdGenerator;
     protected static generateId(): number;
     protected static getObjectData(map: WarMap): WarObjects;
+    private isPortraitModelPathSet?;
     get abilityTypeIds(): AbilityTypeId[];
     set abilityTypeIds(abilityTypeIds: AbilityTypeId[]);
     get defaultActiveAbilityTypeId(): AbilityTypeId | undefined;
@@ -131,6 +132,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get portraitModelPath(): string;
+    set portraitModelPath(portraitModelPath: string);
+    get portraitModelPathSD(): string;
+    set portraitModelPathSD(portraitModelPathSD: string);
+    get portraitModelPathHD(): string;
+    set portraitModelPathHD(portraitModelPathHD: string);
     get runSpeed(): number;
     set runSpeed(runSpeed: number);
     get runSpeedSD(): number;