warscript 0.0.1-dev.b530e1f → 0.0.1-dev.c16baee

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 (93) hide show
  1. package/attributes.d.ts +12 -0
  2. package/attributes.lua +16 -0
  3. package/core/types/frame.d.ts +0 -1
  4. package/core/types/group.d.ts +0 -1
  5. package/core/types/handle.d.ts +2 -1
  6. package/core/types/handle.lua +5 -2
  7. package/core/types/image.d.ts +0 -1
  8. package/core/types/missile.d.ts +2 -2
  9. package/core/types/missile.lua +8 -2
  10. package/core/types/unit.lua +8 -0
  11. package/decl/index.d.ts +1 -0
  12. package/engine/ability.d.ts +1 -1
  13. package/engine/behavior.d.ts +10 -10
  14. package/engine/behaviour/ability/apply-unit-behavior.d.ts +13 -4
  15. package/engine/behaviour/ability/apply-unit-behavior.lua +31 -9
  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/ability.d.ts +1 -1
  25. package/engine/internal/mechanics/ability-duration.d.ts +1 -3
  26. package/engine/internal/mechanics/ability-duration.lua +2 -0
  27. package/engine/internal/mechanics/cast-ability.d.ts +2 -0
  28. package/engine/internal/mechanics/cast-ability.lua +86 -0
  29. package/engine/internal/unit/bonus.d.ts +5 -6
  30. package/engine/internal/unit/detach-missiles.d.ts +7 -0
  31. package/engine/internal/unit/detach-missiles.lua +30 -0
  32. package/engine/internal/unit-missile-launch.lua +1 -1
  33. package/engine/internal/unit.d.ts +37 -10
  34. package/engine/internal/unit.lua +241 -84
  35. package/engine/object-data/auxiliary/attachment-preset.d.ts +0 -1
  36. package/engine/object-data/auxiliary/combat-classification.d.ts +0 -2
  37. package/engine/object-data/entry/ability-type/blank-configurable.d.ts +0 -1
  38. package/engine/object-data/entry/ability-type/blank-passive.d.ts +0 -1
  39. package/engine/object-data/entry/ability-type/blink.d.ts +10 -0
  40. package/engine/object-data/entry/ability-type/blink.lua +39 -0
  41. package/engine/object-data/entry/ability-type/channel.d.ts +0 -1
  42. package/engine/object-data/entry/ability-type/mine.d.ts +10 -0
  43. package/engine/object-data/entry/ability-type/mine.lua +39 -0
  44. package/engine/object-data/entry/ability-type/spirit-touch.d.ts +2 -2
  45. package/engine/object-data/entry/ability-type/spirit-touch.lua +6 -6
  46. package/engine/object-data/entry/ability-type.d.ts +0 -1
  47. package/engine/object-data/entry/buff-type/applicable.d.ts +0 -1
  48. package/engine/object-data/entry/buff-type/applicable.lua +27 -71
  49. package/engine/object-data/entry/buff-type/blank.d.ts +0 -1
  50. package/engine/object-data/entry/buff-type.d.ts +0 -1
  51. package/engine/object-data/entry/destructible-type.d.ts +0 -1
  52. package/engine/object-data/entry/item-type/blank.d.ts +0 -1
  53. package/engine/object-data/entry/item-type.d.ts +0 -1
  54. package/engine/object-data/entry/lightning-type.d.ts +0 -1
  55. package/engine/object-data/entry/unit-type.d.ts +42 -2
  56. package/engine/object-data/entry/unit-type.lua +378 -50
  57. package/engine/object-data/entry/upgrade/blank.d.ts +0 -1
  58. package/engine/object-data/entry/upgrade.d.ts +0 -1
  59. package/engine/object-data/entry.d.ts +2 -3
  60. package/engine/object-field/ability.d.ts +8 -6
  61. package/engine/object-field/ability.lua +6 -0
  62. package/engine/object-field/unit.d.ts +1 -0
  63. package/engine/object-field/unit.lua +3 -0
  64. package/engine/object-field.d.ts +2 -1
  65. package/engine/object-field.lua +16 -12
  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 +139 -40
  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
@@ -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";
@@ -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,7 +1,7 @@
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
- local __TS__Delete = ____lualib.__TS__Delete
5
5
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
6
6
  local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
7
7
  local ____exports = {}
@@ -12,13 +12,17 @@ local getClass = ____reflection.getClass
12
12
  local getSuperclass = ____reflection.getSuperclass
13
13
  local ____exception = require("exception")
14
14
  local IllegalStateException = ____exception.IllegalStateException
15
+ local ____attributes = require("attributes")
16
+ local AttributesHolder = ____attributes.AttributesHolder
15
17
  local getHandleId = GetHandleId
16
18
  local onCreateEventByHandleConstructor = {}
17
19
  local onDestroyEventByHandleConstructor = {}
18
20
  ____exports.Handle = __TS__Class()
19
21
  local Handle = ____exports.Handle
20
22
  Handle.name = "Handle"
23
+ __TS__ClassExtends(Handle, AttributesHolder)
21
24
  function Handle.prototype.____constructor(self, handle)
25
+ AttributesHolder.prototype.____constructor(self)
22
26
  self[0] = 0
23
27
  local id = getHandleId(handle)
24
28
  local clazz = self.constructor
@@ -84,7 +88,6 @@ function Handle.prototype.destroy(self, ...)
84
88
  0
85
89
  )
86
90
  end
87
- __TS__Delete(clazz.memoized, id)
88
91
  return nil
89
92
  end
90
93
  function Handle.invokeOnDestroyEvent(self, clazz, handle)
@@ -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 {};
@@ -1,12 +1,21 @@
1
1
  /** @noSelfInFile */
2
2
  import { AbilityBehavior } from "../ability";
3
3
  import { Ability } from "../../internal/ability";
4
- import { UnitBehaviorConstructor } from "../unit";
4
+ import { UnitBehavior } from "../unit";
5
5
  import { Unit } from "../../internal/unit";
6
- export declare class ApplyUnitBehaviorAbilityBehavior<Args extends any[]> extends AbilityBehavior {
7
- private readonly createUnitBehavior;
6
+ import { MutableKeys } from "../../../utility/types";
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
+ }>;
11
+ export declare class ApplyUnitBehaviorAbilityBehavior<T extends UnitBehavior> extends AbilityBehavior {
12
+ private readonly unitBehaviorConstructor;
13
+ private readonly parameters?;
14
+ private readonly keys?;
8
15
  private unitBehavior?;
9
- constructor(ability: Ability, unitBehaviorConstructor: UnitBehaviorConstructor<Args>, ...args: Args);
16
+ constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: UnitBehaviorParameters<T> | undefined);
17
+ update(): void;
10
18
  onUnitGainAbility(unit: Unit): void;
11
19
  onUnitLoseAbility(): void;
12
20
  }
21
+ export {};
@@ -1,23 +1,38 @@
1
1
  local ____lualib = require("lualib_bundle")
2
2
  local __TS__Class = ____lualib.__TS__Class
3
3
  local __TS__ClassExtends = ____lualib.__TS__ClassExtends
4
+ local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
5
+ local __TS__ArraySort = ____lualib.__TS__ArraySort
4
6
  local __TS__New = ____lualib.__TS__New
5
7
  local ____exports = {}
6
8
  local ____ability = require("engine.behaviour.ability")
7
9
  local AbilityBehavior = ____ability.AbilityBehavior
10
+ local ____ability = require("engine.object-field.ability")
11
+ local AbilityField = ____ability.AbilityField
12
+ local AbilityLevelField = ____ability.AbilityLevelField
8
13
  ____exports.ApplyUnitBehaviorAbilityBehavior = __TS__Class()
9
14
  local ApplyUnitBehaviorAbilityBehavior = ____exports.ApplyUnitBehaviorAbilityBehavior
10
15
  ApplyUnitBehaviorAbilityBehavior.name = "ApplyUnitBehaviorAbilityBehavior"
11
16
  __TS__ClassExtends(ApplyUnitBehaviorAbilityBehavior, AbilityBehavior)
12
- function ApplyUnitBehaviorAbilityBehavior.prototype.____constructor(self, ability, unitBehaviorConstructor, ...)
13
- local args = {...}
17
+ function ApplyUnitBehaviorAbilityBehavior.prototype.____constructor(self, ability, unitBehaviorConstructor, parameters)
14
18
  AbilityBehavior.prototype.____constructor(self, ability)
15
- self.createUnitBehavior = function(____, unit)
16
- return __TS__New(
17
- unitBehaviorConstructor,
18
- unit,
19
- table.unpack(args)
20
- )
19
+ self.unitBehaviorConstructor = unitBehaviorConstructor
20
+ self.parameters = parameters
21
+ if parameters ~= nil then
22
+ self.keys = __TS__ArraySort(__TS__ObjectKeys(parameters))
23
+ end
24
+ end
25
+ function ApplyUnitBehaviorAbilityBehavior.prototype.update(self)
26
+ local unitBehavior = self.unitBehavior
27
+ local parameters = self.parameters
28
+ local keys = self.keys
29
+ if unitBehavior ~= nil and parameters ~= nil and keys ~= nil then
30
+ for ____, key in ipairs(keys) do
31
+ local value = parameters[key]
32
+ if value ~= nil then
33
+ unitBehavior[key] = self:resolveCurrentAbilityDependentValue(value)
34
+ end
35
+ end
21
36
  end
22
37
  end
23
38
  function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitGainAbility(self, unit)
@@ -25,7 +40,8 @@ function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitGainAbility(self, unit
25
40
  if ____opt_0 ~= nil then
26
41
  ____opt_0:destroy()
27
42
  end
28
- self.unitBehavior = self:createUnitBehavior(unit)
43
+ self.unitBehavior = __TS__New(self.unitBehaviorConstructor, unit)
44
+ self:update()
29
45
  end
30
46
  function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitLoseAbility(self)
31
47
  local ____opt_2 = self.unitBehavior
@@ -33,4 +49,10 @@ function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitLoseAbility(self)
33
49
  ____opt_2:destroy()
34
50
  end
35
51
  end
52
+ AbilityField.valueChangeEvent:addListener(function(ability)
53
+ ____exports.ApplyUnitBehaviorAbilityBehavior:forAll(ability, "update")
54
+ end)
55
+ AbilityLevelField.valueChangeEvent:addListener(function(ability)
56
+ ____exports.ApplyUnitBehaviorAbilityBehavior:forAll(ability, "update")
57
+ end)
36
58
  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)
@@ -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,
@@ -12,7 +12,7 @@ interface Fields<K, V> {
12
12
  interface AbilityLevel {
13
13
  realFields: Fields<jabilityreallevelfield, number>;
14
14
  }
15
- type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
15
+ export type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
16
16
  export declare class AbilitySnapshot {
17
17
  }
18
18
  export declare abstract class Ability extends Handle<jability> {
@@ -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 {};