warscript 0.0.1-dev.ed60fea → 0.0.1-dev.effa673

package/config.d.ts

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

package/config.lua

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

package/core/types/effect.d.ts

@@ -30,12 +30,10 @@ 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), 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 create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), modelPath: string, xOrWidget: number | Widget, yOrAttachmentPoint?: number | string, parameters?: EffectParameters): 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, flash
+local dummyPlayer, addSpecialEffectInternal, flash
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____playerColor = require("core.types.playerColor")
@@ -119,6 +119,7 @@ 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 = {}
@@ -177,11 +178,14 @@ function Effect.prototype.onDestroy(self)
     destroyEffect(self.handle)
     return Handle.prototype.onDestroy(self)
 end
-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))
+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
 end
 function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, parametersOrDuration, parameters)
     if type(parametersOrDuration) ~= "number" then
@@ -206,24 +210,12 @@ 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.black
+            return self[100] or PlayerColor.red
         end,
         set = function(self, color)
             setSpecialEffectColor(self.handle, color)
@@ -273,30 +265,35 @@ __TS__SetDescriptor(
     },
     true
 )
-flash = function(modelPath, xOrWidget, yOrOrAttachmentPoint, duration, parameters)
+addSpecialEffectInternal = function(modelPath, xOrWidget, yOrAttachmentPoint, 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 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
+    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")
     if parameters ~= nil then
-        for key, value in ____pairs(parameters) do
-            if key ~= "zOffset" and key ~= "detached" and key ~= "scaleZOffset" and key ~= "delay" then
-                setters[key](effect, value)
+        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)
             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)
-            BlzSetSpecialEffectZ(
+            setSpecialEffectZ(
                 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,6 +1,7 @@
 /** @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,
@@ -18,16 +19,7 @@ export declare enum SoundChannel {
     Birth = 13,
     Fire = 14
 }
-export declare enum SoundEax {
-    Default = "DefaultEAXON",
-    Acknowledgements = "HeroAcksEAX",
-    Environment = "DoodadsEAX",
-    Drums = "KotoDrumsEAX",
-    Attacks = "CombatSoundsEAX",
-    Abilities = "SpellsEAX",
-    Missiles = "MissilesEAX"
-}
-export type SoundPreset = Readonly<{
+export type SoundSettings = Readonly<{
     channel?: SoundChannel;
     eax?: SoundEax;
     fadeInRate?: number;
@@ -36,19 +28,19 @@ export type SoundPreset = Readonly<{
     volume?: number;
     pitch?: number;
 }>;
-export type Sound3DPreset = SoundPreset & Readonly<{
+export type Sound3DSettings = SoundSettings & Readonly<{
     stopWhenOutOfRange?: boolean;
     minDistance?: number;
     maxDistance?: number;
     distanceCutoff?: number;
 }>;
-export declare namespace SoundPreset {
-    const UI: SoundPreset;
-    const Music: SoundPreset;
-    const Attack: Sound3DPreset;
-    const Ability: Sound3DPreset;
-    const AbilityLooping: Sound3DPreset;
-    const Missile: Sound3DPreset;
+export declare namespace SoundSettings {
+    const UI: SoundSettings;
+    const Music: SoundSettings;
+    const Attack: Sound3DSettings;
+    const Ability: Sound3DSettings;
+    const AbilityLooping: Sound3DSettings;
+    const Missile: Sound3DSettings;
 }
 export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
     private _volume?;
@@ -58,12 +50,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: SoundPreset): void;
-    static create(fileName: string, preset: SoundPreset): Sound;
+    static play(fileName: string, preset: SoundSettings): void;
+    static create(fileName: string, preset: SoundSettings): Sound;
 }
 export declare class Sound3D extends Sound {
-    static playAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): void;
-    static playOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): void;
-    static createAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): Sound3D;
-    static createOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): Sound3D;
+    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;
 }

package/core/types/sound.lua

@@ -5,15 +5,18 @@ 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
 local setSoundChannel = SetSoundChannel
 local setSoundPosition = SetSoundPosition
 local setSoundVolume = SetSoundVolume
 local setSoundDistances = SetSoundDistances
 local setSoundDistanceCutoff = SetSoundDistanceCutoff
-local setSoundConeAngles = SetSoundConeAngles
-local setSoundConeOrientation = SetSoundConeOrientation
 local startSound = StartSound
 local setSoundPlayPosition = SetSoundPlayPosition
 local stopSound = StopSound
@@ -50,29 +53,21 @@ ____exports.SoundChannel.Birth = 13
 ____exports.SoundChannel[____exports.SoundChannel.Birth] = "Birth"
 ____exports.SoundChannel.Fire = 14
 ____exports.SoundChannel[____exports.SoundChannel.Fire] = "Fire"
-____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
+____exports.SoundSettings = {}
+local SoundSettings = ____exports.SoundSettings
 do
-    SoundPreset.UI = {channel = ____exports.SoundChannel.UI, eax = ____exports.SoundEax.Default, fadeInRate = 12700, fadeOutRate = 12700}
-    SoundPreset.Music = {
+    SoundSettings.UI = {channel = ____exports.SoundChannel.UI, eax = "DefaultEAXON", fadeInRate = 12700, fadeOutRate = 12700}
+    SoundSettings.Music = {
         channel = ____exports.SoundChannel.Music,
-        eax = ____exports.SoundEax.Default,
+        eax = "DefaultEAXON",
         fadeInRate = 12700,
         fadeOutRate = 12700,
         looping = true
     }
-    SoundPreset.Attack = {channel = ____exports.SoundChannel.Combat, eax = ____exports.SoundEax.Attacks, fadeInRate = 10, fadeOutRate = 10}
-    SoundPreset.Ability = {
+    SoundSettings.Attack = {channel = ____exports.SoundChannel.Combat, eax = "CombatSoundsEAX", fadeInRate = 10, fadeOutRate = 10}
+    SoundSettings.Ability = {
         channel = ____exports.SoundChannel.Animations,
-        eax = ____exports.SoundEax.Abilities,
+        eax = "SpellsEAX",
         stopWhenOutOfRange = true,
         volume = 127,
         fadeInRate = 1,
@@ -82,9 +77,9 @@ do
         maxDistance = 3500,
         distanceCutoff = 3000
     }
-    SoundPreset.AbilityLooping = {
+    SoundSettings.AbilityLooping = {
         channel = ____exports.SoundChannel.Birth,
-        eax = ____exports.SoundEax.Abilities,
+        eax = "SpellsEAX",
         looping = true,
         stopWhenOutOfRange = true,
         volume = 127,
@@ -95,9 +90,9 @@ do
         maxDistance = 3000,
         distanceCutoff = 3000
     }
-    SoundPreset.Missile = {
+    SoundSettings.Missile = {
         channel = ____exports.SoundChannel.Animations,
-        eax = ____exports.SoundEax.Missiles,
+        eax = "MissilesEAX",
         stopWhenOutOfRange = true,
         volume = 127,
         fadeInRate = 1,
@@ -108,6 +103,24 @@ 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
@@ -121,7 +134,7 @@ local function createPresetSound(fileName, preset)
         true,
         preset.fadeInRate or 12700,
         preset.fadeOutRate or 12700,
-        preset.eax or ____exports.SoundEax.Default
+        preset.eax or "DefaultEAXON"
     )
     setSoundChannel(sound, preset.channel or ____exports.SoundChannel.General)
     setSoundVolume(sound, preset.volume or 127)
@@ -144,7 +157,7 @@ local function createPreset3DSound(fileName, preset)
         ____preset_stopWhenOutOfRange_3,
         preset.fadeInRate or 12700,
         preset.fadeOutRate or 12700,
-        preset.eax or ____exports.SoundEax.Default
+        preset.eax or "DefaultEAXON"
     )
     setSoundChannel(sound, preset.channel or ____exports.SoundChannel.General)
     setSoundVolume(sound, preset.volume or 127)
@@ -153,6 +166,53 @@ local function createPreset3DSound(fileName, preset)
     setSoundDistanceCutoff(sound, preset.distanceCutoff or 1500)
     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
+    end
+end
 ____exports.Sound = __TS__Class()
 local Sound = ____exports.Sound
 Sound.name = "Sound"
@@ -225,6 +285,16 @@ function Sound3D.playOnUnit(self, fileName, preset, unit)
     startSound(sound)
     killSoundWhenDone(sound)
 end
+function Sound3D.playFromLabel(self, label, preset, unitOrX, y, z)
+    local sound = createPreset3DSoundFromLabel(label, preset)
+    if type(unitOrX) ~= "number" then
+        attachSoundToUnit(sound, unitOrX.handle)
+    else
+        setSoundPosition(sound, unitOrX, y or 0, z or 0)
+    end
+    startSound(sound)
+    killSoundWhenDone(sound)
+end
 function Sound3D.createAtPosition(self, fileName, preset, x, y, z)
     if x == nil then
         x = 0

package/core/util.lua

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

package/engine/behaviour/ability/apply-buff.d.ts

@@ -33,4 +33,9 @@ export declare class ApplyBuffTargetAreaAbilityBehavior<T extends BuffConstructo
     onPointTargetImpact(caster: Unit, x: number, y: number): void;
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
 }
+export declare class ApplyBuffChannelingTargetAbilityBehavior<T extends BuffConstructor = typeof Buff> extends ApplyBuffAbilityBehavior<T> {
+    private buff?;
+    onUnitTargetChannelingStart(caster: Unit, target: Unit): void;
+    onStop(): void;
+}
 export {};

package/engine/behaviour/ability/apply-buff.lua

@@ -123,4 +123,36 @@ function ApplyBuffTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self,
         self.applyBuff(unit)
     end
 end
+local behaviorByBuff = {}
+____exports.ApplyBuffChannelingTargetAbilityBehavior = __TS__Class()
+local ApplyBuffChannelingTargetAbilityBehavior = ____exports.ApplyBuffChannelingTargetAbilityBehavior
+ApplyBuffChannelingTargetAbilityBehavior.name = "ApplyBuffChannelingTargetAbilityBehavior"
+__TS__ClassExtends(ApplyBuffChannelingTargetAbilityBehavior, ____exports.ApplyBuffAbilityBehavior)
+function ApplyBuffChannelingTargetAbilityBehavior.prototype.onUnitTargetChannelingStart(self, caster, target)
+    local previousBuff = self.buff
+    if previousBuff ~= nil then
+        behaviorByBuff[previousBuff] = nil
+        previousBuff:destroy()
+    end
+    local buff = self.applyBuff(target)
+    if buff ~= nil then
+        behaviorByBuff[buff] = self
+    end
+    self.buff = buff
+end
+function ApplyBuffChannelingTargetAbilityBehavior.prototype.onStop(self)
+    local buff = self.buff
+    if buff ~= nil then
+        behaviorByBuff[buff] = nil
+        buff:destroy()
+        self.buff = nil
+    end
+end
+Buff.destroyEvent:addListener(function(buff)
+    local behavior = behaviorByBuff[buff]
+    if behavior ~= nil then
+        behaviorByBuff[buff] = nil
+        behavior.ability:interruptCast()
+    end
+end)
 return ____exports

package/engine/behaviour/ability/apply-unit-behavior.lua

@@ -41,6 +41,7 @@ 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,6 +5,7 @@ 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>;
@@ -15,6 +16,8 @@ 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(ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.allowedTargetCombatClassifications or ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
         x,
         y,
-        self:resolveCurrentAbilityDependentValue(AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD)
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.areaOfEffect or 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

@@ -22,12 +22,17 @@ export declare abstract class AbilityBehavior<Parameters extends {
     protected subscribe<T extends boolean | number | string>(value: SubscribableAbilityDependentValue<T>): void;
     protected registerCommandEvent(orderTypeStringId?: string): void;
     get ability(): Ability;
+    get unit(): Unit | undefined;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value?: AbilityDependentValue<T>): T | undefined;
-    protected flashCasterEffect(widget: Widget): void;
+    protected flashCasterEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    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], duration?: number]): void;
+    protected flashSpecialEffect(...args: [
+        ...pointOrWidget: [x: number, y: number] | [widget: Widget],
+        ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]
+    ]): void;
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
     protected onCreate(): void;

package/engine/behaviour/ability.lua

@@ -24,6 +24,8 @@ local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL
 local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_INTEGER_FIELD
 local SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD = ____ability.SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD
 local SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = ____ability.TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD
+local TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local ____ability = require("engine.object-field.ability")
 local AbilityField = ____ability.AbilityField
 local AbilityLevelField = ____ability.AbilityLevelField
@@ -112,12 +114,22 @@ end
 function AbilityBehavior.prototype.resolveCurrentAbilityDependentValue(self, value)
     return resolveCurrentAbilityDependentValue(self.ability, value)
 end
-function AbilityBehavior.prototype.flashCasterEffect(self, widget)
+function AbilityBehavior.prototype.flashCasterEffect(self, widget, ...)
     local attachmentPoint = CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
     Effect:flash(
         CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
         widget,
-        attachmentPoint ~= "" and attachmentPoint or "origin"
+        attachmentPoint ~= "" and attachmentPoint or "origin",
+        ...
+    )
+end
+function AbilityBehavior.prototype.flashTargetEffect(self, widget, ...)
+    local attachmentPoint = TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
+    Effect:flash(
+        TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
+        widget,
+        attachmentPoint ~= "" and attachmentPoint or "origin",
+        ...
     )
 end
 function AbilityBehavior.prototype.flashAreaEffect(self, x, y, ...)
@@ -136,20 +148,23 @@ function AbilityBehavior.prototype.flashEffect(self, x, y, ...)
         ...
     )
 end
-function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDuration, duration)
+function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrParametersOrDuration, durationOrParameters, parameters)
     if type(xOrWidget) == "number" then
         Effect:flash(
             SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
             xOrWidget,
-            yOrDuration,
-            duration
+            yOrParametersOrDuration,
+            durationOrParameters,
+            parameters
         )
     else
+        local attachmentPoint = SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
         Effect:flash(
             SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
             xOrWidget,
-            SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability),
-            yOrDuration
+            attachmentPoint ~= "" and attachmentPoint or "origin",
+            yOrParametersOrDuration,
+            durationOrParameters
         )
     end
 end
@@ -224,6 +239,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    AbilityBehavior.prototype,
+    "unit",
+    {get = function(self)
+        local owner = self.object.owner
+        if __TS__InstanceOf(owner, Unit) then
+            return owner
+        end
+        return owner.owner
+    end},
+    true
+)
 AbilityBehavior.MissileLaunchConfig = ____class_2
 __TS__SetDescriptor(
     AbilityBehavior.prototype,

package/engine/behaviour/unit.d.ts

@@ -5,9 +5,11 @@ 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;