warscript 0.0.1-dev.46a1ede → 0.0.1-dev.47f470c

package/config.d.ts

@@ -0,0 +1,5 @@
+/** @noSelfInFile */
+export declare class WarscriptConfig {
+    private constructor();
+    static AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH: boolean;
+}

package/config.lua

@@ -0,0 +1,10 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local ____exports = {}
+____exports.WarscriptConfig = __TS__Class()
+local WarscriptConfig = ____exports.WarscriptConfig
+WarscriptConfig.name = "WarscriptConfig"
+function WarscriptConfig.prototype.____constructor(self)
+end
+WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH = true
+return ____exports

package/core/types/sound.d.ts

@@ -64,6 +64,7 @@ export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
 export declare class Sound3D extends Sound {
     static playAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): void;
     static playOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): void;
+    static playFromLabel(label: string, preset: Sound3DPreset, unit: Unit): void;
     static createAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): Sound3D;
     static createOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): Sound3D;
 }

package/core/types/sound.lua

@@ -6,14 +6,13 @@ local ____exports = {}
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local createSound = CreateSound
+local createSoundFromLabel = CreateSoundFromLabel
 local setSoundPitch = SetSoundPitch
 local setSoundChannel = SetSoundChannel
 local setSoundPosition = SetSoundPosition
 local setSoundVolume = SetSoundVolume
 local setSoundDistances = SetSoundDistances
 local setSoundDistanceCutoff = SetSoundDistanceCutoff
-local setSoundConeAngles = SetSoundConeAngles
-local setSoundConeOrientation = SetSoundConeOrientation
 local startSound = StartSound
 local setSoundPlayPosition = SetSoundPlayPosition
 local stopSound = StopSound
@@ -153,6 +152,31 @@ local function createPreset3DSound(fileName, preset)
     setSoundDistanceCutoff(sound, preset.distanceCutoff or 1500)
     return sound
 end
+local function createPreset3DSoundFromLabel(label, preset)
+    local ____label_7 = label
+    local ____preset_looping_5 = preset.looping
+    if ____preset_looping_5 == nil then
+        ____preset_looping_5 = false
+    end
+    local ____preset_stopWhenOutOfRange_6 = preset.stopWhenOutOfRange
+    if ____preset_stopWhenOutOfRange_6 == nil then
+        ____preset_stopWhenOutOfRange_6 = true
+    end
+    local sound = createSoundFromLabel(
+        ____label_7,
+        ____preset_looping_5,
+        true,
+        ____preset_stopWhenOutOfRange_6,
+        preset.fadeInRate or 12700,
+        preset.fadeOutRate or 12700
+    )
+    setSoundChannel(sound, preset.channel or ____exports.SoundChannel.General)
+    setSoundVolume(sound, preset.volume or 127)
+    setSoundPitch(sound, preset.pitch or 1)
+    setSoundDistances(sound, preset.minDistance or 600, preset.maxDistance or 8000)
+    setSoundDistanceCutoff(sound, preset.distanceCutoff or 1500)
+    return sound
+end
 ____exports.Sound = __TS__Class()
 local Sound = ____exports.Sound
 Sound.name = "Sound"
@@ -225,6 +249,12 @@ function Sound3D.playOnUnit(self, fileName, preset, unit)
     startSound(sound)
     killSoundWhenDone(sound)
 end
+function Sound3D.playFromLabel(self, label, preset, unit)
+    local sound = createPreset3DSoundFromLabel(label, preset)
+    attachSoundToUnit(sound, unit.handle)
+    startSound(sound)
+    killSoundWhenDone(sound)
+end
 function Sound3D.createAtPosition(self, fileName, preset, x, y, z)
     if x == nil then
         x = 0

package/engine/buff.d.ts

@@ -57,6 +57,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     attackSpeedIncreaseFactor?: NumberParameterValueType;
     movementSpeedIncreaseFactor?: NumberParameterValueType;
     evasionProbability?: NumberParameterValueType;
+    missProbability?: NumberParameterValueType;
     damageFactor?: NumberParameterValueType;
     receivedDamageFactor?: NumberParameterValueType;
     receivedMagicDamageFactor?: NumberParameterValueType;
@@ -120,7 +121,8 @@ declare const enum BuffPropertyKey {
     DISABLES_AUTO_ATTACK = 137,
     PROVIDES_INVULNERABILITY = 138,
     KILLS_ON_EXPIRATION = 139,
-    EXPLODES_ON_EXPIRATION = 140
+    EXPLODES_ON_EXPIRATION = 140,
+    MISS_PROBABILITY = 141
 }
 export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
@@ -195,6 +197,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private readonly _level?;
     private readonly _spellStealPriority?;
     private readonly _learnLevelMinimum?;
+    private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
     private _bonusIdByBonusType?;
     private readonly _abilityTypeIds?;
     private _behaviors?;

package/engine/buff.lua

@@ -102,6 +102,7 @@ local buffParametersKeys = {
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
     evasionProbability = true,
+    missProbability = true,
     damageFactor = true,
     receivedDamageFactor = true,
     receivedMagicDamageFactor = true,
@@ -367,14 +368,19 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     end
     self.polarity = resolveEnumValue(ability, level, polarity)
     self.resistanceType = resolveEnumValue(ability, level, resistanceType)
+    local missProbability = parameters and parameters.missProbability or defaultParameters.missProbability
+    if missProbability ~= nil then
+        missProbability = resolveNumberValue(ability, level, missProbability)
+        self[141] = missProbability
+    end
     local buffByTypeId = buffByTypeIdByUnit[_unit]
     if buffByTypeId == nil then
         buffByTypeId = {}
         buffByTypeIdByUnit[_unit] = buffByTypeId
     end
-    local ____opt_13 = buffByTypeId[typeId]
-    if ____opt_13 ~= nil then
-        ____opt_13:destroy()
+    local ____opt_15 = buffByTypeId[typeId]
+    if ____opt_15 ~= nil then
+        ____opt_15:destroy()
     end
     local uniqueGroup = parameters and parameters.uniqueGroup or defaultParameters and defaultParameters.uniqueGroup
     if uniqueGroup ~= nil then
@@ -388,13 +394,16 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         level,
         duration,
         spellStealPriority,
-        learnLevelMinimum
+        learnLevelMinimum,
+        missProbability
     ) then
+        self[100] = 1
         UnitBehavior.prototype.destroy(self)
         error(unsuccessfulApplicationMarker, 0)
     end
     local handle = BlzGetUnitAbility(_unit.handle, typeId)
     if handle == nil then
+        self[100] = 1
         UnitBehavior.prototype.destroy(self)
         error(unsuccessfulApplicationMarker, 0)
     end
@@ -410,13 +419,13 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     self[106] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_SPECIAL, 0)
     if parameters ~= nil or (next(defaultParameters)) ~= nil then
         for ____, buffBooleanParameter in ipairs(buffBooleanParameters) do
-            local ____ability_22 = ability
-            local ____level_23 = level
-            local ____temp_21 = parameters and parameters[buffBooleanParameter]
-            if ____temp_21 == nil then
-                ____temp_21 = defaultParameters[buffBooleanParameter]
+            local ____ability_24 = ability
+            local ____level_25 = level
+            local ____temp_23 = parameters and parameters[buffBooleanParameter]
+            if ____temp_23 == nil then
+                ____temp_23 = defaultParameters[buffBooleanParameter]
             end
-            if resolveBooleanValue(____ability_22, ____level_23, ____temp_21) then
+            if resolveBooleanValue(____ability_24, ____level_25, ____temp_23) then
                 self[buffBooleanParameter] = true
             end
         end
@@ -497,8 +506,8 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     self[100] = 1
 end
 function Buff.prototype.getUnitBonus(self, bonusType)
-    local ____opt_36 = self._bonusIdByBonusType
-    local bonusId = ____opt_36 and ____opt_36[bonusType]
+    local ____opt_38 = self._bonusIdByBonusType
+    local bonusId = ____opt_38 and ____opt_38[bonusType]
     return bonusId == nil and 0 or getUnitBonus(self._unit, bonusType, bonusId)
 end
 function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
@@ -514,45 +523,45 @@ function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrPa
         Effect:flash(self[105], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
         local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
-        local ____Effect_40 = Effect
-        local ____Effect_flash_41 = Effect.flash
-        local ____array_39 = __TS__SparseArrayNew(
+        local ____Effect_42 = Effect
+        local ____Effect_flash_43 = Effect.flash
+        local ____array_41 = __TS__SparseArrayNew(
             self[105],
             isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
             stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
         )
-        local ____isWidgetProvided_38
+        local ____isWidgetProvided_40
         if isWidgetProvided then
-            ____isWidgetProvided_38 = yOrParametersOrDuration
+            ____isWidgetProvided_40 = yOrParametersOrDuration
         else
-            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
+            ____isWidgetProvided_40 = widgetOrXOrParametersOrDuration
         end
-        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
-        ____Effect_flash_41(
-            ____Effect_40,
-            __TS__SparseArraySpread(____array_39)
+        __TS__SparseArrayPush(____array_41, ____isWidgetProvided_40)
+        ____Effect_flash_43(
+            ____Effect_42,
+            __TS__SparseArraySpread(____array_41)
         )
     end
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
     local isWidgetProvided = type(widgetOrDuration) == "table"
-    local ____Effect_44 = Effect
-    local ____Effect_flash_45 = Effect.flash
-    local ____array_43 = __TS__SparseArrayNew(
+    local ____Effect_46 = Effect
+    local ____Effect_flash_47 = Effect.flash
+    local ____array_45 = __TS__SparseArrayNew(
         self[106],
         isWidgetProvided and widgetOrDuration or self._unit,
         stringValueByBuffTypeIdByFieldId[fourCC("fspt")][self.typeId] or "origin"
     )
-    local ____isWidgetProvided_42
+    local ____isWidgetProvided_44
     if isWidgetProvided then
-        ____isWidgetProvided_42 = duration
+        ____isWidgetProvided_44 = duration
     else
-        ____isWidgetProvided_42 = widgetOrDuration
+        ____isWidgetProvided_44 = widgetOrDuration
     end
-    __TS__SparseArrayPush(____array_43, ____isWidgetProvided_42)
-    ____Effect_flash_45(
-        ____Effect_44,
-        __TS__SparseArraySpread(____array_43)
+    __TS__SparseArrayPush(____array_45, ____isWidgetProvided_44)
+    ____Effect_flash_47(
+        ____Effect_46,
+        __TS__SparseArraySpread(____array_45)
     )
 end
 function Buff.prototype.onCreate(self)
@@ -631,8 +640,8 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getByTypeId(self, unit, typeId)
-    local ____opt_46 = buffByTypeIdByUnit[unit]
-    local buff = ____opt_46 and ____opt_46[typeId]
+    local ____opt_48 = buffByTypeIdByUnit[unit]
+    local buff = ____opt_48 and ____opt_48[typeId]
     if __TS__InstanceOf(buff, self) then
         return buff
     end
@@ -790,8 +799,8 @@ __TS__SetDescriptor(
                 return
             end
             self[112] = damageInterval
-            local ____opt_48 = self._timer
-            local elapsed = ____opt_48 and ____opt_48.elapsed or 0
+            local ____opt_50 = self._timer
+            local elapsed = ____opt_50 and ____opt_50.elapsed or 0
             local timer = self[114]
             if timer == nil then
                 timer = Timer:create()
@@ -870,8 +879,8 @@ __TS__SetDescriptor(
                 return
             end
             self[117] = healingInterval
-            local ____opt_50 = self._timer
-            local elapsed = ____opt_50 and ____opt_50.elapsed or 0
+            local ____opt_52 = self._timer
+            local elapsed = ____opt_52 and ____opt_52.elapsed or 0
             local timer = self[119]
             if timer == nil then
                 timer = Timer:create()
@@ -957,11 +966,11 @@ __TS__SetDescriptor(
     "stuns",
     {
         get = function(self)
-            local ____self__135_52 = self[135]
-            if ____self__135_52 == nil then
-                ____self__135_52 = false
+            local ____self__135_54 = self[135]
+            if ____self__135_54 == nil then
+                ____self__135_54 = false
             end
-            return ____self__135_52
+            return ____self__135_54
         end,
         set = function(self, stuns)
             if not stuns and self[135] then
@@ -986,11 +995,11 @@ __TS__SetDescriptor(
     "ignoresStunImmunity",
     {
         get = function(self)
-            local ____self__136_53 = self[136]
-            if ____self__136_53 == nil then
-                ____self__136_53 = false
+            local ____self__136_55 = self[136]
+            if ____self__136_55 == nil then
+                ____self__136_55 = false
             end
-            return ____self__136_53
+            return ____self__136_55
         end,
         set = function(self, ignoresStunImmunity)
             if not ignoresStunImmunity and self[136] then
@@ -1013,11 +1022,11 @@ __TS__SetDescriptor(
     "disablesAutoAttack",
     {
         get = function(self)
-            local ____self__137_54 = self[137]
-            if ____self__137_54 == nil then
-                ____self__137_54 = false
+            local ____self__137_56 = self[137]
+            if ____self__137_56 == nil then
+                ____self__137_56 = false
             end
-            return ____self__137_54
+            return ____self__137_56
         end,
         set = function(self, disablesAutoAttack)
             if not disablesAutoAttack and self[137] then
@@ -1036,11 +1045,11 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__138_55 = self[138]
-            if ____self__138_55 == nil then
-                ____self__138_55 = false
+            local ____self__138_57 = self[138]
+            if ____self__138_57 == nil then
+                ____self__138_57 = false
             end
-            return ____self__138_55
+            return ____self__138_57
         end,
         set = function(self, providesInvulnerability)
             if not providesInvulnerability and self[138] then
@@ -1059,11 +1068,11 @@ __TS__SetDescriptor(
     "killsOnExpiration",
     {
         get = function(self)
-            local ____self__139_56 = self[139]
-            if ____self__139_56 == nil then
-                ____self__139_56 = false
+            local ____self__139_58 = self[139]
+            if ____self__139_58 == nil then
+                ____self__139_58 = false
             end
-            return ____self__139_56
+            return ____self__139_58
         end,
         set = function(self, killsOnExpiration)
             if not killsOnExpiration and self[139] then
@@ -1080,11 +1089,11 @@ __TS__SetDescriptor(
     "explodesOnExpiration",
     {
         get = function(self)
-            local ____self__140_57 = self[140]
-            if ____self__140_57 == nil then
-                ____self__140_57 = false
+            local ____self__140_59 = self[140]
+            if ____self__140_59 == nil then
+                ____self__140_59 = false
             end
-            return ____self__140_57
+            return ____self__140_59
         end,
         set = function(self, killsOnExpiration)
             if not killsOnExpiration and self[140] then
@@ -1212,13 +1221,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_58 = self._timer
-            return ____opt_58 and ____opt_58.remaining or 0
+            local ____opt_60 = self._timer
+            return ____opt_60 and ____opt_60.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_62 = remainingDuration
-            local ____opt_60 = self._timer
-            local remainingDurationDelta = ____remainingDuration_62 - (____opt_60 and ____opt_60.remaining or 0)
+            local ____remainingDuration_64 = remainingDuration
+            local ____opt_62 = self._timer
+            local remainingDurationDelta = ____remainingDuration_64 - (____opt_62 and ____opt_62.remaining or 0)
             if remainingDurationDelta ~= 0 then
                 self[103] = self[103] + remainingDurationDelta
                 if remainingDuration <= 0 then
@@ -1232,7 +1241,8 @@ __TS__SetDescriptor(
                         self._level,
                         remainingDuration,
                         self._spellStealPriority,
-                        self._learnLevelMinimum
+                        self._learnLevelMinimum,
+                        self[141]
                     ) then
                         local timer = self._timer
                         if timer == nil then

package/engine/object-data/auxiliary/animation-name.d.ts

@@ -12,3 +12,4 @@ export declare const enum AnimationName {
     STAND = "stand",
     WALK = "walk"
 }
+export declare const isAnimationName: (value: string) => value is AnimationName;

package/engine/object-data/auxiliary/animation-name.lua

@@ -1,2 +1,18 @@
 local ____exports = {}
+local animationNames = {
+    attack = true,
+    birth = true,
+    death = true,
+    decay = true,
+    dissipate = true,
+    morph = true,
+    portrait = true,
+    sleep = true,
+    spell = true,
+    stand = true,
+    walk = true
+}
+____exports.isAnimationName = function(value)
+    return animationNames[value] ~= nil
+end
 return ____exports

package/engine/object-data/auxiliary/tech-tree-dependency.d.ts

@@ -12,5 +12,5 @@ export type TechTreeDependency = {
     level: number;
 };
 export type TechTreeDependencyInput = TechTreeDependency | UnitTypeId | UpgradeId;
-export declare const extractTechTreeDependencyInputObjectDataEntryId: (techTreeDependencyInput: TechTreeDependencyInput) => ObjectDataEntryId;
+export declare const extractTechTreeDependencyInputObjectDataEntryId: (techTreeDependencyInput: TechTreeDependencyInput) => ObjectDataEntryId & number;
 export declare const extractTechTreeDependencyInputLevel: (techTreeDependencyInput: TechTreeDependencyInput) => number;

package/engine/object-data/entry/ability-type/blank-configurable.lua

@@ -6,6 +6,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____channel = require("engine.object-data.entry.ability-type.channel")
 local ChannelAbilityType = ____channel.ChannelAbilityType
+local ____animation_2Dname = require("engine.object-data.auxiliary.animation-name")
+local isAnimationName = ____animation_2Dname.isAnimationName
 local ____order_2Dtype_2Dstring_2Did_2Dfactory = require("engine.object-data.utility.order-type-string-id-factory")
 local orderTypeStringIdFactory = ____order_2Dtype_2Dstring_2Did_2Dfactory.orderTypeStringIdFactory
 local ____timer = require("core.types.timer")
@@ -21,6 +23,9 @@ local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.A
 local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
 local ____linked_2Dset = require("utility.linked-set")
 local LinkedSet = ____linked_2Dset.LinkedSet
+local ____sound = require("core.types.sound")
+local Sound3D = ____sound.Sound3D
+local SoundPreset = ____sound.SoundPreset
 local isChannelingAbilityTypeIds = {}
 local usesAttackAnimationByAbilityTypeId = {}
 ____exports.BlankConfigurableAbilityType = __TS__Class()
@@ -211,11 +216,26 @@ for abilityTypeId, usesAttackAnimation in pairs(postcompile(function()
     for abilityTypeId, usesAttackAnimation in pairs(usesAttackAnimationByAbilityTypeId) do
         if usesAttackAnimation then
             local abilityType = checkNotNull(____exports.BlankConfigurableAbilityType:of(abilityTypeId))
-            abilityType.channelingAnimation = {"attack"}
+            if isAnimationName(abilityType.channelingAnimation[1]) then
+                if abilityType.channelingAnimation[1] ~= "attack" then
+                    abilityType.channelingAnimation = {"attack"}
+                end
+            else
+                abilityType.channelingAnimation = {
+                    "attack",
+                    table.unpack(abilityType.channelingAnimation)
+                }
+            end
         end
     end
     return usesAttackAnimationByAbilityTypeId
 end)) do
+    Unit.abilityCastingFinishEvent[abilityTypeId]:addListener(function(caster, ability)
+        local effectSound = ability:getField(ABILITY_SF_EFFECT_SOUND)
+        if effectSound ~= "" then
+            Sound3D:playFromLabel(effectSound, SoundPreset.Ability, caster)
+        end
+    end)
     if usesAttackAnimation then
         Unit.abilityCastingStartEvent[abilityTypeId]:addListener(
             4,

package/engine/object-data/entry/ability-type/curse.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "missProbability",
     {
         get = function(self)
-            return self:getNumberLevelField("Crs")
+            return self:getNumberLevelField("Crs1")
         end,
         set = function(self, missProbability)
-            self:setNumberLevelField("Crs", missProbability)
+            self:setNumberLevelField("Crs1", missProbability)
         end
     },
     true

package/engine/object-data/entry/ability-type/disease-cloud.lua

@@ -54,10 +54,10 @@ __TS__SetDescriptor(
     "plagueWardUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Aplu")
+            return self:getObjectDataEntryNumericIdLevelField("Aplu")
         end,
         set = function(self, plagueWardUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Aplu", plagueWardUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Aplu", plagueWardUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type/engineering-upgrade.lua

@@ -55,7 +55,7 @@ __TS__SetDescriptor(
         get = function(self)
             local abilityUpgrades = {}
             for i = 0, 3 do
-                local abilityUpgrade = self:getObjectDataEntryIdsLevelField("Neg" .. tostring(3 + i))
+                local abilityUpgrade = self:getObjectDataEntryNumericIdsLevelField("Neg" .. tostring(3 + i))
                 for level = 0, #abilityUpgrade - 1 do
                     local levelAbilityUpgrade = abilityUpgrade[level + 1]
                     if #levelAbilityUpgrade == 2 then
@@ -71,7 +71,7 @@ __TS__SetDescriptor(
             local ____opt_0 = abilityUpgrades[1]
             local isArray = __TS__ArrayIsArray(____opt_0 and ____opt_0[1])
             for i = 0, #abilityUpgrades - 1 do
-                self:setObjectDataEntryIdsLevelField(
+                self:setObjectDataEntryNumericIdsLevelField(
                     "Neg" .. tostring(3 + i),
                     isArray and map(
                         abilityUpgrades,

package/engine/object-data/entry/ability-type/feral-spirit.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "summonedUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Osf1")
+            return self:getObjectDataEntryNumericIdLevelField("Osf1")
         end,
         set = function(self, summonedUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Osf1", summonedUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Osf1", summonedUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type/phoenix-morph.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "normalFormUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Eme1")
+            return self:getObjectDataEntryNumericIdLevelField("Eme1")
         end,
         set = function(self, normalFormUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Eme1", normalFormUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Eme1", normalFormUnitTypeId)
         end
     },
     true
@@ -119,10 +119,10 @@ __TS__SetDescriptor(
     "alternateFormUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Emeu")
+            return self:getObjectDataEntryNumericIdLevelField("Emeu")
         end,
         set = function(self, alternateFormUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Emeu", alternateFormUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Emeu", alternateFormUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type/summon-quilbeast.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "summonedUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Hwe1")
+            return self:getObjectDataEntryNumericIdLevelField("Hwe1")
         end,
         set = function(self, summonedUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Hwe1", summonedUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Hwe1", summonedUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type/summon-water-elemental.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "summonedUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Hwe1")
+            return self:getObjectDataEntryNumericIdLevelField("Hwe1")
         end,
         set = function(self, summonedUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Hwe1", summonedUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Hwe1", summonedUnitTypeId)
         end
     },
     true

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

@@ -11,7 +11,7 @@ import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-t
 import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { BuffTypeId } from "./buff-type";
 import { LightningTypeId } from "./lightning-type";
-export type AbilityTypeId = ObjectDataEntryId & {
+export type AbilityTypeId = ObjectDataEntryId & number & {
     readonly __abilityTypeId: unique symbol;
 };
 export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId> {