warscript 0.0.1-dev.404878c → 0.0.1-dev.58c74da

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

@@ -7,6 +7,7 @@ local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
 local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
 local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
 local ____exports = {}
+local preparePhysicalPositiveApplicatorAbility
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
 local ____cripple = require("engine.object-data.entry.ability-type.cripple")
@@ -34,20 +35,14 @@ local ____blood_2Dlust = require("engine.object-data.entry.ability-type.blood-lu
 local BloodLustAbilityType = ____blood_2Dlust.BloodLustAbilityType
 local ____berserk = require("engine.object-data.entry.ability-type.berserk")
 local BerserkAbilityType = ____berserk.BerserkAbilityType
-local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
-local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
-local ____dummy_2Dinventory = require("engine.internal.object-data.dummy-inventory")
-local INVENTORY_ABILITY_TYPE_ID = ____dummy_2Dinventory.INVENTORY_ABILITY_TYPE_ID
 local ____blank = require("engine.object-data.entry.upgrade.blank")
 local BlankUpgrade = ____blank.BlankUpgrade
-local ____dummy_2Dunits = require("engine.internal.misc.dummy-units")
-local INVENTORY_DUMMY_NATIVE_UNIT = ____dummy_2Dunits.INVENTORY_DUMMY_NATIVE_UNIT
-local ____preconditions = require("utility.preconditions")
-local checkNotNull = ____preconditions.checkNotNull
 local ____unit_2Dtype = require("engine.object-data.entry.unit-type")
 local UnitType = ____unit_2Dtype.UnitType
 local ____permanent_2Dimmolation = require("engine.object-data.entry.ability-type.permanent-immolation")
 local PermanentImmolationAbilityType = ____permanent_2Dimmolation.PermanentImmolationAbilityType
+local ____cast_2Dability = require("engine.internal.mechanics.cast-ability")
+local castAbility = ____cast_2Dability.castAbility
 local createItem = CreateItem
 local getAbilityId = BlzGetAbilityId
 local getItemAbility = BlzGetItemAbility
@@ -260,75 +255,25 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
         return unitAddAbility(unit.handle, applicatorAbilityTypeId)
     end
     if applicatorType == 852100 then
-        local success
-        local nativeUnit = unit.handle
-        local nativeItem = createItem(DUMMY_ITEM_ID, 0, 0)
-        unitAddItem(INVENTORY_DUMMY_NATIVE_UNIT, nativeItem)
-        itemAddAbility(nativeItem, applicatorAbilityTypeId)
-        local applicatorAbility = checkNotNull(getItemAbility(nativeItem, applicatorAbilityTypeId))
-        if level == nil then
-            level = 0
-            setAbilityIntegerField(applicatorAbility, ABILITY_IF_LEVELS, 1)
-        end
-        setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_DURATION_NORMAL, level, duration or 0)
-        setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_DURATION_HERO, level, duration or 0)
-        if movementSpeedIncreaseFactor ~= nil then
-            setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_MOVEMENT_SPEED_INCREASE_BSK1, level, movementSpeedIncreaseFactor)
-        end
-        setItemBooleanField(nativeItem, ITEM_BF_ACTIVELY_USED, true)
-        setItemBooleanField(nativeItem, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
-        if level > 0 then
+        local nativePlayer = unit.owner.handle
+        if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
             if upgradeId ~= nil then
-                setPlayerTechResearched(
-                    getOwningPlayer(nativeUnit),
-                    upgradeId,
-                    level
-                )
-            end
-        end
-        if not unitAddItem(nativeUnit, nativeItem) then
-            local latestInventoryAbilityTypeId = 0
-            local nativeItemBySlot = {}
-            local inventorySize = unitInventorySize(nativeUnit)
-            if inventorySize ~= 0 then
-                for slot = 0, inventorySize - 1 do
-                    nativeItemBySlot[slot] = UnitRemoveItemFromSlot(nativeUnit, slot)
-                end
-                local unitNativeAbility = getUnitAbilityByIndex(nativeUnit, 0)
-                local i = 1
-                while unitNativeAbility ~= nil do
-                    local abilityTypeId = getAbilityId(unitNativeAbility)
-                    if INVENTORY_ABILITY_TYPE_IDS[abilityTypeId] ~= nil then
-                        latestInventoryAbilityTypeId = abilityTypeId
-                    end
-                    unitNativeAbility = getUnitAbilityByIndex(nativeUnit, i)
-                    i = i + 1
-                end
-                unitRemoveAbility(nativeUnit, latestInventoryAbilityTypeId)
+                setPlayerTechResearched(nativePlayer, upgradeId, level)
             end
-            unitAddAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
-            success = unitAddItem(nativeUnit, nativeItem)
-            unitRemoveAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
-            if latestInventoryAbilityTypeId ~= 0 then
-                unitAddAbility(nativeUnit, latestInventoryAbilityTypeId)
-                for slot, nativeItem in pairs(nativeItemBySlot) do
-                    unitAddItem(nativeUnit, nativeItem)
-                    unitDropItemSlot(nativeUnit, nativeItem, slot)
-                end
-            end
-        else
-            success = true
         end
-        removeItem(nativeItem)
-        if level ~= nil and level > 1 then
+        local success = castAbility(
+            unit.handle,
+            applicatorAbilityTypeId,
+            preparePhysicalPositiveApplicatorAbility,
+            level,
+            duration or 0,
+            movementSpeedIncreaseFactor
+        )
+        if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
             if upgradeId ~= nil then
-                setPlayerTechResearched(
-                    getOwningPlayer(nativeUnit),
-                    upgradeId,
-                    0
-                )
+                setPlayerTechResearched(nativePlayer, upgradeId, 0)
             end
         end
         return success
@@ -364,6 +309,17 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
     end
     return success
 end
+preparePhysicalPositiveApplicatorAbility = function(ability, level, duration, movementSpeedIncreaseFactor)
+    if level == nil then
+        setAbilityIntegerField(ability, ABILITY_IF_LEVELS, 1)
+        level = 1
+    end
+    setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_NORMAL, level, duration)
+    setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_HERO, level, duration)
+    if movementSpeedIncreaseFactor ~= nil then
+        setAbilityRealLevelField(ability, ABILITY_RLF_MOVEMENT_SPEED_INCREASE_BSK1, level, movementSpeedIncreaseFactor)
+    end
+end
 ---
 -- @internal For use by internal systems only.
 ____exports.removeBuff = function(unit, applicableBuffTypeId)

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

@@ -13,6 +13,7 @@ import { ObjectDataEntryIdGenerator } from "../utility/object-data-entry-id-gene
 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 & {
     readonly __unitTypeId: unique symbol;
 };
@@ -23,12 +24,16 @@ export declare class UnitTypeWeapon {
     private readonly unitType;
     private readonly index;
     private constructor();
+    get attackType(): AttackType;
+    set attackType(attackType: AttackType);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
     get impactDelay(): number;
     set impactDelay(impactDelay: number);
     get missileModelPath(): string;
     set missileModelPath(missileModelPath: string);
+    get range(): number;
+    set range(range: number);
     get soundType(): WeaponSoundType;
     set soundType(soundType: WeaponSoundType);
     get soundTypeSD(): WeaponSoundType;
@@ -117,6 +122,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get runSpeed(): number;
+    set runSpeed(runSpeed: number);
+    get runSpeedSD(): number;
+    set runSpeedSD(runSpeedSD: number);
+    get runSpeedHD(): number;
+    set runSpeedHD(runSpeedHD: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
@@ -149,6 +160,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set shadowImageXOffset(shadowImageXOffset: number);
     get shadowImageYOffset(): number;
     set shadowImageYOffset(shadowImageYOffset: number);
+    get walkSpeed(): number;
+    set walkSpeed(walkSpeed: number);
+    get walkSpeedSD(): number;
+    set walkSpeedSD(walkSpeedSD: number);
+    get walkSpeedHD(): number;
+    set walkSpeedHD(walkSpeedHD: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
@@ -215,4 +232,8 @@ export declare abstract class HeroUnitType<Id extends HeroUnitTypeId = HeroUnitT
     protected static generateId(): number;
     get heroAbilityTypeIds(): AbilityTypeId[];
     set heroAbilityTypeIds(heroAbilityTypeIds: AbilityTypeId[]);
+    get properNames(): string[];
+    set properNames(properNames: string | string[]);
+    get properNameCount(): number;
+    set properNameCount(properNameCount: number);
 }

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

@@ -3,6 +3,7 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__New = ____lualib.__TS__New
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__ArrayIsArray = ____lualib.__TS__ArrayIsArray
 local ____exports = {}
 local ____arrays = require("utility.arrays")
 local arrayOfNotNull = ____arrays.arrayOfNotNull
@@ -28,21 +29,21 @@ function UnitTypeWeapon.prototype.____constructor(self, unitType, index)
 end
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "backSwingDuration",
+    "attackType",
     {
         get = function(self)
             local ____self_0 = self.unitType
-            return ____self_0.getNumberField(
+            return ____self_0.getStringField(
                 ____self_0,
-                "ubs" .. tostring(self.index)
+                ("ua" .. tostring(self.index)) .. "t"
             )
         end,
-        set = function(self, backSwingDuration)
+        set = function(self, attackType)
             local ____self_1 = self.unitType
-            ____self_1.setNumberField(
+            ____self_1.setStringField(
                 ____self_1,
-                "ubs" .. tostring(self.index),
-                backSwingDuration
+                ("ua" .. tostring(self.index)) .. "t",
+                attackType
             )
         end
     },
@@ -50,21 +51,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "impactDelay",
+    "backSwingDuration",
     {
         get = function(self)
             local ____self_2 = self.unitType
             return ____self_2.getNumberField(
                 ____self_2,
-                "udp" .. tostring(self.index)
+                "ubs" .. tostring(self.index)
             )
         end,
-        set = function(self, impactDelay)
+        set = function(self, backSwingDuration)
             local ____self_3 = self.unitType
             ____self_3.setNumberField(
                 ____self_3,
-                "udp" .. tostring(self.index),
-                impactDelay
+                "ubs" .. tostring(self.index),
+                backSwingDuration
             )
         end
     },
@@ -72,21 +73,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "missileModelPath",
+    "impactDelay",
     {
         get = function(self)
             local ____self_4 = self.unitType
-            return ____self_4.getStringField(
+            return ____self_4.getNumberField(
                 ____self_4,
-                ("ua" .. tostring(self.index)) .. "m"
+                "udp" .. tostring(self.index)
             )
         end,
-        set = function(self, missileModelPath)
+        set = function(self, impactDelay)
             local ____self_5 = self.unitType
-            ____self_5.setStringField(
+            ____self_5.setNumberField(
                 ____self_5,
-                ("ua" .. tostring(self.index)) .. "m",
-                missileModelPath
+                "udp" .. tostring(self.index),
+                impactDelay
             )
         end
     },
@@ -94,21 +95,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundType",
+    "missileModelPath",
     {
         get = function(self)
             local ____self_6 = self.unitType
             return ____self_6.getStringField(
                 ____self_6,
-                "ucs" .. tostring(self.index)
+                ("ua" .. tostring(self.index)) .. "m"
             )
         end,
-        set = function(self, soundType)
+        set = function(self, missileModelPath)
             local ____self_7 = self.unitType
             ____self_7.setStringField(
                 ____self_7,
-                "ucs" .. tostring(self.index),
-                soundType
+                ("ua" .. tostring(self.index)) .. "m",
+                missileModelPath
             )
         end
     },
@@ -116,21 +117,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundTypeSD",
+    "range",
     {
         get = function(self)
             local ____self_8 = self.unitType
-            return ____self_8.getStringField(
+            return ____self_8.getNumberField(
                 ____self_8,
-                ("ucs" .. tostring(self.index)) .. ":sd"
+                ("ua" .. tostring(self.index)) .. "r"
             )
         end,
-        set = function(self, soundTypeSD)
+        set = function(self, range)
             local ____self_9 = self.unitType
-            ____self_9.setStringField(
+            ____self_9.setNumberField(
                 ____self_9,
-                ("ucs" .. tostring(self.index)) .. ":sd",
-                soundTypeSD
+                ("ua" .. tostring(self.index)) .. "r",
+                range
             )
         end
     },
@@ -138,19 +139,63 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundTypeHD",
+    "soundType",
     {
         get = function(self)
             local ____self_10 = self.unitType
             return ____self_10.getStringField(
                 ____self_10,
-                ("ucs" .. tostring(self.index)) .. ":hd"
+                "ucs" .. tostring(self.index)
             )
         end,
-        set = function(self, soundTypeHD)
+        set = function(self, soundType)
             local ____self_11 = self.unitType
             ____self_11.setStringField(
                 ____self_11,
+                "ucs" .. tostring(self.index),
+                soundType
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "soundTypeSD",
+    {
+        get = function(self)
+            local ____self_12 = self.unitType
+            return ____self_12.getStringField(
+                ____self_12,
+                ("ucs" .. tostring(self.index)) .. ":sd"
+            )
+        end,
+        set = function(self, soundTypeSD)
+            local ____self_13 = self.unitType
+            ____self_13.setStringField(
+                ____self_13,
+                ("ucs" .. tostring(self.index)) .. ":sd",
+                soundTypeSD
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "soundTypeHD",
+    {
+        get = function(self)
+            local ____self_14 = self.unitType
+            return ____self_14.getStringField(
+                ____self_14,
+                ("ucs" .. tostring(self.index)) .. ":hd"
+            )
+        end,
+        set = function(self, soundTypeHD)
+            local ____self_15 = self.unitType
+            ____self_15.setStringField(
+                ____self_15,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -683,6 +728,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "runSpeed",
+    {
+        get = function(self)
+            return self:getNumberField("urun")
+        end,
+        set = function(self, runSpeed)
+            self:setNumberField("urun", runSpeed)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "runSpeedSD",
+    {
+        get = function(self)
+            return self:getNumberField("urun:sd")
+        end,
+        set = function(self, runSpeedSD)
+            self:setNumberField("urun:sd", runSpeedSD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "runSpeedHD",
+    {
+        get = function(self)
+            return self:getNumberField("urun:hd")
+        end,
+        set = function(self, runSpeedHD)
+            self:setNumberField("urun:hd", runSpeedHD)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "selectionCircleScale",
@@ -891,6 +975,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "walkSpeed",
+    {
+        get = function(self)
+            return self:getNumberField("uwal")
+        end,
+        set = function(self, walkSpeed)
+            self:setNumberField("uwal", walkSpeed)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "walkSpeedSD",
+    {
+        get = function(self)
+            return self:getNumberField("uwal:sd")
+        end,
+        set = function(self, walkSpeedSD)
+            self:setNumberField("uwal:sd", walkSpeedSD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "walkSpeedHD",
+    {
+        get = function(self)
+            return self:getNumberField("uwal:hd")
+        end,
+        set = function(self, walkSpeedHD)
+            self:setNumberField("uwal:hd", walkSpeedHD)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "armorSoundType",
@@ -1262,11 +1385,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        local ____class_12 = __TS__Class()
-        ____class_12.name = ____class_12.name
-        __TS__ClassExtends(____class_12, ____exports.UnitType)
-        ____class_12.BASE_ID = id
-        return ____class_12
+        local ____class_16 = __TS__Class()
+        ____class_16.name = ____class_16.name
+        __TS__ClassExtends(____class_16, ____exports.UnitType)
+        ____class_16.BASE_ID = id
+        return ____class_16
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1293,14 +1416,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    HeroUnitType.prototype,
+    "properNames",
+    {
+        get = function(self)
+            return self:getStringsField("upro")
+        end,
+        set = function(self, properNames)
+            if __TS__ArrayIsArray(properNames) then
+                self:setStringsField("upro", properNames)
+                self:setNumberField("upru", #properNames)
+            else
+                self:setStringField("upro", properNames)
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    HeroUnitType.prototype,
+    "properNameCount",
+    {
+        get = function(self)
+            return self:getNumberField("upru")
+        end,
+        set = function(self, properNameCount)
+            self:setNumberField("upru", properNameCount)
+        end
+    },
+    true
+)
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        local ____class_13 = __TS__Class()
-        ____class_13.name = ____class_13.name
-        __TS__ClassExtends(____class_13, ____exports.HeroUnitType)
-        ____class_13.BASE_ID = id
-        return ____class_13
+        local ____class_17 = __TS__Class()
+        ____class_17.name = ____class_17.name
+        __TS__ClassExtends(____class_17, ____exports.HeroUnitType)
+        ____class_17.BASE_ID = id
+        return ____class_17
     end
 )
 return ____exports

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

@@ -1,14 +1,15 @@
 /** @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> {
+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;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
 }
 export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
@@ -18,7 +19,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>;
 }
@@ -59,10 +60,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(instance: Ability): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
 }
 export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {
@@ -72,7 +74,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>;
 }

package/engine/object-field/ability.lua

@@ -27,6 +27,9 @@ __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)
+end
 __TS__SetDescriptor(
     AbilityField.prototype,
     "instanceClass",
@@ -261,6 +264,9 @@ end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityLevelField.prototype.hasNativeFieldValue(self, instance)
+    return instance:hasField(self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityLevelField.prototype,
     "instanceClass",

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

@@ -9,6 +9,7 @@ export declare abstract class UnitField<ValueType extends number | string | bool
 export declare class UnitStringField extends UnitField<string, junitstringfield> {
     protected get defaultValue(): string;
     protected getNativeFieldById(id: number): junitstringfield;
+    protected hasNativeFieldValue(): boolean;
     protected getNativeFieldValue(instance: Unit): string;
     protected getObjectDataEntryId(instance: Unit): UnitTypeId;
     protected setNativeFieldValue(instance: Unit, value: string): boolean;

package/engine/object-field/unit.lua

@@ -29,6 +29,9 @@ __TS__ClassExtends(UnitStringField, ____exports.UnitField)
 function UnitStringField.prototype.getNativeFieldById(self, id)
     return ConvertUnitStringField(id)
 end
+function UnitStringField.prototype.hasNativeFieldValue(self)
+    return true
+end
 function UnitStringField.prototype.getNativeFieldValue(self, instance)
     return instance:getField(self.nativeField)
 end