warscript 0.0.1-dev.c677d41 → 0.0.1-dev.c762beb

package/core/types/handle.lua

@@ -34,7 +34,7 @@ function Handle.prototype.____constructor(self, handle)
     self.handle = handle
 end
 function Handle.of(self, handle, ...)
-    return handle and (getHandleId(handle) ~= 0 or nil) and (self.memoized[getHandleId(handle)] or self:createInternal(handle, ...))
+    return handle and (self.memoized[getHandleId(handle)] or self:createInternal(handle, ...))
 end
 function Handle.createInternal(self, handle, ...)
     local object = __TS__New(self, handle, ...)

package/core/types/sound.lua

@@ -22,7 +22,7 @@ local setSoundPlayPosition = SetSoundPlayPosition
 local stopSound = StopSound
 local attachSoundToUnit = AttachSoundToUnit
 local killSoundWhenDone = KillSoundWhenDone
-____exports.SoundChannel = SoundChannel or ({})
+____exports.SoundChannel = ____exports.SoundChannel or ({})
 ____exports.SoundChannel.General = 0
 ____exports.SoundChannel[____exports.SoundChannel.General] = "General"
 ____exports.SoundChannel.UnitSelection = 1

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

@@ -25,8 +25,11 @@ export declare abstract class DamageAbilityBehavior<T extends DamageAbilityBehav
     protected readonly damage: AbilityDependentValue<number>;
     protected readonly parameters?: T | undefined;
     protected constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: T | undefined);
+    protected precalculatedDamage?: number;
     protected calculateDamage(caster: Unit): number;
     protected damageTarget(caster: Unit, target: Widget, damage?: number): void;
+    onChannelingStart(caster: Unit): void;
+    onStop(): void;
 }
 export declare class DamageSelfAbilityBehavior extends DamageAbilityBehavior {
     constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAbilityBehaviorParameters);

package/engine/behaviour/ability/damage.lua

@@ -39,7 +39,7 @@ function DamageAbilityBehavior.prototype.damageTarget(self, caster, target, dama
     local parameters = self.parameters
     caster:damageTarget(
         target,
-        damage or self:calculateDamage(caster),
+        damage or self.precalculatedDamage or self:calculateDamage(caster),
         nil,
         nil,
         self:resolveCurrentAbilityDependentValue(parameters and parameters.attackType),
@@ -48,6 +48,12 @@ function DamageAbilityBehavior.prototype.damageTarget(self, caster, target, dama
         self:resolveCurrentAbilityDependentValue(parameters and parameters.metadata)
     )
 end
+function DamageAbilityBehavior.prototype.onChannelingStart(self, caster)
+    self.precalculatedDamage = self:calculateDamage(caster)
+end
+function DamageAbilityBehavior.prototype.onStop(self)
+    self.precalculatedDamage = nil
+end
 ____exports.DamageSelfAbilityBehavior = __TS__Class()
 local DamageSelfAbilityBehavior = ____exports.DamageSelfAbilityBehavior
 DamageSelfAbilityBehavior.name = "DamageSelfAbilityBehavior"
@@ -83,7 +89,7 @@ function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
         y,
         self:resolveCurrentAbilityDependentValue(parameters and parameters.areaOfEffect or AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD)
     )
-    local damage = self:calculateDamage(caster)
+    local damage = self.precalculatedDamage or self:calculateDamage(caster)
     local maximumDamage = self:resolveCurrentAbilityDependentValue(parameters and parameters.maximumDamage or 0)
     if maximumDamage ~= 0 and damage > maximumDamage then
         damage = maximumDamage / #targets

package/engine/behaviour/ability.d.ts

@@ -26,16 +26,20 @@ export declare abstract class AbilityBehavior<Parameters extends {
     get unit(): Unit | undefined;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value?: AbilityDependentValue<T>): T | undefined;
-    protected flashCasterEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
-    protected flashTargetEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
-    protected flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
-    protected flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
-    protected flashSpecialEffect(...args: [
+    flashCasterEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    flashTargetEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    flashSpecialEffect(...args: [
         ...pointOrWidget: [x: number, y: number] | [widget: Widget],
         ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]
     ]): void;
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
+    protected launchMissile(source: Unit, ...args: [
+        ...pointOrWidget: [x: number, y: number] | [widget: Unit /** TODO: support Widget */],
+        ...parameters: NonNullable<Parameters["missileParameters"]>
+    ]): void;
     protected onCreate(): void;
     onValueChange(_value: ReadonlySubscribableAbilityDependentValue<string | number | boolean>): void;
     onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;

package/engine/behaviour/ability.lua

@@ -30,7 +30,14 @@ local ____ability = require("engine.object-field.ability")
 local AbilityField = ____ability.AbilityField
 local AbilityLevelField = ____ability.AbilityLevelField
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
+local ____missile = require("core.types.missile")
+local Missile = ____missile.Missile
 local createBehaviorFunctionsByAbilityTypeId = {}
+local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
+    if success then
+        abilityBehavior:onMissileArrival(...)
+    end
+end
 local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
 local function createUnitEventListener(key)
     return function(unit, ability, ...)
@@ -160,6 +167,28 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrParame
         )
     end
 end
+function AbilityBehavior.prototype.launchMissile(self, source, xOrWidget, yOrParameter, ...)
+    if type(xOrWidget) ~= "number" then
+        Missile:launch(
+            self.missileLaunchConfig,
+            source,
+            xOrWidget,
+            invokeOnMissileArrival,
+            self,
+            yOrParameter,
+            ...
+        )
+    else
+        Missile:launch(
+            self.missileLaunchConfig,
+            source,
+            vec2(xOrWidget, yOrParameter),
+            invokeOnMissileArrival,
+            self,
+            ...
+        )
+    end
+end
 function AbilityBehavior.prototype.onCreate(self)
 end
 function AbilityBehavior.prototype.onValueChange(self, _value)

package/engine/buff.d.ts

@@ -56,7 +56,8 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     damageIncrease?: NumberParameterValueType;
     damageIncreaseFactor?: NumberParameterValueType;
     armorIncrease?: NumberParameterValueType;
-    armorIncreaseFactor?: NumberParameterValueType;
+    maxHealthIncrease?: NumberParameterValueType;
+    maxManaIncrease?: NumberParameterValueType;
     attackSpeedIncreaseFactor?: NumberParameterValueType;
     movementSpeedIncreaseFactor?: NumberParameterValueType;
     manaRegenerationRateIncreaseFactor?: NumberParameterValueType;
@@ -79,6 +80,9 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     maximumAutoAttackCount?: IntegerParameterValueType;
     maximumDamageDealtEventCount?: IntegerParameterValueType;
     maximumDamageReceivedEventCount?: IntegerParameterValueType;
+    absorbedDamageFactor?: NumberParameterValueType;
+    maximumDamageAbsorbed?: NumberParameterValueType;
+    destroysOnMaximumDamageAbsorbed?: BooleanParameterValueType;
     damageOnExpiration?: NumberParameterValueType;
     healingOnExpiration?: NumberParameterValueType;
     killsOnExpiration?: BooleanParameterValueType;
@@ -122,22 +126,26 @@ declare const enum BuffPropertyKey {
     MAXIMUM_DAMAGE_DEALT_EVENT_COUNT = 132,
     DAMAGE_RECEIVED_EVENT_COUNT = 133,
     MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT = 134,
-    TURNS_INTO_GHOST = 135,
-    STUNS = 136,
-    IGNORES_STUN_IMMUNITY = 137,
-    DISABLES_AUTO_ATTACK = 138,
-    PROVIDES_INVULNERABILITY = 139,
-    KILLS_ON_EXPIRATION = 140,
-    EXPLODES_ON_EXPIRATION = 141,
-    MISS_PROBABILITY = 142,
-    ABILITY_COOLDOWN_FACTOR = 143,
-    ABILITY_COOLDOWN_MODIFIER = 144
+    ABSORBED_DAMAGE_FACTOR = 135,
+    MAXIMUM_DAMAGE_ABSORBED = 136,
+    DAMAGE_ABSORBED = 137,
+    DESTROYS_ON_MAXIMUM_DAMAGE_ABSORBED = 138,
+    TURNS_INTO_GHOST = 139,
+    STUNS = 140,
+    IGNORES_STUN_IMMUNITY = 141,
+    DISABLES_AUTO_ATTACK = 142,
+    PROVIDES_INVULNERABILITY = 143,
+    KILLS_ON_EXPIRATION = 144,
+    EXPLODES_ON_EXPIRATION = 145,
+    MISS_PROBABILITY = 146,
+    ABILITY_COOLDOWN_FACTOR = 147,
+    ABILITY_COOLDOWN_MODIFIER = 148
 }
 export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
 }
 export type BuffAdditionalParameters = Prohibit<Record<string, any>, keyof BuffParameters>;
-export type BuffConstructorParameters<AdditionalParameters extends BuffAdditionalParameters> = [
+export type BuffConstructorParameters<T extends Buff<BuffAdditionalParameters>> = T extends Buff<infer AdditionalParameters> ? [
     ...typeId: [ApplicableBuffTypeId] | [
         typeIds: ReadonlyNonEmptyArray<ApplicableBuffTypeId>,
         typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
@@ -147,8 +155,10 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
     ...abilityOrParameters: [
         ability?: Ability | AbilityBehavior,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
-    ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
-];
+    ] | [
+        parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
+    ]
+] : never;
 export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = object> extends UnitBehavior {
     private _unit;
     protected readonly __additionalParametersBrand?: AdditionalParameters;
@@ -187,6 +197,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private [BuffPropertyKey.DAMAGE_DEALT_EVENT_COUNT]?;
     private [BuffPropertyKey.MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT]?;
     private [BuffPropertyKey.DAMAGE_RECEIVED_EVENT_COUNT]?;
+    private [BuffPropertyKey.ABSORBED_DAMAGE_FACTOR]?;
+    private [BuffPropertyKey.MAXIMUM_DAMAGE_ABSORBED]?;
+    private [BuffPropertyKey.DAMAGE_ABSORBED]?;
+    private [BuffPropertyKey.DESTROYS_ON_MAXIMUM_DAMAGE_ABSORBED]?;
     private [BuffPropertyKey.TURNS_INTO_GHOST]?;
     private [BuffPropertyKey.STUNS]?;
     private [BuffPropertyKey.IGNORES_STUN_IMMUNITY]?;
@@ -201,10 +215,11 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     readonly typeId: ApplicableBuffTypeId;
     readonly polarity: BuffPolarity;
     readonly resistanceType: BuffResistanceType;
-    readonly parameters: IsExactlyAny<AdditionalParameters> extends true ? any : keyof AdditionalParameters extends never ? undefined : {
+    readonly parameters: IsExactlyAny<AdditionalParameters> extends true ? any : AdditionalParameters extends Record<PropertyKey, never> ? undefined : {
         [K in keyof Omit<AdditionalParameters, keyof BuffParameters>]: AdditionalParameters[K] extends AbilityDependentValue<infer T> ? T : AdditionalParameters[K];
     };
     private readonly handle;
+    readonly previousBuff?: Buff;
     private _timer?;
     private readonly _level?;
     private readonly _spellStealPriority?;
@@ -212,7 +227,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
     private readonly _abilityTypeIds?;
     private _behaviors?;
-    constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
+    constructor(target: Unit, ...parameters: BuffConstructorParameters<Buff<AdditionalParameters>>);
     get level(): number;
     get remainingDamageOverDuration(): number;
     set remainingDamageOverDuration(remainingDamageOverDuration: number);
@@ -240,6 +255,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     set receivedDamageFactor(receivedDamageFactor: number);
     get armorIncrease(): number;
     set armorIncrease(armorIncrease: number);
+    get maxHealthIncrease(): number;
+    set maxHealthIncrease(maxHealthIncrease: number);
+    get maxManaIncrease(): number;
+    set maxManaIncrease(maxManaIncrease: number);
     get turnsIntoGhost(): boolean;
     set turnsIntoGhost(turnsIntoGhost: boolean);
     get stuns(): boolean;
@@ -271,8 +290,16 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     get manaRegenerationRateIncreaseFactor(): number;
     set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: number);
     get duration(): number;
+    set duration(duration: number);
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);
+    get absorbedDamageFactor(): number;
+    set absorbedDamageFactor(absorbedDamageFactor: number);
+    get maximumDamageAbsorbed(): number;
+    set maximumDamageAbsorbed(maximumDamageAbsorbed: number);
+    get damageAbsorbed(): number;
+    get destroysOnMaximumDamageAbsorbed(): boolean;
+    set destroysOnMaximumDamageAbsorbed(destroysOnMaximumDamageAbsorbed: boolean);
     get abilityCooldownFactor(): number;
     set abilityCooldownFactor(abilityCooldownFactor: number);
     onAbilityGained(ability: Ability): void;
@@ -281,7 +308,12 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
         ...widgetOrXY: [] | [Widget] | [x: number, x: number],
         ...parametersOrDuration: [] | [EffectParameters] | [number]
     ]): void;
-    flashSpecialEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    flashSpecialEffect(...parameters: [
+        ...widgetOrXY: [] | [Widget] | [x: number, x: number],
+        ...parametersOrDuration: [] | [EffectParameters] | [number]
+    ]): void;
+    private flash;
+    expire(): void;
     protected onCreate(): void;
     protected onDestroy(): Destructor;
     static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;