warscript 0.0.1-dev.05b0efd → 0.0.1-dev.07e3832

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (95) hide show
  1. package/attributes.d.ts +12 -0
  2. package/attributes.lua +16 -0
  3. package/core/types/frame.d.ts +2 -1
  4. package/core/types/frame.lua +2 -0
  5. package/core/types/group.d.ts +0 -1
  6. package/core/types/handle.d.ts +2 -1
  7. package/core/types/handle.lua +5 -0
  8. package/core/types/image.d.ts +0 -1
  9. package/core/types/missile.d.ts +2 -2
  10. package/core/types/missile.lua +8 -2
  11. package/core/types/unit.lua +8 -0
  12. package/decl/index.d.ts +1 -0
  13. package/engine/ability.d.ts +1 -1
  14. package/engine/behavior.d.ts +10 -10
  15. package/engine/behaviour/ability/apply-unit-behavior.d.ts +5 -1
  16. package/engine/behaviour/ability/damage.d.ts +23 -5
  17. package/engine/behaviour/ability/damage.lua +79 -20
  18. package/engine/behaviour/ability/instant-impact.lua +4 -0
  19. package/engine/behaviour/ability/restore-mana.d.ts +15 -0
  20. package/engine/behaviour/ability/restore-mana.lua +29 -0
  21. package/engine/behaviour/ability.d.ts +8 -1
  22. package/engine/behaviour/ability.lua +62 -0
  23. package/engine/behaviour/unit/stun-immunity.d.ts +0 -1
  24. package/engine/behaviour/unit.d.ts +3 -2
  25. package/engine/behaviour/unit.lua +7 -0
  26. package/engine/buff.d.ts +2 -2
  27. package/engine/buff.lua +8 -10
  28. package/engine/game-map.d.ts +7 -0
  29. package/engine/game-map.lua +32 -0
  30. package/engine/internal/mechanics/ability-duration.d.ts +1 -3
  31. package/engine/internal/mechanics/ability-duration.lua +2 -0
  32. package/engine/internal/mechanics/cast-ability.d.ts +2 -0
  33. package/engine/internal/mechanics/cast-ability.lua +86 -0
  34. package/engine/internal/unit/bonus.d.ts +5 -6
  35. package/engine/internal/unit/detach-missiles.d.ts +7 -0
  36. package/engine/internal/unit/detach-missiles.lua +30 -0
  37. package/engine/internal/unit+transport.lua +4 -10
  38. package/engine/internal/unit-missile-launch.lua +1 -1
  39. package/engine/internal/unit.d.ts +37 -10
  40. package/engine/internal/unit.lua +248 -88
  41. package/engine/object-data/auxiliary/attachment-preset.d.ts +0 -1
  42. package/engine/object-data/auxiliary/combat-classification.d.ts +0 -2
  43. package/engine/object-data/entry/ability-type/blank-configurable.d.ts +0 -1
  44. package/engine/object-data/entry/ability-type/blank-passive.d.ts +0 -1
  45. package/engine/object-data/entry/ability-type/channel.d.ts +0 -1
  46. package/engine/object-data/entry/ability-type/mine.d.ts +10 -0
  47. package/engine/object-data/entry/ability-type/mine.lua +39 -0
  48. package/engine/object-data/entry/ability-type/spirit-touch.d.ts +2 -2
  49. package/engine/object-data/entry/ability-type/spirit-touch.lua +6 -6
  50. package/engine/object-data/entry/ability-type.d.ts +0 -1
  51. package/engine/object-data/entry/buff-type/applicable.d.ts +0 -1
  52. package/engine/object-data/entry/buff-type/applicable.lua +27 -71
  53. package/engine/object-data/entry/buff-type/blank.d.ts +0 -1
  54. package/engine/object-data/entry/buff-type.d.ts +0 -1
  55. package/engine/object-data/entry/destructible-type.d.ts +0 -1
  56. package/engine/object-data/entry/item-type/blank.d.ts +0 -1
  57. package/engine/object-data/entry/item-type.d.ts +0 -1
  58. package/engine/object-data/entry/lightning-type.d.ts +0 -1
  59. package/engine/object-data/entry/unit-type.d.ts +42 -2
  60. package/engine/object-data/entry/unit-type.lua +378 -50
  61. package/engine/object-data/entry/upgrade/blank.d.ts +0 -1
  62. package/engine/object-data/entry/upgrade.d.ts +0 -1
  63. package/engine/object-data/entry.d.ts +2 -3
  64. package/engine/object-field/ability.d.ts +1 -1
  65. package/engine/object-field.d.ts +0 -1
  66. package/engine/random.d.ts +1 -0
  67. package/engine/random.lua +9 -0
  68. package/engine/standard/entries/unit-type.d.ts +42 -1
  69. package/engine/standard/entries/unit-type.lua +42 -1
  70. package/engine/standard/fields/ability.d.ts +1 -1
  71. package/engine/standard/fields/ability.lua +1 -1
  72. package/engine/unit.d.ts +1 -0
  73. package/engine/unit.lua +10 -2
  74. package/event.d.ts +2 -3
  75. package/event.lua +9 -5
  76. package/global/vec2.lua +1 -0
  77. package/lualib_bundle.lua +146 -42
  78. package/math/vec2.d.ts +2 -9
  79. package/math.d.ts +0 -2
  80. package/objutil/ability.d.ts +0 -1
  81. package/objutil/buff.d.ts +0 -1
  82. package/objutil/object.d.ts +0 -1
  83. package/objutil/unit.d.ts +0 -1
  84. package/package.json +13 -14
  85. package/string.d.ts +30 -0
  86. package/string.lua +14 -0
  87. package/util/stream.d.ts +0 -1
  88. package/utility/arrays.d.ts +3 -4
  89. package/utility/bit-set.d.ts +0 -2
  90. package/utility/linked-set.d.ts +1 -2
  91. package/utility/lua-maps.d.ts +1 -2
  92. package/utility/lua-sets.d.ts +1 -2
  93. package/utility/types.d.ts +2 -2
  94. package/core/mapbounds.d.ts +0 -8
  95. package/core/mapbounds.lua +0 -12
@@ -0,0 +1,12 @@
1
+ /** @noSelfInFile */
2
+ export type Attribute<T> = {
3
+ readonly __attribute: unique symbol;
4
+ readonly __type: T;
5
+ } & symbol;
6
+ export declare namespace Attribute {
7
+ const create: <T>() => Attribute<T>;
8
+ }
9
+ export declare class AttributesHolder {
10
+ readonly get: (<T>(attribute: Attribute<T>) => T | undefined) & LuaExtension<"TableGetMethod">;
11
+ readonly set: (<T>(attribute: Attribute<T>, value: T | undefined) => void) & LuaExtension<"TableSetMethod">;
12
+ }
package/attributes.lua ADDED
@@ -0,0 +1,16 @@
1
+ local ____lualib = require("lualib_bundle")
2
+ local __TS__Class = ____lualib.__TS__Class
3
+ local ____exports = {}
4
+ ____exports.Attribute = {}
5
+ local Attribute = ____exports.Attribute
6
+ do
7
+ Attribute.create = function()
8
+ return {}
9
+ end
10
+ end
11
+ ____exports.AttributesHolder = __TS__Class()
12
+ local AttributesHolder = ____exports.AttributesHolder
13
+ AttributesHolder.name = "AttributesHolder"
14
+ function AttributesHolder.prototype.____constructor(self)
15
+ end
16
+ return ____exports
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { Handle, HandleDestructor } from "./handle";
4
3
  import { Player } from "./player";
@@ -26,6 +25,8 @@ export declare class Frame extends Handle<jframehandle> {
26
25
  static readonly GAME_UI: Frame;
27
26
  static readonly CONSOLE_UI: Frame;
28
27
  static readonly CONSOLE_UI_BACKDROP: Frame;
28
+ static readonly CONSOLE_TOP_BAR: Frame;
29
+ static readonly CONSOLE_BOTTOM_BAR: Frame;
29
30
  static readonly WORLD: Frame;
30
31
  static readonly CHAT: Frame;
31
32
  static readonly TIME_OF_DAY_CLOCK: Frame;
@@ -293,6 +293,8 @@ end
293
293
  Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
294
294
  Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)
295
295
  Frame.CONSOLE_UI_BACKDROP = ____exports.Frame:byName("ConsoleUIBackdrop")
296
+ Frame.CONSOLE_TOP_BAR = ____exports.Frame:byName("ConsoleTopBar")
297
+ Frame.CONSOLE_BOTTOM_BAR = ____exports.Frame:byName("ConsoleBottomBar")
296
298
  Frame.WORLD = ____exports.Frame:byOrigin(ORIGIN_FRAME_WORLD_FRAME)
297
299
  Frame.CHAT = ____exports.Frame:byOrigin(ORIGIN_FRAME_CHAT_MSG)
298
300
  Frame.TIME_OF_DAY_CLOCK = ____exports.Frame.GAME_UI:getChild(5):getChild(0)
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { Widget } from "./widget";
4
3
  import { Unit } from "../../engine/internal/unit";
@@ -1,5 +1,6 @@
1
1
  /** @noSelfInFile */
2
2
  import { Event } from "../../event";
3
+ import { AttributesHolder } from "../../attributes";
3
4
  export type HandleConstructor<H extends jhandle, T extends Handle<H>, Args extends any[]> = new (handle: H, ...args: Args) => T;
4
5
  export type HandleDestructor = {
5
6
  readonly __handleDestructor: unique symbol;
@@ -11,7 +12,7 @@ type NoOverride = {
11
12
  declare const enum HandlePropertyKey {
12
13
  STATE = 0
13
14
  }
14
- export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> implements Destroyable {
15
+ export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> extends AttributesHolder implements Destroyable {
15
16
  readonly handle: H;
16
17
  private [HandlePropertyKey.STATE]?;
17
18
  private onDestroyEvent?;
@@ -1,5 +1,6 @@
1
1
  local ____lualib = require("lualib_bundle")
2
2
  local __TS__Class = ____lualib.__TS__Class
3
+ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
3
4
  local __TS__New = ____lualib.__TS__New
4
5
  local __TS__Delete = ____lualib.__TS__Delete
5
6
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -12,13 +13,17 @@ local getClass = ____reflection.getClass
12
13
  local getSuperclass = ____reflection.getSuperclass
13
14
  local ____exception = require("exception")
14
15
  local IllegalStateException = ____exception.IllegalStateException
16
+ local ____attributes = require("attributes")
17
+ local AttributesHolder = ____attributes.AttributesHolder
15
18
  local getHandleId = GetHandleId
16
19
  local onCreateEventByHandleConstructor = {}
17
20
  local onDestroyEventByHandleConstructor = {}
18
21
  ____exports.Handle = __TS__Class()
19
22
  local Handle = ____exports.Handle
20
23
  Handle.name = "Handle"
24
+ __TS__ClassExtends(Handle, AttributesHolder)
21
25
  function Handle.prototype.____constructor(self, handle)
26
+ AttributesHolder.prototype.____constructor(self)
22
27
  self[0] = 0
23
28
  local id = getHandleId(handle)
24
29
  local clazz = self.constructor
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { Handle, HandleDestructor } from "./handle";
4
3
  import { Color } from "./color";
@@ -5,7 +5,7 @@ export declare class Missile implements Destroyable {
5
5
  readonly retarget: (this: void, target: Unit | Vec2) => void;
6
6
  private readonly update;
7
7
  protected constructor(effect: jeffect, retarget: (this: void, target: Unit | Vec2) => void, update: (this: Missile) => boolean);
8
- static launch(config: Readonly<{
8
+ static launch<T extends any[]>(config: Readonly<{
9
9
  art: string;
10
10
  scale?: number;
11
11
  acceleration?: number;
@@ -15,7 +15,7 @@ export declare class Missile implements Destroyable {
15
15
  maxSpeed?: number;
16
16
  sourceOffset?: Vec2;
17
17
  targetOffset?: Vec2;
18
- }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean) => void): Missile;
18
+ }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean, ...parameters: T) => void, ...parameters: T): Missile;
19
19
  destroy(): void;
20
20
  }
21
21
  export declare namespace Missile {
@@ -41,7 +41,8 @@ function Missile.prototype.____constructor(self, effect, retarget, update)
41
41
  end
42
42
  head = self
43
43
  end
44
- function Missile.launch(self, config, source, target, onArrival)
44
+ function Missile.launch(self, config, source, target, onArrival, ...)
45
+ local parameters = {...}
45
46
  local ____opt_0 = config.sourceOffset
46
47
  local offsetX = ____opt_0 and ____opt_0.x or 0
47
48
  local ____opt_2 = config.sourceOffset
@@ -142,7 +143,12 @@ function Missile.launch(self, config, source, target, onArrival)
142
143
  visualPositionArcY = currentVisualTargetY
143
144
  visualPositionArcZ = currentVisualTargetZ
144
145
  retarget = false
145
- safeCall(onArrival, self, true)
146
+ safeCall(
147
+ onArrival,
148
+ self,
149
+ true,
150
+ table.unpack(parameters)
151
+ )
146
152
  return not retarget
147
153
  end
148
154
  if arcVSpeed ~= 0 and (currentTargetX ~= initialTargetX or currentTargetY ~= initialTargetY) then
@@ -21,4 +21,12 @@ do
21
21
  end
22
22
  end
23
23
  end
24
+ do
25
+ local ____export = require("engine.internal.unit+rally")
26
+ for ____exportKey, ____exportValue in pairs(____export) do
27
+ if ____exportKey ~= "default" then
28
+ ____exports[____exportKey] = ____exportValue
29
+ end
30
+ end
31
+ end
24
32
  return ____exports
package/decl/index.d.ts CHANGED
@@ -3,6 +3,7 @@
3
3
  /// <reference path="./native.d.ts"/>
4
4
  /// <reference types="warpack-types/warpack"/>
5
5
  /// <reference types="lua-types/5.3"/>
6
+ /// <reference types="@warscript/language-extensions" />
6
7
 
7
8
  declare function setmetatable<
8
9
  T extends object,
@@ -2,4 +2,4 @@
2
2
  import { AbilityTypeId } from "./object-data/entry/ability-type";
3
3
  import { UnitAbility } from "./internal/ability";
4
4
  import { Player } from "../core/types/player";
5
- 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;
5
+ export declare const castAbility: (owner: Player, abilityTypeId: AbilityTypeId, ...args: [...levelOrAbilityConsumer: [number] | [(ability: UnitAbility) => void] | [], x: number, y: number]) => void;
@@ -1,12 +1,12 @@
1
1
  /** @noSelfInFile */
2
2
  import { AbstractDestroyable, Destructor } from "../destroyable";
3
- export type BehaviorConstructor<T extends Behavior<any>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
3
+ export type BehaviorConstructor<T extends Behavior<AnyNotNil>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
4
4
  declare const enum BehaviorPropertyKey {
5
5
  PREVIOUS_BEHAVIOR = 0,
6
6
  NEXT_BEHAVIOR = 1,
7
7
  TIMER = 2
8
8
  }
9
- export declare abstract class Behavior<T, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
9
+ export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
10
10
  protected readonly object: T;
11
11
  private [BehaviorPropertyKey.PREVIOUS_BEHAVIOR]?;
12
12
  private [BehaviorPropertyKey.NEXT_BEHAVIOR]?;
@@ -16,13 +16,13 @@ export declare abstract class Behavior<T, PeriodicActionParameters extends any[]
16
16
  protected onPeriod(...parameters: PeriodicActionParameters): void;
17
17
  protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;
18
18
  protected stopPeriodicAction(): void;
19
- static count<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, limit?: number): number;
20
- 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;
21
- static getLast<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
22
- static getAll<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T[];
23
- 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;
24
- 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;
25
- 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;
26
- 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;
19
+ static count<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, limit?: number): number;
20
+ 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;
21
+ static getLast<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
22
+ static getAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T[];
23
+ 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;
24
+ 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;
25
+ 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;
26
+ 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;
27
27
  }
28
28
  export {};
@@ -5,13 +5,17 @@ import { UnitBehavior } from "../unit";
5
5
  import { Unit } from "../../internal/unit";
6
6
  import { MutableKeys } from "../../../utility/types";
7
7
  import { AbilityDependentValue } from "../../object-field/ability";
8
+ type UnitBehaviorParameters<T extends UnitBehavior> = Partial<{
9
+ [K in MutableKeys<T> & KeysOfType<T, boolean | number | string>]: T[K] extends boolean | number | string ? AbilityDependentValue<T[K]> : never;
10
+ }>;
8
11
  export declare class ApplyUnitBehaviorAbilityBehavior<T extends UnitBehavior> extends AbilityBehavior {
9
12
  private readonly unitBehaviorConstructor;
10
13
  private readonly parameters?;
11
14
  private readonly keys?;
12
15
  private unitBehavior?;
13
- constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: Partial<{ [K in MutableKeys<T> & KeysOfType<T, string | number | boolean>]: T[K] extends string | number | boolean ? AbilityDependentValue<T[K]> : never; }> | undefined);
16
+ constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: UnitBehaviorParameters<T> | undefined);
14
17
  update(): void;
15
18
  onUnitGainAbility(unit: Unit): void;
16
19
  onUnitLoseAbility(): void;
17
20
  }
21
+ export {};
@@ -4,22 +4,40 @@ import { Ability } from "../../internal/ability";
4
4
  import { Unit } from "../../internal/unit";
5
5
  import { AbilityDependentValue } from "../../object-field/ability";
6
6
  import { Widget } from "../../../core/types/widget";
7
+ import { AttackType, DamageType, WeaponType } from "../../internal/unit+damage";
7
8
  export declare class DamageSelfAbilityBehavior extends AbilityBehavior {
8
9
  private readonly damage;
9
- constructor(ability: Ability, damage: AbilityDependentValue<number>);
10
+ private readonly attackType?;
11
+ private readonly damageType?;
12
+ private readonly weaponType?;
13
+ constructor(ability: Ability, damage: AbilityDependentValue<number>, attackType?: AttackType | undefined, damageType?: DamageType | undefined, weaponType?: WeaponType | undefined);
10
14
  onImpact(caster: Unit): void;
11
15
  }
12
16
  export declare class DamageTargetAbilityBehavior extends AbilityBehavior {
13
17
  private readonly damage;
14
- constructor(ability: Ability, damage: AbilityDependentValue<number>);
18
+ private readonly attackType?;
19
+ private readonly damageType?;
20
+ private readonly weaponType?;
21
+ constructor(ability: Ability, damage: AbilityDependentValue<number>, attackType?: AttackType | undefined, damageType?: DamageType | undefined, weaponType?: WeaponType | undefined);
15
22
  onWidgetTargetImpact(caster: Unit, target: Widget): void;
16
23
  }
17
- export declare class DamageTargetAreaAbilityBehavior extends AbilityBehavior {
24
+ declare abstract class DamageAreaAbilityBehavior extends AbilityBehavior {
18
25
  private readonly damage;
19
26
  private readonly maximumDamage?;
20
- constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number> | undefined);
27
+ private readonly attackType?;
28
+ private readonly damageType?;
29
+ private readonly weaponType?;
30
+ protected constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number> | undefined, attackType?: AttackType | undefined, damageType?: DamageType | undefined, weaponType?: WeaponType | undefined);
31
+ protected damageArea(caster: Unit, x: number, y: number): void;
32
+ }
33
+ export declare class DamageSelfAreaAbilityBehavior extends DamageAreaAbilityBehavior {
34
+ constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number>, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType);
35
+ onImpact(caster: Unit): void;
36
+ }
37
+ export declare class DamageTargetAreaAbilityBehavior extends DamageAreaAbilityBehavior {
38
+ constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number>, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType);
21
39
  onNoTargetImpact(caster: Unit): void;
22
40
  onWidgetTargetImpact(caster: Unit, target: Widget): void;
23
41
  onPointTargetImpact(caster: Unit, x: number, y: number): void;
24
- private damageArea;
25
42
  }
43
+ export {};
@@ -13,49 +13,58 @@ ____exports.DamageSelfAbilityBehavior = __TS__Class()
13
13
  local DamageSelfAbilityBehavior = ____exports.DamageSelfAbilityBehavior
14
14
  DamageSelfAbilityBehavior.name = "DamageSelfAbilityBehavior"
15
15
  __TS__ClassExtends(DamageSelfAbilityBehavior, AbilityBehavior)
16
- function DamageSelfAbilityBehavior.prototype.____constructor(self, ability, damage)
16
+ function DamageSelfAbilityBehavior.prototype.____constructor(self, ability, damage, attackType, damageType, weaponType)
17
17
  AbilityBehavior.prototype.____constructor(self, ability)
18
18
  self.damage = damage
19
+ self.attackType = attackType
20
+ self.damageType = damageType
21
+ self.weaponType = weaponType
19
22
  end
20
23
  function DamageSelfAbilityBehavior.prototype.onImpact(self, caster)
21
24
  caster:damageTarget(
22
25
  caster,
23
- self:resolveCurrentAbilityDependentValue(self.damage)
26
+ self:resolveCurrentAbilityDependentValue(self.damage),
27
+ nil,
28
+ nil,
29
+ self.attackType,
30
+ self.damageType,
31
+ self.weaponType
24
32
  )
25
33
  end
26
34
  ____exports.DamageTargetAbilityBehavior = __TS__Class()
27
35
  local DamageTargetAbilityBehavior = ____exports.DamageTargetAbilityBehavior
28
36
  DamageTargetAbilityBehavior.name = "DamageTargetAbilityBehavior"
29
37
  __TS__ClassExtends(DamageTargetAbilityBehavior, AbilityBehavior)
30
- function DamageTargetAbilityBehavior.prototype.____constructor(self, ability, damage)
38
+ function DamageTargetAbilityBehavior.prototype.____constructor(self, ability, damage, attackType, damageType, weaponType)
31
39
  AbilityBehavior.prototype.____constructor(self, ability)
32
40
  self.damage = damage
41
+ self.attackType = attackType
42
+ self.damageType = damageType
43
+ self.weaponType = weaponType
33
44
  end
34
45
  function DamageTargetAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
35
46
  caster:damageTarget(
36
47
  target,
37
- self:resolveCurrentAbilityDependentValue(self.damage)
48
+ self:resolveCurrentAbilityDependentValue(self.damage),
49
+ nil,
50
+ nil,
51
+ self.attackType,
52
+ self.damageType,
53
+ self.weaponType
38
54
  )
39
55
  end
40
- ____exports.DamageTargetAreaAbilityBehavior = __TS__Class()
41
- local DamageTargetAreaAbilityBehavior = ____exports.DamageTargetAreaAbilityBehavior
42
- DamageTargetAreaAbilityBehavior.name = "DamageTargetAreaAbilityBehavior"
43
- __TS__ClassExtends(DamageTargetAreaAbilityBehavior, AbilityBehavior)
44
- function DamageTargetAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
56
+ local DamageAreaAbilityBehavior = __TS__Class()
57
+ DamageAreaAbilityBehavior.name = "DamageAreaAbilityBehavior"
58
+ __TS__ClassExtends(DamageAreaAbilityBehavior, AbilityBehavior)
59
+ function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage, attackType, damageType, weaponType)
45
60
  AbilityBehavior.prototype.____constructor(self, ability)
46
61
  self.damage = damage
47
62
  self.maximumDamage = maximumDamage
63
+ self.attackType = attackType
64
+ self.damageType = damageType
65
+ self.weaponType = weaponType
48
66
  end
49
- function DamageTargetAreaAbilityBehavior.prototype.onNoTargetImpact(self, caster)
50
- self:damageArea(caster, caster.x, caster.y)
51
- end
52
- function DamageTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
53
- self:damageArea(caster, target.x, target.y)
54
- end
55
- function DamageTargetAreaAbilityBehavior.prototype.onPointTargetImpact(self, caster, x, y)
56
- self:damageArea(caster, x, y)
57
- end
58
- function DamageTargetAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
67
+ function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
59
68
  local targets = Unit.getAllowedTargetsInCollisionRange(
60
69
  caster,
61
70
  self:resolveCurrentAbilityDependentValue(ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
@@ -69,7 +78,57 @@ function DamageTargetAreaAbilityBehavior.prototype.damageArea(self, caster, x, y
69
78
  damage = maximumDamage / #targets
70
79
  end
71
80
  for ____, target in ipairs(targets) do
72
- caster:damageTarget(target, damage)
81
+ caster:damageTarget(
82
+ target,
83
+ damage,
84
+ nil,
85
+ nil,
86
+ self.attackType,
87
+ self.damageType,
88
+ self.weaponType
89
+ )
73
90
  end
74
91
  end
92
+ ____exports.DamageSelfAreaAbilityBehavior = __TS__Class()
93
+ local DamageSelfAreaAbilityBehavior = ____exports.DamageSelfAreaAbilityBehavior
94
+ DamageSelfAreaAbilityBehavior.name = "DamageSelfAreaAbilityBehavior"
95
+ __TS__ClassExtends(DamageSelfAreaAbilityBehavior, DamageAreaAbilityBehavior)
96
+ function DamageSelfAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage, attackType, damageType, weaponType)
97
+ DamageAreaAbilityBehavior.prototype.____constructor(
98
+ self,
99
+ ability,
100
+ damage,
101
+ maximumDamage,
102
+ attackType,
103
+ damageType,
104
+ weaponType
105
+ )
106
+ end
107
+ function DamageSelfAreaAbilityBehavior.prototype.onImpact(self, caster)
108
+ self:damageArea(caster, caster.x, caster.y)
109
+ end
110
+ ____exports.DamageTargetAreaAbilityBehavior = __TS__Class()
111
+ local DamageTargetAreaAbilityBehavior = ____exports.DamageTargetAreaAbilityBehavior
112
+ DamageTargetAreaAbilityBehavior.name = "DamageTargetAreaAbilityBehavior"
113
+ __TS__ClassExtends(DamageTargetAreaAbilityBehavior, DamageAreaAbilityBehavior)
114
+ function DamageTargetAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage, attackType, damageType, weaponType)
115
+ DamageAreaAbilityBehavior.prototype.____constructor(
116
+ self,
117
+ ability,
118
+ damage,
119
+ maximumDamage,
120
+ attackType,
121
+ damageType,
122
+ weaponType
123
+ )
124
+ end
125
+ function DamageTargetAreaAbilityBehavior.prototype.onNoTargetImpact(self, caster)
126
+ self:damageArea(caster, caster.x, caster.y)
127
+ end
128
+ function DamageTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
129
+ self:damageArea(caster, target.x, target.y)
130
+ end
131
+ function DamageTargetAreaAbilityBehavior.prototype.onPointTargetImpact(self, caster, x, y)
132
+ self:damageArea(caster, x, y)
133
+ end
75
134
  return ____exports
@@ -12,8 +12,12 @@ local InstantImpactAbilityBehavior = ____exports.InstantImpactAbilityBehavior
12
12
  InstantImpactAbilityBehavior.name = "InstantImpactAbilityBehavior"
13
13
  __TS__ClassExtends(InstantImpactAbilityBehavior, AbilityBehavior)
14
14
  function InstantImpactAbilityBehavior.prototype.onCastingStart(self, caster)
15
+ local abilityTypeId = self.ability.typeId
15
16
  local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
16
17
  local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
18
+ if caster:getAbilityRemainingCooldown(abilityTypeId) ~= 0 or caster.mana < manaCost then
19
+ return
20
+ end
17
21
  caster.mana = caster.mana - manaCost
18
22
  if cooldown == 0 then
19
23
  caster:interruptCast(self.ability.typeId)
@@ -0,0 +1,15 @@
1
+ /** @noSelfInFile */
2
+ import { Ability } from "../../internal/ability";
3
+ import { Unit } from "../../internal/unit";
4
+ import { AbilityDependentValue } from "../../object-field/ability";
5
+ import { AbilityBehavior } from "../ability";
6
+ export declare class RestoreManaSelfAbilityBehavior extends AbilityBehavior {
7
+ private readonly mana;
8
+ constructor(ability: Ability, mana: AbilityDependentValue<number>);
9
+ onImpact(caster: Unit): void;
10
+ }
11
+ export declare class RestoreManaAbilityBehavior extends AbilityBehavior {
12
+ private readonly mana;
13
+ constructor(ability: Ability, mana: AbilityDependentValue<number>);
14
+ onUnitTargetImpact(caster: Unit, target: Unit): void;
15
+ }
@@ -0,0 +1,29 @@
1
+ local ____lualib = require("lualib_bundle")
2
+ local __TS__Class = ____lualib.__TS__Class
3
+ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
4
+ local ____exports = {}
5
+ local ____ability = require("engine.behaviour.ability")
6
+ local AbilityBehavior = ____ability.AbilityBehavior
7
+ ____exports.RestoreManaSelfAbilityBehavior = __TS__Class()
8
+ local RestoreManaSelfAbilityBehavior = ____exports.RestoreManaSelfAbilityBehavior
9
+ RestoreManaSelfAbilityBehavior.name = "RestoreManaSelfAbilityBehavior"
10
+ __TS__ClassExtends(RestoreManaSelfAbilityBehavior, AbilityBehavior)
11
+ function RestoreManaSelfAbilityBehavior.prototype.____constructor(self, ability, mana)
12
+ AbilityBehavior.prototype.____constructor(self, ability)
13
+ self.mana = mana
14
+ end
15
+ function RestoreManaSelfAbilityBehavior.prototype.onImpact(self, caster)
16
+ caster.mana = caster.mana + self:resolveCurrentAbilityDependentValue(self.mana)
17
+ end
18
+ ____exports.RestoreManaAbilityBehavior = __TS__Class()
19
+ local RestoreManaAbilityBehavior = ____exports.RestoreManaAbilityBehavior
20
+ RestoreManaAbilityBehavior.name = "RestoreManaAbilityBehavior"
21
+ __TS__ClassExtends(RestoreManaAbilityBehavior, AbilityBehavior)
22
+ function RestoreManaAbilityBehavior.prototype.____constructor(self, ability, mana)
23
+ AbilityBehavior.prototype.____constructor(self, ability)
24
+ self.mana = mana
25
+ end
26
+ function RestoreManaAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
27
+ target.mana = target.mana + self:resolveCurrentAbilityDependentValue(self.mana)
28
+ end
29
+ return ____exports
@@ -9,13 +9,20 @@ import { Destructable } from "../../core/types/destructable";
9
9
  import { EffectParameters } from "../../core/types/effect";
10
10
  import { AbilityDependentValue } from "../object-field/ability";
11
11
  export type AbilityBehaviorConstructor<Args extends any[]> = new (ability: Ability, ...args: Args) => AbilityBehavior;
12
- export declare abstract class AbilityBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Ability, PeriodicActionParameters> {
12
+ export declare abstract class AbilityBehavior<Parameters extends {
13
+ periodicActionParameters?: any[];
14
+ missileParameters?: any[];
15
+ } = {}> extends Behavior<Ability, NonNullable<Parameters["periodicActionParameters"]>> {
13
16
  constructor(ability: Ability);
14
17
  get ability(): Ability;
15
18
  protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
16
19
  protected flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
17
20
  protected flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
18
21
  protected flashSpecialEffect(...args: [...pointOrWidget: [x: number, y: number] | [widget: Widget], duration?: number]): void;
22
+ private static MissileLaunchConfig;
23
+ private get missileLaunchConfig();
24
+ protected launchMissile(source: Unit, target: Unit, ...parameters: NonNullable<Parameters["missileParameters"]>): void;
25
+ onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;
19
26
  onUnitGainAbility(_unit: Unit): void;
20
27
  onUnitLoseAbility(_unit: Unit): void;
21
28
  onCastingStart(caster: Unit): void;
@@ -15,13 +15,52 @@ local Effect = ____effect.Effect
15
15
  local ____ability = require("engine.standard.fields.ability")
16
16
  local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
17
17
  local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
18
+ local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
19
+ local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
20
+ local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_INTEGER_FIELD
18
21
  local SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD = ____ability.SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD
19
22
  local SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
20
23
  local ____ability = require("engine.object-field.ability")
21
24
  local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
22
25
  local ____timer = require("core.types.timer")
23
26
  local Timer = ____timer.Timer
27
+ local ____missile = require("core.types.missile")
28
+ local Missile = ____missile.Missile
24
29
  local createBehaviorFunctionsByAbilityTypeId = {}
30
+ local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
31
+ if success then
32
+ abilityBehavior:onMissileArrival(...)
33
+ end
34
+ end
35
+ local ____class_0 = __TS__Class()
36
+ ____class_0.name = ""
37
+ function ____class_0.prototype.____constructor(self, abilityBehavior)
38
+ self.abilityBehavior = abilityBehavior
39
+ end
40
+ __TS__SetDescriptor(
41
+ ____class_0.prototype,
42
+ "art",
43
+ {get = function(self)
44
+ return MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.abilityBehavior.ability, 0)
45
+ end},
46
+ true
47
+ )
48
+ __TS__SetDescriptor(
49
+ ____class_0.prototype,
50
+ "arc",
51
+ {get = function(self)
52
+ return MISSILE_ARC_ABILITY_FLOAT_FIELD:getValue(self.abilityBehavior.ability)
53
+ end},
54
+ true
55
+ )
56
+ __TS__SetDescriptor(
57
+ ____class_0.prototype,
58
+ "speed",
59
+ {get = function(self)
60
+ return MISSILE_SPEED_ABILITY_INTEGER_FIELD:getValue(self.abilityBehavior.ability)
61
+ end},
62
+ true
63
+ )
25
64
  ____exports.AbilityBehavior = __TS__Class()
26
65
  local AbilityBehavior = ____exports.AbilityBehavior
27
66
  AbilityBehavior.name = "AbilityBehavior"
@@ -65,6 +104,18 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
65
104
  )
66
105
  end
67
106
  end
107
+ function AbilityBehavior.prototype.launchMissile(self, source, target, ...)
108
+ Missile:launch(
109
+ self.missileLaunchConfig,
110
+ source,
111
+ target,
112
+ invokeOnMissileArrival,
113
+ self,
114
+ ...
115
+ )
116
+ end
117
+ function AbilityBehavior.prototype.onMissileArrival(self, ...)
118
+ end
68
119
  function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
69
120
  end
70
121
  function AbilityBehavior.prototype.onUnitLoseAbility(self, _unit)
@@ -127,6 +178,17 @@ __TS__SetDescriptor(
127
178
  return self.object
128
179
  end},
129
180
  true
181
+ )
182
+ AbilityBehavior.MissileLaunchConfig = ____class_0
183
+ __TS__SetDescriptor(
184
+ AbilityBehavior.prototype,
185
+ "missileLaunchConfig",
186
+ {get = function(self)
187
+ local missileLaunchConfig = __TS__New(____exports.AbilityBehavior.MissileLaunchConfig, self)
188
+ rawset(self, "missileLaunchConfig", missileLaunchConfig)
189
+ return missileLaunchConfig
190
+ end},
191
+ true
130
192
  );
131
193
  (function(self)
132
194
  local function createUnitEventListener(key)
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { UnitBehavior } from "../unit";
4
3
  import { Unit } from "../../unit";
@@ -2,6 +2,7 @@
2
2
  import { Behavior } from "../behavior";
3
3
  import { Ability } from "../internal/ability";
4
4
  import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
5
+ import "../internal/unit+ability";
5
6
  import "../internal/unit-missile-launch";
6
7
  export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
7
8
  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[
13
14
  onDamageDealt(target: Unit, event: DamageEvent): void;
14
15
  onDamageReceiving(source: Unit | undefined, event: DamagingEvent): void;
15
16
  onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
16
- protected onAbilityGained(ability: Ability): void;
17
- protected onAbilityLost(ability: Ability): void;
17
+ onAbilityGained(ability: Ability): void;
18
+ onAbilityLost(ability: Ability): void;
18
19
  onKill(target: Unit): void;
19
20
  onDeath(source: Unit | undefined): void;
20
21
  }