warscript 0.0.1-dev.172070c → 0.0.1-dev.19d0f81

package/engine/behavior.d.ts

@@ -17,9 +17,9 @@ export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParame
     protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;
     protected stopPeriodicAction(): void;
     static count<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, limit?: number): number;
-    static getFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], Count extends [number] | []>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, ...[count]: Count): Count extends [number] ? T[] : T | undefined;
+    static getFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], CountOrPredicate extends [number] | [] | [(behavior: T, ...args: PredicateArgs) => boolean, ...PredicateArgs], PredicateArgs extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, ...[countOrPredicate]: CountOrPredicate): CountOrPredicate extends [number] ? T[] : T | undefined;
     static getLast<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
-    static getAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T[];
+    static getAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], PredicateArgs extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, predicate?: (this: void, behavior: T, ...args: PredicateArgs) => boolean, ...predicateArgs: PredicateArgs): T[];
     static forFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => any, ...parameters: ConsumerParameters): number;
     static forFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
     static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;

package/engine/behavior.lua

@@ -83,11 +83,11 @@ function Behavior.count(self, object, limit)
     end
     return behaviorsCount
 end
-function Behavior.getFirst(self, object, count)
+function Behavior.getFirst(self, object, countOrPredicate, ...)
     local behavior = firstBehaviorByObject[object]
-    if count == nil then
+    if type(countOrPredicate) ~= "number" then
         while behavior ~= nil do
-            if __TS__InstanceOf(behavior, self) then
+            if __TS__InstanceOf(behavior, self) and (countOrPredicate == nil or countOrPredicate(behavior, ...)) then
                 return behavior
             end
             behavior = behavior[1]
@@ -96,7 +96,7 @@ function Behavior.getFirst(self, object, count)
     end
     local behaviors = {}
     local behaviorsCount = 0
-    while behavior ~= nil and behaviorsCount < count do
+    while behavior ~= nil and behaviorsCount < countOrPredicate do
         if __TS__InstanceOf(behavior, self) then
             behaviorsCount = behaviorsCount + 1
             behaviors[behaviorsCount] = behavior
@@ -115,12 +115,12 @@ function Behavior.getLast(self, object)
     end
     return nil
 end
-function Behavior.getAll(self, object)
+function Behavior.getAll(self, object, predicate, ...)
     local behaviors = {}
     local behaviorsCount = 0
     local behavior = firstBehaviorByObject[object]
     while behavior ~= nil do
-        if __TS__InstanceOf(behavior, self) then
+        if __TS__InstanceOf(behavior, self) and (predicate == nil or predicate(behavior, ...)) then
             behaviorsCount = behaviorsCount + 1
             behaviors[behaviorsCount] = behavior
         end

package/engine/behaviour/ability/always-enabled.d.ts

@@ -0,0 +1,7 @@
+/** @noSelfInFile */
+import { AbilityBehavior } from "../ability";
+import { Destructor } from "../../../destroyable";
+export declare class AlwaysEnabledAbilityBehavior extends AbilityBehavior {
+    protected onCreate(): void;
+    protected onDestroy(): Destructor;
+}

package/engine/behaviour/ability/always-enabled.lua

@@ -0,0 +1,31 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
+local ____exports = {}
+local ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+local ____ability = require("engine.internal.ability")
+local UnitAbility = ____ability.UnitAbility
+local ____ability_2Ddisable_2Dcounter = require("engine.internal.misc.ability-disable-counter")
+local increaseAbilityDisableCounter = ____ability_2Ddisable_2Dcounter.increaseAbilityDisableCounter
+____exports.AlwaysEnabledAbilityBehavior = __TS__Class()
+local AlwaysEnabledAbilityBehavior = ____exports.AlwaysEnabledAbilityBehavior
+AlwaysEnabledAbilityBehavior.name = "AlwaysEnabledAbilityBehavior"
+__TS__ClassExtends(AlwaysEnabledAbilityBehavior, AbilityBehavior)
+function AlwaysEnabledAbilityBehavior.prototype.onCreate(self)
+    local ability = self.ability
+    if not __TS__InstanceOf(ability, UnitAbility) then
+        return
+    end
+    increaseAbilityDisableCounter(ability.owner.handle, ability.typeId, -10)
+end
+function AlwaysEnabledAbilityBehavior.prototype.onDestroy(self)
+    local ability = self.ability
+    if not __TS__InstanceOf(ability, UnitAbility) then
+        return AbilityBehavior.prototype.onDestroy(self)
+    end
+    increaseAbilityDisableCounter(ability.owner.handle, ability.typeId, 10)
+    return AbilityBehavior.prototype.onDestroy(self)
+end
+return ____exports

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

@@ -1,11 +1,9 @@
 /** @noSelfInFile */
 import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
-import { Buff, BuffConstructor, BuffParameters, BuffTypeIdSelectionPolicy } from "../../buff";
+import { Buff, BuffConstructor, BuffParameters, BuffPolarityParameterType, BuffResistanceTypeParameterType, BuffTypeIdSelectionPolicy } from "../../buff";
 import { Unit } from "../../internal/unit";
 import { ApplicableBuffTypeId } from "../../object-data/entry/buff-type/applicable";
-import { BuffResistanceType } from "../../object-data/auxiliary/buff-resistance-type";
-import { BuffPolarity } from "../../object-data/auxiliary/buff-polarity";
 import { Widget } from "../../../core/types/widget";
 type BuffParametersType<T extends BuffConstructor> = BuffParameters & Omit<BuffAdditionalParametersType<T>, keyof BuffParameters>;
 type BuffAdditionalParametersType<T extends BuffConstructor> = T extends BuffConstructor<Buff<infer AdditionalParameters>> ? AdditionalParameters : never;
@@ -17,8 +15,8 @@ export declare abstract class ApplyBuffAbilityBehavior<T extends BuffConstructor
             typeIds: [ApplicableBuffTypeId, ...ApplicableBuffTypeId[]],
             typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
         ],
-        polarity: BuffPolarity,
-        resistanceType: BuffResistanceType,
+        polarity: BuffPolarityParameterType,
+        resistanceType: BuffResistanceTypeParameterType,
         parameters?: BuffParametersType<T>
     ]);
 }
@@ -35,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

@@ -4,28 +4,46 @@ import { Ability } from "../../internal/ability";
 import { Unit } from "../../internal/unit";
 import { AbilityDependentValue } from "../../object-field/ability";
 import { Widget } from "../../../core/types/widget";
-export declare class DamageSelfAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>);
+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;
+    damageType?: DamageType;
+    weaponType?: WeaponType;
+};
+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>;
+    protected readonly parameters?: T | undefined;
+    protected constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: T | undefined);
+    protected calculateDamage(caster: Unit): number;
+}
+export declare class DamageSelfAbilityBehavior extends DamageAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAbilityBehaviorParameters);
     onImpact(caster: Unit): void;
 }
-export declare class DamageTargetAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>);
+export declare class DamageTargetAbilityBehavior extends DamageAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAbilityBehaviorParameters);
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
 }
-declare abstract class DamageAreaAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    private readonly maximumDamage?;
-    protected constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number> | undefined);
+declare abstract class DamageAreaAbilityBehavior extends DamageAbilityBehavior<DamageAreaAbilityBehaviorParameters> {
+    protected constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
     protected damageArea(caster: Unit, x: number, y: number): void;
 }
 export declare class DamageSelfAreaAbilityBehavior extends DamageAreaAbilityBehavior {
-    constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number>);
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
     onImpact(caster: Unit): void;
 }
 export declare class DamageTargetAreaAbilityBehavior extends DamageAreaAbilityBehavior {
-    constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number>);
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
     onNoTargetImpact(caster: Unit): void;
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
     onPointTargetImpact(caster: Unit, x: number, y: number): void;

package/engine/behaviour/ability/damage.lua

@@ -9,65 +9,107 @@ local Unit = ____unit.Unit
 local ____ability = require("engine.standard.fields.ability")
 local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD
 local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
+local DamageAbilityBehavior = __TS__Class()
+DamageAbilityBehavior.name = "DamageAbilityBehavior"
+__TS__ClassExtends(DamageAbilityBehavior, AbilityBehavior)
+function DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    AbilityBehavior.prototype.____constructor(self, ability)
+    self.damage = damage
+    self.parameters = parameters
+end
+function DamageAbilityBehavior.prototype.calculateDamage(self, caster)
+    local parameters = self.parameters
+    local damage = self:resolveCurrentAbilityDependentValue(self.damage)
+    local damagePerStrength = self:resolveCurrentAbilityDependentValue(parameters and parameters.damagePerStrength or 0)
+    if damagePerStrength ~= 0 then
+        damage = damage + damagePerStrength * caster.strength
+    end
+    local damagePerAgility = self:resolveCurrentAbilityDependentValue(parameters and parameters.damagePerAgility or 0)
+    if damagePerAgility ~= 0 then
+        damage = damage + damagePerAgility * caster.agility
+    end
+    local damagePerIntelligence = self:resolveCurrentAbilityDependentValue(parameters and parameters.damagePerIntelligence or 0)
+    if damagePerIntelligence ~= 0 then
+        damage = damage + damagePerIntelligence * caster.intelligence
+    end
+    return damage
+end
 ____exports.DamageSelfAbilityBehavior = __TS__Class()
 local DamageSelfAbilityBehavior = ____exports.DamageSelfAbilityBehavior
 DamageSelfAbilityBehavior.name = "DamageSelfAbilityBehavior"
-__TS__ClassExtends(DamageSelfAbilityBehavior, AbilityBehavior)
-function DamageSelfAbilityBehavior.prototype.____constructor(self, ability, damage)
-    AbilityBehavior.prototype.____constructor(self, ability)
-    self.damage = damage
+__TS__ClassExtends(DamageSelfAbilityBehavior, DamageAbilityBehavior)
+function DamageSelfAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
 end
 function DamageSelfAbilityBehavior.prototype.onImpact(self, caster)
+    local parameters = self.parameters
     caster:damageTarget(
         caster,
-        self:resolveCurrentAbilityDependentValue(self.damage)
+        self:calculateDamage(caster),
+        nil,
+        nil,
+        parameters and parameters.attackType,
+        parameters and parameters.damageType,
+        parameters and parameters.weaponType
     )
 end
 ____exports.DamageTargetAbilityBehavior = __TS__Class()
 local DamageTargetAbilityBehavior = ____exports.DamageTargetAbilityBehavior
 DamageTargetAbilityBehavior.name = "DamageTargetAbilityBehavior"
-__TS__ClassExtends(DamageTargetAbilityBehavior, AbilityBehavior)
-function DamageTargetAbilityBehavior.prototype.____constructor(self, ability, damage)
-    AbilityBehavior.prototype.____constructor(self, ability)
-    self.damage = damage
+__TS__ClassExtends(DamageTargetAbilityBehavior, DamageAbilityBehavior)
+function DamageTargetAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
 end
 function DamageTargetAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
+    local parameters = self.parameters
     caster:damageTarget(
         target,
-        self:resolveCurrentAbilityDependentValue(self.damage)
+        self:calculateDamage(caster),
+        nil,
+        nil,
+        parameters and parameters.attackType,
+        parameters and parameters.damageType,
+        parameters and parameters.weaponType
     )
 end
 local DamageAreaAbilityBehavior = __TS__Class()
 DamageAreaAbilityBehavior.name = "DamageAreaAbilityBehavior"
-__TS__ClassExtends(DamageAreaAbilityBehavior, AbilityBehavior)
-function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
-    AbilityBehavior.prototype.____constructor(self, ability)
-    self.damage = damage
-    self.maximumDamage = maximumDamage
+__TS__ClassExtends(DamageAreaAbilityBehavior, DamageAbilityBehavior)
+function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
 end
 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:resolveCurrentAbilityDependentValue(self.damage)
-    local maximumDamage = self:resolveCurrentAbilityDependentValue(self.maximumDamage or 0)
+    local damage = self:calculateDamage(caster)
+    local maximumDamage = self:resolveCurrentAbilityDependentValue(parameters and parameters.maximumDamage or 0)
     if maximumDamage ~= 0 and damage > maximumDamage then
         damage = maximumDamage / #targets
     end
     for ____, target in ipairs(targets) do
-        caster:damageTarget(target, damage)
+        caster:damageTarget(
+            target,
+            damage,
+            nil,
+            nil,
+            parameters and parameters.attackType,
+            parameters and parameters.damageType,
+            parameters and parameters.weaponType
+        )
     end
 end
 ____exports.DamageSelfAreaAbilityBehavior = __TS__Class()
 local DamageSelfAreaAbilityBehavior = ____exports.DamageSelfAreaAbilityBehavior
 DamageSelfAreaAbilityBehavior.name = "DamageSelfAreaAbilityBehavior"
 __TS__ClassExtends(DamageSelfAreaAbilityBehavior, DamageAreaAbilityBehavior)
-function DamageSelfAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
-    DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
+function DamageSelfAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
 end
 function DamageSelfAreaAbilityBehavior.prototype.onImpact(self, caster)
     self:damageArea(caster, caster.x, caster.y)
@@ -76,8 +118,8 @@ ____exports.DamageTargetAreaAbilityBehavior = __TS__Class()
 local DamageTargetAreaAbilityBehavior = ____exports.DamageTargetAreaAbilityBehavior
 DamageTargetAreaAbilityBehavior.name = "DamageTargetAreaAbilityBehavior"
 __TS__ClassExtends(DamageTargetAreaAbilityBehavior, DamageAreaAbilityBehavior)
-function DamageTargetAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
-    DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
+function DamageTargetAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
 end
 function DamageTargetAreaAbilityBehavior.prototype.onNoTargetImpact(self, caster)
     self:damageArea(caster, caster.x, caster.y)

package/engine/behaviour/ability/emulate-impact.d.ts

@@ -0,0 +1,6 @@
+/** @noSelfInFile */
+import { AbilityBehavior } from "../ability";
+import { Unit } from "../../internal/unit";
+export declare abstract class EmulateImpactAbilityBehavior extends AbilityBehavior {
+    protected emulateImpact(caster: Unit): void;
+}

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

@@ -0,0 +1,35 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+local ____ability = require("engine.standard.fields.ability")
+local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
+local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTEGER_LEVEL_FIELD
+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"
+__TS__ClassExtends(EmulateImpactAbilityBehavior, AbilityBehavior)
+function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
+    local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
+    local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
+    if self.ability.cooldownRemaining ~= 0 or caster.mana < manaCost then
+        return
+    end
+    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/heal.d.ts

@@ -4,13 +4,40 @@ import { Ability } from "../../internal/ability";
 import { Unit } from "../../internal/unit";
 import { AbilityDependentValue } from "../../object-field/ability";
 import { AbilityBehavior } from "../ability";
-export declare class HealSelfAbilityBehavior extends AbilityBehavior {
-    private readonly healing;
-    constructor(ability: Ability, healing: AbilityDependentValue<number>);
+export type HealAbilityBehaviorParameters = {
+    healingPerStrength?: AbilityDependentValue<number>;
+    healingPerAgility?: AbilityDependentValue<number>;
+    healingPerIntelligence?: AbilityDependentValue<number>;
+};
+export type HealAreaAbilityBehaviorParameters = HealAbilityBehaviorParameters & {
+    maximumHealing?: AbilityDependentValue<number>;
+};
+declare abstract class HealAbilityBehavior<T extends HealAbilityBehaviorParameters = HealAbilityBehaviorParameters> extends AbilityBehavior {
+    protected readonly healing: AbilityDependentValue<number>;
+    protected readonly parameters?: T | undefined;
+    protected constructor(ability: Ability, healing: AbilityDependentValue<number>, parameters?: T | undefined);
+    protected calculateHealing(caster: Unit): number;
+}
+export declare class HealSelfAbilityBehavior extends HealAbilityBehavior {
+    constructor(ability: Ability, healing: AbilityDependentValue<number>, parameters?: HealAbilityBehaviorParameters);
+    onImpact(caster: Unit): void;
+}
+export declare class HealTargetAbilityBehavior extends HealAbilityBehavior {
+    constructor(ability: Ability, healing: AbilityDependentValue<number>, parameters?: HealAbilityBehaviorParameters);
+    onWidgetTargetImpact(caster: Unit, target: Widget): void;
+}
+declare abstract class HealAreaAbilityBehavior extends HealAbilityBehavior<HealAreaAbilityBehaviorParameters> {
+    protected constructor(ability: Ability, healing: AbilityDependentValue<number>, parameters?: HealAreaAbilityBehaviorParameters);
+    protected healArea(caster: Unit, x: number, y: number): void;
+}
+export declare class HealSelfAreaAbilityBehavior extends HealAreaAbilityBehavior {
+    constructor(ability: Ability, healing: AbilityDependentValue<number>, parameters?: HealAreaAbilityBehaviorParameters);
     onImpact(caster: Unit): void;
 }
-export declare class HealTargetAbilityBehavior extends AbilityBehavior {
-    private readonly healing;
-    constructor(ability: Ability, healing: AbilityDependentValue<number>);
+export declare class HealTargetAreaAbilityBehavior extends HealAreaAbilityBehavior {
+    constructor(ability: Ability, healing: AbilityDependentValue<number>, parameters?: HealAreaAbilityBehaviorParameters);
+    onNoTargetImpact(caster: Unit): void;
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
+    onPointTargetImpact(caster: Unit, x: number, y: number): void;
 }
+export {};

package/engine/behaviour/ability/heal.lua

@@ -2,34 +2,113 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
 local ____ability = require("engine.behaviour.ability")
 local AbilityBehavior = ____ability.AbilityBehavior
+local ____ability = require("engine.standard.fields.ability")
+local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD
+local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
+local HealAbilityBehavior = __TS__Class()
+HealAbilityBehavior.name = "HealAbilityBehavior"
+__TS__ClassExtends(HealAbilityBehavior, AbilityBehavior)
+function HealAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+    AbilityBehavior.prototype.____constructor(self, ability)
+    self.healing = healing
+    self.parameters = parameters
+end
+function HealAbilityBehavior.prototype.calculateHealing(self, caster)
+    local parameters = self.parameters
+    local healing = self:resolveCurrentAbilityDependentValue(self.healing)
+    local healingPerStrength = self:resolveCurrentAbilityDependentValue(parameters and parameters.healingPerStrength or 0)
+    if healingPerStrength ~= 0 then
+        healing = healing + healingPerStrength * caster.strength
+    end
+    local healingPerAgility = self:resolveCurrentAbilityDependentValue(parameters and parameters.healingPerAgility or 0)
+    if healingPerAgility ~= 0 then
+        healing = healing + healingPerAgility * caster.agility
+    end
+    local healingPerIntelligence = self:resolveCurrentAbilityDependentValue(parameters and parameters.healingPerIntelligence or 0)
+    if healingPerIntelligence ~= 0 then
+        healing = healing + healingPerIntelligence * caster.intelligence
+    end
+    return healing
+end
 ____exports.HealSelfAbilityBehavior = __TS__Class()
 local HealSelfAbilityBehavior = ____exports.HealSelfAbilityBehavior
 HealSelfAbilityBehavior.name = "HealSelfAbilityBehavior"
-__TS__ClassExtends(HealSelfAbilityBehavior, AbilityBehavior)
-function HealSelfAbilityBehavior.prototype.____constructor(self, ability, healing)
-    AbilityBehavior.prototype.____constructor(self, ability)
-    self.healing = healing
+__TS__ClassExtends(HealSelfAbilityBehavior, HealAbilityBehavior)
+function HealSelfAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+    HealAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
 end
 function HealSelfAbilityBehavior.prototype.onImpact(self, caster)
     caster:healTarget(
         caster,
-        self:resolveCurrentAbilityDependentValue(self.healing)
+        self:calculateHealing(caster)
     )
 end
 ____exports.HealTargetAbilityBehavior = __TS__Class()
 local HealTargetAbilityBehavior = ____exports.HealTargetAbilityBehavior
 HealTargetAbilityBehavior.name = "HealTargetAbilityBehavior"
-__TS__ClassExtends(HealTargetAbilityBehavior, AbilityBehavior)
-function HealTargetAbilityBehavior.prototype.____constructor(self, ability, healing)
-    AbilityBehavior.prototype.____constructor(self, ability)
-    self.healing = healing
+__TS__ClassExtends(HealTargetAbilityBehavior, HealAbilityBehavior)
+function HealTargetAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+    HealAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
 end
 function HealTargetAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
     caster:healTarget(
         target,
-        self:resolveCurrentAbilityDependentValue(self.healing)
+        self:calculateHealing(caster)
+    )
+end
+local HealAreaAbilityBehavior = __TS__Class()
+HealAreaAbilityBehavior.name = "HealAreaAbilityBehavior"
+__TS__ClassExtends(HealAreaAbilityBehavior, HealAbilityBehavior)
+function HealAreaAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+    HealAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+end
+function HealAreaAbilityBehavior.prototype.healArea(self, caster, x, y)
+    local targets = Unit.getAllowedTargetsInCollisionRange(
+        caster,
+        self:resolveCurrentAbilityDependentValue(ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
+        x,
+        y,
+        self:resolveCurrentAbilityDependentValue(AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD)
     )
+    local healing = self:calculateHealing(caster)
+    local ____self_resolveCurrentAbilityDependentValue_8 = self.resolveCurrentAbilityDependentValue
+    local ____opt_6 = self.parameters
+    local maximumHealing = ____self_resolveCurrentAbilityDependentValue_8(self, ____opt_6 and ____opt_6.maximumHealing or 0)
+    if maximumHealing ~= 0 and healing > maximumHealing then
+        healing = maximumHealing / #targets
+    end
+    for ____, target in ipairs(targets) do
+        caster:healTarget(target, healing)
+    end
+end
+____exports.HealSelfAreaAbilityBehavior = __TS__Class()
+local HealSelfAreaAbilityBehavior = ____exports.HealSelfAreaAbilityBehavior
+HealSelfAreaAbilityBehavior.name = "HealSelfAreaAbilityBehavior"
+__TS__ClassExtends(HealSelfAreaAbilityBehavior, HealAreaAbilityBehavior)
+function HealSelfAreaAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+    HealAreaAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+end
+function HealSelfAreaAbilityBehavior.prototype.onImpact(self, caster)
+    self:healArea(caster, caster.x, caster.y)
+end
+____exports.HealTargetAreaAbilityBehavior = __TS__Class()
+local HealTargetAreaAbilityBehavior = ____exports.HealTargetAreaAbilityBehavior
+HealTargetAreaAbilityBehavior.name = "HealTargetAreaAbilityBehavior"
+__TS__ClassExtends(HealTargetAreaAbilityBehavior, HealAreaAbilityBehavior)
+function HealTargetAreaAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+    HealAreaAbilityBehavior.prototype.____constructor(self, ability, healing, parameters)
+end
+function HealTargetAreaAbilityBehavior.prototype.onNoTargetImpact(self, caster)
+    self:healArea(caster, caster.x, caster.y)
+end
+function HealTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
+    self:healArea(caster, target.x, target.y)
+end
+function HealTargetAreaAbilityBehavior.prototype.onPointTargetImpact(self, caster, x, y)
+    self:healArea(caster, x, y)
 end
 return ____exports

package/engine/behaviour/ability/instant-impact.d.ts

@@ -1,6 +1,6 @@
 /** @noSelfInFile */
-import { AbilityBehavior } from "../ability";
 import { Unit } from "../../internal/unit";
-export declare class InstantImpactAbilityBehavior extends AbilityBehavior {
+import { EmulateImpactAbilityBehavior } from "./emulate-impact";
+export declare class InstantImpactAbilityBehavior extends EmulateImpactAbilityBehavior {
     onCastingStart(caster: Unit): void;
 }

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

@@ -2,28 +2,13 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
-local ____ability = require("engine.behaviour.ability")
-local AbilityBehavior = ____ability.AbilityBehavior
-local ____ability = require("engine.standard.fields.ability")
-local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
-local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTEGER_LEVEL_FIELD
+local ____emulate_2Dimpact = require("engine.behaviour.ability.emulate-impact")
+local EmulateImpactAbilityBehavior = ____emulate_2Dimpact.EmulateImpactAbilityBehavior
 ____exports.InstantImpactAbilityBehavior = __TS__Class()
 local InstantImpactAbilityBehavior = ____exports.InstantImpactAbilityBehavior
 InstantImpactAbilityBehavior.name = "InstantImpactAbilityBehavior"
-__TS__ClassExtends(InstantImpactAbilityBehavior, AbilityBehavior)
+__TS__ClassExtends(InstantImpactAbilityBehavior, EmulateImpactAbilityBehavior)
 function InstantImpactAbilityBehavior.prototype.onCastingStart(self, caster)
-    local abilityTypeId = self.ability.typeId
-    local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
-    local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
-    if caster:getAbilityRemainingCooldown(abilityTypeId) ~= 0 or caster.mana < manaCost then
-        return
-    end
-    caster.mana = caster.mana - manaCost
-    if cooldown == 0 then
-        caster:interruptCast(self.ability.typeId)
-    else
-        caster:startAbilityCooldown(self.ability.typeId, cooldown)
-    end
-    AbilityBehavior:forAll(self.ability, "onImpact", caster)
+    self:emulateImpact(caster)
 end
 return ____exports