warscript 0.0.1-dev.9ee7706 → 0.0.1-dev.9f30788

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

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

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

@@ -13,6 +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";
+import { ArmorType } from "../auxiliary/armor-type";
 export type UnitTypeId = ObjectDataEntryId & number & {
     readonly __unitTypeId: unique symbol;
 };
@@ -23,8 +24,8 @@ export declare class UnitTypeWeapon {
     private readonly unitType;
     private readonly index;
     private constructor();
-    get attackType(): AttackType;
-    set attackType(attackType: AttackType);
+    get attackType(): AttackType | undefined;
+    set attackType(attackType: AttackType | undefined);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
     get cooldown(): number;
@@ -144,6 +145,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set runSpeedSD(runSpeedSD: number);
     get runSpeedHD(): number;
     set runSpeedHD(runSpeedHD: number);
+    get selectionCircleHeight(): number;
+    set selectionCircleHeight(height: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
@@ -182,16 +185,20 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set walkSpeedSD(walkSpeedSD: number);
     get walkSpeedHD(): number;
     set walkSpeedHD(walkSpeedHD: number);
+    get armor(): number;
+    set armor(armor: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
     set armorSoundTypeSD(armorSoundTypeSD: ArmorSoundType);
     get armorSoundTypeHD(): ArmorSoundType;
     set armorSoundTypeHD(armorSoundTypeHD: ArmorSoundType);
+    get armorType(): ArmorType;
+    set armorType(armorType: ArmorType);
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
-    get unitClassifications(): UnitClassifications;
-    set unitClassifications(unitClassifications: UnitClassifications);
+    get classifications(): UnitClassifications;
+    set classifications(unitClassifications: UnitClassifications);
     get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get firstWeapon(): UnitTypeWeapon;
     get secondWeapon(): UnitTypeWeapon;
@@ -225,6 +232,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set goldCost(goldCost: number);
     get healthRegenerationRate(): number;
     set healthRegenerationRate(healthRegenerationRate: number);
+    get level(): number;
+    set level(level: number);
     get manaRegenerationRate(): number;
     set manaRegenerationRate(manaRegenerationRate: number);
     get maximumHealth(): number;

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
             )
@@ -231,16 +241,16 @@ __TS__SetDescriptor(
     "range",
     {
         get = function(self)
-            local ____self_16 = self.unitType
-            return ____self_16.getNumberField(
-                ____self_16,
+            local ____self_17 = self.unitType
+            return ____self_17.getNumberField(
+                ____self_17,
                 ("ua" .. tostring(self.index)) .. "r"
             )
         end,
         set = function(self, range)
-            local ____self_17 = self.unitType
-            ____self_17.setNumberField(
-                ____self_17,
+            local ____self_18 = self.unitType
+            ____self_18.setNumberField(
+                ____self_18,
                 ("ua" .. tostring(self.index)) .. "r",
                 range
             )
@@ -253,16 +263,16 @@ __TS__SetDescriptor(
     "soundType",
     {
         get = function(self)
-            local ____self_18 = self.unitType
-            return ____self_18.getStringField(
-                ____self_18,
+            local ____self_19 = self.unitType
+            return ____self_19.getStringField(
+                ____self_19,
                 "ucs" .. tostring(self.index)
             )
         end,
         set = function(self, soundType)
-            local ____self_19 = self.unitType
-            ____self_19.setStringField(
-                ____self_19,
+            local ____self_20 = self.unitType
+            ____self_20.setStringField(
+                ____self_20,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -275,16 +285,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_20 = self.unitType
-            return ____self_20.getStringField(
-                ____self_20,
+            local ____self_21 = self.unitType
+            return ____self_21.getStringField(
+                ____self_21,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_21 = self.unitType
-            ____self_21.setStringField(
-                ____self_21,
+            local ____self_22 = self.unitType
+            ____self_22.setStringField(
+                ____self_22,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -297,16 +307,16 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_22 = self.unitType
-            return ____self_22.getStringField(
-                ____self_22,
+            local ____self_23 = self.unitType
+            return ____self_23.getStringField(
+                ____self_23,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_23 = self.unitType
-            ____self_23.setStringField(
-                ____self_23,
+            local ____self_24 = self.unitType
+            ____self_24.setStringField(
+                ____self_24,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -929,6 +939,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 +1199,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 +1251,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 +1285,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "unitClassifications",
+    "classifications",
     {
         get = function(self)
             return stringArrayToUnitClassifications(self:getStringsField("utyp"))
@@ -1341,10 +1393,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 +1521,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 +1680,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_25 = __TS__Class()
+        ____class_25.name = ____class_25.name
+        __TS__ClassExtends(____class_25, ____exports.UnitType)
+        ____class_25.BASE_ID = id
+        return ____class_25
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1677,11 +1745,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_26 = __TS__Class()
+        ____class_26.name = ____class_26.name
+        __TS__ClassExtends(____class_26, ____exports.HeroUnitType)
+        ____class_26.BASE_ID = id
+        return ____class_26
     end
 )
 return ____exports

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>;

package/engine/object-field/ability.lua

@@ -7,6 +7,7 @@ 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
@@ -29,8 +30,8 @@ __TS__ClassExtends(AbilityField, ObjectField)
 function AbilityField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityField.prototype,
@@ -197,8 +198,8 @@ __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)
+function AbilityArrayField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
@@ -269,8 +270,8 @@ end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityLevelField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityLevelField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityLevelField.prototype,