warscript 0.0.1-dev.eda504c → 0.0.1-dev.edf7fad

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

@@ -65,123 +65,127 @@ function ApplicableBuffType.wrap(self, other)
     return __TS__New(____exports.ApplicableBuffType, other.object)
 end
 ApplicableBuffType.BASE_ID = fourCC("BHbz")
-local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId = table.unpack(postcompile(function()
-    local function prepareAbilityType(abilityTypeConstructor, applicableBuffType)
-        local abilityType = abilityTypeConstructor:create()
-        abilityType.isInternal = true
-        abilityType.levelCount = applicableBuffType.levelCount
-        abilityType.buttonPositionX = 0
-        abilityType.buttonPositionY = -11
-        abilityType.casterAttachmentPresets = {}
-        abilityType.targetEffectPresets = {}
-        abilityType.casterEffectSoundPresetId = nil
-        abilityType.learnLevelMinimum = 6
-        abilityType.race = "other"
-        abilityType.shouldCheckTechTreeDependencies = false
-        abilityType.techTreeDependencies = {}
-        abilityType.allowedTargetCombatClassifications = combatClassificationsOf(
-            4,
-            2,
-            2097152,
-            8,
-            1048576,
-            16
-        )
-        abilityType.areaOfEffect = 0
-        abilityType.castRange = 999999
-        abilityType.cooldown = 0
-        abilityType.manaCost = 0
-        abilityType.buffDuration = 0
-        abilityType.heroBuffDuration = 0
-        return abilityType
-    end
-    local multilevelPhysicalPositiveApplicatorAbilityTypes = {}
-    local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId = {}
-    for applicableBuffType in pairs(compiletimeApplicableBuffTypes) do
-        local applicatorAbilityTypeIdByApplicatorType = {}
-        if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
-            if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
-                applicatorAbilityType.missProbability = 0
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
+local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId = table.unpack(
+    postcompile(function()
+        local function prepareAbilityType(abilityTypeConstructor, applicableBuffType)
+            local abilityType = abilityTypeConstructor:create()
+            abilityType.isInternal = true
+            abilityType.levelCount = applicableBuffType.levelCount
+            abilityType.buttonPositionX = 0
+            abilityType.buttonPositionY = -11
+            abilityType.casterAttachmentPresets = {}
+            abilityType.targetEffectPresets = {}
+            abilityType.casterEffectSoundPresetId = nil
+            abilityType.learnLevelMinimum = 6
+            abilityType.race = "other"
+            abilityType.shouldCheckTechTreeDependencies = false
+            abilityType.techTreeDependencies = {}
+            abilityType.allowedTargetCombatClassifications = combatClassificationsOf(
+                4,
+                2,
+                2097152,
+                8,
+                1048576,
+                16
+            )
+            abilityType.areaOfEffect = 0
+            abilityType.castRange = 999999
+            abilityType.cooldown = 0
+            abilityType.manaCost = 0
+            abilityType.buffDuration = 0
+            abilityType.heroBuffDuration = 0
+            return abilityType
+        end
+        local multilevelPhysicalPositiveApplicatorAbilityTypes = {}
+        local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId = {}
+        for applicableBuffType in pairs(compiletimeApplicableBuffTypes) do
+            local applicatorAbilityTypeIdByApplicatorType = {}
+            if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
+                if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
+                    applicatorAbilityType.missProbability = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
+                end
+                if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
+                    applicatorAbilityType.attackSpeedIncreaseFactor = 0
+                    applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                    applicatorAbilityType.scaleIncrease = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852101] = applicatorAbilityType.id
+                end
             end
-            if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
-                applicatorAbilityType.attackSpeedIncreaseFactor = 0
-                applicatorAbilityType.movementSpeedIncreaseFactor = 0
-                applicatorAbilityType.scaleIncrease = 0
+            if applicableBuffType.resistanceType == 2 or applicableBuffType.resistanceType == nil then
+                if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(SlowPoisonAbilityType, applicableBuffType)
+                    applicatorAbilityType.damagePerSecond = 0
+                    applicatorAbilityType.movementSpeedDecreaseFactor = 0
+                    applicatorAbilityType.attackSpeedDecreaseFactor = 0
+                    applicatorAbilityType.isDamageStacking = false
+                    applicatorAbilityType.isMovementSpeedFactorStacking = false
+                    applicatorAbilityType.isAttackSpeedFactorStacking = false
+                    applicatorAbilityType.isAbleToKill = false
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id, applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852173] = applicatorAbilityType.id
+                end
+                if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(BerserkAbilityType, applicableBuffType)
+                    applicatorAbilityType.attackSpeedIncreaseFactor = 0
+                    applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                    applicatorAbilityType.receivedDamageIncreaseFactor = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    if applicatorAbilityType.levelCount > 1 then
+                        multilevelPhysicalPositiveApplicatorAbilityTypes[#multilevelPhysicalPositiveApplicatorAbilityTypes + 1] = applicatorAbilityType
+                    end
+                    applicatorAbilityTypeIdByApplicatorType[852100] = applicatorAbilityType.id
+                end
+            end
+            if applicableBuffType.polarity == 0 or applicableBuffType.polarity == nil then
+                local applicatorAbilityType = prepareAbilityType(PermanentImmolationAbilityType, applicableBuffType)
+                applicatorAbilityType.levelCount = 1
+                applicatorAbilityType.damagePerInterval = 0
+                applicatorAbilityType.castRange = 0
+                applicatorAbilityType.buffDuration = MAXIMUM_INTEGER
+                applicatorAbilityType.heroBuffDuration = MAXIMUM_INTEGER
+                applicatorAbilityType.allowedTargetCombatClassifications = combatClassificationsOf(1)
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852101] = applicatorAbilityType.id
+                applicatorAbilityTypeIdByApplicatorType[0] = applicatorAbilityType.id
             end
+            applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffType.id] = applicatorAbilityTypeIdByApplicatorType
         end
-        if applicableBuffType.resistanceType == 2 or applicableBuffType.resistanceType == nil then
-            if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(SlowPoisonAbilityType, applicableBuffType)
-                applicatorAbilityType.damagePerSecond = 0
-                applicatorAbilityType.movementSpeedDecreaseFactor = 0
-                applicatorAbilityType.attackSpeedDecreaseFactor = 0
-                applicatorAbilityType.isDamageStacking = false
-                applicatorAbilityType.isMovementSpeedFactorStacking = false
-                applicatorAbilityType.isAttackSpeedFactorStacking = false
-                applicatorAbilityType.isAbleToKill = false
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id, applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852173] = applicatorAbilityType.id
-            end
-            if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(BerserkAbilityType, applicableBuffType)
-                applicatorAbilityType.attackSpeedIncreaseFactor = 0
-                applicatorAbilityType.movementSpeedIncreaseFactor = 0
-                applicatorAbilityType.receivedDamageIncreaseFactor = 0
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                if applicatorAbilityType.levelCount > 1 then
-                    multilevelPhysicalPositiveApplicatorAbilityTypes[#multilevelPhysicalPositiveApplicatorAbilityTypes + 1] = applicatorAbilityType
+        local applicatorUpgradeIds = {}
+        local applicatorUpgradeIdByApplicatorAbilityTypeId = {}
+        for ____, multilevelPhysicalPositiveApplicatorAbilityTypesChunk in ipairs(chunked(multilevelPhysicalPositiveApplicatorAbilityTypes, 4)) do
+            local maxLevelCount = max(map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "levelCount"))
+            local applicatorAbilityTypeIds = map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "id")
+            local applicatorUpgrade = BlankUpgrade:create()
+            applicatorUpgrade.isInternal = true
+            applicatorUpgrade.levelCount = maxLevelCount - 1
+            applicatorUpgrade.effects = map(
+                applicatorAbilityTypeIds,
+                function(applicatorAbilityTypeId)
+                    return {type = "rlev", bonusBase = 1, bonusIncrement = 1, abilityTypeId = applicatorAbilityTypeId}
                 end
-                applicatorAbilityTypeIdByApplicatorType[852100] = applicatorAbilityType.id
+            )
+            applicatorUpgradeIds[#applicatorUpgradeIds + 1] = applicatorUpgrade.id
+            for ____, applicatorAbilityTypeId in ipairs(applicatorAbilityTypeIds) do
+                applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId] = applicatorUpgrade.id
             end
         end
-        if applicableBuffType.polarity == 0 or applicableBuffType.polarity == nil then
-            local applicatorAbilityType = prepareAbilityType(PermanentImmolationAbilityType, applicableBuffType)
-            applicatorAbilityType.levelCount = 1
-            applicatorAbilityType.damagePerInterval = 0
-            applicatorAbilityType.castRange = 0
-            applicatorAbilityType.buffDuration = MAXIMUM_INTEGER
-            applicatorAbilityType.heroBuffDuration = MAXIMUM_INTEGER
-            applicatorAbilityType.allowedTargetCombatClassifications = combatClassificationsOf(1)
-            applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-            applicatorAbilityTypeIdByApplicatorType[0] = applicatorAbilityType.id
-        end
-        applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffType.id] = applicatorAbilityTypeIdByApplicatorType
-    end
-    local applicatorUpgradeIds = {}
-    local applicatorUpgradeIdByApplicatorAbilityTypeId = {}
-    for ____, multilevelPhysicalPositiveApplicatorAbilityTypesChunk in ipairs(chunked(multilevelPhysicalPositiveApplicatorAbilityTypes, 4)) do
-        local maxLevelCount = max(map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "levelCount"))
-        local applicatorAbilityTypeIds = map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "id")
-        local applicatorUpgrade = BlankUpgrade:create()
-        applicatorUpgrade.isInternal = true
-        applicatorUpgrade.levelCount = maxLevelCount - 1
-        applicatorUpgrade.effects = map(
-            applicatorAbilityTypeIds,
-            function(applicatorAbilityTypeId)
-                return {type = "rlev", bonusBase = 1, bonusIncrement = 1, abilityTypeId = applicatorAbilityTypeId}
-            end
-        )
-        applicatorUpgradeIds[#applicatorUpgradeIds + 1] = applicatorUpgrade.id
-        for ____, applicatorAbilityTypeId in ipairs(applicatorAbilityTypeIds) do
-            applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId] = applicatorUpgrade.id
+        for ____, unitType in ipairs(UnitType:getAll()) do
+            local ____array_0 = __TS__SparseArrayNew(table.unpack(unitType.affectingUpgradeIds))
+            __TS__SparseArrayPush(
+                ____array_0,
+                table.unpack(applicatorUpgradeIds)
+            )
+            unitType.affectingUpgradeIds = {__TS__SparseArraySpread(____array_0)}
         end
-    end
-    for ____, unitType in ipairs(UnitType:getAll()) do
-        local ____array_0 = __TS__SparseArrayNew(table.unpack(unitType.affectingUpgradeIds))
-        __TS__SparseArrayPush(
-            ____array_0,
-            table.unpack(applicatorUpgradeIds)
-        )
-        unitType.affectingUpgradeIds = {__TS__SparseArraySpread(____array_0)}
-    end
-    return {applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId}
-end))
+        return {applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId}
+    end),
+    1,
+    2
+)
 local EVASION_ABILITY_TYPE_IDS = postcompile(function()
     return AbilityType:getAllIdsByBaseIds(map({
         "AEev",

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

@@ -1,14 +1,30 @@
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { CombatClassifications } from "../auxiliary/combat-classification";
-import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
 export type DestructibleTypeId = ObjectDataEntryId & number & {
     readonly __destructibleTypeId: unique symbol;
 };
+export type StandardDestructibleTypeId = DestructibleTypeId & {
+    readonly __standardDestructibleTypeId: unique symbol;
+};
 export declare abstract class DestructibleType extends ObjectDataEntry<DestructibleTypeId> {
+    static readonly [id: StandardDestructibleTypeId]: ObjectDataEntryConstructor<DestructibleType>;
     private static readonly idGenerator;
     protected static generateId(): number;
     protected static getObjectData(map: WarMap): WarObjects;
+    get fixedFacing(): number;
+    set fixedFacing(fixedFacing: number);
+    get flyOverHeight(): number;
+    set flyOverHeight(flyOverHeight: number);
+    get modelPath(): string;
+    set modelPath(modelPath: string);
+    get modelPathSD(): string;
+    set modelPathSD(modelPathSD: string);
+    get modelPathHD(): string;
+    set modelPathHD(modelPathHD: string);
+    get occlusionHeight(): number;
+    set occlusionHeight(occlusionHeight: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
@@ -17,4 +33,14 @@ export declare abstract class DestructibleType extends ObjectDataEntry<Destructi
     set armorSoundTypeHD(armorSoundTypeHD: ArmorSoundType);
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
+    get cliffHeight(): number;
+    set cliffHeight(cliffHeight: number);
+    get isWalkable(): boolean;
+    set isWalkable(isWalkable: boolean);
+    get pathingTexturePath(): string;
+    set pathingTexturePath(pathingTexturePath: string);
+    get deadPathingTexturePath(): string;
+    set deadPathingTexturePath(deadPathingTexturePath: string);
+    get name(): string;
+    set name(name: string);
 }

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

@@ -11,6 +11,8 @@ 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 ____reflection = require("utility.reflection")
+local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNumberIndexSupplier
 ____exports.DestructibleType = __TS__Class()
 local DestructibleType = ____exports.DestructibleType
 DestructibleType.name = "DestructibleType"
@@ -25,6 +27,84 @@ DestructibleType.idGenerator = __TS__New(
     ObjectDataEntryIdGenerator,
     fourCC("D000")
 )
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "fixedFacing",
+    {
+        get = function(self)
+            return self:getNumberField("bfxr")
+        end,
+        set = function(self, fixedFacing)
+            self:setNumberField("bfxr", fixedFacing)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "flyOverHeight",
+    {
+        get = function(self)
+            return self:getNumberField("bflh")
+        end,
+        set = function(self, flyOverHeight)
+            self:setNumberField("bflh", flyOverHeight)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "modelPath",
+    {
+        get = function(self)
+            return self:getStringField("bfil")
+        end,
+        set = function(self, modelPath)
+            self:setStringField("bfil", modelPath)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "modelPathSD",
+    {
+        get = function(self)
+            return self:getStringField("bfil:sd")
+        end,
+        set = function(self, modelPathSD)
+            self:setStringField("bfil:sd", modelPathSD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "modelPathHD",
+    {
+        get = function(self)
+            return self:getStringField("bfil:hd")
+        end,
+        set = function(self, modelPathHD)
+            self:setStringField("bfil:hd", modelPathHD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "occlusionHeight",
+    {
+        get = function(self)
+            return self:getNumberField("boch")
+        end,
+        set = function(self, occlusionHeight)
+            self:setNumberField("boch", occlusionHeight)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     DestructibleType.prototype,
     "armorSoundType",
@@ -80,4 +160,79 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "cliffHeight",
+    {
+        get = function(self)
+            return self:getNumberField("bclh")
+        end,
+        set = function(self, cliffHeight)
+            self:setNumberField("bclh", cliffHeight)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "isWalkable",
+    {
+        get = function(self)
+            return self:getBooleanField("bwal")
+        end,
+        set = function(self, isWalkable)
+            self:setBooleanField("bwal", isWalkable)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "pathingTexturePath",
+    {
+        get = function(self)
+            return self:getStringField("bptx")
+        end,
+        set = function(self, pathingTexturePath)
+            self:setStringField("bptx", pathingTexturePath)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "deadPathingTexturePath",
+    {
+        get = function(self)
+            return self:getStringField("bptd")
+        end,
+        set = function(self, deadPathingTexturePath)
+            self:setStringField("bptd", deadPathingTexturePath)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "name",
+    {
+        get = function(self)
+            return self:getStringField("bnam")
+        end,
+        set = function(self, name)
+            self:setStringField("bnam", name)
+        end
+    },
+    true
+)
+implementReadonlyNumberIndexSupplier(
+    ____exports.DestructibleType,
+    function(id)
+        local ____class_0 = __TS__Class()
+        ____class_0.name = ____class_0.name
+        __TS__ClassExtends(____class_0, ____exports.DestructibleType)
+        ____class_0.BASE_ID = id
+        return ____class_0
+    end
+)
 return ____exports

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

@@ -42,6 +42,10 @@ export declare class UnitTypeWeapon {
     set impactDelay(impactDelay: number);
     get missileModelPath(): string;
     set missileModelPath(missileModelPath: string);
+    get missileModelPathSD(): string;
+    set missileModelPathSD(missileModelPathSD: string);
+    get missileModelPathHD(): string;
+    set missileModelPathHD(missileModelPathHD: string);
     get range(): number;
     set range(range: number);
     get soundType(): WeaponSoundType;

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

@@ -238,21 +238,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "range",
+    "missileModelPathSD",
     {
         get = function(self)
             local ____self_17 = self.unitType
-            return ____self_17.getNumberField(
+            return ____self_17.getStringField(
                 ____self_17,
-                ("ua" .. tostring(self.index)) .. "r"
+                ("ua" .. tostring(self.index)) .. "m:sd"
             )
         end,
-        set = function(self, range)
+        set = function(self, missileModelPathSD)
             local ____self_18 = self.unitType
-            ____self_18.setNumberField(
+            ____self_18.setStringField(
                 ____self_18,
-                ("ua" .. tostring(self.index)) .. "r",
-                range
+                ("ua" .. tostring(self.index)) .. "m:sd",
+                missileModelPathSD
             )
         end
     },
@@ -260,21 +260,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundType",
+    "missileModelPathHD",
     {
         get = function(self)
             local ____self_19 = self.unitType
             return ____self_19.getStringField(
                 ____self_19,
-                "ucs" .. tostring(self.index)
+                ("ua" .. tostring(self.index)) .. "m:hd"
             )
         end,
-        set = function(self, soundType)
+        set = function(self, missileModelPathHD)
             local ____self_20 = self.unitType
             ____self_20.setStringField(
                 ____self_20,
-                "ucs" .. tostring(self.index),
-                soundType
+                ("ua" .. tostring(self.index)) .. "m:hd",
+                missileModelPathHD
             )
         end
     },
@@ -282,21 +282,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundTypeSD",
+    "range",
     {
         get = function(self)
             local ____self_21 = self.unitType
-            return ____self_21.getStringField(
+            return ____self_21.getNumberField(
                 ____self_21,
-                ("ucs" .. tostring(self.index)) .. ":sd"
+                ("ua" .. tostring(self.index)) .. "r"
             )
         end,
-        set = function(self, soundTypeSD)
+        set = function(self, range)
             local ____self_22 = self.unitType
-            ____self_22.setStringField(
+            ____self_22.setNumberField(
                 ____self_22,
-                ("ucs" .. tostring(self.index)) .. ":sd",
-                soundTypeSD
+                ("ua" .. tostring(self.index)) .. "r",
+                range
             )
         end
     },
@@ -304,19 +304,63 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundTypeHD",
+    "soundType",
     {
         get = function(self)
             local ____self_23 = self.unitType
             return ____self_23.getStringField(
                 ____self_23,
-                ("ucs" .. tostring(self.index)) .. ":hd"
+                "ucs" .. tostring(self.index)
             )
         end,
-        set = function(self, soundTypeHD)
+        set = function(self, soundType)
             local ____self_24 = self.unitType
             ____self_24.setStringField(
                 ____self_24,
+                "ucs" .. tostring(self.index),
+                soundType
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "soundTypeSD",
+    {
+        get = function(self)
+            local ____self_25 = self.unitType
+            return ____self_25.getStringField(
+                ____self_25,
+                ("ucs" .. tostring(self.index)) .. ":sd"
+            )
+        end,
+        set = function(self, soundTypeSD)
+            local ____self_26 = self.unitType
+            ____self_26.setStringField(
+                ____self_26,
+                ("ucs" .. tostring(self.index)) .. ":sd",
+                soundTypeSD
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "soundTypeHD",
+    {
+        get = function(self)
+            local ____self_27 = self.unitType
+            return ____self_27.getStringField(
+                ____self_27,
+                ("ucs" .. tostring(self.index)) .. ":hd"
+            )
+        end,
+        set = function(self, soundTypeHD)
+            local ____self_28 = self.unitType
+            ____self_28.setStringField(
+                ____self_28,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -1680,11 +1724,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        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
+        local ____class_29 = __TS__Class()
+        ____class_29.name = ____class_29.name
+        __TS__ClassExtends(____class_29, ____exports.UnitType)
+        ____class_29.BASE_ID = id
+        return ____class_29
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1745,11 +1789,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        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
+        local ____class_30 = __TS__Class()
+        ____class_30.name = ____class_30.name
+        __TS__ClassExtends(____class_30, ____exports.HeroUnitType)
+        ____class_30.BASE_ID = id
+        return ____class_30
     end
 )
 return ____exports

package/engine/object-field/ability.lua

@@ -519,9 +519,9 @@ __TS__SetDescriptor(
 )
 ____exports.resolveCurrentAbilityDependentValue = function(ability, value)
     if __TS__InstanceOf(value, ____exports.AbilityField) then
-        return value:getValue(ability)
+        return value:getValue(ability, true)
     elseif __TS__InstanceOf(value, ____exports.AbilityLevelField) then
-        return value:getValue(ability, ability.level)
+        return value:getValue(ability, ability.level, true)
     elseif type(value) == "function" then
         return value(ability)
     else