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

package/engine/buff.lua

@@ -109,7 +109,6 @@ local buffParametersKeys = {
     durationIncreaseOnAutoAttack = true,
     maximumDuration = true,
     maximumRemainingDuration = true,
-    turnsIntoGhost = true,
     stuns = true,
     ignoresStunImmunity = true,
     providesStunImmunity = true,
@@ -175,7 +174,6 @@ local function resolveAndSetNumberValue(buff, property, ability, level, value, d
     end
 end
 local buffBooleanParameters = {
-    "turnsIntoGhost",
     "stuns",
     "ignoresStunImmunity",
     "disablesAutoAttack",
@@ -323,7 +321,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         typeId = selectBuffTypeIdWithLeastDuration(typeIdOrTypeIds, _unit)
         polarity = resistanceTypeOrPolarity
         resistanceType = abilityOrParametersOrResistanceType
-        if __TS__InstanceOf(parametersOrAbility, Ability) or parametersOrAbility == nil then
+        if __TS__InstanceOf(parametersOrAbility, Ability) then
             ability = parametersOrAbility
         else
             ability = nil
@@ -333,7 +331,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         typeId = typeIdOrTypeIds
         polarity = polarityOrTypeIdSelectionPolicy
         resistanceType = resistanceTypeOrPolarity
-        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) or abilityOrParametersOrResistanceType == nil then
+        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) then
             ability = abilityOrParametersOrResistanceType
             parameters = parametersOrAbility
         else
@@ -342,7 +340,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         end
     end
     self.typeId = typeId
-    if not (__TS__InstanceOf(ability, Ability) or ability == nil) then
+    if not __TS__InstanceOf(ability, Ability) then
         parameters = ability
         ability = nil
     end
@@ -373,7 +371,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     local missProbability = parameters and parameters.missProbability or defaultParameters.missProbability
     if missProbability ~= nil then
         missProbability = resolveNumberValue(ability, level, missProbability)
-        self[142] = missProbability
+        self[141] = missProbability
     end
     local buffByTypeId = buffByTypeIdByUnit[_unit]
     if buffByTypeId == nil then
@@ -594,21 +592,15 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    if self[139] then
-        unit:decrementInvulnerabilityCounter()
-    end
-    if self[138] then
+    if self[137] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[136] then
-        if self[137] then
+    if self[135] then
+        if self[136] then
             unit:decrementStunCounter()
         end
         unit:decrementStunCounter()
     end
-    if self[135] then
-        unit:decrementGhostCounter()
-    end
     if self._abilityTypeIds ~= nil then
         for abilityTypeId in pairs(self._abilityTypeIds) do
             unit:removeAbility(abilityTypeId)
@@ -663,9 +655,9 @@ function Buff.prototype.onExpiration(self)
     if self[121] ~= nil then
         (self[102] or unit):healTarget(unit, self[120] or 0)
     end
-    if self[141] then
+    if self[140] then
         unit:explode()
-    elseif self[140] then
+    elseif self[139] then
         unit:kill()
     end
 end
@@ -971,7 +963,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "turnsIntoGhost",
+    "stuns",
     {
         get = function(self)
             local ____self__135_54 = self[135]
@@ -980,12 +972,18 @@ __TS__SetDescriptor(
             end
             return ____self__135_54
         end,
-        set = function(self, turnsIntoGhost)
-            if not turnsIntoGhost and self[135] then
-                self.object:decrementGhostCounter()
+        set = function(self, stuns)
+            if not stuns and self[135] then
+                if self[136] then
+                    self.object:decrementStunCounter()
+                end
+                self.object:decrementStunCounter()
                 self[135] = nil
-            elseif turnsIntoGhost and not self[135] then
-                self.object:incrementGhostCounter()
+            elseif stuns and not self[135] then
+                if self[136] then
+                    self.object:incrementStunCounter()
+                end
+                self.object:incrementStunCounter()
                 self[135] = true
             end
         end
@@ -994,7 +992,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "stuns",
+    "ignoresStunImmunity",
     {
         get = function(self)
             local ____self__136_55 = self[136]
@@ -1003,18 +1001,16 @@ __TS__SetDescriptor(
             end
             return ____self__136_55
         end,
-        set = function(self, stuns)
-            if not stuns and self[136] then
-                if self[137] then
+        set = function(self, ignoresStunImmunity)
+            if not ignoresStunImmunity and self[136] then
+                if self[135] then
                     self.object:decrementStunCounter()
                 end
-                self.object:decrementStunCounter()
                 self[136] = nil
-            elseif stuns and not self[136] then
-                if self[137] then
+            elseif ignoresStunImmunity and not self[136] then
+                if self[135] then
                     self.object:incrementStunCounter()
                 end
-                self.object:incrementStunCounter()
                 self[136] = true
             end
         end
@@ -1023,7 +1019,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "ignoresStunImmunity",
+    "disablesAutoAttack",
     {
         get = function(self)
             local ____self__137_56 = self[137]
@@ -1032,16 +1028,12 @@ __TS__SetDescriptor(
             end
             return ____self__137_56
         end,
-        set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[137] then
-                if self[136] then
-                    self.object:decrementStunCounter()
-                end
+        set = function(self, disablesAutoAttack)
+            if not disablesAutoAttack and self[137] then
+                self.object:decrementDisableAutoAttackCounter()
                 self[137] = nil
-            elseif ignoresStunImmunity and not self[137] then
-                if self[136] then
-                    self.object:incrementStunCounter()
-                end
+            elseif disablesAutoAttack and not self[137] then
+                self.object:incrementDisableAutoAttackCounter()
                 self[137] = true
             end
         end
@@ -1050,7 +1042,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "disablesAutoAttack",
+    "providesInvulnerability",
     {
         get = function(self)
             local ____self__138_57 = self[138]
@@ -1059,12 +1051,12 @@ __TS__SetDescriptor(
             end
             return ____self__138_57
         end,
-        set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[138] then
-                self.object:decrementDisableAutoAttackCounter()
+        set = function(self, providesInvulnerability)
+            if not providesInvulnerability and self[138] then
+                self.object:decrementInvulnerabilityCounter()
                 self[138] = nil
-            elseif disablesAutoAttack and not self[138] then
-                self.object:incrementDisableAutoAttackCounter()
+            elseif providesInvulnerability and not self[138] then
+                self.object:incrementInvulnerabilityCounter()
                 self[138] = true
             end
         end
@@ -1073,7 +1065,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "providesInvulnerability",
+    "killsOnExpiration",
     {
         get = function(self)
             local ____self__139_58 = self[139]
@@ -1082,12 +1074,10 @@ __TS__SetDescriptor(
             end
             return ____self__139_58
         end,
-        set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[139] then
-                self.object:decrementInvulnerabilityCounter()
+        set = function(self, killsOnExpiration)
+            if not killsOnExpiration and self[139] then
                 self[139] = nil
-            elseif providesInvulnerability and not self[139] then
-                self.object:incrementInvulnerabilityCounter()
+            elseif killsOnExpiration and not self[139] then
                 self[139] = true
             end
         end
@@ -1096,7 +1086,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "killsOnExpiration",
+    "explodesOnExpiration",
     {
         get = function(self)
             local ____self__140_59 = self[140]
@@ -1115,27 +1105,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Buff.prototype,
-    "explodesOnExpiration",
-    {
-        get = function(self)
-            local ____self__141_60 = self[141]
-            if ____self__141_60 == nil then
-                ____self__141_60 = false
-            end
-            return ____self__141_60
-        end,
-        set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[141] then
-                self[141] = nil
-            elseif killsOnExpiration and not self[141] then
-                self[141] = true
-            end
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Buff.prototype,
     "maximumDamageDealtEventCount",
@@ -1252,13 +1221,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_61 = self._timer
-            return ____opt_61 and ____opt_61.remaining or 0
+            local ____opt_60 = self._timer
+            return ____opt_60 and ____opt_60.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_65 = remainingDuration
-            local ____opt_63 = self._timer
-            local remainingDurationDelta = ____remainingDuration_65 - (____opt_63 and ____opt_63.remaining or 0)
+            local ____remainingDuration_64 = remainingDuration
+            local ____opt_62 = self._timer
+            local remainingDurationDelta = ____remainingDuration_64 - (____opt_62 and ____opt_62.remaining or 0)
             if remainingDurationDelta ~= 0 then
                 self[103] = self[103] + remainingDurationDelta
                 if remainingDuration <= 0 then
@@ -1273,7 +1242,7 @@ __TS__SetDescriptor(
                         remainingDuration,
                         self._spellStealPriority,
                         self._learnLevelMinimum,
-                        self[142]
+                        self[141]
                     ) then
                         local timer = self._timer
                         if timer == nil then

package/engine/internal/mechanics/ability-duration.lua

@@ -8,6 +8,6 @@ local DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_NORMAL_AB
 -- @internal For use by internal systems only.
 ____exports.getAbilityDuration = function(ability, target)
     local level = ability.level
-    return target ~= nil and (target.isHero or target:getField(UNIT_IF_LEVEL) >= 6 or target:hasClassification(UnitClassification.RESISTANT)) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
+    return target ~= nil and target:hasClassification(UnitClassification.RESISTANT) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
 end
 return ____exports

package/engine/internal/unit.d.ts

@@ -100,9 +100,7 @@ declare const enum UnitPropertyKey {
     DELAY_HEALTH_CHECKS_COUNTER = 103,
     DELAY_HEALTH_CHECKS_HEALTH_BONUS = 104,
     PREVENT_DEATH_HEALTH_BONUS = 105,
-    IS_TEAM_GLOW_HIDDEN = 106,
-    LAST_X = 107,
-    LAST_Y = 108
+    IS_TEAM_GLOW_HIDDEN = 106
 }
 export type UnitSyncId = number & {
     readonly __unitSyncId: unique symbol;
@@ -115,8 +113,6 @@ export declare class Unit extends Handle<junit> {
     private [UnitPropertyKey.DELAY_HEALTH_CHECKS_HEALTH_BONUS]?;
     private [UnitPropertyKey.PREVENT_DEATH_HEALTH_BONUS]?;
     private [UnitPropertyKey.IS_TEAM_GLOW_HIDDEN]?;
-    private [UnitPropertyKey.LAST_X]?;
-    private [UnitPropertyKey.LAST_Y]?;
     private _owner?;
     private _timeScale?;
     private events?;
@@ -152,7 +148,6 @@ export declare class Unit extends Handle<junit> {
     isEnemyOf(unit: Unit): boolean;
     playAnimation(animation: string, rarity?: jraritycontrol): void;
     playAnimation(animation: number): void;
-    resetAnimation(): void;
     queueAnimation(animation: string): void;
     get weapons(): [UnitWeapon, UnitWeapon];
     get firstWeapon(): UnitWeapon;

package/engine/internal/unit.lua

@@ -58,7 +58,6 @@ local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
 local setUnitAnimationWithRarity = SetUnitAnimationWithRarity
 local setUnitAnimationByIndex = SetUnitAnimationByIndex
-local resetUnitAnimation = ResetUnitAnimation
 local queueUnitAnimation = QueueUnitAnimation
 local getUnitIntegerField = BlzGetUnitIntegerField
 local getUnitRealField = BlzGetUnitRealField
@@ -681,8 +680,6 @@ function Unit.prototype.getEvent(self, event, collector)
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
-    self[107] = getUnitX(handle)
-    self[108] = getUnitY(handle)
     if not self._owner then
         self._owner = Player:of(getOwningPlayer(handle))
     end
@@ -798,9 +795,6 @@ function Unit.prototype.playAnimation(self, animation, rarity)
         setUnitAnimation(self.handle, animation)
     end
 end
-function Unit.prototype.resetAnimation(self)
-    resetUnitAnimation(self.handle)
-end
 function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
@@ -1603,7 +1597,7 @@ __TS__SetDescriptor(
     "x",
     {
         get = function(self)
-            return self[107] or getUnitX(self.handle)
+            return getUnitX(self.handle)
         end,
         set = function(self, v)
             SetUnitX(self.handle, v)
@@ -1616,7 +1610,7 @@ __TS__SetDescriptor(
     "y",
     {
         get = function(self)
-            return self[108] or getUnitY(self.handle)
+            return getUnitY(self.handle)
         end,
         set = function(self, v)
             SetUnitY(self.handle, v)

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

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

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

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

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

@@ -7,8 +7,4 @@ export declare class ShockWaveAbilityType extends AbilityType {
     set damagePerTarget(damagePerTarget: ObjectDataEntryLevelFieldValueSupplier<number>);
     get maximumTotalDamage(): number[];
     set maximumTotalDamage(maximumTotalDamage: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get distance(): number[];
-    set distance(distance: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get finalAreaOfEffect(): number[];
-    set finalAreaOfEffect(finalAreaOfEffect: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

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

@@ -36,30 +36,4 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    ShockWaveAbilityType.prototype,
-    "distance",
-    {
-        get = function(self)
-            return self:getNumberLevelField("Osh3")
-        end,
-        set = function(self, distance)
-            self:setNumberLevelField("Osh3", distance)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    ShockWaveAbilityType.prototype,
-    "finalAreaOfEffect",
-    {
-        get = function(self)
-            return self:getNumberLevelField("Osh4")
-        end,
-        set = function(self, finalAreaOfEffect)
-            self:setNumberLevelField("Osh4", finalAreaOfEffect)
-        end
-    },
-    true
-)
 return ____exports

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

@@ -3,7 +3,7 @@ import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";
 import { AnimationName } from "../auxiliary/animation-name";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
-import { AttachmentPresetInput, EffectPresetWithParameters, EffectPresetWithParametersInput } from "../auxiliary/attachment-preset";
+import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { Race } from "../auxiliary/race";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
@@ -27,11 +27,11 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set buttonPositionX(buttonPositionX: number);
     get buttonPositionY(): number;
     set buttonPositionY(buttonPositionY: number);
-    get casterCastingEffectPresets(): EffectPresetWithParameters[];
-    set casterCastingEffectPresets(casterCastingEffectPresets: EffectPresetWithParametersInput[]);
-    get casterChannelingEffectPresets(): EffectPresetWithParameters[];
-    set casterChannelingEffectPresets(casterChannelingEffectPresets: EffectPresetWithParametersInput[]);
-    get casterAttachmentPresets(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2>;
+    get casterCastingEffectPresets(): AttachmentPreset[];
+    set casterCastingEffectPresets(casterCastingEffectPresets: AttachmentPresetInput[]);
+    get casterChannelingEffectPresets(): AttachmentPreset[];
+    set casterChannelingEffectPresets(casterChannelingEffectPresets: AttachmentPresetInput[]);
+    get casterAttachmentPresets(): TupleOf<AttachmentPreset, 0 | 1 | 2>;
     set casterAttachmentPresets(casterAttachmentPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2>);
     get effectModelPaths(): string[];
     set effectModelPaths(effectModelPaths: string[]);
@@ -63,15 +63,15 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set missileMovementArc(missileMovementArc: number);
     get missileMovementSpeed(): number;
     set missileMovementSpeed(missileMovementSpeed: number);
-    get specialAttachmentPreset(): EffectPresetWithParameters | undefined;
+    get specialAttachmentPreset(): AttachmentPreset | undefined;
     set specialAttachmentPreset(specialAttachmentPreset: AttachmentPresetInput | undefined);
-    get targetCastingEffectPresets(): EffectPresetWithParameters[];
+    get targetCastingEffectPresets(): AttachmentPreset[];
     set targetCastingEffectPresets(targetCastingEffectPresets: AttachmentPresetInput[]);
-    get targetEffectPresets(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    get targetEffectPresets(): TupleOf<AttachmentPreset, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresets(targetEffectPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
-    get targetEffectPresetsSD(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    get targetEffectPresetsSD(): TupleOf<AttachmentPreset, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresetsSD(targetEffectPresetsSD: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
-    get targetEffectPresetsHD(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    get targetEffectPresetsHD(): TupleOf<AttachmentPreset, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresetsHD(targetEffectPresetsHD: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
     get turnOffButtonPositionX(): number;
     set turnOffButtonPositionX(buttonPositionX: number);

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

@@ -20,7 +20,7 @@ local mapIndexed = ____arrays.mapIndexed
 local ____attachment_2Dpreset = require("engine.object-data.auxiliary.attachment-preset")
 local extractAttachmentPresetInputModelPath = ____attachment_2Dpreset.extractAttachmentPresetInputModelPath
 local extractAttachmentPresetInputNodeFQN = ____attachment_2Dpreset.extractAttachmentPresetInputNodeFQN
-local toEffectPreset = ____attachment_2Dpreset.toEffectPreset
+local toAttachmentPreset = ____attachment_2Dpreset.toAttachmentPreset
 local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
 local combatClassificationsToStringArray = ____combat_2Dclassification.combatClassificationsToStringArray
 local stringArrayToCombatClassifications = ____combat_2Dclassification.stringArrayToCombatClassifications
@@ -36,7 +36,7 @@ local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local ____sound = require("core.types.sound")
 local Sound3D = ____sound.Sound3D
-local SoundSettings = ____sound.SoundSettings
+local SoundPreset = ____sound.SoundPreset
 local castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
@@ -118,7 +118,7 @@ __TS__SetDescriptor(
             return casterCastingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, casterCastingEffectPresets)
-            casterCastingEffectPresetsByAbilityTypeId[self.id] = map(casterCastingEffectPresets, toEffectPreset)
+            casterCastingEffectPresetsByAbilityTypeId[self.id] = map(casterCastingEffectPresets, toAttachmentPreset)
         end
     },
     true
@@ -131,7 +131,7 @@ __TS__SetDescriptor(
             return casterChannelingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, casterChannelingEffectPresets)
-            casterChannelingEffectPresetsByAbilityTypeId[self.id] = map(casterChannelingEffectPresets, toEffectPreset)
+            casterChannelingEffectPresetsByAbilityTypeId[self.id] = map(casterChannelingEffectPresets, toAttachmentPreset)
         end
     },
     true
@@ -370,7 +370,7 @@ __TS__SetDescriptor(
             return targetCastingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, targetCastingEffectPresets)
-            targetCastingEffectPresetsByAbilityTypeId[self.id] = map(targetCastingEffectPresets, toEffectPreset)
+            targetCastingEffectPresetsByAbilityTypeId[self.id] = map(targetCastingEffectPresets, toAttachmentPreset)
         end
     },
     true
@@ -991,16 +991,16 @@ for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEf
             4,
             function(caster, ability, target)
                 if __TS__InstanceOf(target, Unit) then
-                    Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, target)
+                    Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, target)
                 else
-                    Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, target.x, target.y)
+                    Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, target.x, target.y)
                 end
             end
         )
         Unit.abilityPointTargetChannelingStartEvent[abilityTypeId]:addListener(
             4,
             function(caster, ability, x, y)
-                Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, x, y)
+                Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, x, y)
             end
         )
     end
@@ -1017,17 +1017,10 @@ local casterCastingEffectAttachmentPointsByAbilityTypeId = postcompile(function(
         function(casterCastingEffectPresets) return map(casterCastingEffectPresets, extractAttachmentPresetInputNodeFQN) end
     )
 end)
-local casterCastingEffectParametersByAbilityTypeId = postcompile(function()
-    return mapValues(
-        casterCastingEffectPresetsByAbilityTypeId,
-        function(casterCastingEffectPresets) return map(casterCastingEffectPresets, "parameters") end
-    )
-end)
 local casterCastingEffectsByCaster = {}
 local function handleAbilityCastingStartEvent(caster, ability)
     local effectModelPaths = casterCastingEffectModelPathsByAbilityTypeId[ability.typeId]
     local attachmentPoints = casterCastingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
-    local parameters = casterCastingEffectParametersByAbilityTypeId[ability.typeId]
     local effects = {}
     if effectModelPaths ~= nil then
         for i = 1, #effectModelPaths do
@@ -1036,7 +1029,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
             if attachmentPoint == nil or attachmentPoint == "" then
                 attachmentPoint = "origin"
             end
-            effects[i] = Effect:create(effectModelPath, caster, attachmentPoint, parameters and parameters[i])
+            effects[i] = Effect:createTarget(effectModelPath, caster, attachmentPoint)
         end
     end
     casterCastingEffectsByCaster[caster] = effects
@@ -1067,17 +1060,10 @@ local casterChannelingEffectAttachmentPointsByAbilityTypeId = postcompile(functi
         function(casterChannelingEffectPresets) return map(casterChannelingEffectPresets, extractAttachmentPresetInputNodeFQN) end
     )
 end)
-local casterChannelingEffectParametersByAbilityTypeId = postcompile(function()
-    return mapValues(
-        casterChannelingEffectPresetsByAbilityTypeId,
-        function(casterChannelingEffectPresets) return map(casterChannelingEffectPresets, "parameters") end
-    )
-end)
 local casterChannelingEffectsByCaster = {}
 local function handleAbilityChannelingStartEvent(caster, ability)
     local effectModelPaths = casterChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
     local attachmentPoints = casterChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
-    local parameters = casterChannelingEffectParametersByAbilityTypeId[ability.typeId]
     local effects = {}
     if effectModelPaths ~= nil then
         for i = 1, #effectModelPaths do
@@ -1086,7 +1072,7 @@ local function handleAbilityChannelingStartEvent(caster, ability)
             if attachmentPoint == nil or attachmentPoint == "" then
                 attachmentPoint = "origin"
             end
-            effects[i] = Effect:create(effectModelPath, caster, attachmentPoint, parameters and parameters[i])
+            effects[i] = Effect:createTarget(effectModelPath, caster, attachmentPoint)
         end
     end
     casterChannelingEffectsByCaster[caster] = effects

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

@@ -1,6 +1,5 @@
 /** @noSelfInFile */
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
-import { SoundEax } from "../auxiliary/sound-eax";
 export type SoundPresetId = ObjectDataEntryId & string & {
     readonly __soundPresetId: unique symbol;
 };
@@ -14,20 +13,4 @@ export declare class SoundPreset extends ObjectDataEntry<SoundPresetId> {
     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);
 }