warscript 0.0.1-dev.c8224f3 → 0.0.1-dev.c826fde

package/engine/lightning.d.ts

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { LightningTypeId } from "./object-data/entry/lightning-type";
-import { Handle, HandleDestructor } from "../core/types/handle";
 import { Unit } from "../core/types/unit";
+import { AbstractDestroyable, Destructor } from "../destroyable";
 declare const enum LightningPropertyKey {
     CHECK_VISIBILITY = 100,
     SOURCE_UNIT = 101,
@@ -16,7 +16,8 @@ declare const enum LightningPropertyKey {
     FADING = 110
 }
 export type LightningConstructor<T extends Lightning> = typeof Lightning & (new (handle: jlightning, typeId: LightningTypeId) => T);
-export declare class Lightning extends Handle<jlightning> {
+export declare class Lightning extends AbstractDestroyable {
+    readonly handle: jlightning;
     readonly typeId: LightningTypeId;
     private [LightningPropertyKey.CHECK_VISIBILITY]?;
     private [LightningPropertyKey.SOURCE_UNIT]?;
@@ -30,7 +31,7 @@ export declare class Lightning extends Handle<jlightning> {
     private [LightningPropertyKey.DURATION]?;
     private [LightningPropertyKey.FADING]?;
     constructor(handle: jlightning, typeId: LightningTypeId);
-    protected onDestroy(): HandleDestructor;
+    protected onDestroy(): Destructor;
     static create<T extends Lightning>(this: LightningConstructor<T>, typeId: LightningTypeId, ...parameters: [
         ...checkVisibility: [boolean] | [],
         ...sourceAndTarget: [sourceX: number, sourceY: number, targetX: number, targetY: number] | [

package/engine/lightning.lua

@@ -1,15 +1,16 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local ____handle = require("core.types.handle")
-local Handle = ____handle.Handle
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____functions = require("utility.functions")
 local forwardByN = ____functions.forwardByN
 local ____unit_2Dmissile_2Ddata = require("engine.internal.unit-missile-data")
 local MISSILE_DATA_BY_UNIT_TYPE_ID = ____unit_2Dmissile_2Ddata.MISSILE_DATA_BY_UNIT_TYPE_ID
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local ____type = _G.type
 local select = _G.select
 local cos = math.cos
@@ -41,9 +42,10 @@ local temporaryLightningsCount = 0
 ____exports.Lightning = __TS__Class()
 local Lightning = ____exports.Lightning
 Lightning.name = "Lightning"
-__TS__ClassExtends(Lightning, Handle)
+__TS__ClassExtends(Lightning, AbstractDestroyable)
 function Lightning.prototype.____constructor(self, handle, typeId)
-    Handle.prototype.____constructor(self, handle)
+    AbstractDestroyable.prototype.____constructor(self)
+    self.handle = handle
     self.typeId = typeId
 end
 function Lightning.prototype.onDestroy(self)
@@ -51,7 +53,7 @@ function Lightning.prototype.onDestroy(self)
     unitToPointLightnings[self] = nil
     pointToUnitLightnings[self] = nil
     destroyLightning(self.handle)
-    return Handle.prototype.onDestroy(self)
+    return AbstractDestroyable.prototype.onDestroy(self)
 end
 function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, sourceYOrTargetXOrTargetUnit, sourceZOrTargetXOrTargetUnitOrTargetY, targetXOrTargetUnitOrTargetYOrTargetZ, targetY, targetZ)
     if type(checkVisibility) ~= "boolean" then
@@ -67,7 +69,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
         )
     end
     if targetZ ~= nil then
-        return self:of(
+        return __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -84,7 +87,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     if targetXOrTargetUnitOrTargetYOrTargetZ ~= nil then
         if ____type(targetXOrTargetUnitOrTargetYOrTargetZ) == "number" then
             if ____type(sourceXOrSourceUnit) == "number" then
-                return self:of(
+                return __TS__New(
+                    self,
                     addLightning(
                         util.id2s(typeId),
                         checkVisibility,
@@ -97,7 +101,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
                 )
             end
             local unit = sourceXOrSourceUnit.handle
-            local lightning = self:of(
+            local lightning = __TS__New(
+                self,
                 addLightningEx(
                     util.id2s(typeId),
                     checkVisibility,
@@ -122,7 +127,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
             return lightning
         end
         local unit = targetXOrTargetUnitOrTargetYOrTargetZ.handle
-        local lightning = self:of(
+        local lightning = __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -151,7 +157,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
             local unit = sourceXOrSourceUnit.handle
             moveLocation(location, sourceYOrTargetXOrTargetUnit, sourceZOrTargetXOrTargetUnitOrTargetY)
             local z = getLocationZ(location)
-            local lightning = self:of(
+            local lightning = __TS__New(
+                self,
                 addLightningEx(
                     util.id2s(typeId),
                     checkVisibility,
@@ -178,7 +185,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
         local unit = sourceZOrTargetXOrTargetUnitOrTargetY.handle
         moveLocation(location, sourceXOrSourceUnit, sourceYOrTargetXOrTargetUnit)
         local z = getLocationZ(location)
-        local lightning = self:of(
+        local lightning = __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -204,7 +212,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     end
     local sourceUnit = sourceXOrSourceUnit.handle
     local targetUnit = sourceYOrTargetXOrTargetUnit.handle
-    local lightning = self:of(
+    local lightning = __TS__New(
+        self,
         addLightningEx(
             util.id2s(typeId),
             checkVisibility,

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/armor-type.d.ts

@@ -0,0 +1,11 @@
+/** @noSelfInFile */
+export declare const enum ArmorType {
+    LIGHT = 0,
+    MEDIUM = 1,
+    HEAVY = 2,
+    FORTIFIED = 3,
+    NORMAL = 4,
+    HERO = 5,
+    DIVINE = 6,
+    UNARMORED = 7
+}

package/engine/object-data/auxiliary/armor-type.lua

@@ -0,0 +1,46 @@
+local ____exports = {}
+local ____records = require("utility.records")
+local invertRecord = ____records.invertRecord
+local stringByArmorType = {
+    [0] = "small",
+    [1] = "medium",
+    [2] = "large",
+    [3] = "fort",
+    [4] = "normal",
+    [5] = "hero",
+    [6] = "divine",
+    [7] = "none"
+}
+local armorTypeByString = invertRecord(stringByArmorType)
+local nativeByArmorType = {
+    [0] = DEFENSE_TYPE_LIGHT,
+    [1] = DEFENSE_TYPE_MEDIUM,
+    [2] = DEFENSE_TYPE_LARGE,
+    [3] = DEFENSE_TYPE_FORT,
+    [4] = DEFENSE_TYPE_NORMAL,
+    [5] = DEFENSE_TYPE_HERO,
+    [6] = DEFENSE_TYPE_DIVINE,
+    [7] = DEFENSE_TYPE_NONE
+}
+local armorTypeByNative = invertRecord(nativeByArmorType)
+---
+-- @internal For use by internal systems only.
+____exports.armorTypeToString = function(armorType)
+    return stringByArmorType[armorType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.stringToArmorType = function(____string)
+    return armorTypeByString[____string] or 7
+end
+---
+-- @internal For use by internal systems only.
+____exports.armorTypeToNative = function(armorType)
+    return nativeByArmorType[armorType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.nativeToArmorType = function(armorType)
+    return armorTypeByNative[armorType]
+end
+return ____exports

package/engine/object-data/auxiliary/attachment-preset.d.ts

@@ -2,13 +2,18 @@
 import { ModelNodeName } from "./model-node-name";
 import { ModelNodeQualifier } from "./model-node-qualifier";
 import { Optional } from "../../../utility/types";
+import { EffectParameters } from "../../../core/types/effect";
 export type AttachmentPreset = {
     modelPath: string;
     nodeName: ModelNodeName;
     nodeQualifiers: ModelNodeQualifier[];
 };
-export type AttachmentPresetInput = Optional<AttachmentPreset, "nodeQualifiers"> | string;
-export declare const toAttachmentPreset: (attachmentPresetInput: AttachmentPresetInput) => AttachmentPreset;
+export type EffectPresetWithParameters = AttachmentPreset & {
+    parameters?: EffectParameters;
+};
+export type AttachmentPresetInput<T extends AttachmentPreset = AttachmentPreset> = Optional<T, "nodeName" | "nodeQualifiers"> | string;
+export type EffectPresetWithParametersInput = AttachmentPresetInput<EffectPresetWithParameters>;
+export declare const toEffectPreset: (effectPresetInput: EffectPresetWithParametersInput) => EffectPresetWithParameters;
 export declare const extractAttachmentPresetInputModelPath: (attachmentPresetInput: AttachmentPresetInput | undefined) => string;
 export declare const extractAttachmentPresetInputNodeFQN: (attachmentPresetInput: AttachmentPresetInput | undefined) => string;
 export declare const splitAttachmentNodeFQN: (attachmentNodeFQN: string) => LuaMultiReturn<[attachmentNodeName: ModelNodeName, attachmentNodeQualifiers: ModelNodeQualifier[]]>;

package/engine/object-data/auxiliary/attachment-preset.lua

@@ -1,9 +1,10 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayJoin = ____lualib.__TS__ArrayJoin
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArraySlice = ____lualib.__TS__ArraySlice
 local ____exports = {}
-____exports.toAttachmentPreset = function(attachmentPresetInput)
-    return type(attachmentPresetInput) == "string" and ({modelPath = attachmentPresetInput, nodeName = "origin", nodeQualifiers = {}}) or ({modelPath = attachmentPresetInput.modelPath, nodeName = attachmentPresetInput.nodeName, nodeQualifiers = attachmentPresetInput.nodeQualifiers or ({})})
+____exports.toEffectPreset = function(effectPresetInput)
+    return type(effectPresetInput) == "string" and ({modelPath = effectPresetInput, nodeName = "origin", nodeQualifiers = {}}) or ({modelPath = effectPresetInput.modelPath, nodeName = effectPresetInput.nodeName or "origin", nodeQualifiers = effectPresetInput.nodeQualifiers or ({}), parameters = effectPresetInput.parameters})
 end
 ____exports.extractAttachmentPresetInputModelPath = function(attachmentPresetInput)
     return type(attachmentPresetInput) == "string" and attachmentPresetInput or (attachmentPresetInput and attachmentPresetInput.modelPath or "")
@@ -12,7 +13,7 @@ ____exports.extractAttachmentPresetInputNodeFQN = function(attachmentPresetInput
     if type(attachmentPresetInput) == "string" or attachmentPresetInput == nil then
         return ""
     end
-    return table.concat(
+    return __TS__ArrayJoin(
         {
             attachmentPresetInput.nodeName,
             table.unpack(attachmentPresetInput.nodeQualifiers or ({}))

package/engine/object-data/auxiliary/attack-type.d.ts

@@ -1,11 +1,10 @@
 /** @noSelfInFile */
 export declare const enum AttackType {
-    NONE = "unknown",
-    NORMAL = "normal",
-    PIERCE = "pierce",
-    SIEGE = "siege",
-    SPELL = "spells",
-    CHAOS = "chaos",
-    MAGIC = "magic",
-    HERO = "hero"
+    SPELL = 0,
+    NORMAL = 1,
+    PIERCE = 2,
+    SIEGE = 3,
+    MAGIC = 4,
+    CHAOS = 5,
+    HERO = 6
 }

package/engine/object-data/auxiliary/attack-type.lua

@@ -1,2 +1,44 @@
 local ____exports = {}
+local ____records = require("utility.records")
+local invertRecord = ____records.invertRecord
+local stringByAttackType = {
+    [1] = "normal",
+    [2] = "pierce",
+    [3] = "siege",
+    [0] = "spells",
+    [5] = "chaos",
+    [4] = "magic",
+    [6] = "hero"
+}
+local attackTypeByString = invertRecord(stringByAttackType)
+local nativeByAttackType = {
+    [1] = ATTACK_TYPE_MELEE,
+    [2] = ATTACK_TYPE_PIERCE,
+    [3] = ATTACK_TYPE_SIEGE,
+    [0] = ATTACK_TYPE_NORMAL,
+    [5] = ATTACK_TYPE_CHAOS,
+    [4] = ATTACK_TYPE_MAGIC,
+    [6] = ATTACK_TYPE_HERO
+}
+local attackTypeByNative = invertRecord(nativeByAttackType)
+---
+-- @internal For use by internal systems only.
+____exports.attackTypeToString = function(attackType)
+    return attackType ~= nil and stringByAttackType[attackType] or "unknown"
+end
+---
+-- @internal For use by internal systems only.
+____exports.stringToAttackType = function(____string)
+    return attackTypeByString[____string]
+end
+---
+-- @internal For use by internal systems only.
+____exports.attackTypeToNative = function(attackType)
+    return nativeByAttackType[attackType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.nativeToAttackType = function(attackType)
+    return attackTypeByNative[attackType]
+end
 return ____exports

package/engine/object-data/auxiliary/movement-type.d.ts

@@ -1,10 +1,10 @@
 /** @noSelfInFile */
 export declare const enum MovementType {
-    NONE = "",
-    FLOAT = "float",
-    FLY = "fly",
-    FOOT = "foot",
-    HORSE = "horse",
-    HOVER = "hover",
-    AMPHIBIOUS = "amph"
+    NONE = 0,
+    FOOT = 1,
+    FLY = 2,
+    HORSE = 4,
+    HOVER = 8,
+    FLOAT = 16,
+    AMPHIBIOUS = 32
 }

package/engine/object-data/auxiliary/movement-type.lua

@@ -1,2 +1,24 @@
 local ____exports = {}
+local ____records = require("utility.records")
+local invertRecord = ____records.invertRecord
+local stringByMovementType = {
+    [0] = "",
+    [16] = "float",
+    [2] = "fly",
+    [1] = "foot",
+    [4] = "horse",
+    [8] = "hover",
+    [32] = "amph"
+}
+local movementTypeByString = invertRecord(stringByMovementType)
+---
+-- @internal For use by internal systems only.
+____exports.movementTypeToString = function(movementType)
+    return stringByMovementType[movementType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.stringToMovementType = function(____string)
+    return movementTypeByString[____string] or 0
+end
 return ____exports

package/engine/object-data/auxiliary/sound-eax.d.ts

@@ -0,0 +1,10 @@
+/** @noSelfInFile */
+export declare const enum SoundEax {
+    DEFAULT = "DefaultEAXON",
+    ACKNOWLEDGEMENTS = "HeroAcksEAX",
+    ENVIRONMENT = "DoodadsEAX",
+    DRUMS = "KotoDrumsEAX",
+    ATTACKS = "CombatSoundsEAX",
+    ABILITIES = "SpellsEAX",
+    MISSILES = "MissilesEAX"
+}

package/engine/object-data/auxiliary/sound-eax.lua

@@ -0,0 +1,2 @@
+local ____exports = {}
+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/auxiliary/unit-attribute.d.ts

@@ -0,0 +1,6 @@
+/** @noSelfInFile */
+export declare enum UnitAttribute {
+    STRENGTH = 1,
+    INTELLIGENCE = 2,
+    AGILITY = 3
+}

package/engine/object-data/auxiliary/unit-attribute.lua

@@ -0,0 +1,9 @@
+local ____exports = {}
+____exports.UnitAttribute = UnitAttribute or ({})
+____exports.UnitAttribute.STRENGTH = 1
+____exports.UnitAttribute[____exports.UnitAttribute.STRENGTH] = "STRENGTH"
+____exports.UnitAttribute.INTELLIGENCE = 2
+____exports.UnitAttribute[____exports.UnitAttribute.INTELLIGENCE] = "INTELLIGENCE"
+____exports.UnitAttribute.AGILITY = 3
+____exports.UnitAttribute[____exports.UnitAttribute.AGILITY] = "AGILITY"
+return ____exports

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

@@ -7,4 +7,6 @@ export declare class BerserkAbilityType extends AbilityType {
     set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
     get attackSpeedIncreaseFactor(): number[];
     set attackSpeedIncreaseFactor(attackSpeedIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get receivedDamageIncreaseFactor(): number[];
+    set receivedDamageIncreaseFactor(receivedDamageIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

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

@@ -36,4 +36,17 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    BerserkAbilityType.prototype,
+    "receivedDamageIncreaseFactor",
+    {
+        get = function(self)
+            return self:getNumberLevelField("bsk3")
+        end,
+        set = function(self, receivedDamageIncreaseFactor)
+            self:setNumberLevelField("bsk3", receivedDamageIncreaseFactor)
+        end
+    },
+    true
+)
 return ____exports

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")
@@ -211,7 +213,16 @@ 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

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

@@ -0,0 +1,14 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class CarrionSwarmAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get damagePerTarget(): number[];
+    set damagePerTarget(damagePerTarget: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get maximumTotalDamage(): number[];
+    set maximumTotalDamage(maximumTotalDamage: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get distance(): number[];
+    set distance(distance: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get finalAreaOfEffect(): number[];
+    set finalAreaOfEffect(finalAreaOfEffect: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

package/engine/object-data/entry/ability-type/carrion-swarm.lua

@@ -0,0 +1,65 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.CarrionSwarmAbilityType = __TS__Class()
+local CarrionSwarmAbilityType = ____exports.CarrionSwarmAbilityType
+CarrionSwarmAbilityType.name = "CarrionSwarmAbilityType"
+__TS__ClassExtends(CarrionSwarmAbilityType, AbilityType)
+CarrionSwarmAbilityType.BASE_ID = fourCC("AUcs")
+__TS__SetDescriptor(
+    CarrionSwarmAbilityType.prototype,
+    "damagePerTarget",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ucs1")
+        end,
+        set = function(self, damagePerTarget)
+            self:setNumberLevelField("Ucs1", damagePerTarget)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    CarrionSwarmAbilityType.prototype,
+    "maximumTotalDamage",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ucs2")
+        end,
+        set = function(self, maximumTotalDamage)
+            self:setNumberLevelField("Ucs2", maximumTotalDamage)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    CarrionSwarmAbilityType.prototype,
+    "distance",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ucs3")
+        end,
+        set = function(self, distance)
+            self:setNumberLevelField("Ucs3", distance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    CarrionSwarmAbilityType.prototype,
+    "finalAreaOfEffect",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ucs4")
+        end,
+        set = function(self, finalAreaOfEffect)
+            self:setNumberLevelField("Ucs4", finalAreaOfEffect)
+        end
+    },
+    true
+)
+return ____exports

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/ensnare.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class EnsnareAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get airUnitLoweringDuration(): number[];
+    set airUnitLoweringDuration(airUnitLoweringDuration: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get airUnitHeight(): number[];
+    set airUnitHeight(airUnitHeight: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get meleeAttackRange(): number[];
+    set meleeAttackRange(meleeAttackRange: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

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

@@ -0,0 +1,52 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.EnsnareAbilityType = __TS__Class()
+local EnsnareAbilityType = ____exports.EnsnareAbilityType
+EnsnareAbilityType.name = "EnsnareAbilityType"
+__TS__ClassExtends(EnsnareAbilityType, AbilityType)
+EnsnareAbilityType.BASE_ID = fourCC("Aens")
+__TS__SetDescriptor(
+    EnsnareAbilityType.prototype,
+    "airUnitLoweringDuration",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ens1")
+        end,
+        set = function(self, airUnitLoweringDuration)
+            self:setNumberLevelField("Ens1", airUnitLoweringDuration)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    EnsnareAbilityType.prototype,
+    "airUnitHeight",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ens2")
+        end,
+        set = function(self, airUnitHeight)
+            self:setNumberLevelField("Ens2", airUnitHeight)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    EnsnareAbilityType.prototype,
+    "meleeAttackRange",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ens3")
+        end,
+        set = function(self, meleeAttackRange)
+            self:setNumberLevelField("Ens3", meleeAttackRange)
+        end
+    },
+    true
+)
+return ____exports