warscript 0.0.1-dev.524f1b8 → 0.0.1-dev.5619a0e

package/core/types/effect.d.ts

@@ -30,10 +30,12 @@ export declare class Effect extends Handle<jeffect> {
     set pitch(pitch: number);
     get roll(): number;
     set roll(roll: number);
-    static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), modelPath: string, xOrWidget: number | Widget, yOrAttachmentPoint?: number | string, parameters?: EffectParameters): T;
+    static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, pos: Vec2): T;
+    static createTarget<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, target: Widget, attachPoint: string): T;
     static flash(modelPath: string, ...args: [
         ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint?: string],
         ...parametersOrDuration: [parametersOrDuration?: EffectParameters | number] | [duration?: number, parameters?: EffectParameters]
     ]): void;
+    static flashTarget(model: string, target: Widget, attachPoint: string, duration?: number): void;
 }
 export {};

package/core/types/effect.lua

@@ -4,7 +4,7 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
-local dummyPlayer, addSpecialEffectInternal, flash
+local dummyPlayer, flash
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____playerColor = require("core.types.playerColor")
@@ -119,7 +119,6 @@ local function setSpecialEffectColor(effect, color)
     dummyPlayer.color = dummyColor
 end
 local setters = {scale = setSpecialEffectScale, color = setSpecialEffectColor, pitch = setSpecialEffectPitchDegrees, roll = setSpecialEffectRollDegrees}
-local setterProperties = {"scale", "color", "pitch", "roll"}
 dummyPlayer = Player.neutralExtra
 local temporaryEffects = {}
 local temporaryEffectsDurations = {}
@@ -178,14 +177,11 @@ function Effect.prototype.onDestroy(self)
     destroyEffect(self.handle)
     return Handle.prototype.onDestroy(self)
 end
-function Effect.create(self, modelPath, xOrWidget, yOrAttachmentPoint, parameters)
-    local effect = self:of(addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters))
-    if parameters ~= nil then
-        effect[100] = parameters.color
-        effect[101] = parameters.pitch
-        effect[102] = parameters.roll
-    end
-    return effect
+function Effect.create(self, model, pos)
+    return self:of(addSpecialEffect(model, pos.x, pos.y))
+end
+function Effect.createTarget(self, model, target, attachPoint)
+    return self:of(addSpecialEffectTarget(model, target.handle, attachPoint))
 end
 function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, parametersOrDuration, parameters)
     if type(parametersOrDuration) ~= "number" then
@@ -210,12 +206,24 @@ function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, paramete
         parameters
     )
 end
+function Effect.flashTarget(self, model, target, attachPoint, duration)
+    local effect = addSpecialEffectTarget(model, target.handle, attachPoint)
+    if effect ~= nil then
+        if duration and duration > 0 then
+            temporaryEffectsCount = temporaryEffectsCount + 1
+            temporaryEffects[temporaryEffectsCount] = effect
+            temporaryEffectsDurations[temporaryEffectsCount] = duration
+        else
+            destroyEffect(effect)
+        end
+    end
+end
 __TS__SetDescriptor(
     Effect.prototype,
     "color",
     {
         get = function(self)
-            return self[100] or PlayerColor.red
+            return self[100] or PlayerColor.black
         end,
         set = function(self, color)
             setSpecialEffectColor(self.handle, color)
@@ -265,35 +273,30 @@ __TS__SetDescriptor(
     },
     true
 )
-addSpecialEffectInternal = function(modelPath, xOrWidget, yOrAttachmentPoint, parameters)
+flash = function(modelPath, xOrWidget, yOrOrAttachmentPoint, duration, parameters)
     local coordinatesProvided = type(xOrWidget) == "number"
     local isPositional = coordinatesProvided or (parameters and parameters.detached) == true
     local x = not isPositional and 0 or (coordinatesProvided and xOrWidget or xOrWidget.x)
-    local y = not isPositional and 0 or (coordinatesProvided and yOrAttachmentPoint or xOrWidget.y)
-    local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrAttachmentPoint or "origin")
+    local y = not isPositional and 0 or (coordinatesProvided and yOrOrAttachmentPoint or xOrWidget.y)
+    local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint or "origin")
+    if isPositional and not coordinatesProvided and (parameters and parameters.scale) == nil and __TS__InstanceOf(xOrWidget, Unit) then
+        setSpecialEffectScale(effect, xOrWidget.scale)
+    end
     if parameters ~= nil then
-        if isPositional and parameters.scale == nil and __TS__InstanceOf(xOrWidget, Unit) then
-            setSpecialEffectScale(effect, xOrWidget.scale)
-        end
-        for ____, property in ipairs(setterProperties) do
-            local value = parameters[property]
-            if value ~= nil then
-                setters[property](effect, value)
+        for key, value in ____pairs(parameters) do
+            if key ~= "zOffset" and key ~= "detached" and key ~= "scaleZOffset" and key ~= "delay" then
+                setters[key](effect, value)
             end
         end
         if isPositional and parameters.zOffset ~= nil then
             moveLocation(location, x, y)
             local z = __TS__InstanceOf(xOrWidget, Unit) and getLocationZ(location) + xOrWidget.flyHeight or getLocationZ(location)
-            setSpecialEffectZ(
+            BlzSetSpecialEffectZ(
                 effect,
                 z + parameters.zOffset * (parameters.scaleZOffset and getSpecialEffectScale(effect) or 1)
             )
         end
     end
-    return effect
-end
-flash = function(modelPath, xOrWidget, yOrAttachmentPoint, duration, parameters)
-    local effect = addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters)
     if duration ~= nil and duration > 0 then
         temporaryEffectsCount = temporaryEffectsCount + 1
         temporaryEffects[temporaryEffectsCount] = effect

package/core/types/sound.lua

@@ -121,11 +121,6 @@ local customSoundPresetDataByLabel = postcompile(function()
     end
     return customSoundPresetDataByLabel
 end)
----
--- @internal For use by internal systems only.
-____exports.isSoundLabelCustom = function(label)
-    return customSoundPresetDataByLabel[label] ~= nil
-end
 local function createPresetSound(fileName, preset)
     local ____fileName_1 = fileName
     local ____preset_looping_0 = preset.looping

package/core/types/timer.d.ts

@@ -1,26 +1,27 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
-import { AbstractDestroyable, Destructor } from "../../destroyable";
 declare const enum TimerPropertyKey {
     HANDLE = 0,
-    DESTROY_ON_EXPIRATION = 1,
-    CALLBACK = 2,
-    ARGS_LENGTH = 3
+    DESTROYED = 1,
+    DESTROY_ON_EXPIRATION = 2,
+    CALLBACK = 3,
+    ARGS_LENGTH = 4
 }
-export declare class Timer extends AbstractDestroyable {
+export declare class Timer implements Destroyable {
     private readonly [TimerPropertyKey.HANDLE];
+    private [TimerPropertyKey.DESTROYED]?;
     private [TimerPropertyKey.DESTROY_ON_EXPIRATION]?;
     private [TimerPropertyKey.CALLBACK]?;
     private [TimerPropertyKey.ARGS_LENGTH]?;
     private constructor();
     get handle(): jtimer;
     start<Args extends any[]>(timeout: number, periodic: boolean, callback: (...args: Args) => void, ...args: Args): void;
-    onDestroy(): Destructor;
     get elapsed(): number;
     get remaining(): number;
     get timeout(): number;
     pause(): void;
     resume(): void;
+    destroy(): void;
     static create(): Timer;
     static run<Args extends any[]>(callback: (...args: Args) => void, ...args: Args): void;
     static simple<Args extends any[]>(timeout: number, callback: (...args: Args) => void, ...args: Args): Timer;

package/core/types/timer.lua

@@ -1,7 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
-local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__Promise = ____lualib.__TS__Promise
 local ____exports = {}
@@ -10,8 +9,8 @@ local Event = ____event.Event
 local InitializingEvent = ____event.InitializingEvent
 local ____objectPool = require("util.objectPool")
 local ObjectPool = ____objectPool.ObjectPool
-local ____destroyable = require("destroyable")
-local AbstractDestroyable = ____destroyable.AbstractDestroyable
+local ____exception = require("exception")
+local IllegalStateException = ____exception.IllegalStateException
 local createTimer = CreateTimer
 local timerStart = TimerStart
 local pauseTimer = PauseTimer
@@ -36,14 +35,14 @@ local timerByHandleId = {}
 local function timerSafeCall()
     local timer = timerByHandleId[getHandleId(getExpiredTimer())]
     if timer ~= nil then
-        if timer[1] then
+        if timer[2] then
             timer:destroy()
         end
-        local callback = timer[2]
+        local callback = timer[3]
         if callback ~= nil then
             safeCall(
                 callback,
-                ____unpack(timer, 3 + 1, 3 + (timer[3] or 0))
+                ____unpack(timer, 4 + 1, 4 + (timer[4] or 0))
             )
         end
     end
@@ -51,33 +50,37 @@ end
 ____exports.Timer = __TS__Class()
 local Timer = ____exports.Timer
 Timer.name = "Timer"
-__TS__ClassExtends(Timer, AbstractDestroyable)
 function Timer.prototype.____constructor(self)
-    AbstractDestroyable.prototype.____constructor(self)
     self[0] = get()
     timerByHandleId[getHandleId(self[0])] = self
 end
 function Timer.prototype.start(self, timeout, periodic, callback, ...)
-    self[2] = callback
+    self[3] = callback
     local argsLength = select("#", ...)
-    self[3] = argsLength
+    self[4] = argsLength
     for i = 1, argsLength do
-        self[3 + i] = (select(i, ...))
+        self[4 + i] = (select(i, ...))
     end
     timerStart(self.handle, timeout, periodic, timerSafeCall)
 end
-function Timer.prototype.onDestroy(self)
-    local handle = self[0]
-    timerByHandleId[getHandleId(handle)] = nil
-    release(handle)
-    return AbstractDestroyable.prototype.onDestroy(self)
-end
 function Timer.prototype.pause(self)
     pauseTimer(self[0])
 end
 function Timer.prototype.resume(self)
     resumeTimer(self[0])
 end
+function Timer.prototype.destroy(self)
+    if self[1] then
+        error(
+            __TS__New(IllegalStateException, "Double-destroy run for timer"),
+            0
+        )
+    end
+    local handle = self[0]
+    timerByHandleId[getHandleId(handle)] = nil
+    release(handle)
+    self[1] = true
+end
 function Timer.create(self)
     return __TS__New(____exports.Timer)
 end
@@ -86,7 +89,7 @@ function Timer.run(self, callback, ...)
 end
 function Timer.simple(self, timeout, callback, ...)
     local timer = __TS__New(____exports.Timer)
-    timer[1] = true
+    timer[2] = true
     timer:start(timeout, false, callback, ...)
     return timer
 end

package/engine/behaviour/ability.d.ts

@@ -29,10 +29,7 @@ export declare abstract class AbilityBehavior<Parameters extends {
     protected flashTargetEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
-    protected flashSpecialEffect(...args: [
-        ...pointOrWidget: [x: number, y: number] | [widget: Widget],
-        ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]
-    ]): void;
+    protected flashSpecialEffect(...args: [...pointOrWidget: [x: number, y: number] | [widget: Widget], duration?: number]): void;
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
     protected onCreate(): void;

package/engine/behaviour/ability.lua

@@ -148,14 +148,13 @@ function AbilityBehavior.prototype.flashEffect(self, x, y, ...)
         ...
     )
 end
-function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrParametersOrDuration, durationOrParameters, parameters)
+function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDuration, duration)
     if type(xOrWidget) == "number" then
         Effect:flash(
             SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
             xOrWidget,
-            yOrParametersOrDuration,
-            durationOrParameters,
-            parameters
+            yOrDuration,
+            duration
         )
     else
         local attachmentPoint = SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
@@ -163,8 +162,7 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrParame
             SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
             xOrWidget,
             attachmentPoint ~= "" and attachmentPoint or "origin",
-            yOrParametersOrDuration,
-            durationOrParameters
+            yOrDuration
         )
     end
 end

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/berserk.d.ts

@@ -7,6 +7,4 @@ export declare class BerserkAbilityType extends AbilityType {
     set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
     get attackSpeedIncreaseFactor(): number[];
     set attackSpeedIncreaseFactor(attackSpeedIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get receivedDamageIncreaseFactor(): number[];
-    set receivedDamageIncreaseFactor(receivedDamageIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

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

@@ -36,17 +36,4 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    BerserkAbilityType.prototype,
-    "receivedDamageIncreaseFactor",
-    {
-        get = function(self)
-            return self:getNumberLevelField("bsk3")
-        end,
-        set = function(self, receivedDamageIncreaseFactor)
-            self:setNumberLevelField("bsk3", receivedDamageIncreaseFactor)
-        end
-    },
-    true
-)
 return ____exports

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

@@ -9,14 +9,4 @@ export declare class SlowPoisonAbilityType extends AbilityType {
     set movementSpeedDecreaseFactor(movementSpeedDecreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
     get attackSpeedDecreaseFactor(): number[];
     set attackSpeedDecreaseFactor(attackSpeedDecreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get isDamageStacking(): boolean[];
-    set isDamageStacking(isDamageStacking: ObjectDataEntryLevelFieldValueSupplier<boolean>);
-    get isMovementSpeedFactorStacking(): boolean[];
-    set isMovementSpeedFactorStacking(isMovementSpeedFactorStacking: ObjectDataEntryLevelFieldValueSupplier<boolean>);
-    get isAttackSpeedFactorStacking(): boolean[];
-    set isAttackSpeedFactorStacking(isAttackSpeedFactorStacking: ObjectDataEntryLevelFieldValueSupplier<boolean>);
-    get isAbleToKill(): boolean[];
-    set isAbleToKill(isAbleToKill: ObjectDataEntryLevelFieldValueSupplier<boolean>);
-    private setOption;
-    private getOption;
 }

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

@@ -9,12 +9,6 @@ ____exports.SlowPoisonAbilityType = __TS__Class()
 local SlowPoisonAbilityType = ____exports.SlowPoisonAbilityType
 SlowPoisonAbilityType.name = "SlowPoisonAbilityType"
 __TS__ClassExtends(SlowPoisonAbilityType, AbilityType)
-function SlowPoisonAbilityType.prototype.setOption(self, option, supplier)
-    self:setFlagLevelFieldValue("Spo4", option, supplier)
-end
-function SlowPoisonAbilityType.prototype.getOption(self, option)
-    return self:getFlagLevelFieldValue("Spo4", option)
-end
 SlowPoisonAbilityType.BASE_ID = fourCC("Aspo")
 __TS__SetDescriptor(
     SlowPoisonAbilityType.prototype,
@@ -55,56 +49,4 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    SlowPoisonAbilityType.prototype,
-    "isDamageStacking",
-    {
-        get = function(self)
-            return self:getOption(1)
-        end,
-        set = function(self, isDamageStacking)
-            self:setOption(1, isDamageStacking)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    SlowPoisonAbilityType.prototype,
-    "isMovementSpeedFactorStacking",
-    {
-        get = function(self)
-            return self:getOption(2)
-        end,
-        set = function(self, isMovementSpeedFactorStacking)
-            self:setOption(2, isMovementSpeedFactorStacking)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    SlowPoisonAbilityType.prototype,
-    "isAttackSpeedFactorStacking",
-    {
-        get = function(self)
-            return self:getOption(4)
-        end,
-        set = function(self, isAttackSpeedFactorStacking)
-            self:setOption(4, isAttackSpeedFactorStacking)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    SlowPoisonAbilityType.prototype,
-    "isAbleToKill",
-    {
-        get = function(self)
-            return self:getOption(8)
-        end,
-        set = function(self, isAbleToKill)
-            self:setOption(8, isAbleToKill)
-        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
@@ -35,7 +35,6 @@ local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilit
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local ____sound = require("core.types.sound")
-local isSoundLabelCustom = ____sound.isSoundLabelCustom
 local Sound3D = ____sound.Sound3D
 local SoundSettings = ____sound.SoundSettings
 local castAnimationFQNByAbilityTypeId = {}
@@ -119,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
@@ -132,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
@@ -371,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
@@ -1006,12 +1005,6 @@ for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEf
         )
     end
 end
-Unit.abilityChannelingStartEvent:addListener(function(caster, ability)
-    local soundPresetId = ability:getField(ABILITY_SF_EFFECT_SOUND)
-    if isSoundLabelCustom(soundPresetId) then
-        Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
-    end
-end)
 local casterCastingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
         casterCastingEffectPresetsByAbilityTypeId,
@@ -1024,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
@@ -1043,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
@@ -1074,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
@@ -1093,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/buff-type/applicable.lua

@@ -121,10 +121,6 @@ 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
@@ -132,7 +128,6 @@ 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

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.524f1b8",
+    "version": "0.0.1-dev.5619a0e",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.8e8a660"
+        "warpack": "0.0.1-dev.9a8d1de"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

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

@@ -1,10 +0,0 @@
-/** @noSelfInFile */
-import { AbilityType, AbilityTypeId } from "../ability-type";
-import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
-export declare class PhaseShiftAbilityType extends AbilityType {
-    static readonly BASE_ID: AbilityTypeId;
-    get movementSpeedDecreaseFactor(): number[];
-    set movementSpeedDecreaseFactor(movementSpeedDecreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get attackSpeedDecreaseFactor(): number[];
-    set attackSpeedDecreaseFactor(attackSpeedDecreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
-}

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

@@ -1,39 +0,0 @@
-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.PhaseShiftAbilityType = __TS__Class()
-local PhaseShiftAbilityType = ____exports.PhaseShiftAbilityType
-PhaseShiftAbilityType.name = "PhaseShiftAbilityType"
-__TS__ClassExtends(PhaseShiftAbilityType, AbilityType)
-PhaseShiftAbilityType.BASE_ID = fourCC("Apsh")
-__TS__SetDescriptor(
-    PhaseShiftAbilityType.prototype,
-    "movementSpeedDecreaseFactor",
-    {
-        get = function(self)
-            return self:getNumberLevelField("Hbn1")
-        end,
-        set = function(self, movementSpeedDecreaseFactor)
-            self:setNumberLevelField("Hbn1", movementSpeedDecreaseFactor)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    PhaseShiftAbilityType.prototype,
-    "attackSpeedDecreaseFactor",
-    {
-        get = function(self)
-            return self:getNumberLevelField("Hbn2")
-        end,
-        set = function(self, attackSpeedDecreaseFactor)
-            self:setNumberLevelField("Hbn2", attackSpeedDecreaseFactor)
-        end
-    },
-    true
-)
-return ____exports

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

@@ -1,12 +0,0 @@
-/** @noSelfInFile */
-import { AbilityType, AbilityTypeId } from "../ability-type";
-import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
-export declare class WebAbilityType extends AbilityType {
-    static readonly BASE_ID: AbilityTypeId;
-    get airUnitLoweringDuration(): number[];
-    set airUnitLoweringDuration(airUnitLoweringDuration: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get airUnitHeight(): number[];
-    set airUnitHeight(airUnitHeight: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get meleeAttackRange(): number[];
-    set meleeAttackRange(meleeAttackRange: ObjectDataEntryLevelFieldValueSupplier<number>);
-}

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

@@ -1,52 +0,0 @@
-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.WebAbilityType = __TS__Class()
-local WebAbilityType = ____exports.WebAbilityType
-WebAbilityType.name = "WebAbilityType"
-__TS__ClassExtends(WebAbilityType, AbilityType)
-WebAbilityType.BASE_ID = fourCC("Aweb")
-__TS__SetDescriptor(
-    WebAbilityType.prototype,
-    "airUnitLoweringDuration",
-    {
-        get = function(self)
-            return self:getNumberLevelField("Ens1")
-        end,
-        set = function(self, airUnitLoweringDuration)
-            self:setNumberLevelField("Ens1", airUnitLoweringDuration)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    WebAbilityType.prototype,
-    "airUnitHeight",
-    {
-        get = function(self)
-            return self:getNumberLevelField("Ens2")
-        end,
-        set = function(self, airUnitHeight)
-            self:setNumberLevelField("Ens2", airUnitHeight)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    WebAbilityType.prototype,
-    "meleeAttackRange",
-    {
-        get = function(self)
-            return self:getNumberLevelField("Ens3")
-        end,
-        set = function(self, meleeAttackRange)
-            self:setNumberLevelField("Ens3", meleeAttackRange)
-        end
-    },
-    true
-)
-return ____exports