warscript 0.0.1-dev.2ae9956 → 0.0.1-dev.2bde093

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

@@ -4,17 +4,22 @@ import { Ability } from "../../internal/ability";
 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 { DamageType, WeaponType } from "../../internal/unit+damage";
+import { CombatClassifications } from "../../object-data/auxiliary/combat-classification";
+import { AttackType } from "../../object-data/auxiliary/attack-type";
 export type DamageAbilityBehaviorParameters = {
     damagePerStrength?: AbilityDependentValue<number>;
     damagePerAgility?: AbilityDependentValue<number>;
     damagePerIntelligence?: AbilityDependentValue<number>;
-    attackType?: AttackType;
+    attackType?: AbilityDependentValue<AttackType>;
     damageType?: DamageType;
     weaponType?: WeaponType;
+    metadata?: AbilityDependentValue<string | number | boolean>;
 };
 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

@@ -48,9 +48,10 @@ function DamageSelfAbilityBehavior.prototype.onImpact(self, caster)
         self:calculateDamage(caster),
         nil,
         nil,
-        parameters and parameters.attackType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.attackType),
         parameters and parameters.damageType,
-        parameters and parameters.weaponType
+        parameters and parameters.weaponType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.metadata)
     )
 end
 ____exports.DamageTargetAbilityBehavior = __TS__Class()
@@ -67,9 +68,10 @@ function DamageTargetAbilityBehavior.prototype.onWidgetTargetImpact(self, caster
         self:calculateDamage(caster),
         nil,
         nil,
-        parameters and parameters.attackType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.attackType),
         parameters and parameters.damageType,
-        parameters and parameters.weaponType
+        parameters and parameters.weaponType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.metadata)
     )
 end
 local DamageAreaAbilityBehavior = __TS__Class()
@@ -82,10 +84,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)
@@ -98,9 +100,10 @@ function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
             damage,
             nil,
             nil,
-            parameters and parameters.attackType,
+            self:resolveCurrentAbilityDependentValue(parameters and parameters.attackType),
             parameters and parameters.damageType,
-            parameters and parameters.weaponType
+            parameters and parameters.weaponType,
+            self:resolveCurrentAbilityDependentValue(parameters and parameters.metadata)
         )
     end
 end

package/engine/behaviour/ability/emulate-impact.lua

@@ -10,6 +10,9 @@ local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTE
 local ____math = require("math")
 local max = ____math.max
 local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
+local ____sound = require("core.types.sound")
+local Sound3D = ____sound.Sound3D
+local SoundSettings = ____sound.SoundSettings
 ____exports.EmulateImpactAbilityBehavior = __TS__Class()
 local EmulateImpactAbilityBehavior = ____exports.EmulateImpactAbilityBehavior
 EmulateImpactAbilityBehavior.name = "EmulateImpactAbilityBehavior"
@@ -23,6 +26,10 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
     caster.mana = caster.mana - manaCost
     self.ability.cooldownRemaining = max(cooldown, MINIMUM_POSITIVE_NORMALIZED_FLOAT)
     self:flashCasterEffect(caster)
+    local soundPresetId = self.ability:getField(ABILITY_SF_EFFECT_SOUND)
+    if soundPresetId ~= "" then
+        Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
+    end
     AbilityBehavior:forAll(self.ability, "onImpact", caster)
 end
 return ____exports

package/engine/behaviour/ability.d.ts

@@ -22,13 +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, ...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

@@ -148,13 +148,14 @@ 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)
@@ -162,7 +163,8 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
             SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
             xOrWidget,
             attachmentPoint ~= "" and attachmentPoint or "origin",
-            yOrDuration
+            yOrParametersOrDuration,
+            durationOrParameters
         )
     end
 end
@@ -237,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;

package/engine/buff.d.ts

@@ -57,12 +57,14 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     attackSpeedIncreaseFactor?: NumberParameterValueType;
     movementSpeedIncreaseFactor?: NumberParameterValueType;
     evasionProbability?: NumberParameterValueType;
+    missProbability?: NumberParameterValueType;
     damageFactor?: NumberParameterValueType;
     receivedDamageFactor?: NumberParameterValueType;
     receivedMagicDamageFactor?: NumberParameterValueType;
     durationIncreaseOnAutoAttack?: NumberParameterValueType;
     maximumRemainingDuration?: NumberParameterValueType;
     maximumDuration?: NumberParameterValueType;
+    turnsIntoGhost?: BooleanParameterValueType;
     stuns?: BooleanParameterValueType;
     ignoresStunImmunity?: BooleanParameterValueType;
     providesStunImmunity?: BooleanParameterValueType;
@@ -80,46 +82,49 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     uniqueGroup?: BuffUniqueGroup;
 } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
 declare const enum BuffPropertyKey {
-    UNIT = 100,
-    SOURCE = 101,
-    DURATION = 102,
-    UNIQUE_GROUP = 103,
-    EFFECT_MODEL_PATH = 104,
-    SPECIAL_EFFECT_MODEL_PATH = 105,
-    DURATION_INCREASE_ON_AUTO_ATTACK = 106,
-    MAXIMUM_DURATION = 107,
-    MAXIMUM_REMAINING_DURATION = 108,
-    DAMAGE_OVER_DURATION = 109,
-    DAMAGE_PER_INTERVAL = 110,
-    DAMAGE_INTERVAL = 111,
-    REMAINING_DAMAGE_OVER_DURATION = 112,
-    DAMAGE_INTERVAL_TIMER = 113,
-    HEALING_OVER_DURATION = 114,
-    HEALING_PER_INTERVAL = 115,
-    HEALING_INTERVAL = 116,
-    REMAINING_HEALING_OVER_DURATION = 117,
-    HEALING_INTERVAL_TIMER = 118,
-    DAMAGE_ON_EXPIRATION = 119,
-    HEALING_ON_EXPIRATION = 120,
-    DAMAGE_UPON_DEATH_ALLOWED_TARGET_CLASSIFICATIONS = 121,
-    DAMAGE_UPON_DEATH = 122,
-    DAMAGE_UPON_DEATH_RANGE = 123,
-    MEDIUM_DAMAGE_UPON_DEATH = 124,
-    MEDIUM_DAMAGE_UPON_DEATH_RANGE = 125,
-    SMALL_DAMAGE_UPON_DEATH = 126,
-    SMALL_DAMAGE_UPON_DEATH_RANGE = 127,
-    AUTO_ATTACK_COUNT = 128,
-    MAXIMUM_AUTO_ATTACK_COUNT = 129,
-    DAMAGE_DEALT_EVENT_COUNT = 130,
-    MAXIMUM_DAMAGE_DEALT_EVENT_COUNT = 131,
-    DAMAGE_RECEIVED_EVENT_COUNT = 132,
-    MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT = 133,
-    STUNS = 134,
-    IGNORES_STUN_IMMUNITY = 135,
-    DISABLES_AUTO_ATTACK = 136,
-    PROVIDES_INVULNERABILITY = 137,
-    KILLS_ON_EXPIRATION = 138,
-    EXPLODES_ON_EXPIRATION = 139
+    STATE = 100,
+    UNIT = 101,
+    SOURCE = 102,
+    DURATION = 103,
+    UNIQUE_GROUP = 104,
+    EFFECT_MODEL_PATH = 105,
+    SPECIAL_EFFECT_MODEL_PATH = 106,
+    DURATION_INCREASE_ON_AUTO_ATTACK = 107,
+    MAXIMUM_DURATION = 108,
+    MAXIMUM_REMAINING_DURATION = 109,
+    DAMAGE_OVER_DURATION = 110,
+    DAMAGE_PER_INTERVAL = 111,
+    DAMAGE_INTERVAL = 112,
+    REMAINING_DAMAGE_OVER_DURATION = 113,
+    DAMAGE_INTERVAL_TIMER = 114,
+    HEALING_OVER_DURATION = 115,
+    HEALING_PER_INTERVAL = 116,
+    HEALING_INTERVAL = 117,
+    REMAINING_HEALING_OVER_DURATION = 118,
+    HEALING_INTERVAL_TIMER = 119,
+    DAMAGE_ON_EXPIRATION = 120,
+    HEALING_ON_EXPIRATION = 121,
+    DAMAGE_UPON_DEATH_ALLOWED_TARGET_CLASSIFICATIONS = 122,
+    DAMAGE_UPON_DEATH = 123,
+    DAMAGE_UPON_DEATH_RANGE = 124,
+    MEDIUM_DAMAGE_UPON_DEATH = 125,
+    MEDIUM_DAMAGE_UPON_DEATH_RANGE = 126,
+    SMALL_DAMAGE_UPON_DEATH = 127,
+    SMALL_DAMAGE_UPON_DEATH_RANGE = 128,
+    AUTO_ATTACK_COUNT = 129,
+    MAXIMUM_AUTO_ATTACK_COUNT = 130,
+    DAMAGE_DEALT_EVENT_COUNT = 131,
+    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
 }
 export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
@@ -133,13 +138,14 @@ 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>]
 ];
 export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = object> extends UnitBehavior {
     private _unit;
     protected readonly __additionalParametersBrand?: AdditionalParameters;
+    private [BuffPropertyKey.STATE];
     private [BuffPropertyKey.UNIT];
     private [BuffPropertyKey.SOURCE]?;
     private [BuffPropertyKey.DURATION];
@@ -174,6 +180,7 @@ 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]?;
@@ -193,6 +200,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private readonly _level?;
     private readonly _spellStealPriority?;
     private readonly _learnLevelMinimum?;
+    private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
     private _bonusIdByBonusType?;
     private readonly _abilityTypeIds?;
     private _behaviors?;
@@ -226,6 +234,8 @@ 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;