warscript 0.0.1-dev.f48f7bb → 0.0.1-dev.f9321c0

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

@@ -10,8 +10,8 @@ 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")
-local CrippleAbilityType = ____cripple.CrippleAbilityType
+local ____curse = require("engine.object-data.entry.ability-type.curse")
+local CurseAbilityType = ____curse.CurseAbilityType
 local ____searing_2Darrows = require("engine.object-data.entry.ability-type.searing-arrows")
 local SearingArrowsAbilityType = ____searing_2Darrows.SearingArrowsAbilityType
 local ____slow_2Dpoison = require("engine.object-data.entry.ability-type.slow-poison")
@@ -30,7 +30,6 @@ local ____arrays = require("utility.arrays")
 local chunked = ____arrays.chunked
 local map = ____arrays.map
 local max = ____arrays.max
-local toLuaSet = ____arrays.toLuaSet
 local ____blood_2Dlust = require("engine.object-data.entry.ability-type.blood-lust")
 local BloodLustAbilityType = ____blood_2Dlust.BloodLustAbilityType
 local ____berserk = require("engine.object-data.entry.ability-type.berserk")
@@ -43,22 +42,11 @@ local ____permanent_2Dimmolation = require("engine.object-data.entry.ability-typ
 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
-local getOwningPlayer = GetOwningPlayer
-local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
-local itemAddAbility = BlzItemAddAbility
-local removeItem = RemoveItem
 local setAbilityIntegerField = BlzSetAbilityIntegerField
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
-local setItemBooleanField = BlzSetItemBooleanField
 local setPlayerTechResearched = SetPlayerTechResearched
 local unitAddAbility = UnitAddAbility
-local unitAddItem = UnitAddItem
 local unitDisableAbility = BlzUnitDisableAbility
-local unitDropItemSlot = UnitDropItemSlot
-local unitInventorySize = UnitInventorySize
 local unitRemoveAbility = UnitRemoveAbility
 local compiletimeApplicableBuffTypes = {}
 ____exports.ApplicableBuffType = __TS__Class()
@@ -86,7 +74,7 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
         abilityType.buttonPositionY = -11
         abilityType.casterAttachmentPresets = {}
         abilityType.targetEffectPresets = {}
-        abilityType.soundPresetName = ""
+        abilityType.casterEffectSoundPresetId = nil
         abilityType.learnLevelMinimum = 6
         abilityType.race = "other"
         abilityType.shouldCheckTechTreeDependencies = false
@@ -113,12 +101,10 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
         local applicatorAbilityTypeIdByApplicatorType = {}
         if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
             if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(CrippleAbilityType, applicableBuffType)
-                applicatorAbilityType.movementSpeedDecreaseFactor = 0
-                applicatorAbilityType.attackSpeedDecreaseFactor = 0
-                applicatorAbilityType.damageDecreaseFactor = 0
+                local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
+                applicatorAbilityType.missProbability = 0
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852189] = applicatorAbilityType.id
+                applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
             end
             if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
                 local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
@@ -135,6 +121,10 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
                 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
@@ -142,6 +132,7 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
                 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
@@ -204,15 +195,6 @@ local EVASION_ABILITY_TYPE_IDS = postcompile(function()
         "AIcs"
     }, fourCC))
 end)
-local INVENTORY_ABILITY_TYPE_IDS = postcompile(function()
-    return toLuaSet(AbilityType:getAllIdsByBaseIds(map({
-        "AInv",
-        "Aihn",
-        "Aien",
-        "Aion",
-        "Aiun"
-    }, fourCC)))
-end)
 local SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
     local abilityType = SearingArrowsAbilityType:create()
     abilityType.isInternal = true
@@ -244,8 +226,8 @@ Unit.abilityCastingStartEvent[SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID]:addListener(
 )
 ---
 -- @internal For use by internal systems only.
-____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, movementSpeedIncreaseFactor)
-    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852189 or 852173) or 0)
+____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, missProbability)
+    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852190 or 852173) or 0)
     local ____opt_1 = applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffTypeId]
     local applicatorAbilityTypeId = ____opt_1 and ____opt_1[applicatorType]
     if applicatorAbilityTypeId == nil then
@@ -267,8 +249,7 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
             applicatorAbilityTypeId,
             preparePhysicalPositiveApplicatorAbility,
             level,
-            duration or 0,
-            movementSpeedIncreaseFactor
+            duration or 0
         )
         if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
@@ -298,6 +279,9 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
             ability:setField(ABILITY_RLF_DURATION_HERO, level, actualDuration)
             ability:setField(ABILITY_IF_PRIORITY, spellStealPriority or 0)
             ability:setField(ABILITY_IF_REQUIRED_LEVEL, learnLevelMinimum or 6)
+            if missProbability ~= nil and applicatorType == 852190 then
+                ability:setField(ABILITY_RLF_CHANCE_TO_MISS_CRS, missProbability)
+            end
         end,
         applicatorType,
         unit
@@ -309,16 +293,13 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
     end
     return success
 end
-preparePhysicalPositiveApplicatorAbility = function(ability, level, duration, movementSpeedIncreaseFactor)
+preparePhysicalPositiveApplicatorAbility = function(ability, level, duration)
     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.

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

@@ -3,12 +3,16 @@ import { TupleOf } from "../../../utility/types";
 import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
 import { Race } from "../auxiliary/race";
 import { SoundPresetName } from "../auxiliary/sound-preset-name";
-import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
 import { LightningTypeId } from "./lightning-type";
-export type BuffTypeId = ObjectDataEntryId & {
+export type BuffTypeId = ObjectDataEntryId & number & {
     readonly __buffTypeId: unique symbol;
 };
+export type StandardBuffTypeId = BuffTypeId & {
+    readonly __standardBuffTypeId: unique symbol;
+};
 export declare abstract class BuffType<Id extends BuffTypeId = BuffTypeId> extends ObjectDataEntry<Id> {
+    static readonly [id: StandardBuffTypeId]: ObjectDataEntryConstructor<BuffType>;
     private static readonly idGenerator;
     protected static generateId(): number;
     protected static getObjectData(map: WarMap): WarObjects;
@@ -51,13 +55,3 @@ export declare abstract class BuffType<Id extends BuffTypeId = BuffTypeId> exten
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
 }
-declare const AvatarBuffType_base: typeof BuffType;
-export declare class AvatarBuffType extends AvatarBuffType_base {
-}
-declare const DevotionAuraBuffType_base: typeof BuffType;
-export declare class DevotionAuraBuffType extends DevotionAuraBuffType_base {
-}
-declare const DivineShieldBuffType_base: typeof BuffType;
-export declare class DivineShieldBuffType extends DivineShieldBuffType_base {
-}
-export {};

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

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

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

@@ -2,7 +2,7 @@
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
-export type DestructibleTypeId = ObjectDataEntryId & {
+export type DestructibleTypeId = ObjectDataEntryId & number & {
     readonly __destructibleTypeId: unique symbol;
 };
 export declare abstract class DestructibleType extends ObjectDataEntry<DestructibleTypeId> {

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

@@ -2,7 +2,7 @@
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
 import type { AbilityTypeId } from "./ability-type";
-export type ItemTypeId = ObjectDataEntryId & {
+export type ItemTypeId = ObjectDataEntryId & number & {
     readonly __itemTypeId: unique symbol;
 };
 export declare class ItemType extends ObjectDataEntry<ItemTypeId> {

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

@@ -27,10 +27,10 @@ __TS__SetDescriptor(
     "abilityTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("iabi")
+            return self:getObjectDataEntryNumericIdsField("iabi")
         end,
         set = function(self, abilityTypeIds)
-            self:setObjectDataEntryIdsField("iabi", abilityTypeIds)
+            self:setObjectDataEntryNumericIdsField("iabi", abilityTypeIds)
         end
     },
     true
@@ -261,10 +261,10 @@ __TS__SetDescriptor(
     "cooldownGroupId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdField("icid")
+            return self:getObjectDataEntryNumericIdField("icid")
         end,
         set = function(self, cooldownGroupId)
-            self:setObjectDataEntryIdField("icid", cooldownGroupId)
+            self:setObjectDataEntryNumericIdField("icid", cooldownGroupId)
         end
     },
     true

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

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
 import { Color } from "../../../core/types/color";
-export type LightningTypeId = ObjectDataEntryId & {
+export type LightningTypeId = ObjectDataEntryId & number & {
     readonly __lightningTypeId: unique symbol;
 };
 export type StandardLightningTypeId = LightningTypeId & {

package/engine/object-data/entry/sound-preset.d.ts

@@ -0,0 +1,33 @@
+/** @noSelfInFile */
+import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { SoundEax } from "../auxiliary/sound-eax";
+export type SoundPresetId = ObjectDataEntryId & string & {
+    readonly __soundPresetId: unique symbol;
+};
+export type StandardSoundPresetId = SoundPresetId & {
+    readonly __standardSoundPresetId: unique symbol;
+};
+export declare class SoundPreset extends ObjectDataEntry<SoundPresetId> {
+    static readonly BASE_ID: SoundPresetId;
+    private static nextId;
+    protected static generateId(): string;
+    protected static getObjectData(map: WarMap): WarObjects;
+    get filePaths(): string[];
+    set filePaths(filePaths: string[]);
+    get volume(): number;
+    set volume(volume: number);
+    get pitch(): number;
+    set pitch(pitch: number);
+    get priority(): number;
+    set priority(priority: number);
+    get channel(): number;
+    set channel(channel: number);
+    get minimumDistance(): number;
+    set minimumDistance(minimumDistance: number);
+    get maximumDistance(): number;
+    set maximumDistance(maximumDistance: number);
+    get distanceCutoff(): number;
+    set distanceCutoff(distanceCutoff: number);
+    get eax(): SoundEax;
+    set eax(eax: SoundEax);
+}

package/engine/object-data/entry/sound-preset.lua

@@ -0,0 +1,140 @@
+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 ____entry = require("engine.object-data.entry")
+local ObjectDataEntry = ____entry.ObjectDataEntry
+____exports.SoundPreset = __TS__Class()
+local SoundPreset = ____exports.SoundPreset
+SoundPreset.name = "SoundPreset"
+__TS__ClassExtends(SoundPreset, ObjectDataEntry)
+function SoundPreset.generateId(self)
+    local ____self_0, ____nextId_1 = self, "nextId"
+    local ____self_nextId_2 = ____self_0[____nextId_1]
+    ____self_0[____nextId_1] = ____self_nextId_2 + 1
+    return "CustomSound" .. tostring(____self_nextId_2)
+end
+function SoundPreset.getObjectData(self, map)
+    return map.objects.sound
+end
+SoundPreset.BASE_ID = "BlizzardWave"
+SoundPreset.nextId = 0
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "filePaths",
+    {
+        get = function(self)
+            return self:getStringsField("FileNames")
+        end,
+        set = function(self, filePaths)
+            self:setStringsField("FileNames", filePaths)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "volume",
+    {
+        get = function(self)
+            return self:getNumberField("Volume")
+        end,
+        set = function(self, volume)
+            self:setNumberField("Volume", volume)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "pitch",
+    {
+        get = function(self)
+            return self:getNumberField("Pitch")
+        end,
+        set = function(self, pitch)
+            self:setNumberField("Pitch", pitch)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "priority",
+    {
+        get = function(self)
+            return self:getNumberField("Priority")
+        end,
+        set = function(self, priority)
+            self:setNumberField("Priority", priority)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "channel",
+    {
+        get = function(self)
+            return self:getNumberField("Channel")
+        end,
+        set = function(self, channel)
+            self:setNumberField("Channel", channel)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "minimumDistance",
+    {
+        get = function(self)
+            return self:getNumberField("MinDistance")
+        end,
+        set = function(self, minimumDistance)
+            self:setNumberField("MinDistance", minimumDistance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "maximumDistance",
+    {
+        get = function(self)
+            return self:getNumberField("MaxDistance")
+        end,
+        set = function(self, maximumDistance)
+            self:setNumberField("MaxDistance", maximumDistance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "distanceCutoff",
+    {
+        get = function(self)
+            return self:getNumberField("DistanceCutoff")
+        end,
+        set = function(self, distanceCutoff)
+            self:setNumberField("DistanceCutoff", distanceCutoff)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "eax",
+    {
+        get = function(self)
+            return self:getStringField("EAXFlags")
+        end,
+        set = function(self, eax)
+            self:setStringField("EAXFlags", eax)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -13,7 +13,7 @@ import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
 import { AttackType } from "../auxiliary/attack-type";
-export type UnitTypeId = ObjectDataEntryId & {
+export type UnitTypeId = ObjectDataEntryId & number & {
     readonly __unitTypeId: unique symbol;
 };
 export type StandardUnitTypeId = UnitTypeId & {
@@ -55,6 +55,7 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     protected static readonly idGenerator: ObjectDataEntryIdGenerator;
     protected static generateId(): number;
     protected static getObjectData(map: WarMap): WarObjects;
+    private isPortraitModelPathSet?;
     get abilityTypeIds(): AbilityTypeId[];
     set abilityTypeIds(abilityTypeIds: AbilityTypeId[]);
     get defaultActiveAbilityTypeId(): AbilityTypeId | undefined;
@@ -131,6 +132,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get portraitModelPath(): string;
+    set portraitModelPath(portraitModelPath: string);
+    get portraitModelPathSD(): string;
+    set portraitModelPathSD(portraitModelPathSD: string);
+    get portraitModelPathHD(): string;
+    set portraitModelPathHD(portraitModelPathHD: string);
     get runSpeed(): number;
     set runSpeed(runSpeed: number);
     get runSpeedSD(): number;

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

@@ -12,6 +12,9 @@ local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNum
 local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
 local combatClassificationsToStringArray = ____combat_2Dclassification.combatClassificationsToStringArray
 local stringArrayToCombatClassifications = ____combat_2Dclassification.stringArrayToCombatClassifications
+local ____movement_2Dtype = require("engine.object-data.auxiliary.movement-type")
+local movementTypeToString = ____movement_2Dtype.movementTypeToString
+local stringToMovementType = ____movement_2Dtype.stringToMovementType
 local ____unit_2Dclassification = require("engine.object-data.auxiliary.unit-classification")
 local stringArrayToUnitClassifications = ____unit_2Dclassification.stringArrayToUnitClassifications
 local unitClassificationsToStringArray = ____unit_2Dclassification.unitClassificationsToStringArray
@@ -19,6 +22,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 ____config = require("config")
+local WarscriptConfig = ____config.WarscriptConfig
 local getOrCreateUnitTypeWeapons
 ____exports.UnitTypeWeapon = __TS__Class()
 local UnitTypeWeapon = ____exports.UnitTypeWeapon
@@ -345,10 +350,10 @@ __TS__SetDescriptor(
     "abilityTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("uabi")
+            return self:getObjectDataEntryNumericIdsField("uabi")
         end,
         set = function(self, abilityTypeIds)
-            self:setObjectDataEntryIdsField("uabi", abilityTypeIds)
+            self:setObjectDataEntryNumericIdsField("uabi", abilityTypeIds)
         end
     },
     true
@@ -358,10 +363,10 @@ __TS__SetDescriptor(
     "defaultActiveAbilityTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("udaa")[1]
+            return self:getObjectDataEntryNumericIdsField("udaa")[1]
         end,
         set = function(self, abilityTypeId)
-            self:setObjectDataEntryIdsField(
+            self:setObjectDataEntryNumericIdsField(
                 "udaa",
                 arrayOfNotNull(abilityTypeId)
             )
@@ -807,6 +812,9 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPath)
             self:setStringField("umdl", modelPath)
+            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor", "")
+            end
         end
     },
     true
@@ -820,6 +828,9 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPathSD)
             self:setStringField("umdl:sd", modelPathSD)
+            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor:sd", "")
+            end
         end
     },
     true
@@ -833,6 +844,51 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPathHD)
             self:setStringField("umdl:hd", modelPathHD)
+            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor:hd", "")
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPath",
+    {
+        get = function(self)
+            return self:getStringField("upor")
+        end,
+        set = function(self, portraitModelPath)
+            self:setStringField("upor", portraitModelPath)
+            self.isPortraitModelPathSet = true
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPathSD",
+    {
+        get = function(self)
+            return self:getStringField("upor:sd")
+        end,
+        set = function(self, portraitModelPathSD)
+            self:setStringField("upor:sd", portraitModelPathSD)
+            self.isPortraitModelPathSet = true
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPathHD",
+    {
+        get = function(self)
+            return self:getStringField("upor:hd")
+        end,
+        set = function(self, portraitModelPathHD)
+            self:setStringField("upor:hd", portraitModelPathHD)
+            self.isPortraitModelPathSet = true
         end
     },
     true
@@ -1288,10 +1344,13 @@ __TS__SetDescriptor(
     "movementType",
     {
         get = function(self)
-            return self:getStringField("umvt")
+            return stringToMovementType(self:getStringField("umvt"))
         end,
         set = function(self, movementType)
-            self:setStringField("umvt", movementType)
+            self:setStringField(
+                "umvt",
+                movementTypeToString(movementType)
+            )
         end
     },
     true
@@ -1496,10 +1555,10 @@ __TS__SetDescriptor(
     "affectingUpgradeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("upgr")
+            return self:getObjectDataEntryNumericIdsField("upgr")
         end,
         set = function(self, affectingUpgradeIds)
-            self:setObjectDataEntryIdsField("upgr", affectingUpgradeIds)
+            self:setObjectDataEntryNumericIdsField("upgr", affectingUpgradeIds)
         end
     },
     true
@@ -1582,10 +1641,10 @@ __TS__SetDescriptor(
     "heroAbilityTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("uhab")
+            return self:getObjectDataEntryNumericIdsField("uhab")
         end,
         set = function(self, heroAbilityTypeIds)
-            self:setObjectDataEntryIdsField("uhab", heroAbilityTypeIds)
+            self:setObjectDataEntryNumericIdsField("uhab", heroAbilityTypeIds)
         end
     },
     true

package/engine/object-data/entry/upgrade.d.ts

@@ -3,7 +3,7 @@ import { TupleOf } from "../../../utility/types";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
 import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { AbilityTypeId } from "./ability-type";
-export type UpgradeId = ObjectDataEntryId & {
+export type UpgradeId = ObjectDataEntryId & number & {
     readonly __upgradeId: unique symbol;
 };
 export declare const enum UpgradeEffectType {