warscript 0.0.1-dev.47f470c → 0.0.1-dev.48e5280

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

@@ -12,6 +12,9 @@ local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNum
 local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
 local combatClassificationsToStringArray = ____combat_2Dclassification.combatClassificationsToStringArray
 local stringArrayToCombatClassifications = ____combat_2Dclassification.stringArrayToCombatClassifications
+local ____movement_2Dtype = require("engine.object-data.auxiliary.movement-type")
+local movementTypeToString = ____movement_2Dtype.movementTypeToString
+local stringToMovementType = ____movement_2Dtype.stringToMovementType
 local ____unit_2Dclassification = require("engine.object-data.auxiliary.unit-classification")
 local stringArrayToUnitClassifications = ____unit_2Dclassification.stringArrayToUnitClassifications
 local unitClassificationsToStringArray = ____unit_2Dclassification.unitClassificationsToStringArray
@@ -19,8 +22,14 @@ 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 ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
+local attackTypeToString = ____attack_2Dtype.attackTypeToString
+local stringToAttackType = ____attack_2Dtype.stringToAttackType
 local ____config = require("config")
 local WarscriptConfig = ____config.WarscriptConfig
+local ____armor_2Dtype = require("engine.object-data.auxiliary.armor-type")
+local armorTypeToString = ____armor_2Dtype.armorTypeToString
+local stringToArmorType = ____armor_2Dtype.stringToArmorType
 local getOrCreateUnitTypeWeapons
 ____exports.UnitTypeWeapon = __TS__Class()
 local UnitTypeWeapon = ____exports.UnitTypeWeapon
@@ -34,18 +43,19 @@ __TS__SetDescriptor(
     "attackType",
     {
         get = function(self)
+            local ____stringToAttackType_1 = stringToAttackType
             local ____self_0 = self.unitType
-            return ____self_0.getStringField(
+            return ____stringToAttackType_1(____self_0.getStringField(
                 ____self_0,
                 ("ua" .. tostring(self.index)) .. "t"
-            )
+            ))
         end,
         set = function(self, attackType)
-            local ____self_1 = self.unitType
-            ____self_1.setStringField(
-                ____self_1,
+            local ____self_2 = self.unitType
+            ____self_2.setStringField(
+                ____self_2,
                 ("ua" .. tostring(self.index)) .. "t",
-                attackType
+                attackTypeToString(attackType)
             )
         end
     },
@@ -56,16 +66,16 @@ __TS__SetDescriptor(
     "backSwingDuration",
     {
         get = function(self)
-            local ____self_2 = self.unitType
-            return ____self_2.getNumberField(
-                ____self_2,
+            local ____self_3 = self.unitType
+            return ____self_3.getNumberField(
+                ____self_3,
                 "ubs" .. tostring(self.index)
             )
         end,
         set = function(self, backSwingDuration)
-            local ____self_3 = self.unitType
-            ____self_3.setNumberField(
-                ____self_3,
+            local ____self_4 = self.unitType
+            ____self_4.setNumberField(
+                ____self_4,
                 "ubs" .. tostring(self.index),
                 backSwingDuration
             )
@@ -78,16 +88,16 @@ __TS__SetDescriptor(
     "cooldown",
     {
         get = function(self)
-            local ____self_4 = self.unitType
-            return ____self_4.getNumberField(
-                ____self_4,
+            local ____self_5 = self.unitType
+            return ____self_5.getNumberField(
+                ____self_5,
                 ("ua" .. tostring(self.index)) .. "c"
             )
         end,
         set = function(self, cooldown)
-            local ____self_5 = self.unitType
-            ____self_5.setNumberField(
-                ____self_5,
+            local ____self_6 = self.unitType
+            ____self_6.setNumberField(
+                ____self_6,
                 ("ua" .. tostring(self.index)) .. "c",
                 cooldown
             )
@@ -121,16 +131,16 @@ __TS__SetDescriptor(
     "damageBase",
     {
         get = function(self)
-            local ____self_6 = self.unitType
-            return ____self_6.getNumberField(
-                ____self_6,
+            local ____self_7 = self.unitType
+            return ____self_7.getNumberField(
+                ____self_7,
                 ("ua" .. tostring(self.index)) .. "b"
             )
         end,
         set = function(self, damageBase)
-            local ____self_7 = self.unitType
-            ____self_7.setNumberField(
-                ____self_7,
+            local ____self_8 = self.unitType
+            ____self_8.setNumberField(
+                ____self_8,
                 ("ua" .. tostring(self.index)) .. "b",
                 damageBase
             )
@@ -143,16 +153,16 @@ __TS__SetDescriptor(
     "damageDiceCount",
     {
         get = function(self)
-            local ____self_8 = self.unitType
-            return ____self_8.getNumberField(
-                ____self_8,
+            local ____self_9 = self.unitType
+            return ____self_9.getNumberField(
+                ____self_9,
                 ("ua" .. tostring(self.index)) .. "d"
             )
         end,
         set = function(self, damageDiceNumber)
-            local ____self_9 = self.unitType
-            ____self_9.setNumberField(
-                ____self_9,
+            local ____self_10 = self.unitType
+            ____self_10.setNumberField(
+                ____self_10,
                 ("ua" .. tostring(self.index)) .. "d",
                 damageDiceNumber
             )
@@ -165,16 +175,16 @@ __TS__SetDescriptor(
     "damageDiceSideCount",
     {
         get = function(self)
-            local ____self_10 = self.unitType
-            return ____self_10.getNumberField(
-                ____self_10,
+            local ____self_11 = self.unitType
+            return ____self_11.getNumberField(
+                ____self_11,
                 ("ua" .. tostring(self.index)) .. "s"
             )
         end,
         set = function(self, damageDiceSideCount)
-            local ____self_11 = self.unitType
-            ____self_11.setNumberField(
-                ____self_11,
+            local ____self_12 = self.unitType
+            ____self_12.setNumberField(
+                ____self_12,
                 ("ua" .. tostring(self.index)) .. "s",
                 damageDiceSideCount
             )
@@ -187,16 +197,16 @@ __TS__SetDescriptor(
     "impactDelay",
     {
         get = function(self)
-            local ____self_12 = self.unitType
-            return ____self_12.getNumberField(
-                ____self_12,
+            local ____self_13 = self.unitType
+            return ____self_13.getNumberField(
+                ____self_13,
                 "udp" .. tostring(self.index)
             )
         end,
         set = function(self, impactDelay)
-            local ____self_13 = self.unitType
-            ____self_13.setNumberField(
-                ____self_13,
+            local ____self_14 = self.unitType
+            ____self_14.setNumberField(
+                ____self_14,
                 "udp" .. tostring(self.index),
                 impactDelay
             )
@@ -209,16 +219,16 @@ __TS__SetDescriptor(
     "missileModelPath",
     {
         get = function(self)
-            local ____self_14 = self.unitType
-            return ____self_14.getStringField(
-                ____self_14,
+            local ____self_15 = self.unitType
+            return ____self_15.getStringField(
+                ____self_15,
                 ("ua" .. tostring(self.index)) .. "m"
             )
         end,
         set = function(self, missileModelPath)
-            local ____self_15 = self.unitType
-            ____self_15.setStringField(
-                ____self_15,
+            local ____self_16 = self.unitType
+            ____self_16.setStringField(
+                ____self_16,
                 ("ua" .. tostring(self.index)) .. "m",
                 missileModelPath
             )
@@ -226,21 +236,65 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileModelPathSD",
+    {
+        get = function(self)
+            local ____self_17 = self.unitType
+            return ____self_17.getStringField(
+                ____self_17,
+                ("ua" .. tostring(self.index)) .. "m:sd"
+            )
+        end,
+        set = function(self, missileModelPathSD)
+            local ____self_18 = self.unitType
+            ____self_18.setStringField(
+                ____self_18,
+                ("ua" .. tostring(self.index)) .. "m:sd",
+                missileModelPathSD
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileModelPathHD",
+    {
+        get = function(self)
+            local ____self_19 = self.unitType
+            return ____self_19.getStringField(
+                ____self_19,
+                ("ua" .. tostring(self.index)) .. "m:hd"
+            )
+        end,
+        set = function(self, missileModelPathHD)
+            local ____self_20 = self.unitType
+            ____self_20.setStringField(
+                ____self_20,
+                ("ua" .. tostring(self.index)) .. "m:hd",
+                missileModelPathHD
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
     "range",
     {
         get = function(self)
-            local ____self_16 = self.unitType
-            return ____self_16.getNumberField(
-                ____self_16,
+            local ____self_21 = self.unitType
+            return ____self_21.getNumberField(
+                ____self_21,
                 ("ua" .. tostring(self.index)) .. "r"
             )
         end,
         set = function(self, range)
-            local ____self_17 = self.unitType
-            ____self_17.setNumberField(
-                ____self_17,
+            local ____self_22 = self.unitType
+            ____self_22.setNumberField(
+                ____self_22,
                 ("ua" .. tostring(self.index)) .. "r",
                 range
             )
@@ -253,16 +307,16 @@ __TS__SetDescriptor(
     "soundType",
     {
         get = function(self)
-            local ____self_18 = self.unitType
-            return ____self_18.getStringField(
-                ____self_18,
+            local ____self_23 = self.unitType
+            return ____self_23.getStringField(
+                ____self_23,
                 "ucs" .. tostring(self.index)
             )
         end,
         set = function(self, soundType)
-            local ____self_19 = self.unitType
-            ____self_19.setStringField(
-                ____self_19,
+            local ____self_24 = self.unitType
+            ____self_24.setStringField(
+                ____self_24,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -275,16 +329,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_20 = self.unitType
-            return ____self_20.getStringField(
-                ____self_20,
+            local ____self_25 = self.unitType
+            return ____self_25.getStringField(
+                ____self_25,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_21 = self.unitType
-            ____self_21.setStringField(
-                ____self_21,
+            local ____self_26 = self.unitType
+            ____self_26.setStringField(
+                ____self_26,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -297,16 +351,16 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_22 = self.unitType
-            return ____self_22.getStringField(
-                ____self_22,
+            local ____self_27 = self.unitType
+            return ____self_27.getStringField(
+                ____self_27,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_23 = self.unitType
-            ____self_23.setStringField(
-                ____self_23,
+            local ____self_28 = self.unitType
+            ____self_28.setStringField(
+                ____self_28,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -810,7 +864,7 @@ __TS__SetDescriptor(
         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)
+                self:setStringField("upor", "")
             end
         end
     },
@@ -826,7 +880,7 @@ __TS__SetDescriptor(
         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)
+                self:setStringField("upor:sd", "")
             end
         end
     },
@@ -842,7 +896,7 @@ __TS__SetDescriptor(
         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)
+                self:setStringField("upor:hd", "")
             end
         end
     },
@@ -929,6 +983,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "selectionCircleHeight",
+    {
+        get = function(self)
+            return self:getNumberField("uslz")
+        end,
+        set = function(self, height)
+            self:setNumberField("uslz", height)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "selectionCircleScale",
@@ -1176,6 +1243,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armor",
+    {
+        get = function(self)
+            return self:getNumberField("udef")
+        end,
+        set = function(self, armor)
+            self:setNumberField("udef", armor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "armorSoundType",
@@ -1215,6 +1295,22 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armorType",
+    {
+        get = function(self)
+            return stringToArmorType(self:getStringField("udty"))
+        end,
+        set = function(self, armorType)
+            self:setStringField(
+                "udty",
+                armorTypeToString(armorType)
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "combatClassifications",
@@ -1233,7 +1329,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "unitClassifications",
+    "classifications",
     {
         get = function(self)
             return stringArrayToUnitClassifications(self:getStringsField("utyp"))
@@ -1341,10 +1437,13 @@ __TS__SetDescriptor(
     "movementType",
     {
         get = function(self)
-            return self:getStringField("umvt")
+            return stringToMovementType(self:getStringField("umvt"))
         end,
         set = function(self, movementType)
-            self:setStringField("umvt", movementType)
+            self:setStringField(
+                "umvt",
+                movementTypeToString(movementType)
+            )
         end
     },
     true
@@ -1466,6 +1565,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "level",
+    {
+        get = function(self)
+            return self:getNumberField("ulev")
+        end,
+        set = function(self, level)
+            self:setNumberField("ulev", level)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "manaRegenerationRate",
@@ -1612,11 +1724,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        local ____class_24 = __TS__Class()
-        ____class_24.name = ____class_24.name
-        __TS__ClassExtends(____class_24, ____exports.UnitType)
-        ____class_24.BASE_ID = id
-        return ____class_24
+        local ____class_29 = __TS__Class()
+        ____class_29.name = ____class_29.name
+        __TS__ClassExtends(____class_29, ____exports.UnitType)
+        ____class_29.BASE_ID = id
+        return ____class_29
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1677,11 +1789,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        local ____class_25 = __TS__Class()
-        ____class_25.name = ____class_25.name
-        __TS__ClassExtends(____class_25, ____exports.HeroUnitType)
-        ____class_25.BASE_ID = id
-        return ____class_25
+        local ____class_30 = __TS__Class()
+        ____class_30.name = ____class_30.name
+        __TS__ClassExtends(____class_30, ____exports.HeroUnitType)
+        ____class_30.BASE_ID = id
+        return ____class_30
     end
 )
 return ____exports

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

@@ -14,17 +14,17 @@ 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;
+    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[] | string | string[]): ObjectDataEntryIdType<T>[];
-    static create<T extends ObjectDataEntry>(this: ObjectDataEntryConstructor<T>, ...args: [id?: number, properties?: ObjectDataEntryProperties<T>] | [properties: ObjectDataEntryProperties<T>]): 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 | string): T | undefined;

package/engine/object-data/entry.lua

@@ -7,6 +7,7 @@ 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 = {}
@@ -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, self.ID_TYPE))
+            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, self.ID_TYPE))
+        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, self.ID_TYPE)]
+    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.ID_TYPE) == 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)
@@ -475,7 +476,6 @@ 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,
@@ -503,11 +503,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, self.type.ID_TYPE)
+        return dataToObjectDataEntryId(self.object.id, self.type.idType)
     end},
     true
 )
@@ -515,7 +522,7 @@ __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "baseId",
     {get = function(self)
-        return dataToObjectDataEntryId(self.object.parentId or self.object.id, self.type.ID_TYPE)
+        return dataToObjectDataEntryId(self.object.parentId or self.object.id, self.type.idType)
     end},
     true
 )

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

@@ -12,7 +12,7 @@ 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(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
 }
 export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
@@ -48,7 +48,7 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
 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;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -68,7 +68,7 @@ export declare abstract class AbilityLevelField<ValueType extends number | strin
     protected get instanceClass(): typeof Ability;
     protected getLevelCount(entry: AbilityType | Ability): number;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
 }
 export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {
@@ -117,7 +117,7 @@ export declare abstract class AbilityEnumLevelField<T extends number> extends Ab
     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<AbilityBooleanLevelField>;
+    static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityEnumLevelField<number>>;
 }
 export declare class AbilityBuffPolarityLevelField extends AbilityEnumLevelField<BuffPolarity> {
     protected values: ReadonlyNonEmptyLinkedSet<BuffPolarity>;