warscript 0.0.1-dev.ab8c392 → 0.0.1-dev.b3e4d60

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

@@ -9,13 +9,20 @@ import { Destructable } from "../../core/types/destructable";
 import { EffectParameters } from "../../core/types/effect";
 import { AbilityDependentValue } from "../object-field/ability";
 export type AbilityBehaviorConstructor<Args extends any[]> = new (ability: Ability, ...args: Args) => AbilityBehavior;
-export declare abstract class AbilityBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Ability, PeriodicActionParameters> {
+export declare abstract class AbilityBehavior<Parameters extends {
+    periodicActionParameters?: any[];
+    missileParameters?: any[];
+} = {}> extends Behavior<Ability, NonNullable<Parameters["periodicActionParameters"]>> {
     constructor(ability: Ability);
     get ability(): Ability;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
     protected flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashSpecialEffect(...args: [...pointOrWidget: [x: number, y: number] | [widget: Widget], duration?: number]): void;
+    private static MissileLaunchConfig;
+    private get missileLaunchConfig();
+    protected launchMissile(source: Unit, target: Unit, ...parameters: NonNullable<Parameters["missileParameters"]>): void;
+    onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;
     onUnitGainAbility(_unit: Unit): void;
     onUnitLoseAbility(_unit: Unit): void;
     onCastingStart(caster: Unit): void;

package/engine/behaviour/ability.lua

@@ -15,13 +15,52 @@ local Effect = ____effect.Effect
 local ____ability = require("engine.standard.fields.ability")
 local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
+local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_INTEGER_FIELD
 local SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD = ____ability.SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD
 local SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local ____ability = require("engine.object-field.ability")
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+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 ____class_0 = __TS__Class()
+____class_0.name = ""
+function ____class_0.prototype.____constructor(self, abilityBehavior)
+    self.abilityBehavior = abilityBehavior
+end
+__TS__SetDescriptor(
+    ____class_0.prototype,
+    "art",
+    {get = function(self)
+        return MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.abilityBehavior.ability, 0)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    ____class_0.prototype,
+    "arc",
+    {get = function(self)
+        return MISSILE_ARC_ABILITY_FLOAT_FIELD:getValue(self.abilityBehavior.ability)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    ____class_0.prototype,
+    "speed",
+    {get = function(self)
+        return MISSILE_SPEED_ABILITY_INTEGER_FIELD:getValue(self.abilityBehavior.ability)
+    end},
+    true
+)
 ____exports.AbilityBehavior = __TS__Class()
 local AbilityBehavior = ____exports.AbilityBehavior
 AbilityBehavior.name = "AbilityBehavior"
@@ -65,6 +104,18 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
         )
     end
 end
+function AbilityBehavior.prototype.launchMissile(self, source, target, ...)
+    Missile:launch(
+        self.missileLaunchConfig,
+        source,
+        target,
+        invokeOnMissileArrival,
+        self,
+        ...
+    )
+end
+function AbilityBehavior.prototype.onMissileArrival(self, ...)
+end
 function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
 end
 function AbilityBehavior.prototype.onUnitLoseAbility(self, _unit)
@@ -127,6 +178,17 @@ __TS__SetDescriptor(
         return self.object
     end},
     true
+)
+AbilityBehavior.MissileLaunchConfig = ____class_0
+__TS__SetDescriptor(
+    AbilityBehavior.prototype,
+    "missileLaunchConfig",
+    {get = function(self)
+        local missileLaunchConfig = __TS__New(____exports.AbilityBehavior.MissileLaunchConfig, self)
+        rawset(self, "missileLaunchConfig", missileLaunchConfig)
+        return missileLaunchConfig
+    end},
+    true
 );
 (function(self)
     local function createUnitEventListener(key)

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)

package/engine/buff.d.ts

@@ -65,7 +65,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     destroysOnDamage?: BooleanParameterValueType;
     maximumAutoAttackCount?: IntegerParameterValueType;
     uniqueGroup?: BuffUniqueGroup;
-} : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : {});
+} : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
 declare const enum BuffPropertyKey {
     UNIT = 100,
     SOURCE = 101,
@@ -116,7 +116,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
     ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
 ];
-export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = {}> extends UnitBehavior {
+export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = object> extends UnitBehavior {
     private _unit;
     protected readonly __additionalParametersBrand?: AdditionalParameters;
     private [BuffPropertyKey.UNIT];

package/engine/buff.lua

@@ -1035,24 +1035,22 @@ __TS__SetDescriptor(
     true
 );
 (function(self)
+    local function destroyBuffIfNeeded(buff)
+        if getUnitAbility(buff[100].handle, buff.typeId) ~= buff.handle then
+            buff:destroy()
+        end
+    end
     ____exports.checkBuff = function(unit, buffTypeId)
         local buffByTypeId = buffByTypeIdByUnit[unit]
         if buffByTypeId ~= nil then
             local buff = buffByTypeId[buffTypeId]
-            if buff ~= nil and getUnitAbility(unit.handle, buffTypeId) ~= buff.handle then
-                buff:destroy()
+            if buff ~= nil then
+                destroyBuffIfNeeded(buff)
             end
         end
     end
     ____exports.checkBuffs = function(unit)
-        local buffByTypeId = buffByTypeIdByUnit[unit]
-        if buffByTypeId ~= nil then
-            for ____, buff in pairs(buffByTypeId) do
-                if getUnitAbility(unit.handle, buff.typeId) ~= buff.handle then
-                    buff:destroy()
-                end
-            end
-        end
+        ____exports.Buff:forAll(unit, destroyBuffIfNeeded)
     end
     Unit.abilityChannelingStartEvent:addListener(
         0,

package/engine/game-map.d.ts

@@ -0,0 +1,7 @@
+/** @noSelfInFile */
+import { Rect } from "../core/types/rect";
+import { Region } from "../core/types/region";
+export declare class GameMap {
+    static get worldBoundsRect(): Rect;
+    static get worldBoundsRegion(): Region;
+}

package/engine/game-map.lua

@@ -0,0 +1,32 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____rect = require("core.types.rect")
+local Rect = ____rect.Rect
+local ____region = require("core.types.region")
+local Region = ____region.Region
+____exports.GameMap = __TS__Class()
+local GameMap = ____exports.GameMap
+GameMap.name = "GameMap"
+function GameMap.prototype.____constructor(self)
+end
+__TS__ObjectDefineProperty(
+    GameMap,
+    "worldBoundsRect",
+    {get = function(self)
+        local rect = Rect:of(GetWorldBounds())
+        rawset(self, "worldBoundsRect", rect)
+        return rect
+    end}
+)
+__TS__ObjectDefineProperty(
+    GameMap,
+    "worldBoundsRegion",
+    {get = function(self)
+        local region = Region:create(self.worldBoundsRect)
+        rawset(self, "worldBoundsRegion", region)
+        return region
+    end}
+)
+return ____exports

package/engine/internal/unit/bonus.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Unit } from "../unit";
 import { AbilityTypeId } from "../../object-data/entry/ability-type";
@@ -34,8 +33,8 @@ export declare namespace UnitBonusType {
     const DAMAGE: UnitBonusType<UnitDamageBonusId>;
     const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
 }
-export declare const addUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
-export declare const removeUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;
-export declare const updateUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id, value: number) => boolean;
-export declare const addOrUpdateOrRemoveUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id | undefined, value: number) => Id | undefined;
-export declare const getUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => number;
+export declare const addUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
+export declare const removeUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;
+export declare const updateUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id, value: number) => boolean;
+export declare const addOrUpdateOrRemoveUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id | undefined, value: number) => Id | undefined;
+export declare const getUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => number;

package/engine/internal/unit+transport.lua

@@ -6,9 +6,8 @@ local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
 local Event = ____event.Event
-local ____mapbounds = require("core.mapbounds")
-local boundMax = ____mapbounds.boundMax
-local boundRegion = ____mapbounds.boundRegion
+local ____game_2Dmap = require("engine.game-map")
+local GameMap = ____game_2Dmap.GameMap
 local eventInvoke = Event.invoke
 local tableRemove = table.remove
 local ____assert = _G.assert
@@ -58,8 +57,8 @@ triggerAddCondition(
             deboard(unit)
         end
         if not unitAlive(handle) then
-            unit.x = boundMax.x
-            unit.y = boundMax.y
+            unit.x = GameMap.worldBoundsRect.maxX
+            unit.y = GameMap.worldBoundsRect.maxY
         end
         local transport = Unit:of(getTransportUnit())
         transportByUnit[unit] = transport
@@ -68,11 +67,6 @@ triggerAddCondition(
         eventInvoke(onBoardEvent, unit, transport)
     end)
 )
-boundRegion.onUnitEnter:addListener(function(unit)
-    if transportByUnit[unit] ~= nil and not isUnitLoaded(unit.handle) then
-        deboard(unit)
-    end
-end)
 Unit.deathEvent:addListener(function(unit)
     if transportByUnit[unit] ~= nil then
         deboard(unit)

package/engine/internal/unit-missile-launch.lua

@@ -25,7 +25,7 @@ local function timerCallback(source, target)
     Event.invoke(autoAttackFinishEvent, source, target)
 end
 Unit.autoAttackStartEvent:addListener(function(source, target)
-    local attackPoint = source.weapons[1].attackPoint
+    local attackPoint = source.weapons[1].impactDelay
     local timer = Timer:simple(attackPoint, timerCallback, source, target)
     eventTimerByUnit[source] = timer
 end)

package/engine/internal/unit.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "../../core/types/handle";
 import { Player } from "../../core/types/player";
@@ -68,23 +67,44 @@ declare const modifiers: {
     speed: (unit: junit, value: number) => void;
     armor: (unit: junit, value: number) => void;
 };
-interface UnitWeapon {
+export declare class UnitWeapon {
+    readonly unit: Unit;
     readonly index: 0 | 1;
-    cooldown: number;
-    projectileArc: number;
-    projectileArt: string;
-    projectileSpeed: number;
-    attackPoint: number;
+    constructor(unit: Unit, index: 0 | 1);
+    get cooldown(): number;
+    set cooldown(cooldown: number);
+    get damage(): [minimumDamage: number, maximumDamage: number];
+    set damage([minimumDamage, maximumDamage]: [number, number]);
+    get damageBase(): number;
+    set damageBase(damageBase: number);
+    get damageDiceCount(): number;
+    set damageDiceCount(damageDiceCount: number);
+    get damageDiceSideCount(): number;
+    set damageDiceSideCount(damageDiceSideCount: number);
+    get range(): number;
+    set range(range: number);
+    get impactDelay(): number;
+    set impactDelay(impactDelay: number);
+    get missileArc(): number;
+    set missileArc(missileArc: number);
+    get missileModelPath(): string;
+    set missileModelPath(missileModelPath: string);
+    get missileSpeed(): number;
+    set missileSpeed(missileSpeed: number);
 }
 declare const enum UnitPropertyKey {
     IS_PAUSED = 100,
     STUN_COUNTER = 101,
-    PREVENT_DEATH_HEALTH_BONUS = 102,
-    IS_TEAM_GLOW_HIDDEN = 103
+    DELAY_HEALTH_CHECKS_COUNTER = 102,
+    DELAY_HEALTH_CHECKS_HEALTH_BONUS = 103,
+    PREVENT_DEATH_HEALTH_BONUS = 104,
+    IS_TEAM_GLOW_HIDDEN = 105
 }
 export declare class Unit extends Handle<junit> {
     private [UnitPropertyKey.IS_PAUSED]?;
     private [UnitPropertyKey.STUN_COUNTER]?;
+    private [UnitPropertyKey.DELAY_HEALTH_CHECKS_COUNTER]?;
+    private [UnitPropertyKey.DELAY_HEALTH_CHECKS_HEALTH_BONUS]?;
     private [UnitPropertyKey.PREVENT_DEATH_HEALTH_BONUS]?;
     private [UnitPropertyKey.IS_TEAM_GLOW_HIDDEN]?;
     private _owner?;
@@ -123,6 +143,8 @@ export declare class Unit extends Handle<junit> {
     playAnimation(animation: number): void;
     queueAnimation(animation: string): void;
     get weapons(): [UnitWeapon, UnitWeapon];
+    get firstWeapon(): UnitWeapon;
+    get secondWeapon(): UnitWeapon;
     get level(): number;
     set level(v: number);
     get xp(): number;
@@ -148,6 +170,10 @@ export declare class Unit extends Handle<junit> {
     set color(color: PlayerColor);
     get acquisitionRange(): number;
     set acquisitionRange(v: number);
+    /**
+     * Keeps this unit alive even if its health becomes negative until the current game thread yields.
+     */
+    delayHealthChecks(): void;
     get maxHealth(): number;
     set maxHealth(maxHealth: number);
     get healthRegenerationRate(): number;
@@ -201,7 +227,7 @@ export declare class Unit extends Handle<junit> {
     isSelected(player: Player): boolean;
     explode(): void;
     kill(): void;
-    revive(pos: Vec2, doEffect: boolean): void;
+    revive(x: number, y: number, doEffect?: boolean): void;
     healTarget(target: Widget, amount: number): void;
     useItem(item: Item): boolean;
     issueImmediateOrder(order: number): boolean;
@@ -222,6 +248,7 @@ export declare class Unit extends Handle<junit> {
     getAbilityById(abilityId: number): UnitAbility | undefined;
     removeAbility(abilityId: number): boolean;
     hideAbility(abilityId: number, flag: boolean): void;
+    getAbilityRemainingCooldown(abilityId: number): number;
     startAbilityCooldown(abilityId: number, cooldown: number): void;
     endAbilityCooldown(abilityId: number): void;
     interruptAttack(): void;