warscript 0.0.1-dev.6f480d0 → 0.0.1-dev.79435cf

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 (88) 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/instant-impact.lua +4 -0
  17. package/engine/behaviour/ability.d.ts +8 -1
  18. package/engine/behaviour/ability.lua +62 -0
  19. package/engine/behaviour/unit/stun-immunity.d.ts +0 -1
  20. package/engine/behaviour/unit.d.ts +3 -2
  21. package/engine/behaviour/unit.lua +7 -0
  22. package/engine/buff.d.ts +2 -2
  23. package/engine/buff.lua +8 -10
  24. package/engine/internal/mechanics/ability-duration.d.ts +1 -3
  25. package/engine/internal/mechanics/ability-duration.lua +2 -0
  26. package/engine/internal/mechanics/cast-ability.d.ts +2 -0
  27. package/engine/internal/mechanics/cast-ability.lua +86 -0
  28. package/engine/internal/unit/bonus.d.ts +5 -6
  29. package/engine/internal/unit/detach-missiles.d.ts +7 -0
  30. package/engine/internal/unit/detach-missiles.lua +30 -0
  31. package/engine/internal/unit-missile-launch.lua +1 -1
  32. package/engine/internal/unit.d.ts +37 -10
  33. package/engine/internal/unit.lua +248 -88
  34. package/engine/object-data/auxiliary/attachment-preset.d.ts +0 -1
  35. package/engine/object-data/auxiliary/combat-classification.d.ts +0 -2
  36. package/engine/object-data/entry/ability-type/blank-configurable.d.ts +0 -1
  37. package/engine/object-data/entry/ability-type/blank-passive.d.ts +0 -1
  38. package/engine/object-data/entry/ability-type/blink.d.ts +10 -0
  39. package/engine/object-data/entry/ability-type/blink.lua +39 -0
  40. package/engine/object-data/entry/ability-type/channel.d.ts +0 -1
  41. package/engine/object-data/entry/ability-type/mine.d.ts +10 -0
  42. package/engine/object-data/entry/ability-type/mine.lua +39 -0
  43. package/engine/object-data/entry/ability-type/spirit-touch.d.ts +2 -2
  44. package/engine/object-data/entry/ability-type/spirit-touch.lua +6 -6
  45. package/engine/object-data/entry/ability-type.d.ts +0 -1
  46. package/engine/object-data/entry/buff-type/applicable.d.ts +0 -1
  47. package/engine/object-data/entry/buff-type/applicable.lua +27 -71
  48. package/engine/object-data/entry/buff-type/blank.d.ts +0 -1
  49. package/engine/object-data/entry/buff-type.d.ts +0 -1
  50. package/engine/object-data/entry/destructible-type.d.ts +0 -1
  51. package/engine/object-data/entry/item-type/blank.d.ts +0 -1
  52. package/engine/object-data/entry/item-type.d.ts +0 -1
  53. package/engine/object-data/entry/lightning-type.d.ts +0 -1
  54. package/engine/object-data/entry/unit-type.d.ts +42 -2
  55. package/engine/object-data/entry/unit-type.lua +378 -50
  56. package/engine/object-data/entry/upgrade/blank.d.ts +0 -1
  57. package/engine/object-data/entry/upgrade.d.ts +0 -1
  58. package/engine/object-data/entry.d.ts +2 -3
  59. package/engine/object-field/ability.d.ts +1 -1
  60. package/engine/object-field.d.ts +0 -1
  61. package/engine/random.d.ts +1 -0
  62. package/engine/random.lua +9 -0
  63. package/engine/standard/entries/unit-type.d.ts +42 -1
  64. package/engine/standard/entries/unit-type.lua +42 -1
  65. package/engine/standard/fields/ability.d.ts +1 -1
  66. package/engine/standard/fields/ability.lua +1 -1
  67. package/engine/unit.d.ts +1 -0
  68. package/engine/unit.lua +10 -2
  69. package/event.d.ts +2 -3
  70. package/event.lua +9 -5
  71. package/global/vec2.lua +1 -0
  72. package/lualib_bundle.lua +139 -40
  73. package/math/vec2.d.ts +2 -9
  74. package/math.d.ts +0 -2
  75. package/objutil/ability.d.ts +0 -1
  76. package/objutil/buff.d.ts +0 -1
  77. package/objutil/object.d.ts +0 -1
  78. package/objutil/unit.d.ts +0 -1
  79. package/package.json +13 -14
  80. package/string.d.ts +30 -0
  81. package/string.lua +14 -0
  82. package/util/stream.d.ts +0 -1
  83. package/utility/arrays.d.ts +3 -4
  84. package/utility/bit-set.d.ts +0 -2
  85. package/utility/linked-set.d.ts +1 -2
  86. package/utility/lua-maps.d.ts +1 -2
  87. package/utility/lua-sets.d.ts +1 -2
  88. package/utility/types.d.ts +2 -2
@@ -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 {};
@@ -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)
@@ -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
  }
@@ -7,6 +7,7 @@ local ____behavior = require("engine.behavior")
7
7
  local Behavior = ____behavior.Behavior
8
8
  local ____unit = require("engine.internal.unit")
9
9
  local Unit = ____unit.Unit
10
+ require("engine.internal.unit+ability")
10
11
  require("engine.internal.unit-missile-launch")
11
12
  ____exports.UnitBehavior = __TS__Class()
12
13
  local UnitBehavior = ____exports.UnitBehavior
@@ -62,6 +63,12 @@ __TS__SetDescriptor(
62
63
  end
63
64
  ____exports.UnitBehavior:forAll(target, "onDamageReceived", source, event)
64
65
  end)
66
+ Unit.abilityGainedEvent:addListener(function(source, target)
67
+ ____exports.UnitBehavior:forAll(source, "onAbilityGained", target)
68
+ end)
69
+ Unit.abilityLostEvent:addListener(function(source, target)
70
+ ____exports.UnitBehavior:forAll(source, "onAbilityLost", target)
71
+ end)
65
72
  Unit.deathEvent:addListener(function(target, source)
66
73
  if source ~= nil then
67
74
  ____exports.UnitBehavior:forAll(source, "onKill", target)
package/engine/buff.d.ts CHANGED
@@ -65,7 +65,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
65
65
  destroysOnDamage?: BooleanParameterValueType;
66
66
  maximumAutoAttackCount?: IntegerParameterValueType;
67
67
  uniqueGroup?: BuffUniqueGroup;
68
- } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : {});
68
+ } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
69
69
  declare const enum BuffPropertyKey {
70
70
  UNIT = 100,
71
71
  SOURCE = 101,
@@ -116,7 +116,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
116
116
  parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
117
117
  ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
118
118
  ];
119
- export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = {}> extends UnitBehavior {
119
+ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = object> extends UnitBehavior {
120
120
  private _unit;
121
121
  protected readonly __additionalParametersBrand?: AdditionalParameters;
122
122
  private [BuffPropertyKey.UNIT];
package/engine/buff.lua CHANGED
@@ -1035,24 +1035,22 @@ __TS__SetDescriptor(
1035
1035
  true
1036
1036
  );
1037
1037
  (function(self)
1038
+ local function destroyBuffIfNeeded(buff)
1039
+ if getUnitAbility(buff[100].handle, buff.typeId) ~= buff.handle then
1040
+ buff:destroy()
1041
+ end
1042
+ end
1038
1043
  ____exports.checkBuff = function(unit, buffTypeId)
1039
1044
  local buffByTypeId = buffByTypeIdByUnit[unit]
1040
1045
  if buffByTypeId ~= nil then
1041
1046
  local buff = buffByTypeId[buffTypeId]
1042
- if buff ~= nil and getUnitAbility(unit.handle, buffTypeId) ~= buff.handle then
1043
- buff:destroy()
1047
+ if buff ~= nil then
1048
+ destroyBuffIfNeeded(buff)
1044
1049
  end
1045
1050
  end
1046
1051
  end
1047
1052
  ____exports.checkBuffs = function(unit)
1048
- local buffByTypeId = buffByTypeIdByUnit[unit]
1049
- if buffByTypeId ~= nil then
1050
- for ____, buff in pairs(buffByTypeId) do
1051
- if getUnitAbility(unit.handle, buff.typeId) ~= buff.handle then
1052
- buff:destroy()
1053
- end
1054
- end
1055
- end
1053
+ ____exports.Buff:forAll(unit, destroyBuffIfNeeded)
1056
1054
  end
1057
1055
  Unit.abilityChannelingStartEvent:addListener(
1058
1056
  0,
@@ -1,4 +1,2 @@
1
1
  /** @noSelfInFile */
2
- import { Ability } from "../ability";
3
- import { Unit } from "../unit";
4
- export declare const getAbilityDuration: (ability: Ability, target?: Unit) => number;
2
+ export {};
@@ -4,6 +4,8 @@ local UnitClassification = ____unit.UnitClassification
4
4
  local ____ability = require("engine.standard.fields.ability")
5
5
  local DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD
6
6
  local DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD
7
+ ---
8
+ -- @internal For use by internal systems only.
7
9
  ____exports.getAbilityDuration = function(ability, target)
8
10
  local level = ability.level
9
11
  return target ~= nil and target:hasClassification(UnitClassification.RESISTANT) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
@@ -0,0 +1,2 @@
1
+ /** @noSelfInFile */
2
+ export {};
@@ -0,0 +1,86 @@
1
+ local ____exports = {}
2
+ local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
3
+ local AbilityType = ____ability_2Dtype.AbilityType
4
+ local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
5
+ local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
6
+ local ____dummy_2Dunits = require("engine.internal.misc.dummy-units")
7
+ local INVENTORY_DUMMY_NATIVE_UNIT = ____dummy_2Dunits.INVENTORY_DUMMY_NATIVE_UNIT
8
+ local ____preconditions = require("utility.preconditions")
9
+ local checkNotNull = ____preconditions.checkNotNull
10
+ local ____dummy_2Dinventory = require("engine.internal.object-data.dummy-inventory")
11
+ local INVENTORY_ABILITY_TYPE_ID = ____dummy_2Dinventory.INVENTORY_ABILITY_TYPE_ID
12
+ local ____arrays = require("utility.arrays")
13
+ local map = ____arrays.map
14
+ local toLuaSet = ____arrays.toLuaSet
15
+ local createItem = CreateItem
16
+ local getAbilityId = BlzGetAbilityId
17
+ local getItemAbility = BlzGetItemAbility
18
+ local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
19
+ local itemAddAbility = BlzItemAddAbility
20
+ local setItemBooleanField = BlzSetItemBooleanField
21
+ local removeItem = RemoveItem
22
+ local unitAddAbility = UnitAddAbility
23
+ local unitAddItem = UnitAddItem
24
+ local unitDropItemSlot = UnitDropItemSlot
25
+ local unitInventorySize = UnitInventorySize
26
+ local unitRemoveAbility = UnitRemoveAbility
27
+ local unitRemoveItemFromSlot = UnitRemoveItemFromSlot
28
+ local INVENTORY_ABILITY_TYPE_IDS = postcompile(function()
29
+ return toLuaSet(AbilityType:getAllIdsByBaseIds(map({
30
+ "AInv",
31
+ "Aihn",
32
+ "Aien",
33
+ "Aion",
34
+ "Aiun"
35
+ }, fourCC)))
36
+ end)
37
+ ---
38
+ -- @internal For use by internal systems only.
39
+ ____exports.castAbility = function(nativeUnit, abilityTypeId, prepareAbility, ...)
40
+ local nativeItem = createItem(DUMMY_ITEM_ID, 0, 0)
41
+ unitAddItem(INVENTORY_DUMMY_NATIVE_UNIT, nativeItem)
42
+ itemAddAbility(nativeItem, abilityTypeId)
43
+ local nativeAbility = checkNotNull(getItemAbility(nativeItem, abilityTypeId))
44
+ if prepareAbility ~= nil then
45
+ prepareAbility(nativeAbility, ...)
46
+ end
47
+ setItemBooleanField(nativeItem, ITEM_BF_ACTIVELY_USED, true)
48
+ setItemBooleanField(nativeItem, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
49
+ local success
50
+ if unitAddItem(nativeUnit, nativeItem) then
51
+ success = true
52
+ else
53
+ local latestInventoryAbilityTypeId = 0
54
+ local nativeItemBySlot = {}
55
+ local inventorySize = unitInventorySize(nativeUnit)
56
+ if inventorySize ~= 0 then
57
+ for slot = 0, inventorySize - 1 do
58
+ nativeItemBySlot[slot] = unitRemoveItemFromSlot(nativeUnit, slot)
59
+ end
60
+ local unitNativeAbility = getUnitAbilityByIndex(nativeUnit, 0)
61
+ local i = 1
62
+ while unitNativeAbility ~= nil do
63
+ local abilityTypeId = getAbilityId(unitNativeAbility)
64
+ if INVENTORY_ABILITY_TYPE_IDS[abilityTypeId] ~= nil then
65
+ latestInventoryAbilityTypeId = abilityTypeId
66
+ end
67
+ unitNativeAbility = getUnitAbilityByIndex(nativeUnit, i)
68
+ i = i + 1
69
+ end
70
+ unitRemoveAbility(nativeUnit, latestInventoryAbilityTypeId)
71
+ end
72
+ unitAddAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
73
+ success = unitAddItem(nativeUnit, nativeItem)
74
+ unitRemoveAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
75
+ if latestInventoryAbilityTypeId ~= 0 then
76
+ unitAddAbility(nativeUnit, latestInventoryAbilityTypeId)
77
+ for slot, nativeItem in pairs(nativeItemBySlot) do
78
+ unitAddItem(nativeUnit, nativeItem)
79
+ unitDropItemSlot(nativeUnit, nativeItem, slot)
80
+ end
81
+ end
82
+ end
83
+ removeItem(nativeItem)
84
+ return success
85
+ end
86
+ return ____exports
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { Unit } from "../unit";
4
3
  import { AbilityTypeId } from "../../object-data/entry/ability-type";
@@ -34,8 +33,8 @@ export declare namespace UnitBonusType {
34
33
  const DAMAGE: UnitBonusType<UnitDamageBonusId>;
35
34
  const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
36
35
  }
37
- export declare const addUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
38
- export declare const removeUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;
39
- export declare const updateUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id, value: number) => boolean;
40
- export declare const addOrUpdateOrRemoveUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id | undefined, value: number) => Id | undefined;
41
- export declare const getUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => number;
36
+ export declare const addUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
37
+ export declare const removeUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;
38
+ export declare const updateUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id, value: number) => boolean;
39
+ export declare const addOrUpdateOrRemoveUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id | undefined, value: number) => Id | undefined;
40
+ export declare const getUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => number;
@@ -0,0 +1,7 @@
1
+ /** @noSelfInFile */
2
+ declare module "../unit" {
3
+ interface Unit {
4
+ detachMissiles(this: Unit): void;
5
+ }
6
+ }
7
+ export {};
@@ -0,0 +1,30 @@
1
+ local ____exports = {}
2
+ local ____unit = require("engine.internal.unit")
3
+ local Unit = ____unit.Unit
4
+ local ____cast_2Dability = require("engine.internal.mechanics.cast-ability")
5
+ local castAbility = ____cast_2Dability.castAbility
6
+ local ____blink = require("engine.object-data.entry.ability-type.blink")
7
+ local BlinkAbilityType = ____blink.BlinkAbilityType
8
+ local ____math = require("math")
9
+ local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
10
+ local getUnitX = GetUnitX
11
+ local getUnitY = GetUnitY
12
+ local setUnitX = SetUnitX
13
+ local setUnitY = SetUnitY
14
+ local BLINK_ABILITY_TYPE_ID = compiletime(function()
15
+ local abilityType = BlinkAbilityType:create()
16
+ abilityType.minimumRange = 0
17
+ abilityType.maximumRange = MAXIMUM_INTEGER
18
+ abilityType.manaCost = 0
19
+ abilityType.cooldown = 0
20
+ return abilityType.id
21
+ end)
22
+ Unit.prototype.detachMissiles = function(self)
23
+ local nativeUnit = self.handle
24
+ local x = getUnitX(nativeUnit)
25
+ local y = getUnitY(nativeUnit)
26
+ castAbility(nativeUnit, BLINK_ABILITY_TYPE_ID)
27
+ setUnitX(nativeUnit, x)
28
+ setUnitY(nativeUnit, y)
29
+ end
30
+ return ____exports