warscript 0.0.1-dev.cc63edd → 0.0.1-dev.d30161d

package/attributes.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export type Attribute<T> = {
     readonly __attribute: unique symbol;

package/binaryreader.d.ts

@@ -3,6 +3,7 @@ export declare class BinaryReader {
     private readonly s;
     private i;
     constructor(data: string);
+    toString(): string;
     read(fmt: string): any;
     readBytes(size: number): string;
     readDouble(): number;

package/binaryreader.lua

@@ -9,6 +9,9 @@ function BinaryReader.prototype.____constructor(self, data)
     self.i = 1
     self.s = data
 end
+function BinaryReader.prototype.__tostring(self)
+    return self.s
+end
 function BinaryReader.prototype.read(self, fmt)
     local value, pos = ____unpack(">" .. fmt, self.s, self.i)
     self.i = pos

package/core/types/frame.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Player } from "./player";
@@ -26,6 +25,8 @@ export declare class Frame extends Handle<jframehandle> {
     static readonly GAME_UI: Frame;
     static readonly CONSOLE_UI: Frame;
     static readonly CONSOLE_UI_BACKDROP: Frame;
+    static readonly CONSOLE_TOP_BAR: Frame;
+    static readonly CONSOLE_BOTTOM_BAR: Frame;
     static readonly WORLD: Frame;
     static readonly CHAT: Frame;
     static readonly TIME_OF_DAY_CLOCK: Frame;

package/core/types/frame.lua

@@ -293,6 +293,8 @@ end
 Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
 Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)
 Frame.CONSOLE_UI_BACKDROP = ____exports.Frame:byName("ConsoleUIBackdrop")
+Frame.CONSOLE_TOP_BAR = ____exports.Frame:byName("ConsoleTopBar")
+Frame.CONSOLE_BOTTOM_BAR = ____exports.Frame:byName("ConsoleBottomBar")
 Frame.WORLD = ____exports.Frame:byOrigin(ORIGIN_FRAME_WORLD_FRAME)
 Frame.CHAT = ____exports.Frame:byOrigin(ORIGIN_FRAME_CHAT_MSG)
 Frame.TIME_OF_DAY_CLOCK = ____exports.Frame.GAME_UI:getChild(5):getChild(0)

package/core/types/group.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Widget } from "./widget";
 import { Unit } from "../../engine/internal/unit";

package/core/types/image.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Color } from "./color";

package/core/types/unit.lua

@@ -21,4 +21,12 @@ do
         end
     end
 end
+do
+    local ____export = require("engine.internal.unit+rally")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 return ____exports

package/decl/index.d.ts

@@ -3,6 +3,7 @@
 /// <reference path="./native.d.ts"/>
 /// <reference types="warpack-types/warpack"/>
 /// <reference types="lua-types/5.3"/>
+/// <reference types="@warscript/language-extensions" />
 
 declare function setmetatable<
     T extends object,

package/engine/ability.d.ts

@@ -2,4 +2,4 @@
 import { AbilityTypeId } from "./object-data/entry/ability-type";
 import { UnitAbility } from "./internal/ability";
 import { Player } from "../core/types/player";
-export declare const castAbility: (owner: Player, abilityTypeId: AbilityTypeId, ...args: [x: number, y: number] | [number, x: number, y: number] | [(ability: UnitAbility) => void, x: number, y: number]) => void;
+export declare const castAbility: (owner: Player, abilityTypeId: AbilityTypeId, ...args: [...levelOrAbilityConsumer: [number] | [(ability: UnitAbility) => void] | [], x: number, y: number]) => void;

package/engine/behavior.d.ts

@@ -1,12 +1,12 @@
 /** @noSelfInFile */
 import { AbstractDestroyable, Destructor } from "../destroyable";
-export type BehaviorConstructor<T extends Behavior<any>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
+export type BehaviorConstructor<T extends Behavior<AnyNotNil>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
 declare const enum BehaviorPropertyKey {
     PREVIOUS_BEHAVIOR = 0,
     NEXT_BEHAVIOR = 1,
     TIMER = 2
 }
-export declare abstract class Behavior<T, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
+export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
     protected readonly object: T;
     private [BehaviorPropertyKey.PREVIOUS_BEHAVIOR]?;
     private [BehaviorPropertyKey.NEXT_BEHAVIOR]?;
@@ -16,13 +16,13 @@ export declare abstract class Behavior<T, PeriodicActionParameters extends any[]
     protected onPeriod(...parameters: PeriodicActionParameters): void;
     protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;
     protected stopPeriodicAction(): void;
-    static count<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, limit?: number): number;
-    static getFirst<T extends Behavior<any>, 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 getLast<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
-    static getAll<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T[];
-    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, consumer: (behavior: T, ...parameters: ConsumerParameters) => any, ...parameters: ConsumerParameters): number;
-    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (...args: any) => any ? Parameters<T[K]> : never): number;
-    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
-    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (...args: any) => any ? Parameters<T[K]> : never): number;
+    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 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 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;
+    static forAll<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, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
 }
 export {};

package/engine/behaviour/ability/apply-unit-behavior.d.ts

@@ -3,14 +3,19 @@ import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
 import { UnitBehavior } from "../unit";
 import { Unit } from "../../internal/unit";
+import { MutableKeys } from "../../../utility/types";
 import { AbilityDependentValue } from "../../object-field/ability";
+type UnitBehaviorParameters<T extends UnitBehavior> = Partial<{
+    [K in MutableKeys<T> & KeysOfType<T, boolean | number | string>]: T[K] extends boolean | number | string ? AbilityDependentValue<T[K]> : never;
+}>;
 export declare class ApplyUnitBehaviorAbilityBehavior<T extends UnitBehavior> extends AbilityBehavior {
     private readonly unitBehaviorConstructor;
     private readonly parameters?;
     private readonly keys?;
     private unitBehavior?;
-    constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: Partial<{ [K in keyof T & { [P in keyof T]-?: (<T_1>() => T_1 extends { [Q in P]: T[P]; } ? 1 : 2) extends <T_2>() => T_2 extends { -readonly [Q_1 in P]: T[P]; } ? 1 : 2 ? P : never; }[keyof T] & KeysOfType<T, string | number | boolean>]: T[K] extends string | number | boolean ? AbilityDependentValue<T[K]> : never; }> | undefined);
+    constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: UnitBehaviorParameters<T> | undefined);
     update(): void;
     onUnitGainAbility(unit: Unit): void;
     onUnitLoseAbility(): void;
 }
+export {};

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

@@ -4,22 +4,44 @@ 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 { AttackType, DamageType, WeaponType } from "../../internal/unit+damage";
+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>;
+};
+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;
 }
-export declare class DamageTargetAreaAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    private readonly maximumDamage?;
-    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>, parameters?: DamageAreaAbilityBehaviorParameters);
+    onImpact(caster: Unit): void;
+}
+export declare class DamageTargetAreaAbilityBehavior extends DamageAreaAbilityBehavior {
+    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;
-    private damageArea;
 }
+export {};

package/engine/behaviour/ability/damage.lua

@@ -9,53 +9,77 @@ 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
-____exports.DamageTargetAreaAbilityBehavior = __TS__Class()
-local DamageTargetAreaAbilityBehavior = ____exports.DamageTargetAreaAbilityBehavior
-DamageTargetAreaAbilityBehavior.name = "DamageTargetAreaAbilityBehavior"
-__TS__ClassExtends(DamageTargetAreaAbilityBehavior, AbilityBehavior)
-function DamageTargetAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
-    AbilityBehavior.prototype.____constructor(self, ability)
-    self.damage = damage
-    self.maximumDamage = maximumDamage
+local DamageAreaAbilityBehavior = __TS__Class()
+DamageAreaAbilityBehavior.name = "DamageAreaAbilityBehavior"
+__TS__ClassExtends(DamageAreaAbilityBehavior, DamageAbilityBehavior)
+function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
 end
-function DamageTargetAreaAbilityBehavior.prototype.onNoTargetImpact(self, caster)
-    self:damageArea(caster, caster.x, caster.y)
-end
-function DamageTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
-    self:damageArea(caster, target.x, target.y)
-end
-function DamageTargetAreaAbilityBehavior.prototype.onPointTargetImpact(self, caster, x, y)
-    self:damageArea(caster, x, y)
-end
-function DamageTargetAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
+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),
@@ -63,13 +87,47 @@ function DamageTargetAreaAbilityBehavior.prototype.damageArea(self, caster, x, y
         y,
         self:resolveCurrentAbilityDependentValue(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, parameters)
+    DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+end
+function DamageSelfAreaAbilityBehavior.prototype.onImpact(self, caster)
+    self:damageArea(caster, caster.x, caster.y)
+end
+____exports.DamageTargetAreaAbilityBehavior = __TS__Class()
+local DamageTargetAreaAbilityBehavior = ____exports.DamageTargetAreaAbilityBehavior
+DamageTargetAreaAbilityBehavior.name = "DamageTargetAreaAbilityBehavior"
+__TS__ClassExtends(DamageTargetAreaAbilityBehavior, DamageAreaAbilityBehavior)
+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)
+end
+function DamageTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
+    self:damageArea(caster, target.x, target.y)
+end
+function DamageTargetAreaAbilityBehavior.prototype.onPointTargetImpact(self, caster, x, y)
+    self:damageArea(caster, x, y)
+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/restore-mana.d.ts

@@ -0,0 +1,15 @@
+/** @noSelfInFile */
+import { Ability } from "../../internal/ability";
+import { Unit } from "../../internal/unit";
+import { AbilityDependentValue } from "../../object-field/ability";
+import { AbilityBehavior } from "../ability";
+export declare class RestoreManaSelfAbilityBehavior extends AbilityBehavior {
+    private readonly mana;
+    constructor(ability: Ability, mana: AbilityDependentValue<number>);
+    onImpact(caster: Unit): void;
+}
+export declare class RestoreManaAbilityBehavior extends AbilityBehavior {
+    private readonly mana;
+    constructor(ability: Ability, mana: AbilityDependentValue<number>);
+    onUnitTargetImpact(caster: Unit, target: Unit): void;
+}

package/engine/behaviour/ability/restore-mana.lua

@@ -0,0 +1,29 @@
+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
+____exports.RestoreManaSelfAbilityBehavior = __TS__Class()
+local RestoreManaSelfAbilityBehavior = ____exports.RestoreManaSelfAbilityBehavior
+RestoreManaSelfAbilityBehavior.name = "RestoreManaSelfAbilityBehavior"
+__TS__ClassExtends(RestoreManaSelfAbilityBehavior, AbilityBehavior)
+function RestoreManaSelfAbilityBehavior.prototype.____constructor(self, ability, mana)
+    AbilityBehavior.prototype.____constructor(self, ability)
+    self.mana = mana
+end
+function RestoreManaSelfAbilityBehavior.prototype.onImpact(self, caster)
+    caster.mana = caster.mana + self:resolveCurrentAbilityDependentValue(self.mana)
+end
+____exports.RestoreManaAbilityBehavior = __TS__Class()
+local RestoreManaAbilityBehavior = ____exports.RestoreManaAbilityBehavior
+RestoreManaAbilityBehavior.name = "RestoreManaAbilityBehavior"
+__TS__ClassExtends(RestoreManaAbilityBehavior, AbilityBehavior)
+function RestoreManaAbilityBehavior.prototype.____constructor(self, ability, mana)
+    AbilityBehavior.prototype.____constructor(self, ability)
+    self.mana = mana
+end
+function RestoreManaAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
+    target.mana = target.mana + self:resolveCurrentAbilityDependentValue(self.mana)
+end
+return ____exports

package/engine/behaviour/unit/stun-immunity.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { UnitBehavior } from "../unit";
 import { Unit } from "../../unit";

package/engine/behaviour/unit.d.ts

@@ -2,6 +2,7 @@
 import { Behavior } from "../behavior";
 import { Ability } from "../internal/ability";
 import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
+import "../internal/unit+ability";
 import "../internal/unit-missile-launch";
 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> {
@@ -13,8 +14,8 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onDamageDealt(target: Unit, event: DamageEvent): void;
     onDamageReceiving(source: Unit | undefined, event: DamagingEvent): void;
     onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
-    protected onAbilityGained(ability: Ability): void;
-    protected onAbilityLost(ability: Ability): void;
+    onAbilityGained(ability: Ability): void;
+    onAbilityLost(ability: Ability): void;
     onKill(target: Unit): void;
     onDeath(source: Unit | undefined): void;
 }

package/engine/behaviour/unit.lua

@@ -7,6 +7,7 @@ local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit+ability")
 require("engine.internal.unit-missile-launch")
 ____exports.UnitBehavior = __TS__Class()
 local UnitBehavior = ____exports.UnitBehavior
@@ -62,6 +63,12 @@ __TS__SetDescriptor(
         end
         ____exports.UnitBehavior:forAll(target, "onDamageReceived", source, event)
     end)
+    Unit.abilityGainedEvent:addListener(function(source, target)
+        ____exports.UnitBehavior:forAll(source, "onAbilityGained", target)
+    end)
+    Unit.abilityLostEvent:addListener(function(source, target)
+        ____exports.UnitBehavior:forAll(source, "onAbilityLost", target)
+    end)
     Unit.deathEvent:addListener(function(target, source)
         if source ~= nil then
             ____exports.UnitBehavior:forAll(source, "onKill", target)