warscript 0.0.1-dev.65d0014 → 0.0.1-dev.66ce6c9

package/config.d.ts

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

package/config.lua

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

package/core/types/sound.d.ts

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

package/core/types/sound.lua

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

package/core/util.lua

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__StringPadEnd = ____lualib.__TS__StringPadEnd
 local ____exports = {}
 local ns = {}
 do
@@ -14,7 +16,10 @@ do
         if type(id) == "number" then
             return id
         else
-            local numid = string.unpack(">I4", id)
+            local numid = string.unpack(
+                ">I4",
+                __TS__StringPadEnd(id, 4, "\0")
+            )
             return numid
         end
     end

package/engine/behaviour/ability.d.ts

@@ -22,6 +22,7 @@ export declare abstract class AbilityBehavior<Parameters extends {
     protected subscribe<T extends boolean | number | string>(value: SubscribableAbilityDependentValue<T>): void;
     protected registerCommandEvent(orderTypeStringId?: string): void;
     get ability(): Ability;
+    get unit(): Unit | undefined;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value?: AbilityDependentValue<T>): T | undefined;
     protected flashCasterEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;

package/engine/behaviour/ability.lua

@@ -237,6 +237,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    AbilityBehavior.prototype,
+    "unit",
+    {get = function(self)
+        local owner = self.object.owner
+        if __TS__InstanceOf(owner, Unit) then
+            return owner
+        end
+        return owner.owner
+    end},
+    true
+)
 AbilityBehavior.MissileLaunchConfig = ____class_2
 __TS__SetDescriptor(
     AbilityBehavior.prototype,

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

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

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

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

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

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

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

@@ -6,6 +6,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____channel = require("engine.object-data.entry.ability-type.channel")
 local ChannelAbilityType = ____channel.ChannelAbilityType
+local ____animation_2Dname = require("engine.object-data.auxiliary.animation-name")
+local isAnimationName = ____animation_2Dname.isAnimationName
 local ____order_2Dtype_2Dstring_2Did_2Dfactory = require("engine.object-data.utility.order-type-string-id-factory")
 local orderTypeStringIdFactory = ____order_2Dtype_2Dstring_2Did_2Dfactory.orderTypeStringIdFactory
 local ____timer = require("core.types.timer")
@@ -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/disease-cloud.lua

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

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+import { UnitTypeId } from "../unit-type";
+export declare class RaiseDeadAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get firstSummonedUnitCount(): number[];
+    set firstSummonedUnitCount(firstSummonedUnitCount: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get secondSummonedUnitCount(): number[];
+    set secondSummonedUnitCount(secondSummonedUnitCount: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get firstSummonedUnitTypeId(): UnitTypeId[];
+    set firstSummonedUnitTypeId(firstSummonedUnitTypeId: ObjectDataEntryLevelFieldValueSupplier<UnitTypeId>);
+    get secondSummonedUnitTypeId(): UnitTypeId[];
+    set secondSummonedUnitTypeId(secondSummonedUnitTypeId: ObjectDataEntryLevelFieldValueSupplier<UnitTypeId>);
+    get limitCheckUnitTypeId(): UnitTypeId[];
+    set limitCheckUnitTypeId(limitCheckUnitTypeId: ObjectDataEntryLevelFieldValueSupplier<UnitTypeId>);
+}

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

@@ -0,0 +1,78 @@
+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.RaiseDeadAbilityType = __TS__Class()
+local RaiseDeadAbilityType = ____exports.RaiseDeadAbilityType
+RaiseDeadAbilityType.name = "RaiseDeadAbilityType"
+__TS__ClassExtends(RaiseDeadAbilityType, AbilityType)
+RaiseDeadAbilityType.BASE_ID = fourCC("Arai")
+__TS__SetDescriptor(
+    RaiseDeadAbilityType.prototype,
+    "firstSummonedUnitCount",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Rai1")
+        end,
+        set = function(self, firstSummonedUnitCount)
+            self:setNumberLevelField("Rai1", firstSummonedUnitCount)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    RaiseDeadAbilityType.prototype,
+    "secondSummonedUnitCount",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Rai2")
+        end,
+        set = function(self, secondSummonedUnitCount)
+            self:setNumberLevelField("Rai2", secondSummonedUnitCount)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    RaiseDeadAbilityType.prototype,
+    "firstSummonedUnitTypeId",
+    {
+        get = function(self)
+            return self:getObjectDataEntryNumericIdLevelField("Rai3")
+        end,
+        set = function(self, firstSummonedUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Rai3", firstSummonedUnitTypeId)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    RaiseDeadAbilityType.prototype,
+    "secondSummonedUnitTypeId",
+    {
+        get = function(self)
+            return self:getObjectDataEntryNumericIdLevelField("Rai4")
+        end,
+        set = function(self, secondSummonedUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Rai4", secondSummonedUnitTypeId)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    RaiseDeadAbilityType.prototype,
+    "limitCheckUnitTypeId",
+    {
+        get = function(self)
+            return self:getObjectDataEntryNumericIdLevelField("Raiu")
+        end,
+        set = function(self, limitCheckUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Raiu", limitCheckUnitTypeId)
+        end
+    },
+    true
+)
+return ____exports

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

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

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

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

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

@@ -6,12 +6,12 @@ import { AnimationQualifier } from "../auxiliary/animation-qualifier";
 import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { Race } from "../auxiliary/race";
-import { SoundPresetName } from "../auxiliary/sound-preset-name";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
 import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { BuffTypeId } from "./buff-type";
 import { LightningTypeId } from "./lightning-type";
-export type AbilityTypeId = ObjectDataEntryId & {
+import { SoundPresetId } from "./sound-preset";
+export type AbilityTypeId = ObjectDataEntryId & number & {
     readonly __abilityTypeId: unique symbol;
 };
 export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId> {
@@ -111,10 +111,12 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set turnOffTooltipText(turnOffTooltipText: ObjectDataEntryLevelFieldValueSupplier<string>);
     get turnOffTooltipExtendedText(): string[];
     set turnOffTooltipExtendedText(turnOffTooltipExtendedText: ObjectDataEntryLevelFieldValueSupplier<string>);
-    get soundPresetName(): SoundPresetName;
-    set soundPresetName(soundPresetName: SoundPresetName);
-    get loopingSoundPresetName(): SoundPresetName;
-    set loopingSoundPresetName(loopingSoundPresetName: SoundPresetName);
+    get casterEffectSoundPresetId(): SoundPresetId | undefined;
+    set casterEffectSoundPresetId(casterEffectSoundPresetId: SoundPresetId | undefined);
+    get casterEffectLoopingSoundPresetId(): SoundPresetId;
+    set casterEffectLoopingSoundPresetId(casterEffectLoopingSoundPresetId: SoundPresetId);
+    get targetEffectSoundPresetId(): SoundPresetId | undefined;
+    set targetEffectSoundPresetId(targetEffectSoundPresetId: SoundPresetId | undefined);
     get allowedTargetCombatClassifications(): CombatClassifications[];
     set allowedTargetCombatClassifications(allowedTargetCombatClassifications: ObjectDataEntryLevelFieldValueSupplier<CombatClassifications>);
     get areaOfEffect(): number[];

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

@@ -2,6 +2,7 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
@@ -33,11 +34,15 @@ local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.u
 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"
@@ -271,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
@@ -508,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,
@@ -528,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
     },
@@ -718,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
@@ -796,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
@@ -848,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
@@ -966,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,

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

@@ -74,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
@@ -104,7 +104,7 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
                 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)
@@ -222,7 +222,7 @@ 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, missProbability)
-    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852189 or 852173) or 0)
+    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
@@ -274,7 +274,7 @@ ____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 == 852189 then
+            if missProbability ~= nil and applicatorType == 852190 then
                 ability:setField(ABILITY_RLF_CHANCE_TO_MISS_CRS, missProbability)
             end
         end,

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> {