warscript 0.0.1-dev.c37d12c → 0.0.1-dev.c47d565

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { Upgrade, UpgradeId } from "../upgrade";
 export declare class BlankUpgrade extends Upgrade {

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

@@ -1,10 +1,9 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { TupleOf } from "../../../utility/types";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
-import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
+import { ObjectDataEntry, CustomObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { AbilityTypeId } from "./ability-type";
-export type UpgradeId = ObjectDataEntryId & {
+export type UpgradeId = CustomObjectDataEntryId & 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,17 +1,20 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { AttachmentPreset, AttachmentPresetInput } from "./auxiliary/attachment-preset";
 import { MutableKeys } from "../../utility/types";
-export type ObjectDataEntryId = number & {
+import { StandardAbilityTypeId } from "../standard/entries/ability-type";
+import { StandardItemTypeId } from "../standard/entries/item-type";
+import { StandardLightningTypeId } from "../standard/entries/lightning-type";
+export type CustomObjectDataEntryId = (number | string) & {
     readonly __objectDataEntryId: unique symbol;
 };
+export type ObjectDataEntryId = CustomObjectDataEntryId | StandardAbilityTypeId | StandardItemTypeId | StandardLightningTypeId;
 export type ObjectDataEntryIdType<T extends ObjectDataEntry> = T extends ObjectDataEntry<infer Id> ? Id : never;
 export type ObjectDataEntryConstructor<T extends ObjectDataEntry> = OmitConstructor<typeof ObjectDataEntry> & (new (object: WarObject) => T);
 export type ObjectDataEntryAbstractConstructor<T extends ObjectDataEntry> = OmitConstructor<typeof ObjectDataEntry> & (abstract new (object: WarObject) => T);
 export type ObjectDataEntryProperties<T extends ObjectDataEntry> = Partial<T[MutableKeys<T>]>;
 export type ObjectDataEntryLevelFieldValueSupplier<ValueType extends string | number | boolean | undefined | Record<string, any>, InputValueType = ValueType> = ValueType | readonly ValueType[] | ((level: number, currentValue: InputValueType) => ValueType);
-export declare const extractObjectDataEntryLevelFieldValue: <ValueType extends string | number | boolean | Record<string, any> | undefined, InputValueType = ValueType>(supplier: ObjectDataEntryLevelFieldValueSupplier<ValueType, InputValueType>, level: number, currentValue: InputValueType) => ValueType;
-export declare const extractObjectDataEntryLevelArrayFieldValue: <T extends string | number | boolean | Record<string, any> | undefined, S extends T[]>(supplier: ObjectDataEntryLevelFieldValueSupplier<S, S>, level: number, currentValue: S) => S;
+export declare const extractObjectDataEntryLevelFieldValue: <ValueType extends string | number | boolean | undefined | Record<string, any>, InputValueType = ValueType>(supplier: ObjectDataEntryLevelFieldValueSupplier<ValueType, InputValueType>, level: number, currentValue: InputValueType) => ValueType;
+export declare const extractObjectDataEntryLevelArrayFieldValue: <T extends string | number | boolean | undefined | Record<string, any>, S extends T[]>(supplier: ObjectDataEntryLevelFieldValueSupplier<S>, level: number, currentValue: S) => S;
 export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = ObjectDataEntryId> {
     protected readonly object: WarObject;
     static readonly BASE_ID: ObjectDataEntryId;
@@ -19,14 +22,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;
@@ -37,14 +42,15 @@ export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = Obj
     setFieldValue<This extends this, Args extends any[]>(this: This, field: {
         setValue(entry: This, ...args: Args): boolean;
     }, ...args: Args): void;
+    copyFrom(id: Id): void;
     protected getBooleanField(field: string): boolean;
     protected setBooleanField(field: string, value: boolean): void;
     protected getNumberField(field: string): number;
     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[];
@@ -53,8 +59,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;
@@ -65,16 +71,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

@@ -7,10 +7,11 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 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 +125,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.idType))
             if objectDataEntry ~= nil and not objectDataEntry.isInternal then
                 result[#result + 1] = objectDataEntry
             end
@@ -139,7 +140,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.idType))
         if objectDataEntry ~= nil and not objectDataEntry.isInternal then
             result[#result + 1] = objectDataEntry
         end
@@ -156,9 +157,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.idType)]
     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.idType) == self.BASE_ID) then
             local AbstractObjectDataEntryView = __TS__Class()
             AbstractObjectDataEntryView.name = "AbstractObjectDataEntryView"
             __TS__ClassExtends(AbstractObjectDataEntryView, constructor)
@@ -180,6 +181,14 @@ end
 function ObjectDataEntry.prototype.setFieldValue(self, field, ...)
     check(field:setValue(self, ...))
 end
+function ObjectDataEntry.prototype.copyFrom(self, id)
+    local that = self.type:of(id)
+    if that == nil then
+        return
+    end
+    for ____, field in ipairs(self.object.all) do
+    end
+end
 function ObjectDataEntry.prototype.getBooleanField(self, field)
     return dataToBoolean(self.object:getField(field))
 end
@@ -231,13 +240,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 +294,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 +378,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 +426,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
@@ -473,6 +485,14 @@ function ObjectDataEntry.prototype.setLevelField(self, field, supplier, extracto
 end
 ObjectDataEntry.BASE_ID = 0
 ObjectDataEntry.IS_SYNTHETIC = false
+__TS__SetDescriptor(
+    ObjectDataEntry.prototype,
+    "type",
+    {get = function(self)
+        return self.constructor
+    end},
+    true
+)
 __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "isInternal",
@@ -491,11 +511,18 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__ObjectDefineProperty(
+    ObjectDataEntry,
+    "idType",
+    {get = function(self)
+        return type(self.BASE_ID) == "number" and "number" or "string"
+    end}
+)
 __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "id",
     {get = function(self)
-        return dataToObjectDataEntryId(self.object.id)
+        return dataToObjectDataEntryId(self.object.id, self.type.idType)
     end},
     true
 )
@@ -503,7 +530,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.idType)
     end},
     true
 )
@@ -533,10 +560,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 +571,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 +643,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 +661,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-data/utility/object-data-entry-id-generator.lua

@@ -1,5 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
@@ -60,4 +61,10 @@ function ObjectDataEntryIdGenerator.prototype.next(self)
     self.id = id
     return id
 end
+---
+-- @internal For use by internal systems only.
+____exports.abilityTypeIdGenerator = __TS__New(
+    ____exports.ObjectDataEntryIdGenerator,
+    fourCC("A000")
+)
 return ____exports

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

@@ -1,14 +1,18 @@
 /** @noSelfInFile */
-import { Ability } from "../internal/ability";
+import { Ability, jabilityfield } from "../internal/ability";
 import { ObjectArrayField, ObjectField, ObjectFieldValueChangeEvent, ObjectLevelField, ObjectLevelFieldValueChangeEvent, ReadonlyObjectFieldType, ReadonlyObjectLevelFieldType } from "../object-field";
 import { AbilityType, AbilityTypeId } from "../object-data/entry/ability-type";
 import { ObjectDataEntryId } from "../object-data/entry";
 import { LightningTypeId } from "../object-data/entry/lightning-type";
 import { CombatClassifications } from "../object-data/auxiliary/combat-classification";
 import { UnitTypeId } from "../object-data/entry/unit-type";
-export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
+import { BuffResistanceType } from "../object-data/auxiliary/buff-resistance-type";
+import { BuffPolarity } from "../object-data/auxiliary/buff-polarity";
+import { ReadonlyNonEmptyLinkedSet } from "../../utility/linked-set";
+export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
 }
 export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
@@ -18,7 +22,7 @@ export declare class AbilityBooleanField extends AbilityField<boolean, jabilityb
     protected setNativeFieldValue(instance: Ability, value: boolean): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityBooleanField>;
 }
-export declare abstract class AbilityNumberField<NativeFieldType = unknown> extends AbilityField<number, NativeFieldType> {
+export declare abstract class AbilityNumberField<NativeFieldType extends jabilityfield = jabilityfield> extends AbilityField<number, NativeFieldType> {
     protected get defaultValue(): number;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityNumberField>;
 }
@@ -41,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(abilityTypeId: AbilityTypeId): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -59,10 +64,11 @@ export declare abstract class AbilityObjectDataEntryIdArrayField<T extends Objec
 }
 export declare class AbilityLightningTypeIdArrayField extends AbilityObjectDataEntryIdArrayField<LightningTypeId> {
 }
-export declare abstract class AbilityLevelField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectLevelField<AbilityType, Ability, ValueType, InputValueType, NativeFieldType> {
+export declare abstract class AbilityLevelField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectLevelField<AbilityType, Ability, ValueType, InputValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getLevelCount(entry: AbilityType | Ability): number;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
 }
 export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {
@@ -72,7 +78,7 @@ export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean,
     protected setNativeFieldValue(instance: Ability, level: number, value: boolean): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityBooleanLevelField>;
 }
-export declare abstract class AbilityNumberLevelField<NativeFieldType = unknown> extends AbilityLevelField<number, number, NativeFieldType> {
+export declare abstract class AbilityNumberLevelField<NativeFieldType extends jabilityfield = jabilityfield> extends AbilityLevelField<number, number, NativeFieldType> {
     protected get defaultValue(): number;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityNumberLevelField>;
 }
@@ -105,11 +111,30 @@ export declare class AbilityAbilityTypeIdLevelField extends AbilityObjectDataEnt
 }
 export declare class AbilityUnitTypeIdLevelField extends AbilityObjectDataEntryIdLevelField<UnitTypeId> {
 }
+export declare abstract class AbilityEnumLevelField<T extends number> extends AbilityLevelField<T, T, jabilityintegerlevelfield> {
+    protected abstract values: ReadonlyNonEmptyLinkedSet<T>;
+    protected get defaultValue(): T;
+    protected getNativeFieldById(id: number): jabilityintegerlevelfield;
+    protected getNativeFieldValue(instance: Ability, level: number): T;
+    protected setNativeFieldValue(instance: Ability, level: number, value: T): boolean;
+    static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityEnumLevelField<number>>;
+}
+export declare class AbilityBuffPolarityLevelField extends AbilityEnumLevelField<BuffPolarity> {
+    protected values: ReadonlyNonEmptyLinkedSet<BuffPolarity>;
+}
+export declare class AbilityBuffResistanceTypeLevelField extends AbilityEnumLevelField<BuffResistanceType> {
+    protected values: ReadonlyNonEmptyLinkedSet<BuffResistanceType>;
+}
 export declare class AbilityCombatClassificationsLevelField extends AbilityLevelField<CombatClassifications, CombatClassifications, jabilityintegerlevelfield> {
     protected get defaultValue(): CombatClassifications;
     protected getNativeFieldById(id: number): jabilityintegerlevelfield;
     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 declare const resolveCurrentAbilityDependentValue: <ValueType extends string | number | boolean>(ability: Ability, value: AbilityDependentValue<ValueType>) => 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

@@ -7,12 +7,15 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
+local abilityTypeHasField = ____ability.abilityTypeHasField
 local ____object_2Dfield = require("engine.object-field")
 local ObjectArrayField = ____object_2Dfield.ObjectArrayField
 local ObjectField = ____object_2Dfield.ObjectField
 local ObjectLevelField = ____object_2Dfield.ObjectLevelField
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
+local ____linked_2Dset = require("utility.linked-set")
+local nonEmptyLinkedSetOf = ____linked_2Dset.nonEmptyLinkedSetOf
 local convertAbilityBooleanField = _G.ConvertAbilityBooleanField
 local convertAbilityIntegerField = _G.ConvertAbilityIntegerField
 local convertAbilityRealField = _G.ConvertAbilityRealField
@@ -27,6 +30,9 @@ __TS__ClassExtends(AbilityField, ObjectField)
 function AbilityField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityField.prototype,
     "instanceClass",
@@ -192,6 +198,9 @@ __TS__ClassExtends(AbilityArrayField, ObjectArrayField)
 function AbilityArrayField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityArrayField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
     "instanceClass",
@@ -256,11 +265,14 @@ local AbilityLevelField = ____exports.AbilityLevelField
 AbilityLevelField.name = "AbilityLevelField"
 __TS__ClassExtends(AbilityLevelField, ObjectLevelField)
 function AbilityLevelField.prototype.getLevelCount(self, entry)
-    return __TS__InstanceOf(entry, Ability) and #entry.levels or entry.levelCount
+    return entry.levelCount
 end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityLevelField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityLevelField.prototype,
     "instanceClass",
@@ -425,6 +437,54 @@ ____exports.AbilityUnitTypeIdLevelField = __TS__Class()
 local AbilityUnitTypeIdLevelField = ____exports.AbilityUnitTypeIdLevelField
 AbilityUnitTypeIdLevelField.name = "AbilityUnitTypeIdLevelField"
 __TS__ClassExtends(AbilityUnitTypeIdLevelField, ____exports.AbilityObjectDataEntryIdLevelField)
+____exports.AbilityEnumLevelField = __TS__Class()
+local AbilityEnumLevelField = ____exports.AbilityEnumLevelField
+AbilityEnumLevelField.name = "AbilityEnumLevelField"
+__TS__ClassExtends(AbilityEnumLevelField, ____exports.AbilityLevelField)
+function AbilityEnumLevelField.prototype.getNativeFieldById(self, id)
+    return convertAbilityIntegerLevelField(id)
+end
+function AbilityEnumLevelField.prototype.getNativeFieldValue(self, instance, level)
+    local value = instance:getField(self.nativeField, level)
+    if self.values:contains(value) then
+        return value
+    end
+    return self.values:first()
+end
+function AbilityEnumLevelField.prototype.setNativeFieldValue(self, instance, level, value)
+    return instance:setField(self.nativeField, level, value)
+end
+__TS__SetDescriptor(
+    AbilityEnumLevelField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return self.values:first()
+    end},
+    true
+)
+__TS__ObjectDefineProperty(
+    AbilityEnumLevelField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
+____exports.AbilityBuffPolarityLevelField = __TS__Class()
+local AbilityBuffPolarityLevelField = ____exports.AbilityBuffPolarityLevelField
+AbilityBuffPolarityLevelField.name = "AbilityBuffPolarityLevelField"
+__TS__ClassExtends(AbilityBuffPolarityLevelField, ____exports.AbilityEnumLevelField)
+function AbilityBuffPolarityLevelField.prototype.____constructor(self, ...)
+    AbilityBuffPolarityLevelField.____super.prototype.____constructor(self, ...)
+    self.values = nonEmptyLinkedSetOf(0, 1, 2)
+end
+____exports.AbilityBuffResistanceTypeLevelField = __TS__Class()
+local AbilityBuffResistanceTypeLevelField = ____exports.AbilityBuffResistanceTypeLevelField
+AbilityBuffResistanceTypeLevelField.name = "AbilityBuffResistanceTypeLevelField"
+__TS__ClassExtends(AbilityBuffResistanceTypeLevelField, ____exports.AbilityEnumLevelField)
+function AbilityBuffResistanceTypeLevelField.prototype.____constructor(self, ...)
+    AbilityBuffResistanceTypeLevelField.____super.prototype.____constructor(self, ...)
+    self.values = nonEmptyLinkedSetOf(1, 2, 3)
+end
 local allowedTargetCombatClassificationsByLevelByAbilityTypeId = postcompile(function()
     local allowedTargetCombatClassificationsByLevelByAbilityTypeId = {}
     for ____, abilityType in ipairs(AbilityType:getAll()) do
@@ -459,9 +519,9 @@ __TS__SetDescriptor(
 )
 ____exports.resolveCurrentAbilityDependentValue = function(ability, value)
     if __TS__InstanceOf(value, ____exports.AbilityField) then
-        return value:getValue(ability)
+        return value:getValue(ability, true)
     elseif __TS__InstanceOf(value, ____exports.AbilityLevelField) then
-        return value:getValue(ability, ability.level)
+        return value:getValue(ability, ability.level, true)
     elseif type(value) == "function" then
         return value(ability)
     else