warscript 0.0.1-dev.f48f7bb → 0.0.1-dev.f5421e8

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 & {
@@ -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;

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

@@ -19,6 +19,8 @@ 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")
 local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
+local ____config = require("config")
+local WarscriptConfig = ____config.WarscriptConfig
 local getOrCreateUnitTypeWeapons
 ____exports.UnitTypeWeapon = __TS__Class()
 local UnitTypeWeapon = ____exports.UnitTypeWeapon
@@ -345,10 +347,10 @@ __TS__SetDescriptor(
     "abilityTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("uabi")
+            return self:getObjectDataEntryNumericIdsField("uabi")
         end,
         set = function(self, abilityTypeIds)
-            self:setObjectDataEntryIdsField("uabi", abilityTypeIds)
+            self:setObjectDataEntryNumericIdsField("uabi", abilityTypeIds)
         end
     },
     true
@@ -358,10 +360,10 @@ __TS__SetDescriptor(
     "defaultActiveAbilityTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("udaa")[1]
+            return self:getObjectDataEntryNumericIdsField("udaa")[1]
         end,
         set = function(self, abilityTypeId)
-            self:setObjectDataEntryIdsField(
+            self:setObjectDataEntryNumericIdsField(
                 "udaa",
                 arrayOfNotNull(abilityTypeId)
             )
@@ -807,6 +809,9 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPath)
             self:setStringField("umdl", modelPath)
+            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor", "")
+            end
         end
     },
     true
@@ -820,6 +825,9 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPathSD)
             self:setStringField("umdl:sd", modelPathSD)
+            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor:sd", "")
+            end
         end
     },
     true
@@ -833,6 +841,51 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPathHD)
             self:setStringField("umdl:hd", modelPathHD)
+            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor:hd", "")
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPath",
+    {
+        get = function(self)
+            return self:getStringField("upor")
+        end,
+        set = function(self, portraitModelPath)
+            self:setStringField("upor", portraitModelPath)
+            self.isPortraitModelPathSet = true
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPathSD",
+    {
+        get = function(self)
+            return self:getStringField("upor:sd")
+        end,
+        set = function(self, portraitModelPathSD)
+            self:setStringField("upor:sd", portraitModelPathSD)
+            self.isPortraitModelPathSet = true
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPathHD",
+    {
+        get = function(self)
+            return self:getStringField("upor:hd")
+        end,
+        set = function(self, portraitModelPathHD)
+            self:setStringField("upor:hd", portraitModelPathHD)
+            self.isPortraitModelPathSet = true
         end
     },
     true
@@ -1496,10 +1549,10 @@ __TS__SetDescriptor(
     "affectingUpgradeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("upgr")
+            return self:getObjectDataEntryNumericIdsField("upgr")
         end,
         set = function(self, affectingUpgradeIds)
-            self:setObjectDataEntryIdsField("upgr", affectingUpgradeIds)
+            self:setObjectDataEntryNumericIdsField("upgr", affectingUpgradeIds)
         end
     },
     true
@@ -1582,10 +1635,10 @@ __TS__SetDescriptor(
     "heroAbilityTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("uhab")
+            return self:getObjectDataEntryNumericIdsField("uhab")
         end,
         set = function(self, heroAbilityTypeIds)
-            self:setObjectDataEntryIdsField("uhab", heroAbilityTypeIds)
+            self:setObjectDataEntryNumericIdsField("uhab", heroAbilityTypeIds)
         end
     },
     true

package/engine/object-data/entry/upgrade.d.ts

@@ -3,7 +3,7 @@ import { TupleOf } from "../../../utility/types";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
 import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { AbilityTypeId } from "./ability-type";
-export type UpgradeId = ObjectDataEntryId & {
+export type UpgradeId = ObjectDataEntryId & number & {
     readonly __upgradeId: unique symbol;
 };
 export declare const enum UpgradeEffectType {

package/engine/object-data/entry/upgrade.lua

@@ -32,7 +32,7 @@ function Upgrade.prototype.getEffect(self, i)
             type = effectType,
             bonusBase = self:getNumberField("gba" .. tostring(i)),
             bonusIncrement = self:getNumberField("gmo" .. tostring(i)),
-            abilityTypeId = self:getObjectDataEntryIdField("gco" .. tostring(i))
+            abilityTypeId = self:getObjectDataEntryNumericIdField("gco" .. tostring(i))
         }
     end
     return nil
@@ -51,7 +51,7 @@ function Upgrade.prototype.setEffect(self, i, effect)
         effect and effect.bonusIncrement or 0
     )
     if (effect and effect.abilityTypeId) ~= nil then
-        self:setObjectDataEntryIdField(
+        self:setObjectDataEntryNumericIdField(
             "gco" .. tostring(i),
             effect and effect.abilityTypeId
         )
@@ -145,7 +145,7 @@ __TS__SetDescriptor(
     "techTreeDependencies",
     {
         get = function(self)
-            local techTreeDependencyIds = self:getObjectDataEntryIdsLevelField("greq")
+            local techTreeDependencyIds = self:getObjectDataEntryNumericIdsLevelField("greq")
             local techTreeDependencyInternalLevels = self:getNumbersLevelField("grqc")
             return mapIndexed(
                 techTreeDependencyIds,
@@ -177,7 +177,7 @@ __TS__SetDescriptor(
                     function(level) return level + 1 end
                 )
             end
-            self:setObjectDataEntryIdsLevelField("greq", techTreeDependencyIds)
+            self:setObjectDataEntryNumericIdsLevelField("greq", techTreeDependencyIds)
             self:setNumbersLevelField("grqc", techTreeDependencyInternalLevels)
         end
     },

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

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { AttachmentPreset, AttachmentPresetInput } from "./auxiliary/attachment-preset";
 import { MutableKeys } from "../../utility/types";
-export type ObjectDataEntryId = number & {
+export type ObjectDataEntryId = (number | string) & {
     readonly __objectDataEntryId: unique symbol;
 };
 export type ObjectDataEntryIdType<T extends ObjectDataEntry> = T extends ObjectDataEntry<infer Id> ? Id : never;
@@ -18,14 +18,16 @@ export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = Obj
     private readonly levelFieldParametersByField;
     private readonly maxAffectedLevelByField;
     private _isInternal;
+    private get type();
     get isInternal(): boolean;
-    protected static generateId(): number;
+    static get idType(): "number" | "string";
+    protected static generateId(): number | string;
     protected static getObjectData(map: WarMap): WarObjects;
-    static getAllIdsByBaseIds<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, baseIds: number | number[]): ObjectDataEntryIdType<T>[];
-    static create<T extends ObjectDataEntry>(this: ObjectDataEntryConstructor<T>, ...args: [id?: number, properties?: ObjectDataEntryProperties<T>] | [properties: ObjectDataEntryProperties<T>]): T;
-    static getAllByBaseIds<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, baseIds: number | number[]): T[];
+    static getAllIdsByBaseIds<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, baseIds: number | number[] | string | string[]): ObjectDataEntryIdType<T>[];
+    static create<T extends ObjectDataEntry>(this: ObjectDataEntryConstructor<T>, ...args: [id?: number | string, properties?: ObjectDataEntryProperties<T>] | [properties: ObjectDataEntryProperties<T>]): T;
+    static getAllByBaseIds<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, baseIds: number | number[] | string | string[]): T[];
     static getAll<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>): T[];
-    static of<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, id: number): T | undefined;
+    static of<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, id: number | string): T | undefined;
     constructor(object: WarObject);
     get id(): Id;
     get baseId(): Id;
@@ -42,8 +44,8 @@ export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = Obj
     protected setNumberField(field: string, value: number): void;
     protected getStringField(field: string): string;
     protected setStringField(field: string, value: string): void;
-    protected getObjectDataEntryIdField<Id extends ObjectDataEntryId>(field: string): Id;
-    protected setObjectDataEntryIdField<Id extends ObjectDataEntryId>(field: string, value: Id): void;
+    protected getObjectDataEntryNumericIdField<Id extends ObjectDataEntryId & number>(field: string): Id;
+    protected setObjectDataEntryNumericIdField<Id extends ObjectDataEntryId & number>(field: string, value: Id): void;
     protected getAttachmentPresetField(modelPathField: string, nodeFQNField: string): AttachmentPreset | undefined;
     protected setAttachmentPresetField(modelPathField: string, nodeFQNField: string, attachmentPreset: AttachmentPresetInput | undefined): void;
     protected getBooleansField(field: string): boolean[];
@@ -52,8 +54,8 @@ export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = Obj
     protected setNumbersField(field: string, values: number[]): void;
     protected getStringsField(field: string): string[];
     protected setStringsField(field: string, values: string[]): void;
-    protected getObjectDataEntryIdsField<Id extends ObjectDataEntryId>(field: string): Id[];
-    protected setObjectDataEntryIdsField<Id extends ObjectDataEntryId>(field: string, values: Id[]): void;
+    protected getObjectDataEntryNumericIdsField<Id extends ObjectDataEntryId & number>(field: string): Id[];
+    protected setObjectDataEntryNumericIdsField<Id extends ObjectDataEntryId & number>(field: string, values: Id[]): void;
     protected getAttachmentPresetListField(modelPathListField: string, nodeFQNFields: string[]): AttachmentPreset[];
     protected setAttachmentPresetListField(modelPathListField: string, nodeFQNFields: string[], lengthField: string, attachmentPresets: AttachmentPresetInput[]): void;
     protected setFlagLevelFieldValue(fieldId: string, flag: 1 | 2 | 4 | 8 | 16, supplier: ObjectDataEntryLevelFieldValueSupplier<boolean>): void;
@@ -64,16 +66,16 @@ export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = Obj
     protected setNumberLevelField(field: string, values: ObjectDataEntryLevelFieldValueSupplier<number>): void;
     protected getStringLevelField(field: string): string[];
     protected setStringLevelField(field: string, values: ObjectDataEntryLevelFieldValueSupplier<string>): void;
-    protected getObjectDataEntryIdLevelField<Id extends ObjectDataEntryId>(field: string): Id[];
-    protected setObjectDataEntryIdLevelField<Id extends ObjectDataEntryId>(field: string, values: ObjectDataEntryLevelFieldValueSupplier<Id>): void;
+    protected getObjectDataEntryNumericIdLevelField<Id extends ObjectDataEntryId & number>(field: string): Id[];
+    protected setObjectDataEntryNumericIdLevelField<Id extends ObjectDataEntryId & number>(field: string, values: ObjectDataEntryLevelFieldValueSupplier<Id>): void;
     protected getBooleansLevelField(field: string): boolean[][];
     protected setBooleansLevelField(field: string, values: ObjectDataEntryLevelFieldValueSupplier<boolean[]>): void;
     protected getNumbersLevelField(field: string): number[][];
     protected setNumbersLevelField(field: string, values: ObjectDataEntryLevelFieldValueSupplier<number[]>): void;
     protected getStringsLevelField(field: string): string[][];
     protected setStringsLevelField(field: string, values: ObjectDataEntryLevelFieldValueSupplier<string[]>): void;
-    protected getObjectDataEntryIdsLevelField<T extends ObjectDataEntryId>(field: string): T[][];
-    protected setObjectDataEntryIdsLevelField<T extends ObjectDataEntryId>(field: string, values: ObjectDataEntryLevelFieldValueSupplier<T[]>): void;
+    protected getObjectDataEntryNumericIdsLevelField<T extends ObjectDataEntryId & number>(field: string): T[][];
+    protected setObjectDataEntryNumericIdsLevelField<T extends ObjectDataEntryId & number>(field: string, values: ObjectDataEntryLevelFieldValueSupplier<T[]>): void;
     private getLevelField;
     private setLevelField;
 }