warscript 0.0.1-dev.ea69747 → 0.0.1-dev.ebee5b2

package/attributes.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+export type Attribute<T> = {
+    readonly __attribute: unique symbol;
+    readonly __type: T;
+} & symbol;
+export declare namespace Attribute {
+    const create: <T>() => Attribute<T>;
+}
+export declare class AttributesHolder {
+    readonly get: (<T>(attribute: Attribute<T>) => T | undefined) & LuaExtension<"TableGetMethod">;
+    readonly set: (<T>(attribute: Attribute<T>, value: T | undefined) => void) & LuaExtension<"TableSetMethod">;
+}

package/attributes.lua

@@ -0,0 +1,16 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local ____exports = {}
+____exports.Attribute = {}
+local Attribute = ____exports.Attribute
+do
+    Attribute.create = function()
+        return {}
+    end
+end
+____exports.AttributesHolder = __TS__Class()
+local AttributesHolder = ____exports.AttributesHolder
+AttributesHolder.name = "AttributesHolder"
+function AttributesHolder.prototype.____constructor(self)
+end
+return ____exports

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,9 +25,13 @@ export declare class Frame extends Handle<jframehandle> {
     static readonly GAME_UI: Frame;
     static readonly CONSOLE_UI: Frame;
     static readonly CONSOLE_UI_BACKDROP: Frame;
+    private static readonly CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD;
+    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;
+    static get uiScale(): number;
     static get leftBorder(): Frame;
     static get rightBorder(): Frame;
     static get minX(): number;

package/core/types/frame.lua

@@ -62,8 +62,10 @@ local function updateBorders()
     local width4by3 = (w - h / 600 * 800) / 2
     local pxtodpi = 0.6 / h
     BlzFrameSetAbsPoint(leftBorder, FRAMEPOINT_TOPLEFT, -width4by3 * pxtodpi, 0.6)
+    BlzFrameSetScale(leftBorder, 1)
     BlzFrameSetSize(leftBorder, 0.001, 0.6)
     BlzFrameSetAbsPoint(rightBorder, FRAMEPOINT_TOPRIGHT, (-width4by3 + w) * pxtodpi, 0.6)
+    BlzFrameSetScale(rightBorder, 1)
     BlzFrameSetSize(rightBorder, 0.001, 0.6)
 end
 local worldFrame = BlzGetOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0)
@@ -267,7 +269,16 @@ function Frame.createSimple(self, name, parent, createContext)
     ))
 end
 function Frame.create(self, name, parent, priority, createContext)
-    return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
+    if parent == ____exports.Frame.CONSOLE_UI_BACKDROP then
+        local helper = ____exports.Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD.handle
+        BlzFrameSetScale(helper, 1)
+        local frame = BlzCreateFrame(name, helper, priority or 0, createContext or 0)
+        BlzFrameSetScale(helper, ____exports.Frame.uiScale)
+        BlzFrameSetParent(frame, ____exports.Frame.CONSOLE_UI_BACKDROP.handle)
+        return self:of(frame)
+    else
+        return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
+    end
 end
 function Frame.createByType(self, typeName, name, parent, inherits, createContext)
     return self:of(BlzCreateFrameByType(
@@ -293,9 +304,19 @@ 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_UI_BACKDROP_UI_SCALE_HELPER_CHILD = ____exports.Frame:createByType("FRAME", "ConsoleUIBackdropUIScaleHelperChild", ____exports.Frame.CONSOLE_UI_BACKDROP)
+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)
+__TS__ObjectDefineProperty(
+    Frame,
+    "uiScale",
+    {get = function(self)
+        return ____exports.Frame.CONSOLE_BOTTOM_BAR.width / 0.8
+    end}
+)
 __TS__ObjectDefineProperty(
     Frame,
     "leftBorder",

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

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
+import { AttributesHolder } from "../../attributes";
 export type HandleConstructor<H extends jhandle, T extends Handle<H>, Args extends any[]> = new (handle: H, ...args: Args) => T;
 export type HandleDestructor = {
     readonly __handleDestructor: unique symbol;
@@ -11,7 +12,7 @@ type NoOverride = {
 declare const enum HandlePropertyKey {
     STATE = 0
 }
-export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> implements Destroyable {
+export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> extends AttributesHolder implements Destroyable {
     readonly handle: H;
     private [HandlePropertyKey.STATE]?;
     private onDestroyEvent?;

package/core/types/handle.lua

@@ -1,5 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__New = ____lualib.__TS__New
 local __TS__Delete = ____lualib.__TS__Delete
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -12,13 +13,17 @@ local getClass = ____reflection.getClass
 local getSuperclass = ____reflection.getSuperclass
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local ____attributes = require("attributes")
+local AttributesHolder = ____attributes.AttributesHolder
 local getHandleId = GetHandleId
 local onCreateEventByHandleConstructor = {}
 local onDestroyEventByHandleConstructor = {}
 ____exports.Handle = __TS__Class()
 local Handle = ____exports.Handle
 Handle.name = "Handle"
+__TS__ClassExtends(Handle, AttributesHolder)
 function Handle.prototype.____constructor(self, handle)
+    AttributesHolder.prototype.____constructor(self)
     self[0] = 0
     local id = getHandleId(handle)
     local clazz = self.constructor

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

@@ -5,7 +5,7 @@ export declare class Missile implements Destroyable {
     readonly retarget: (this: void, target: Unit | Vec2) => void;
     private readonly update;
     protected constructor(effect: jeffect, retarget: (this: void, target: Unit | Vec2) => void, update: (this: Missile) => boolean);
-    static launch(config: Readonly<{
+    static launch<T extends any[]>(config: Readonly<{
         art: string;
         scale?: number;
         acceleration?: number;
@@ -15,7 +15,7 @@ export declare class Missile implements Destroyable {
         maxSpeed?: number;
         sourceOffset?: Vec2;
         targetOffset?: Vec2;
-    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean) => void): Missile;
+    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean, ...parameters: T) => void, ...parameters: T): Missile;
     destroy(): void;
 }
 export declare namespace Missile {

package/core/types/missile.lua

@@ -41,7 +41,8 @@ function Missile.prototype.____constructor(self, effect, retarget, update)
     end
     head = self
 end
-function Missile.launch(self, config, source, target, onArrival)
+function Missile.launch(self, config, source, target, onArrival, ...)
+    local parameters = {...}
     local ____opt_0 = config.sourceOffset
     local offsetX = ____opt_0 and ____opt_0.x or 0
     local ____opt_2 = config.sourceOffset
@@ -142,7 +143,12 @@ function Missile.launch(self, config, source, target, onArrival)
             visualPositionArcY = currentVisualTargetY
             visualPositionArcZ = currentVisualTargetZ
             retarget = false
-            safeCall(onArrival, self, true)
+            safeCall(
+                onArrival,
+                self,
+                true,
+                table.unpack(parameters)
+            )
             return not retarget
         end
         if arcVSpeed ~= 0 and (currentTargetX ~= initialTargetX or currentTargetY ~= initialTargetY) then

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-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>
     ]);
 }

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

@@ -1,12 +1,21 @@
 /** @noSelfInFile */
 import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
-import { UnitBehaviorConstructor } from "../unit";
+import { UnitBehavior } from "../unit";
 import { Unit } from "../../internal/unit";
-export declare class ApplyUnitBehaviorAbilityBehavior<Args extends any[]> extends AbilityBehavior {
-    private readonly createUnitBehavior;
+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: UnitBehaviorConstructor<Args>, ...args: Args);
+    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/apply-unit-behavior.lua

@@ -1,23 +1,38 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
+local __TS__ArraySort = ____lualib.__TS__ArraySort
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____ability = require("engine.behaviour.ability")
 local AbilityBehavior = ____ability.AbilityBehavior
+local ____ability = require("engine.object-field.ability")
+local AbilityField = ____ability.AbilityField
+local AbilityLevelField = ____ability.AbilityLevelField
 ____exports.ApplyUnitBehaviorAbilityBehavior = __TS__Class()
 local ApplyUnitBehaviorAbilityBehavior = ____exports.ApplyUnitBehaviorAbilityBehavior
 ApplyUnitBehaviorAbilityBehavior.name = "ApplyUnitBehaviorAbilityBehavior"
 __TS__ClassExtends(ApplyUnitBehaviorAbilityBehavior, AbilityBehavior)
-function ApplyUnitBehaviorAbilityBehavior.prototype.____constructor(self, ability, unitBehaviorConstructor, ...)
-    local args = {...}
+function ApplyUnitBehaviorAbilityBehavior.prototype.____constructor(self, ability, unitBehaviorConstructor, parameters)
     AbilityBehavior.prototype.____constructor(self, ability)
-    self.createUnitBehavior = function(____, unit)
-        return __TS__New(
-            unitBehaviorConstructor,
-            unit,
-            table.unpack(args)
-        )
+    self.unitBehaviorConstructor = unitBehaviorConstructor
+    self.parameters = parameters
+    if parameters ~= nil then
+        self.keys = __TS__ArraySort(__TS__ObjectKeys(parameters))
+    end
+end
+function ApplyUnitBehaviorAbilityBehavior.prototype.update(self)
+    local unitBehavior = self.unitBehavior
+    local parameters = self.parameters
+    local keys = self.keys
+    if unitBehavior ~= nil and parameters ~= nil and keys ~= nil then
+        for ____, key in ipairs(keys) do
+            local value = parameters[key]
+            if value ~= nil then
+                unitBehavior[key] = self:resolveCurrentAbilityDependentValue(value)
+            end
+        end
     end
 end
 function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitGainAbility(self, unit)
@@ -25,7 +40,8 @@ function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitGainAbility(self, unit
     if ____opt_0 ~= nil then
         ____opt_0:destroy()
     end
-    self.unitBehavior = self:createUnitBehavior(unit)
+    self.unitBehavior = __TS__New(self.unitBehaviorConstructor, unit)
+    self:update()
 end
 function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitLoseAbility(self)
     local ____opt_2 = self.unitBehavior
@@ -33,4 +49,10 @@ function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitLoseAbility(self)
         ____opt_2:destroy()
     end
 end
+AbilityField.valueChangeEvent:addListener(function(ability)
+    ____exports.ApplyUnitBehaviorAbilityBehavior:forAll(ability, "update")
+end)
+AbilityLevelField.valueChangeEvent:addListener(function(ability)
+    ____exports.ApplyUnitBehaviorAbilityBehavior:forAll(ability, "update")
+end)
 return ____exports

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