warscript 0.0.1-dev.ff2a62d → 0.0.1-dev.ffaa090

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

@@ -1,8 +1,8 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
@@ -31,14 +31,18 @@ local ____entry = require("engine.object-data.entry")
 local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLevelFieldValue
 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 abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
+local ____sound = require("core.types.sound")
+local Sound3D = ____sound.Sound3D
+local SoundPreset = ____sound.SoundPreset
 local castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
 local casterChannelingEffectPresetsByAbilityTypeId = {}
 local targetCastingEffectPresetsByAbilityTypeId = {}
+local targetEffectSoundPresetByAbilityTypeId = {}
 ____exports.AbilityType = __TS__Class()
 local AbilityType = ____exports.AbilityType
 AbilityType.name = "AbilityType"
@@ -53,10 +57,7 @@ end
 function AbilityType.getObjectData(self, map)
     return map.objects.ability
 end
-AbilityType.idGenerator = __TS__New(
-    ObjectDataEntryIdGenerator,
-    fourCC("A000")
-)
+AbilityType.idGenerator = abilityTypeIdGenerator
 __TS__SetDescriptor(
     AbilityType.prototype,
     "channelingAnimation",
@@ -275,10 +276,10 @@ __TS__SetDescriptor(
     "lightningTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("alig")
+            return self:getObjectDataEntryNumericIdsField("alig")
         end,
         set = function(self, lightningTypeIds)
-            self:setObjectDataEntryIdsField("alig", lightningTypeIds)
+            self:setObjectDataEntryNumericIdsField("alig", lightningTypeIds)
         end
     },
     true
@@ -512,7 +513,7 @@ __TS__SetDescriptor(
     "techTreeDependencies",
     {
         get = function(self)
-            local techTreeDependencyIds = self:getObjectDataEntryIdsField("areq")
+            local techTreeDependencyIds = self:getObjectDataEntryNumericIdsField("areq")
             local techTreeDependencyInternalLevels = self:getNumbersField("arqa")
             return mapIndexed(
                 techTreeDependencyIds,
@@ -532,7 +533,7 @@ __TS__SetDescriptor(
                 map(techTreeDependencies, extractTechTreeDependencyInputLevel),
                 function(techTreeDependencyLevel) return techTreeDependencyLevel + 1 end
             )
-            self:setObjectDataEntryIdsField("areq", techTreeDependencyIds)
+            self:setObjectDataEntryNumericIdsField("areq", techTreeDependencyIds)
             self:setNumbersField("arqa", techTreeDependencyInternalLevels)
         end
     },
@@ -722,26 +723,40 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     AbilityType.prototype,
-    "soundPresetName",
+    "casterEffectSoundPresetId",
     {
         get = function(self)
-            return self:getStringField("aefs")
+            local casterEffectSoundPresetId = self:getStringField("aefs")
+            return casterEffectSoundPresetId ~= "" and casterEffectSoundPresetId or nil
         end,
-        set = function(self, soundPresetName)
-            self:setStringField("aefs", soundPresetName)
+        set = function(self, casterEffectSoundPresetId)
+            self:setStringField("aefs", casterEffectSoundPresetId or "")
         end
     },
     true
 )
 __TS__SetDescriptor(
     AbilityType.prototype,
-    "loopingSoundPresetName",
+    "casterEffectLoopingSoundPresetId",
     {
         get = function(self)
             return self:getStringField("aefl")
         end,
-        set = function(self, loopingSoundPresetName)
-            self:setStringField("aefl", loopingSoundPresetName)
+        set = function(self, casterEffectLoopingSoundPresetId)
+            self:setStringField("aefl", casterEffectLoopingSoundPresetId)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetEffectSoundPresetId",
+    {
+        get = function(self)
+            return targetEffectSoundPresetByAbilityTypeId[self.id]
+        end,
+        set = function(self, targetEffectSoundPresetId)
+            targetEffectSoundPresetByAbilityTypeId[self.id] = targetEffectSoundPresetId
         end
     },
     true
@@ -800,10 +815,10 @@ __TS__SetDescriptor(
     "buffTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsLevelField("abuf")
+            return self:getObjectDataEntryNumericIdsLevelField("abuf")
         end,
         set = function(self, buffTypeIds)
-            self:setObjectDataEntryIdsLevelField("abuf", buffTypeIds)
+            self:setObjectDataEntryNumericIdsLevelField("abuf", buffTypeIds)
         end
     },
     true
@@ -852,10 +867,10 @@ __TS__SetDescriptor(
     "effectBuffTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsLevelField("aeff")
+            return self:getObjectDataEntryNumericIdsLevelField("aeff")
         end,
         set = function(self, effectBuffTypeIds)
-            self:setObjectDataEntryIdsLevelField("aeff", effectBuffTypeIds)
+            self:setObjectDataEntryNumericIdsLevelField("aeff", effectBuffTypeIds)
         end
     },
     true
@@ -970,6 +985,26 @@ for abilityTypeId, animationFQN in pairs(postcompile(function() return castAnima
         end
     )
 end
+for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEffectSoundPresetByAbilityTypeId end)) do
+    if soundPresetId ~= nil then
+        Unit.abilityWidgetTargetChannelingStartEvent[abilityTypeId]:addListener(
+            4,
+            function(caster, ability, target)
+                if __TS__InstanceOf(target, Unit) then
+                    Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, target)
+                else
+                    Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, target.x, target.y)
+                end
+            end
+        )
+        Unit.abilityPointTargetChannelingStartEvent[abilityTypeId]:addListener(
+            4,
+            function(caster, ability, x, y)
+                Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, x, y)
+            end
+        )
+    end
+end
 local casterCastingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
         casterCastingEffectPresetsByAbilityTypeId,
@@ -999,7 +1034,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
     end
     casterCastingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEvent(caster)
+local function handleAbilityStopCastingEvent(caster)
     local effects = casterCastingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1010,8 +1045,8 @@ local function handleAbilityStopEvent(caster)
 end
 for abilityTypeId in pairs(casterCastingEffectModelPathsByAbilityTypeId) do
     Unit.abilityCastingStartEvent[abilityTypeId]:addListener(4, handleAbilityCastingStartEvent)
-    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
+    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
 end
 local casterChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
@@ -1042,7 +1077,7 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEventV2(caster)
+local function handleAbilityStopChannelingEvent(caster)
     local effects = casterChannelingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1053,7 +1088,7 @@ local function handleAbilityStopEventV2(caster)
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
-    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
 return ____exports

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)
@@ -204,15 +190,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 +221,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 +244,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 +274,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 +288,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

@@ -5,7 +5,7 @@ import { Race } from "../auxiliary/race";
 import { SoundPresetName } from "../auxiliary/sound-preset-name";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
 import { LightningTypeId } from "./lightning-type";
-export type BuffTypeId = ObjectDataEntryId & {
+export type BuffTypeId = ObjectDataEntryId & number & {
     readonly __buffTypeId: unique symbol;
 };
 export declare abstract class BuffType<Id extends BuffTypeId = BuffTypeId> extends ObjectDataEntry<Id> {

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

@@ -94,10 +94,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

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> {
@@ -45,4 +45,18 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set tooltipText(tooltipText: string);
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
+    get cooldownGroupId(): number;
+    set cooldownGroupId(cooldownGroupId: number);
+    get goldCost(): number;
+    set goldCost(goldCost: number);
+    get lumberCost(): number;
+    set lumberCost(lumberCost: number);
+    get activelyUsed(): boolean;
+    set activelyUsed(activelyUsed: boolean);
+    get perishable(): boolean;
+    set perishable(perishable: boolean);
+    get initialStackSize(): number;
+    set initialStackSize(initialStackSize: number);
+    get maximumStackSize(): number;
+    set maximumStackSize(maximumStackSize: number);
 }

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
@@ -256,4 +256,95 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "cooldownGroupId",
+    {
+        get = function(self)
+            return self:getObjectDataEntryNumericIdField("icid")
+        end,
+        set = function(self, cooldownGroupId)
+            self:setObjectDataEntryNumericIdField("icid", cooldownGroupId)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "goldCost",
+    {
+        get = function(self)
+            return self:getNumberField("igol")
+        end,
+        set = function(self, goldCost)
+            self:setNumberField("igol", goldCost)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "lumberCost",
+    {
+        get = function(self)
+            return self:getNumberField("ilum")
+        end,
+        set = function(self, lumberCost)
+            self:setNumberField("ilum", lumberCost)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "activelyUsed",
+    {
+        get = function(self)
+            return self:getBooleanField("iusa")
+        end,
+        set = function(self, activelyUsed)
+            self:setBooleanField("iusa", activelyUsed)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "perishable",
+    {
+        get = function(self)
+            return self:getBooleanField("iper")
+        end,
+        set = function(self, perishable)
+            self:setBooleanField("iper", perishable)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "initialStackSize",
+    {
+        get = function(self)
+            return self:getNumberField("iuse")
+        end,
+        set = function(self, initialStackSize)
+            self:setNumberField("iuse", initialStackSize)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "maximumStackSize",
+    {
+        get = function(self)
+            return self:getNumberField("ista")
+        end,
+        set = function(self, maximumStackSize)
+            self:setNumberField("ista", maximumStackSize)
+        end
+    },
+    true
+)
 return ____exports

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,16 @@
+/** @noSelfInFile */
+import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+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[]);
+}

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

@@ -0,0 +1,36 @@
+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
+)
+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;