warscript 0.0.1-dev.397722e → 0.0.1-dev.3989633

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,17 @@
+/** @noSelfInFile */
+import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
+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 [id: StandardSoundPresetId]: ObjectDataEntryConstructor<SoundPreset>;
+    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[]);
+}

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

@@ -0,0 +1,50 @@
+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
+local ____reflection = require("utility.reflection")
+local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNumberIndexSupplier
+____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;
+(function(self)
+    implementReadonlyNumberIndexSupplier(
+        ____exports.SoundPreset,
+        function(id)
+            local ____class_3 = __TS__Class()
+            ____class_3.name = ____class_3.name
+            __TS__ClassExtends(____class_3, ____exports.SoundPreset)
+            ____class_3.BASE_ID = id
+            return ____class_3
+        end
+    )
+end)(SoundPreset)
+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
+)
+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", modelPath)
+            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", modelPathSD)
+            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", modelPathHD)
+            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;
@@ -14,18 +14,20 @@ export declare const extractObjectDataEntryLevelArrayFieldValue: <T extends stri
 export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = ObjectDataEntryId> {
     protected readonly object: WarObject;
     static readonly BASE_ID: ObjectDataEntryId;
+    static readonly ID_TYPE: string;
     protected static readonly IS_SYNTHETIC: boolean;
     private readonly levelFieldParametersByField;
     private readonly maxAffectedLevelByField;
     private _isInternal;
+    private get type();
     get isInternal(): boolean;
-    protected static generateId(): number;
+    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 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, properties?: ObjectDataEntryProperties<T>] | [properties: ObjectDataEntryProperties<T>]): T;
-    static getAllByBaseIds<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, baseIds: number | number[]): 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;
 }

package/engine/object-data/entry.lua

@@ -10,7 +10,7 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local booleanToData, dataToBoolean, numberToData, dataToNumber, stringToData, dataToString, objectDataEntryIdToData, dataToObjectDataEntryId, booleansToData, dataToBooleans, numbersToData, dataToNumbers, stringsToData, dataToStrings, objectDataEntryIdsToData, dataToObjectDataEntryIds, isDataNotBlank
+local booleanToData, dataToBoolean, numberToData, dataToNumber, stringToData, dataToString, objectDataEntryNumericIdToData, dataToObjectDataEntryNumericId, objectDataEntryIdToData, dataToObjectDataEntryId, booleansToData, dataToBooleans, numbersToData, dataToNumbers, stringsToData, dataToStrings, objectDataEntryNumericIdsToData, dataToObjectDataEntryNumericIds, isDataNotBlank
 local ____attachment_2Dpreset = require("engine.object-data.auxiliary.attachment-preset")
 local extractAttachmentPresetInputModelPath = ____attachment_2Dpreset.extractAttachmentPresetInputModelPath
 local extractAttachmentPresetInputNodeFQN = ____attachment_2Dpreset.extractAttachmentPresetInputNodeFQN
@@ -124,7 +124,7 @@ function ObjectDataEntry.getAllByBaseIds(self, baseIds)
     local constructor = self
     for id, object in pairs(constructor:getObjectData(currentMap).all) do
         if dataBaseIds[object.parentId or id] ~= nil then
-            local objectDataEntry = self:of(dataToObjectDataEntryId(id))
+            local objectDataEntry = self:of(dataToObjectDataEntryId(id, self.ID_TYPE))
             if objectDataEntry ~= nil and not objectDataEntry.isInternal then
                 result[#result + 1] = objectDataEntry
             end
@@ -139,7 +139,7 @@ function ObjectDataEntry.getAll(self)
     local constructor = self
     local result = {}
     for id in pairs(constructor:getObjectData(currentMap).all) do
-        local objectDataEntry = self:of(dataToObjectDataEntryId(id))
+        local objectDataEntry = self:of(dataToObjectDataEntryId(id, self.ID_TYPE))
         if objectDataEntry ~= nil and not objectDataEntry.isInternal then
             result[#result + 1] = objectDataEntry
         end
@@ -156,9 +156,9 @@ function ObjectDataEntry.of(self, id)
     if object == nil then
         return nil
     end
-    local objectDataEntry = objectDataEntryByObjectDataEntryId[dataToObjectDataEntryId(object.id)]
+    local objectDataEntry = objectDataEntryByObjectDataEntryId[dataToObjectDataEntryId(object.id, self.ID_TYPE)]
     if objectDataEntry == nil then
-        if not constructor.IS_SYNTHETIC and (self.BASE_ID == 0 or dataToObjectDataEntryId(object.parentId) == self.BASE_ID) then
+        if not constructor.IS_SYNTHETIC and (self.BASE_ID == 0 or dataToObjectDataEntryId(object.parentId, self.ID_TYPE) == self.BASE_ID) then
             local AbstractObjectDataEntryView = __TS__Class()
             AbstractObjectDataEntryView.name = "AbstractObjectDataEntryView"
             __TS__ClassExtends(AbstractObjectDataEntryView, constructor)
@@ -231,13 +231,13 @@ function ObjectDataEntry.prototype.setStringField(self, field, value)
         stringToData(value)
     )
 end
-function ObjectDataEntry.prototype.getObjectDataEntryIdField(self, field)
-    return dataToObjectDataEntryId(self.object:getField(field))
+function ObjectDataEntry.prototype.getObjectDataEntryNumericIdField(self, field)
+    return dataToObjectDataEntryNumericId(self.object:getField(field))
 end
-function ObjectDataEntry.prototype.setObjectDataEntryIdField(self, field, value)
+function ObjectDataEntry.prototype.setObjectDataEntryNumericIdField(self, field, value)
     self.object:setField(
         field,
-        objectDataEntryIdToData(value)
+        objectDataEntryNumericIdToData(value)
     )
 end
 function ObjectDataEntry.prototype.getAttachmentPresetField(self, modelPathField, nodeFQNField)
@@ -285,13 +285,13 @@ function ObjectDataEntry.prototype.setStringsField(self, field, values)
         stringsToData(values)
     )
 end
-function ObjectDataEntry.prototype.getObjectDataEntryIdsField(self, field)
-    return dataToObjectDataEntryIds(self.object:getField(field))
+function ObjectDataEntry.prototype.getObjectDataEntryNumericIdsField(self, field)
+    return dataToObjectDataEntryNumericIds(self.object:getField(field))
 end
-function ObjectDataEntry.prototype.setObjectDataEntryIdsField(self, field, values)
+function ObjectDataEntry.prototype.setObjectDataEntryNumericIdsField(self, field, values)
     self.object:setField(
         field,
-        objectDataEntryIdsToData(values)
+        objectDataEntryNumericIdsToData(values)
     )
 end
 function ObjectDataEntry.prototype.getAttachmentPresetListField(self, modelPathListField, nodeFQNFields)
@@ -369,16 +369,16 @@ function ObjectDataEntry.prototype.setStringLevelField(self, field, values)
         stringToData
     )
 end
-function ObjectDataEntry.prototype.getObjectDataEntryIdLevelField(self, field)
-    return self:getLevelField(field, dataToObjectDataEntryId)
+function ObjectDataEntry.prototype.getObjectDataEntryNumericIdLevelField(self, field)
+    return self:getLevelField(field, dataToObjectDataEntryNumericId)
 end
-function ObjectDataEntry.prototype.setObjectDataEntryIdLevelField(self, field, values)
+function ObjectDataEntry.prototype.setObjectDataEntryNumericIdLevelField(self, field, values)
     self:setLevelField(
         field,
         values,
         ____exports.extractObjectDataEntryLevelFieldValue,
-        dataToObjectDataEntryId,
-        objectDataEntryIdToData
+        dataToObjectDataEntryNumericId,
+        objectDataEntryNumericIdToData
     )
 end
 function ObjectDataEntry.prototype.getBooleansLevelField(self, field)
@@ -417,23 +417,26 @@ function ObjectDataEntry.prototype.setStringsLevelField(self, field, values)
         stringsToData
     )
 end
-function ObjectDataEntry.prototype.getObjectDataEntryIdsLevelField(self, field)
-    return self:getLevelField(field, dataToObjectDataEntryIds)
+function ObjectDataEntry.prototype.getObjectDataEntryNumericIdsLevelField(self, field)
+    return self:getLevelField(field, dataToObjectDataEntryNumericIds)
 end
-function ObjectDataEntry.prototype.setObjectDataEntryIdsLevelField(self, field, values)
+function ObjectDataEntry.prototype.setObjectDataEntryNumericIdsLevelField(self, field, values)
     self:setLevelField(
         field,
         values,
         ____exports.extractObjectDataEntryLevelArrayFieldValue,
-        dataToObjectDataEntryIds,
-        objectDataEntryIdsToData
+        dataToObjectDataEntryNumericIds,
+        objectDataEntryNumericIdsToData
     )
 end
 function ObjectDataEntry.prototype.getLevelField(self, field, dataToValue)
     local values = {}
     local object = self.object
     for level = 1, tonumber(object:getField("levels")) or 1 do
-        values[level] = dataToValue(object:getField((field .. "+") .. tostring(level)))
+        values[level] = dataToValue(
+            object:getField((field .. "+") .. tostring(level)),
+            "number"
+        )
     end
     return values
 end
@@ -472,7 +475,16 @@ function ObjectDataEntry.prototype.setLevelField(self, field, supplier, extracto
     end
 end
 ObjectDataEntry.BASE_ID = 0
+ObjectDataEntry.ID_TYPE = type(self.BASE_ID) == "number" and "number" or "string"
 ObjectDataEntry.IS_SYNTHETIC = false
+__TS__SetDescriptor(
+    ObjectDataEntry.prototype,
+    "type",
+    {get = function(self)
+        return self.constructor
+    end},
+    true
+)
 __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "isInternal",
@@ -495,7 +507,7 @@ __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "id",
     {get = function(self)
-        return dataToObjectDataEntryId(self.object.id)
+        return dataToObjectDataEntryId(self.object.id, self.type.ID_TYPE)
     end},
     true
 )
@@ -503,7 +515,7 @@ __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "baseId",
     {get = function(self)
-        return dataToObjectDataEntryId(self.object.parentId or self.object.id)
+        return dataToObjectDataEntryId(self.object.parentId or self.object.id, self.type.ID_TYPE)
     end},
     true
 )
@@ -533,10 +545,10 @@ end
 dataToString = function(data)
     return tostring(data or "")
 end
-objectDataEntryIdToData = function(value)
+objectDataEntryNumericIdToData = function(value)
     return value == 0 and "" or string.pack(">I4", value)
 end
-dataToObjectDataEntryId = function(data)
+dataToObjectDataEntryNumericId = function(data)
     local dataString = dataToString(data)
     if isDataNotBlank(nil, dataString) then
         return (string.unpack(">I4", dataString))
@@ -544,6 +556,15 @@ dataToObjectDataEntryId = function(data)
         return 0
     end
 end
+objectDataEntryIdToData = function(value)
+    return type(value) == "number" and objectDataEntryNumericIdToData(value) or value
+end
+dataToObjectDataEntryId = function(data, ____type)
+    if ____type == "number" then
+        return dataToObjectDataEntryNumericId(data)
+    end
+    return dataToString(data)
+end
 booleansToData = function(value)
     return table.concat(
         __TS__ArrayMap(
@@ -607,16 +628,16 @@ dataToStrings = function(data)
         function(____, data) return dataToString(data) end
     )
 end
-objectDataEntryIdsToData = function(value)
+objectDataEntryNumericIdsToData = function(value)
     return table.concat(
         __TS__ArrayMap(
             value,
-            function(____, objectDataEntryId) return objectDataEntryIdToData(objectDataEntryId) end
+            function(____, objectDataEntryId) return objectDataEntryNumericIdToData(objectDataEntryId) end
         ),
         ","
     )
 end
-dataToObjectDataEntryIds = function(data)
+dataToObjectDataEntryNumericIds = function(data)
     return __TS__ArrayMap(
         __TS__ArrayFilter(
             __TS__StringSplit(
@@ -625,7 +646,7 @@ dataToObjectDataEntryIds = function(data)
             ),
             isDataNotBlank
         ),
-        function(____, data) return dataToObjectDataEntryId(data) end
+        function(____, data) return dataToObjectDataEntryNumericId(data) end
     )
 end
 isDataNotBlank = function(self, data)

package/engine/object-field/ability.d.ts

@@ -45,9 +45,10 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
     protected setNativeFieldValue(instance: Ability, value: string): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityStringField>;
 }
-export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
+export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(instance: Ability): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -130,7 +131,9 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
     protected getNativeFieldValue(instance: Ability, level: number): CombatClassifications;
     protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
 }
-export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
+export type ReadonlySubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | ReadonlyObjectFieldType<AbilityField<ValueType>> | ReadonlyObjectLevelFieldType<AbilityLevelField<ValueType>>;
+export type SubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType>;
+export type AbilityDependentValue<ValueType extends boolean | number | string> = SubscribableAbilityDependentValue<ValueType> | ((ability: Ability) => ValueType);
 export declare const resolveCurrentAbilityDependentValue: {
     <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>): ValueType;
     <ValueType extends boolean | number | string>(ability: Ability, value?: AbilityDependentValue<ValueType>): ValueType | undefined;

package/engine/object-field/ability.lua

@@ -197,6 +197,9 @@ __TS__ClassExtends(AbilityArrayField, ObjectArrayField)
 function AbilityArrayField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityArrayField.prototype.hasNativeFieldValue(self, instance)
+    return instance:hasField(self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
     "instanceClass",