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

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

@@ -1,7 +1,6 @@
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Unit } from "./unit";
-import { SoundEax } from "../../engine/object-data/auxiliary/sound-eax";
 export declare enum SoundChannel {
     General = 0,
     UnitSelection = 1,
@@ -19,7 +18,16 @@ export declare enum SoundChannel {
     Birth = 13,
     Fire = 14
 }
-export type SoundSettings = Readonly<{
+export declare enum SoundEax {
+    Default = "DefaultEAXON",
+    Acknowledgements = "HeroAcksEAX",
+    Environment = "DoodadsEAX",
+    Drums = "KotoDrumsEAX",
+    Attacks = "CombatSoundsEAX",
+    Abilities = "SpellsEAX",
+    Missiles = "MissilesEAX"
+}
+export type SoundPreset = Readonly<{
     channel?: SoundChannel;
     eax?: SoundEax;
     fadeInRate?: number;
@@ -28,19 +36,19 @@ export type SoundSettings = Readonly<{
     volume?: number;
     pitch?: number;
 }>;
-export type Sound3DSettings = SoundSettings & Readonly<{
+export type Sound3DPreset = SoundPreset & Readonly<{
     stopWhenOutOfRange?: boolean;
     minDistance?: number;
     maxDistance?: number;
     distanceCutoff?: number;
 }>;
-export declare namespace SoundSettings {
-    const UI: SoundSettings;
-    const Music: SoundSettings;
-    const Attack: Sound3DSettings;
-    const Ability: Sound3DSettings;
-    const AbilityLooping: Sound3DSettings;
-    const Missile: Sound3DSettings;
+export declare namespace SoundPreset {
+    const UI: SoundPreset;
+    const Music: SoundPreset;
+    const Attack: Sound3DPreset;
+    const Ability: Sound3DPreset;
+    const AbilityLooping: Sound3DPreset;
+    const Missile: Sound3DPreset;
 }
 export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
     private _volume?;
@@ -50,13 +58,13 @@ export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
     start(milliseconds?: number): void;
     stop(fadeOut?: boolean): void;
     restart(milliseconds?: number): void;
-    static play(fileName: string, preset: SoundSettings): void;
-    static create(fileName: string, preset: SoundSettings): Sound;
+    static play(fileName: string, preset: SoundPreset): void;
+    static create(fileName: string, preset: SoundPreset): Sound;
 }
 export declare class Sound3D extends Sound {
-    static playAtPosition(fileName: string, preset: Sound3DSettings, x?: number, y?: number, z?: number): void;
-    static playOnUnit(fileName: string, preset: Sound3DSettings, unit: Unit): void;
-    static playFromLabel(label: string, preset: Sound3DSettings, ...positionOrUnit: [Unit] | [number, number, number?]): void;
-    static createAtPosition(fileName: string, preset: Sound3DSettings, x?: number, y?: number, z?: number): Sound3D;
-    static createOnUnit(fileName: string, preset: Sound3DSettings, unit: Unit): Sound3D;
+    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

@@ -5,10 +5,6 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
-local ____sound_2Dpreset = require("engine.object-data.entry.sound-preset")
-local SoundPreset = ____sound_2Dpreset.SoundPreset
-local ____random = require("engine.random")
-local randomInteger = ____random.randomInteger
 local createSound = CreateSound
 local createSoundFromLabel = CreateSoundFromLabel
 local setSoundPitch = SetSoundPitch
@@ -53,21 +49,29 @@ ____exports.SoundChannel.Birth = 13
 ____exports.SoundChannel[____exports.SoundChannel.Birth] = "Birth"
 ____exports.SoundChannel.Fire = 14
 ____exports.SoundChannel[____exports.SoundChannel.Fire] = "Fire"
-____exports.SoundSettings = {}
-local SoundSettings = ____exports.SoundSettings
+____exports.SoundEax = SoundEax or ({})
+____exports.SoundEax.Default = "DefaultEAXON"
+____exports.SoundEax.Acknowledgements = "HeroAcksEAX"
+____exports.SoundEax.Environment = "DoodadsEAX"
+____exports.SoundEax.Drums = "KotoDrumsEAX"
+____exports.SoundEax.Attacks = "CombatSoundsEAX"
+____exports.SoundEax.Abilities = "SpellsEAX"
+____exports.SoundEax.Missiles = "MissilesEAX"
+____exports.SoundPreset = {}
+local SoundPreset = ____exports.SoundPreset
 do
-    SoundSettings.UI = {channel = ____exports.SoundChannel.UI, eax = "DefaultEAXON", fadeInRate = 12700, fadeOutRate = 12700}
-    SoundSettings.Music = {
+    SoundPreset.UI = {channel = ____exports.SoundChannel.UI, eax = ____exports.SoundEax.Default, fadeInRate = 12700, fadeOutRate = 12700}
+    SoundPreset.Music = {
         channel = ____exports.SoundChannel.Music,
-        eax = "DefaultEAXON",
+        eax = ____exports.SoundEax.Default,
         fadeInRate = 12700,
         fadeOutRate = 12700,
         looping = true
     }
-    SoundSettings.Attack = {channel = ____exports.SoundChannel.Combat, eax = "CombatSoundsEAX", fadeInRate = 10, fadeOutRate = 10}
-    SoundSettings.Ability = {
+    SoundPreset.Attack = {channel = ____exports.SoundChannel.Combat, eax = ____exports.SoundEax.Attacks, fadeInRate = 10, fadeOutRate = 10}
+    SoundPreset.Ability = {
         channel = ____exports.SoundChannel.Animations,
-        eax = "SpellsEAX",
+        eax = ____exports.SoundEax.Abilities,
         stopWhenOutOfRange = true,
         volume = 127,
         fadeInRate = 1,
@@ -77,9 +81,9 @@ do
         maxDistance = 3500,
         distanceCutoff = 3000
     }
-    SoundSettings.AbilityLooping = {
+    SoundPreset.AbilityLooping = {
         channel = ____exports.SoundChannel.Birth,
-        eax = "SpellsEAX",
+        eax = ____exports.SoundEax.Abilities,
         looping = true,
         stopWhenOutOfRange = true,
         volume = 127,
@@ -90,9 +94,9 @@ do
         maxDistance = 3000,
         distanceCutoff = 3000
     }
-    SoundSettings.Missile = {
+    SoundPreset.Missile = {
         channel = ____exports.SoundChannel.Animations,
-        eax = "MissilesEAX",
+        eax = ____exports.SoundEax.Missiles,
         stopWhenOutOfRange = true,
         volume = 127,
         fadeInRate = 1,
@@ -103,24 +107,6 @@ do
         distanceCutoff = 3000
     }
 end
-local customSoundPresetDataByLabel = postcompile(function()
-    local customSoundPresetDataByLabel = {}
-    for ____, soundPreset in ipairs(SoundPreset:getAll()) do
-        if soundPreset.isCustom then
-            customSoundPresetDataByLabel[soundPreset.id] = {
-                filePaths = soundPreset.filePaths,
-                volume = soundPreset.volume,
-                pitch = soundPreset.pitch,
-                channel = soundPreset.channel,
-                minimumDistance = soundPreset.minimumDistance,
-                maximumDistance = soundPreset.maximumDistance,
-                distanceCutoff = soundPreset.distanceCutoff,
-                eax = soundPreset.eax
-            }
-        end
-    end
-    return customSoundPresetDataByLabel
-end)
 local function createPresetSound(fileName, preset)
     local ____fileName_1 = fileName
     local ____preset_looping_0 = preset.looping
@@ -134,7 +120,7 @@ local function createPresetSound(fileName, preset)
         true,
         preset.fadeInRate or 12700,
         preset.fadeOutRate or 12700,
-        preset.eax or "DefaultEAXON"
+        preset.eax or ____exports.SoundEax.Default
     )
     setSoundChannel(sound, preset.channel or ____exports.SoundChannel.General)
     setSoundVolume(sound, preset.volume or 127)
@@ -157,7 +143,7 @@ local function createPreset3DSound(fileName, preset)
         ____preset_stopWhenOutOfRange_3,
         preset.fadeInRate or 12700,
         preset.fadeOutRate or 12700,
-        preset.eax or "DefaultEAXON"
+        preset.eax or ____exports.SoundEax.Default
     )
     setSoundChannel(sound, preset.channel or ____exports.SoundChannel.General)
     setSoundVolume(sound, preset.volume or 127)
@@ -167,51 +153,29 @@ local function createPreset3DSound(fileName, preset)
     return sound
 end
 local function createPreset3DSoundFromLabel(label, preset)
-    local customSoundPresetData = customSoundPresetDataByLabel[label]
-    if customSoundPresetData == nil then
-        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
-        return createSoundFromLabel(
-            ____label_7,
-            ____preset_looping_5,
-            true,
-            ____preset_stopWhenOutOfRange_6,
-            preset.fadeInRate or 12700,
-            preset.fadeOutRate or 12700
-        )
-    else
-        local ____customSoundPresetData_filePaths_index_10 = customSoundPresetData.filePaths[randomInteger(#customSoundPresetData.filePaths - 1) + 1]
-        local ____preset_looping_8 = preset.looping
-        if ____preset_looping_8 == nil then
-            ____preset_looping_8 = false
-        end
-        local ____preset_stopWhenOutOfRange_9 = preset.stopWhenOutOfRange
-        if ____preset_stopWhenOutOfRange_9 == nil then
-            ____preset_stopWhenOutOfRange_9 = true
-        end
-        local sound = createSound(
-            ____customSoundPresetData_filePaths_index_10,
-            ____preset_looping_8,
-            true,
-            ____preset_stopWhenOutOfRange_9,
-            preset.fadeInRate or 12700,
-            preset.fadeOutRate or 12700,
-            customSoundPresetData.eax
-        )
-        setSoundChannel(sound, customSoundPresetData.channel)
-        setSoundVolume(sound, customSoundPresetData.volume)
-        setSoundPitch(sound, customSoundPresetData.pitch)
-        setSoundDistances(sound, customSoundPresetData.minimumDistance, customSoundPresetData.maximumDistance)
-        setSoundDistanceCutoff(sound, customSoundPresetData.distanceCutoff)
-        return sound
+    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

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/apply-unit-behavior.lua

@@ -41,7 +41,6 @@ function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitGainAbility(self, unit
         ____opt_0:destroy()
     end
     self.unitBehavior = __TS__New(self.unitBehaviorConstructor, unit)
-    self.unitBehavior.sourceAbilityBehavior = self
     self:update()
 end
 function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitLoseAbility(self)

package/engine/behaviour/ability/damage.d.ts

@@ -5,7 +5,6 @@ import { Unit } from "../../internal/unit";
 import { AbilityDependentValue } from "../../object-field/ability";
 import { Widget } from "../../../core/types/widget";
 import { AttackType, DamageType, WeaponType } from "../../internal/unit+damage";
-import { CombatClassifications } from "../../object-data/auxiliary/combat-classification";
 export type DamageAbilityBehaviorParameters = {
     damagePerStrength?: AbilityDependentValue<number>;
     damagePerAgility?: AbilityDependentValue<number>;
@@ -16,8 +15,6 @@ export type DamageAbilityBehaviorParameters = {
 };
 export type DamageAreaAbilityBehaviorParameters = DamageAbilityBehaviorParameters & {
     maximumDamage?: AbilityDependentValue<number>;
-    areaOfEffect?: AbilityDependentValue<number>;
-    allowedTargetCombatClassifications?: AbilityDependentValue<CombatClassifications>;
 };
 declare abstract class DamageAbilityBehavior<T extends DamageAbilityBehaviorParameters = DamageAbilityBehaviorParameters> extends AbilityBehavior {
     protected readonly damage: AbilityDependentValue<number>;

package/engine/behaviour/ability/damage.lua

@@ -82,10 +82,10 @@ function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
     local parameters = self.parameters
     local targets = Unit.getAllowedTargetsInCollisionRange(
         caster,
-        self:resolveCurrentAbilityDependentValue(parameters and parameters.allowedTargetCombatClassifications or ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
+        self:resolveCurrentAbilityDependentValue(ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
         x,
         y,
-        self:resolveCurrentAbilityDependentValue(parameters and parameters.areaOfEffect or AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD)
+        self:resolveCurrentAbilityDependentValue(AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD)
     )
     local damage = self:calculateDamage(caster)
     local maximumDamage = self:resolveCurrentAbilityDependentValue(parameters and parameters.maximumDamage or 0)

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

@@ -5,11 +5,9 @@ import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
 import "../internal/unit+ability";
 import "../internal/unit-missile-launch";
 import { Item } from "../internal/item";
-import type { AbilityBehavior } from "./ability";
 export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
 export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
     constructor(unit: Unit);
-    readonly sourceAbilityBehavior?: AbilityBehavior;
     get unit(): Unit;
     onAutoAttackStart(target: Unit): void;
     onAutoAttackFinish(target: Unit): void;

package/engine/buff.d.ts

@@ -64,7 +64,6 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     durationIncreaseOnAutoAttack?: NumberParameterValueType;
     maximumRemainingDuration?: NumberParameterValueType;
     maximumDuration?: NumberParameterValueType;
-    turnsIntoGhost?: BooleanParameterValueType;
     stuns?: BooleanParameterValueType;
     ignoresStunImmunity?: BooleanParameterValueType;
     providesStunImmunity?: BooleanParameterValueType;
@@ -117,14 +116,13 @@ declare const enum BuffPropertyKey {
     MAXIMUM_DAMAGE_DEALT_EVENT_COUNT = 132,
     DAMAGE_RECEIVED_EVENT_COUNT = 133,
     MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT = 134,
-    TURNS_INTO_GHOST = 135,
-    STUNS = 136,
-    IGNORES_STUN_IMMUNITY = 137,
-    DISABLES_AUTO_ATTACK = 138,
-    PROVIDES_INVULNERABILITY = 139,
-    KILLS_ON_EXPIRATION = 140,
-    EXPLODES_ON_EXPIRATION = 141,
-    MISS_PROBABILITY = 142
+    STUNS = 135,
+    IGNORES_STUN_IMMUNITY = 136,
+    DISABLES_AUTO_ATTACK = 137,
+    PROVIDES_INVULNERABILITY = 138,
+    KILLS_ON_EXPIRATION = 139,
+    EXPLODES_ON_EXPIRATION = 140,
+    MISS_PROBABILITY = 141
 }
 export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
@@ -138,7 +136,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
     polarity: BuffPolarityParameterType,
     resistanceType: BuffResistanceTypeParameterType,
     ...abilityOrParameters: [
-        ability?: Ability,
+        ability: Ability,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
     ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
 ];
@@ -180,7 +178,6 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private [BuffPropertyKey.DAMAGE_DEALT_EVENT_COUNT]?;
     private [BuffPropertyKey.MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT]?;
     private [BuffPropertyKey.DAMAGE_RECEIVED_EVENT_COUNT]?;
-    private [BuffPropertyKey.TURNS_INTO_GHOST]?;
     private [BuffPropertyKey.STUNS]?;
     private [BuffPropertyKey.IGNORES_STUN_IMMUNITY]?;
     private [BuffPropertyKey.DISABLES_AUTO_ATTACK]?;
@@ -234,8 +231,6 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     set receivedDamageFactor(receivedDamageFactor: number);
     get armorIncrease(): number;
     set armorIncrease(armorIncrease: number);
-    get turnsIntoGhost(): boolean;
-    set turnsIntoGhost(turnsIntoGhost: boolean);
     get stuns(): boolean;
     set stuns(stuns: boolean);
     get ignoresStunImmunity(): boolean;