warscript 0.0.1-dev.a21905e → 0.0.1-dev.a228cc0

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 (59) hide show
  1. package/core/types/effect.d.ts +13 -3
  2. package/core/types/effect.lua +116 -17
  3. package/core/types/frame.d.ts +4 -0
  4. package/core/types/frame.lua +71 -0
  5. package/core/util.d.ts +1 -1
  6. package/core/util.lua +12 -0
  7. package/engine/behavior.d.ts +2 -2
  8. package/engine/behavior.lua +6 -6
  9. package/engine/behaviour/ability/always-enabled.d.ts +7 -0
  10. package/engine/behaviour/ability/always-enabled.lua +31 -0
  11. package/engine/behaviour/ability/emulate-impact.d.ts +6 -0
  12. package/engine/behaviour/ability/emulate-impact.lua +29 -0
  13. package/engine/behaviour/ability/instant-impact.d.ts +2 -2
  14. package/engine/behaviour/ability/instant-impact.lua +4 -19
  15. package/engine/behaviour/ability/on-command-impact.d.ts +8 -0
  16. package/engine/behaviour/ability/on-command-impact.lua +25 -0
  17. package/engine/behaviour/ability/remove-buffs.d.ts +16 -0
  18. package/engine/behaviour/ability/remove-buffs.lua +28 -0
  19. package/engine/behaviour/ability.d.ts +9 -2
  20. package/engine/behaviour/ability.lua +47 -33
  21. package/engine/buff.d.ts +6 -1
  22. package/engine/buff.lua +29 -18
  23. package/engine/internal/ability.d.ts +16 -13
  24. package/engine/internal/ability.lua +79 -76
  25. package/engine/internal/item/ability.lua +81 -0
  26. package/engine/internal/misc/ability-disable-counter.d.ts +2 -0
  27. package/engine/internal/misc/ability-disable-counter.lua +13 -0
  28. package/engine/internal/unit/ability.d.ts +10 -1
  29. package/engine/internal/unit/ability.lua +36 -14
  30. package/engine/internal/unit/item.d.ts +2 -0
  31. package/engine/internal/unit/item.lua +20 -4
  32. package/engine/internal/unit/main-selected.d.ts +13 -0
  33. package/engine/internal/unit/main-selected.lua +51 -0
  34. package/engine/internal/unit-missile-launch.lua +24 -5
  35. package/engine/internal/unit.d.ts +20 -7
  36. package/engine/internal/unit.lua +112 -66
  37. package/engine/internal/utility.lua +12 -0
  38. package/engine/local-client.d.ts +7 -2
  39. package/engine/local-client.lua +82 -0
  40. package/engine/object-data/auxiliary/sound-preset-name.d.ts +5 -1
  41. package/engine/object-data/entry/ability-type.lua +8 -12
  42. package/engine/object-data/entry/item-type.d.ts +14 -0
  43. package/engine/object-data/entry/item-type.lua +91 -0
  44. package/engine/object-data/utility/object-data-entry-id-generator.lua +7 -0
  45. package/engine/object-field/ability.d.ts +4 -1
  46. package/engine/object-field/ability.lua +1 -1
  47. package/engine/standard/fields/ability.d.ts +2 -0
  48. package/engine/standard/fields/ability.lua +2 -0
  49. package/engine/unit.d.ts +1 -0
  50. package/engine/unit.lua +1 -0
  51. package/index.d.ts +1 -0
  52. package/index.lua +1 -0
  53. package/package.json +1 -1
  54. package/patch-lua.d.ts +0 -0
  55. package/patch-lua.lua +10 -0
  56. package/utility/arrays.d.ts +8 -1
  57. package/utility/arrays.lua +34 -3
  58. package/utility/lazy.d.ts +2 -0
  59. package/utility/lazy.lua +14 -0
@@ -0,0 +1,16 @@
1
+ /** @noSelfInFile */
2
+ import { AbilityBehavior } from "../ability";
3
+ import { Unit } from "../../internal/unit";
4
+ import { Ability } from "../../internal/ability";
5
+ import { AbilityDependentValue } from "../../object-field/ability";
6
+ import { BuffPolarity } from "../../object-data/auxiliary/buff-polarity";
7
+ import { BuffResistanceType } from "../../object-data/auxiliary/buff-resistance-type";
8
+ export declare class RemoveBuffsSelfAbilityBehavior extends AbilityBehavior {
9
+ private readonly polarity?;
10
+ private readonly resistanceType?;
11
+ private readonly includeExpirationTimers?;
12
+ private readonly includeAuras?;
13
+ private readonly autoDispel?;
14
+ constructor(ability: Ability, polarity?: AbilityDependentValue<BuffPolarity> | undefined, resistanceType?: AbilityDependentValue<BuffResistanceType> | undefined, includeExpirationTimers?: AbilityDependentValue<boolean> | undefined, includeAuras?: AbilityDependentValue<boolean> | undefined, autoDispel?: AbilityDependentValue<boolean> | undefined);
15
+ onImpact(caster: Unit): void;
16
+ }
@@ -0,0 +1,28 @@
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.RemoveBuffsSelfAbilityBehavior = __TS__Class()
8
+ local RemoveBuffsSelfAbilityBehavior = ____exports.RemoveBuffsSelfAbilityBehavior
9
+ RemoveBuffsSelfAbilityBehavior.name = "RemoveBuffsSelfAbilityBehavior"
10
+ __TS__ClassExtends(RemoveBuffsSelfAbilityBehavior, AbilityBehavior)
11
+ function RemoveBuffsSelfAbilityBehavior.prototype.____constructor(self, ability, polarity, resistanceType, includeExpirationTimers, includeAuras, autoDispel)
12
+ AbilityBehavior.prototype.____constructor(self, ability)
13
+ self.polarity = polarity
14
+ self.resistanceType = resistanceType
15
+ self.includeExpirationTimers = includeExpirationTimers
16
+ self.includeAuras = includeAuras
17
+ self.autoDispel = autoDispel
18
+ end
19
+ function RemoveBuffsSelfAbilityBehavior.prototype.onImpact(self, caster)
20
+ caster:removeBuffs(
21
+ self:resolveCurrentAbilityDependentValue(self.polarity),
22
+ self:resolveCurrentAbilityDependentValue(self.resistanceType),
23
+ self:resolveCurrentAbilityDependentValue(self.includeExpirationTimers),
24
+ self:resolveCurrentAbilityDependentValue(self.includeAuras),
25
+ self:resolveCurrentAbilityDependentValue(self.autoDispel)
26
+ )
27
+ end
28
+ return ____exports
@@ -9,22 +9,29 @@ 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 type AbilityBehaviorParameters = {
13
+ isExclusiveOnImpactHandler?: boolean;
14
+ };
12
15
  export declare abstract class AbilityBehavior<Parameters extends {
13
16
  periodicActionParameters?: any[];
14
17
  missileParameters?: any[];
15
18
  } = {}> extends Behavior<Ability, NonNullable<Parameters["periodicActionParameters"]>> {
16
- constructor(ability: Ability);
19
+ constructor(ability: Ability, parameters?: AbilityBehaviorParameters);
20
+ protected registerCommandEvent(orderTypeStringId?: string): void;
17
21
  get ability(): Ability;
18
22
  protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
23
+ protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value?: AbilityDependentValue<T>): T | undefined;
24
+ protected flashCasterEffect(widget: Widget): void;
19
25
  protected flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
20
26
  protected flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
21
27
  protected flashSpecialEffect(...args: [...pointOrWidget: [x: number, y: number] | [widget: Widget], duration?: number]): void;
22
28
  private static MissileLaunchConfig;
23
29
  private get missileLaunchConfig();
24
- protected launchMissile(source: Unit, target: Unit, ...parameters: NonNullable<Parameters["missileParameters"]>): void;
30
+ protected onCreate(): void;
25
31
  onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;
26
32
  onUnitGainAbility(_unit: Unit): void;
27
33
  onUnitLoseAbility(_unit: Unit): void;
34
+ onCommand(caster: Unit, orderTypeStringId: string): void;
28
35
  onCastingStart(caster: Unit): void;
29
36
  onCastingFinish(caster: Unit): void;
30
37
  onChannelingStart(caster: Unit): void;
@@ -4,6 +4,7 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
4
4
  local __TS__New = ____lualib.__TS__New
5
5
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
6
6
  local ____exports = {}
7
+ local createUnitEventListener
7
8
  local ____behavior = require("engine.behavior")
8
9
  local Behavior = ____behavior.Behavior
9
10
  local ____unit = require("engine.unit")
@@ -14,6 +15,8 @@ local ____effect = require("core.types.effect")
14
15
  local Effect = ____effect.Effect
15
16
  local ____ability = require("engine.standard.fields.ability")
16
17
  local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
18
+ local CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = ____ability.CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD
19
+ local CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
17
20
  local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
18
21
  local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
19
22
  local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
@@ -24,21 +27,27 @@ local ____ability = require("engine.object-field.ability")
24
27
  local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
25
28
  local ____timer = require("core.types.timer")
26
29
  local Timer = ____timer.Timer
27
- local ____missile = require("core.types.missile")
28
- local Missile = ____missile.Missile
29
30
  local createBehaviorFunctionsByAbilityTypeId = {}
30
- local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
31
- if success then
32
- abilityBehavior:onMissileArrival(...)
31
+ local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
32
+ local function createZeroTimerUnitEventListener(key)
33
+ local unitEventListener = createUnitEventListener(key)
34
+ return function(unit, ability, ...)
35
+ Timer:run(unitEventListener, unit, ability, ...)
33
36
  end
34
37
  end
35
- local ____class_0 = __TS__Class()
36
- ____class_0.name = ""
37
- function ____class_0.prototype.____constructor(self, abilityBehavior)
38
+ createUnitEventListener = function(key)
39
+ return function(unit, ability, ...)
40
+ ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
41
+ end
42
+ end
43
+ local registeredCommandEventIds = {}
44
+ local ____class_2 = __TS__Class()
45
+ ____class_2.name = ""
46
+ function ____class_2.prototype.____constructor(self, abilityBehavior)
38
47
  self.abilityBehavior = abilityBehavior
39
48
  end
40
49
  __TS__SetDescriptor(
41
- ____class_0.prototype,
50
+ ____class_2.prototype,
42
51
  "art",
43
52
  {get = function(self)
44
53
  return MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.abilityBehavior.ability, 0)
@@ -46,7 +55,7 @@ __TS__SetDescriptor(
46
55
  true
47
56
  )
48
57
  __TS__SetDescriptor(
49
- ____class_0.prototype,
58
+ ____class_2.prototype,
50
59
  "arc",
51
60
  {get = function(self)
52
61
  return MISSILE_ARC_ABILITY_FLOAT_FIELD:getValue(self.abilityBehavior.ability)
@@ -54,7 +63,7 @@ __TS__SetDescriptor(
54
63
  true
55
64
  )
56
65
  __TS__SetDescriptor(
57
- ____class_0.prototype,
66
+ ____class_2.prototype,
58
67
  "speed",
59
68
  {get = function(self)
60
69
  return MISSILE_SPEED_ABILITY_INTEGER_FIELD:getValue(self.abilityBehavior.ability)
@@ -65,12 +74,34 @@ ____exports.AbilityBehavior = __TS__Class()
65
74
  local AbilityBehavior = ____exports.AbilityBehavior
66
75
  AbilityBehavior.name = "AbilityBehavior"
67
76
  __TS__ClassExtends(AbilityBehavior, Behavior)
68
- function AbilityBehavior.prototype.____constructor(self, ability)
77
+ function AbilityBehavior.prototype.____constructor(self, ability, parameters)
69
78
  Behavior.prototype.____constructor(self, ability)
79
+ if parameters and parameters.isExclusiveOnImpactHandler then
80
+ exclusiveOnImpactHandlerAbilityBehaviorByAbility[ability] = self
81
+ end
82
+ self:onCreate()
83
+ end
84
+ function AbilityBehavior.prototype.registerCommandEvent(self, orderTypeStringId)
85
+ if orderTypeStringId == nil then
86
+ orderTypeStringId = self.ability.orderTypeStringId
87
+ end
88
+ local commandEventId = (tostring(self.ability.typeId) .. "#") .. orderTypeStringId
89
+ if not (registeredCommandEventIds[commandEventId] ~= nil) then
90
+ registeredCommandEventIds[commandEventId] = true
91
+ Unit.abilityCommandEvent[self.ability.typeId][orderTypeStringId]:addListener(createUnitEventListener("onCommand"))
92
+ end
70
93
  end
71
94
  function AbilityBehavior.prototype.resolveCurrentAbilityDependentValue(self, value)
72
95
  return resolveCurrentAbilityDependentValue(self.ability, value)
73
96
  end
97
+ function AbilityBehavior.prototype.flashCasterEffect(self, widget)
98
+ local attachmentPoint = CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
99
+ Effect:flash(
100
+ CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
101
+ widget,
102
+ attachmentPoint ~= "" and attachmentPoint or "origin"
103
+ )
104
+ end
74
105
  function AbilityBehavior.prototype.flashAreaEffect(self, x, y, ...)
75
106
  Effect:flash(
76
107
  AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
@@ -104,15 +135,7 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
104
135
  )
105
136
  end
106
137
  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
- )
138
+ function AbilityBehavior.prototype.onCreate(self)
116
139
  end
117
140
  function AbilityBehavior.prototype.onMissileArrival(self, ...)
118
141
  end
@@ -120,6 +143,8 @@ function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
120
143
  end
121
144
  function AbilityBehavior.prototype.onUnitLoseAbility(self, _unit)
122
145
  end
146
+ function AbilityBehavior.prototype.onCommand(self, caster, orderTypeStringId)
147
+ end
123
148
  function AbilityBehavior.prototype.onCastingStart(self, caster)
124
149
  end
125
150
  function AbilityBehavior.prototype.onCastingFinish(self, caster)
@@ -179,7 +204,7 @@ __TS__SetDescriptor(
179
204
  end},
180
205
  true
181
206
  )
182
- AbilityBehavior.MissileLaunchConfig = ____class_0
207
+ AbilityBehavior.MissileLaunchConfig = ____class_2
183
208
  __TS__SetDescriptor(
184
209
  AbilityBehavior.prototype,
185
210
  "missileLaunchConfig",
@@ -191,17 +216,6 @@ __TS__SetDescriptor(
191
216
  true
192
217
  );
193
218
  (function(self)
194
- local function createUnitEventListener(key)
195
- return function(unit, ability, ...)
196
- ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
197
- end
198
- end
199
- local function createZeroTimerUnitEventListener(key)
200
- local unitEventListener = createUnitEventListener(key)
201
- return function(unit, ability, ...)
202
- Timer:run(unitEventListener, unit, ability, ...)
203
- end
204
- end
205
219
  Unit.abilityGainedEvent:addListener(createUnitEventListener("onUnitGainAbility"))
206
220
  Unit.abilityLostEvent:addListener(createUnitEventListener("onUnitLoseAbility"))
207
221
  Unit.abilityCastingStartEvent:addListener(createUnitEventListener("onCastingStart"))
package/engine/buff.d.ts CHANGED
@@ -8,6 +8,7 @@ import { BuffResistanceType } from "./object-data/auxiliary/buff-resistance-type
8
8
  import { AbilityBooleanField, AbilityBooleanLevelField, AbilityCombatClassificationsLevelField, AbilityDependentValue, AbilityEnumLevelField, AbilityIntegerField, AbilityIntegerLevelField, AbilityNumberField, AbilityNumberLevelField } from "./object-field/ability";
9
9
  import { CombatClassifications } from "./object-data/auxiliary/combat-classification";
10
10
  import { IsExactlyAny, Prohibit, ReadonlyNonEmptyArray } from "../utility/types";
11
+ import { EffectParameters } from "../core/types/effect";
11
12
  import { UnitBehavior } from "./behaviour/unit";
12
13
  import type { Widget } from "../core/types/widget";
13
14
  import { Destructor } from "../destroyable";
@@ -250,8 +251,12 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
250
251
  get duration(): number;
251
252
  get remainingDuration(): number;
252
253
  set remainingDuration(remainingDuration: number);
253
- flashEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
254
+ flashEffect(...parameters: [
255
+ ...widgetOrXY: [] | [Widget] | [x: number, x: number],
256
+ ...parametersOrDuration: [] | [EffectParameters] | [number]
257
+ ]): void;
254
258
  flashSpecialEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
259
+ protected onCreate(): void;
255
260
  protected onDestroy(): Destructor;
256
261
  static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;
257
262
  static getByTypeId<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, unit: Unit, typeId: ApplicableBuffTypeId): T | undefined;
package/engine/buff.lua CHANGED
@@ -46,6 +46,10 @@ local ____arrays = require("utility.arrays")
46
46
  local forEach = ____arrays.forEach
47
47
  local ____ability_2Dduration = require("engine.internal.mechanics.ability-duration")
48
48
  local getAbilityDuration = ____ability_2Dduration.getAbilityDuration
49
+ local ____item = require("engine.internal.item")
50
+ local Item = ____item.Item
51
+ local ____destructable = require("core.types.destructable")
52
+ local Destructable = ____destructable.Destructable
49
53
  local getUnitAbility = BlzGetUnitAbility
50
54
  local stringValueByBuffTypeIdByFieldId = postcompile(function()
51
55
  local stringValueByBuffTypeIdByFieldId = {}
@@ -482,6 +486,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
482
486
  timer:start(duration, false, expireBuff, self)
483
487
  self._timer = timer
484
488
  end
489
+ self:onCreate()
485
490
  end
486
491
  function Buff.prototype.getUnitBonus(self, bonusType)
487
492
  local ____opt_36 = self._bonusIdByBonusType
@@ -496,26 +501,30 @@ function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
496
501
  end
497
502
  bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self._unit, bonusType, bonusIdByBonusType[bonusType], value)
498
503
  end
499
- function Buff.prototype.flashEffect(self, widgetOrDuration, duration)
500
- local isWidgetProvided = type(widgetOrDuration) == "table"
501
- local ____Effect_40 = Effect
502
- local ____Effect_flash_41 = Effect.flash
503
- local ____array_39 = __TS__SparseArrayNew(
504
- self[104],
505
- isWidgetProvided and widgetOrDuration or self._unit,
506
- stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
507
- )
508
- local ____isWidgetProvided_38
509
- if isWidgetProvided then
510
- ____isWidgetProvided_38 = duration
504
+ function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
505
+ if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
506
+ Effect:flash(self[104], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
511
507
  else
512
- ____isWidgetProvided_38 = widgetOrDuration
508
+ local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
509
+ local ____Effect_40 = Effect
510
+ local ____Effect_flash_41 = Effect.flash
511
+ local ____array_39 = __TS__SparseArrayNew(
512
+ self[104],
513
+ isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
514
+ stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
515
+ )
516
+ local ____isWidgetProvided_38
517
+ if isWidgetProvided then
518
+ ____isWidgetProvided_38 = yOrParametersOrDuration
519
+ else
520
+ ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
521
+ end
522
+ __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
523
+ ____Effect_flash_41(
524
+ ____Effect_40,
525
+ __TS__SparseArraySpread(____array_39)
526
+ )
513
527
  end
514
- __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
515
- ____Effect_flash_41(
516
- ____Effect_40,
517
- __TS__SparseArraySpread(____array_39)
518
- )
519
528
  end
520
529
  function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
521
530
  local isWidgetProvided = type(widgetOrDuration) == "table"
@@ -538,6 +547,8 @@ function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
538
547
  __TS__SparseArraySpread(____array_43)
539
548
  )
540
549
  end
550
+ function Buff.prototype.onCreate(self)
551
+ end
541
552
  function Buff.prototype.onDestroy(self)
542
553
  local unit = self._unit
543
554
  if getUnitAbility(unit.handle, self.typeId) == self.handle then
@@ -4,14 +4,6 @@ import { Event } from "../../event";
4
4
  import type { Item } from "../../core/types/item";
5
5
  import type { Unit } from "./unit";
6
6
  import type { AbilityTypeId } from "../object-data/entry/ability-type";
7
- interface Fields<K, V> {
8
- set(field: K, value: V): boolean;
9
- get(field: K): V;
10
- has(field: K): boolean;
11
- }
12
- interface AbilityLevel {
13
- realFields: Fields<jabilityreallevelfield, number>;
14
- }
15
7
  export type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
16
8
  export declare class AbilitySnapshot {
17
9
  }
@@ -20,7 +12,8 @@ export declare abstract class Ability extends Handle<jability> {
20
12
  protected constructor(handle: jability, typeId: number);
21
13
  toString(): string;
22
14
  get parentTypeId(): number;
23
- get orderId(): number;
15
+ get orderTypeStringId(): string;
16
+ get orderTypeId(): number;
24
17
  abstract readonly owner: Unit | Item;
25
18
  getSnapshot(): AbilitySnapshot;
26
19
  hasField(field: jabilityfield | number): boolean;
@@ -40,9 +33,11 @@ export declare abstract class Ability extends Handle<jability> {
40
33
  setField(field: jabilityintegerlevelfield | jabilityreallevelfield, level: number, value: number): boolean;
41
34
  setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
42
35
  setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
43
- get realFields(): Fields<jabilityrealfield, number>;
44
- get levels(): readonly AbilityLevel[];
36
+ get levelCount(): number;
45
37
  abstract get level(): number;
38
+ abstract get cooldownRemaining(): number;
39
+ abstract set cooldownRemaining(cooldownRemaining: number);
40
+ abstract interruptCast(): void;
46
41
  static get onCreate(): Event<[Ability]>;
47
42
  static get destroyEvent(): Event<[Ability]>;
48
43
  }
@@ -53,15 +48,21 @@ export declare class UnrecognizedAbility extends Ability {
53
48
  readonly owner: Unit;
54
49
  constructor(typeId: number, owner: Unit);
55
50
  get level(): number;
51
+ get cooldownRemaining(): number;
52
+ set cooldownRemaining(_: number);
53
+ interruptCast(): void;
56
54
  }
57
55
  export declare class UnitAbility extends Ability {
58
56
  readonly owner: Unit;
59
57
  private readonly u;
60
58
  constructor(handle: jability, typeId: number, owner: Unit);
59
+ incrementHideCounter(): void;
60
+ decrementHideCounter(): void;
61
61
  get level(): number;
62
62
  set level(v: number);
63
63
  get cooldownRemaining(): number;
64
- set cooldownRemaining(v: number);
64
+ set cooldownRemaining(cooldownRemaining: number);
65
+ interruptCast(): void;
65
66
  static get onCreate(): Event<[UnitAbility]>;
66
67
  static get onDestroy(): Event<[UnitAbility]>;
67
68
  }
@@ -85,7 +86,9 @@ export declare class ItemAbility extends Ability {
85
86
  setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
86
87
  setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
87
88
  get level(): number;
89
+ get cooldownRemaining(): number;
90
+ set cooldownRemaining(cooldownRemaining: number);
91
+ interruptCast(): void;
88
92
  static get onCreate(): Event<[ItemAbility]>;
89
93
  static get onDestroy(): Event<[ItemAbility]>;
90
94
  }
91
- export {};
@@ -2,7 +2,6 @@ local ____lualib = require("lualib_bundle")
2
2
  local __TS__ArrayMap = ____lualib.__TS__ArrayMap
3
3
  local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
4
4
  local __TS__Class = ____lualib.__TS__Class
5
- local __TS__New = ____lualib.__TS__New
6
5
  local __TS__ClassExtends = ____lualib.__TS__ClassExtends
7
6
  local __TS__InstanceOf = ____lualib.__TS__InstanceOf
8
7
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -11,7 +10,10 @@ local ____exports = {}
11
10
  local ____handle = require("core.types.handle")
12
11
  local Handle = ____handle.Handle
13
12
  local ____ability = require("engine.internal.item.ability")
13
+ local abilityActionDummy = ____ability.abilityActionDummy
14
14
  local doAbilityAction = ____ability.doAbilityAction
15
+ local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
16
+ local startItemCooldown = ____ability.startItemCooldown
15
17
  local getUnitAbilityLevel = GetUnitAbilityLevel
16
18
  local setUnitAbilityLevel = SetUnitAbilityLevel
17
19
  local setAbilityIntegerField = BlzSetAbilityIntegerField
@@ -33,7 +35,7 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
33
35
  local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
34
36
  local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
35
37
  local getHandleId = GetHandleId
36
- local getItemAbility = BlzGetItemAbility
38
+ local unitHideAbility = BlzUnitHideAbility
37
39
  local match = string.match
38
40
  local ____type = _G.type
39
41
  local ____tostring = _G.tostring
@@ -151,55 +153,6 @@ local orders = postcompile(function()
151
153
  end
152
154
  return orders
153
155
  end)
154
- local RealFields = __TS__Class()
155
- RealFields.name = "RealFields"
156
- function RealFields.prototype.____constructor(self, handle)
157
- self.handle = handle
158
- end
159
- function RealFields.prototype.set(self, field, value)
160
- return BlzSetAbilityRealField(self.handle, field, value)
161
- end
162
- function RealFields.prototype.get(self, field)
163
- return BlzGetAbilityRealField(self.handle, field)
164
- end
165
- function RealFields.prototype.has(self, field)
166
- local handle = self.handle
167
- return BlzSetAbilityRealField(
168
- handle,
169
- field,
170
- BlzGetAbilityRealField(handle, field)
171
- )
172
- end
173
- local RealLevelFields = __TS__Class()
174
- RealLevelFields.name = "RealLevelFields"
175
- function RealLevelFields.prototype.____constructor(self, handle, level)
176
- self.handle = handle
177
- self.level = level
178
- end
179
- function RealLevelFields.prototype.set(self, field, value)
180
- return BlzSetAbilityRealLevelField(self.handle, field, self.level, value)
181
- end
182
- function RealLevelFields.prototype.get(self, field)
183
- return BlzGetAbilityRealLevelField(self.handle, field, self.level)
184
- end
185
- function RealLevelFields.prototype.has(self, field)
186
- local handle = self.handle
187
- return BlzSetAbilityRealLevelField(
188
- handle,
189
- field,
190
- 0,
191
- BlzGetAbilityRealLevelField(handle, field, 0)
192
- )
193
- end
194
- local realLevelMetatable = {__index = self}
195
- local levelDescriptors = {realFields = function(self, handle, level)
196
- return __TS__New(RealLevelFields, handle, level)
197
- end}
198
- local levelMetatable = {__index = function(self, key)
199
- local fields = levelDescriptors[key](levelDescriptors, self.handle, self.level)
200
- rawset(self, key, fields)
201
- return fields
202
- end}
203
156
  local fieldGetters = {
204
157
  abilityintegerfield = function(ability, field)
205
158
  return getAbilityIntegerField(ability.handle, field)
@@ -346,43 +299,26 @@ __TS__SetDescriptor(
346
299
  )
347
300
  __TS__SetDescriptor(
348
301
  Ability.prototype,
349
- "orderId",
302
+ "orderTypeStringId",
350
303
  {get = function(self)
351
304
  local field = orderIdFieldByParentTypeId[self.parentTypeId]
352
- return order2orderId(field ~= nil and getAbilityStringLevelField(self.handle, ABILITY_SLF_BASE_ORDER_ID_NCL6, self.level) or (orders[self.parentTypeId] or ""))
305
+ return field ~= nil and getAbilityStringLevelField(self.handle, field, self.level) or (orders[self.parentTypeId] or "")
353
306
  end},
354
307
  true
355
308
  )
356
309
  __TS__SetDescriptor(
357
310
  Ability.prototype,
358
- "realFields",
311
+ "orderTypeId",
359
312
  {get = function(self)
360
- local realFields = __TS__New(RealFields, self.handle)
361
- rawset(self, "realFields", realFields)
362
- return realFields
313
+ return order2orderId(self.orderTypeStringId)
363
314
  end},
364
315
  true
365
316
  )
366
317
  __TS__SetDescriptor(
367
318
  Ability.prototype,
368
- "levels",
319
+ "levelCount",
369
320
  {get = function(self)
370
- local handle = self.handle
371
- local levels = setmetatable(
372
- {},
373
- {
374
- __len = function(self)
375
- return BlzGetAbilityIntegerField(handle, ABILITY_IF_LEVELS)
376
- end,
377
- __index = function(self, i)
378
- local level = setmetatable({handle = handle, level = i - 1}, levelMetatable)
379
- self[i] = level
380
- return level
381
- end
382
- }
383
- )
384
- rawset(self, "levels", levels)
385
- return levels
321
+ return self:getField(ABILITY_IF_LEVELS)
386
322
  end},
387
323
  true
388
324
  )
@@ -393,6 +329,17 @@ __TS__SetDescriptor(
393
329
  end},
394
330
  true
395
331
  )
332
+ __TS__SetDescriptor(
333
+ Ability.prototype,
334
+ "cooldownRemaining",
335
+ {
336
+ get = function(self)
337
+ end,
338
+ set = function(self, cooldownRemaining)
339
+ end
340
+ },
341
+ true
342
+ )
396
343
  __TS__ObjectDefineProperty(
397
344
  Ability,
398
345
  "onCreate",
@@ -416,6 +363,8 @@ function UnrecognizedAbility.prototype.____constructor(self, typeId, owner)
416
363
  UnrecognizedAbility.____super.prototype.____constructor(self, nil, typeId)
417
364
  self.owner = owner
418
365
  end
366
+ function UnrecognizedAbility.prototype.interruptCast(self)
367
+ end
419
368
  __TS__SetDescriptor(
420
369
  UnrecognizedAbility.prototype,
421
370
  "level",
@@ -424,6 +373,18 @@ __TS__SetDescriptor(
424
373
  end},
425
374
  true
426
375
  )
376
+ __TS__SetDescriptor(
377
+ UnrecognizedAbility.prototype,
378
+ "cooldownRemaining",
379
+ {
380
+ get = function(self)
381
+ return 0
382
+ end,
383
+ set = function(self, _)
384
+ end
385
+ },
386
+ true
387
+ )
427
388
  ____exports.UnitAbility = __TS__Class()
428
389
  local UnitAbility = ____exports.UnitAbility
429
390
  UnitAbility.name = "UnitAbility"
@@ -433,6 +394,15 @@ function UnitAbility.prototype.____constructor(self, handle, typeId, owner)
433
394
  self.owner = owner
434
395
  self.u = owner.handle
435
396
  end
397
+ function UnitAbility.prototype.incrementHideCounter(self)
398
+ unitHideAbility(self.u, self.typeId, true)
399
+ end
400
+ function UnitAbility.prototype.decrementHideCounter(self)
401
+ unitHideAbility(self.u, self.typeId, false)
402
+ end
403
+ function UnitAbility.prototype.interruptCast(self)
404
+ self.owner:interruptCast(self.typeId)
405
+ end
436
406
  __TS__SetDescriptor(
437
407
  UnitAbility.prototype,
438
408
  "level",
@@ -453,8 +423,8 @@ __TS__SetDescriptor(
453
423
  get = function(self)
454
424
  return getUnitAbilityCooldownRemaining(self.u, self.typeId)
455
425
  end,
456
- set = function(self, v)
457
- startUnitAbilityCooldown(self.u, self.typeId, v)
426
+ set = function(self, cooldownRemaining)
427
+ startUnitAbilityCooldown(self.u, self.typeId, cooldownRemaining)
458
428
  end
459
429
  },
460
430
  true
@@ -479,6 +449,11 @@ end
479
449
  local function setAbilityField(_, ability, field, levelOrValue, value)
480
450
  return ____exports.Ability.prototype.setField(ability, field, levelOrValue, value)
481
451
  end
452
+ local function getAbilityCooldown(_, abilityTypeId)
453
+ return getUnitAbilityCooldownRemaining(abilityActionDummy, abilityTypeId)
454
+ end
455
+ local function doNothing()
456
+ end
482
457
  ____exports.ItemAbility = __TS__Class()
483
458
  local ItemAbility = ____exports.ItemAbility
484
459
  ItemAbility.name = "ItemAbility"
@@ -506,6 +481,13 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
506
481
  value
507
482
  )
508
483
  end
484
+ function ItemAbility.prototype.interruptCast(self)
485
+ local item = self.owner
486
+ local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
487
+ local ____item_handle_3 = item.handle
488
+ local ____opt_1 = item.owner
489
+ ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, doNothing)
490
+ end
509
491
  __TS__SetDescriptor(
510
492
  ItemAbility.prototype,
511
493
  "level",
@@ -514,6 +496,27 @@ __TS__SetDescriptor(
514
496
  end},
515
497
  true
516
498
  )
499
+ __TS__SetDescriptor(
500
+ ItemAbility.prototype,
501
+ "cooldownRemaining",
502
+ {
503
+ get = function(self)
504
+ local item = self.owner
505
+ local ____doAbilityActionForceDummy_8 = doAbilityActionForceDummy
506
+ local ____item_handle_7 = item.handle
507
+ local ____opt_5 = item.owner
508
+ return ____doAbilityActionForceDummy_8(____item_handle_7, ____opt_5 and ____opt_5.handle, getAbilityCooldown, self.typeId)
509
+ end,
510
+ set = function(self, cooldownRemaining)
511
+ local item = self.owner
512
+ local ____startItemCooldown_12 = startItemCooldown
513
+ local ____item_handle_11 = item.handle
514
+ local ____opt_9 = item.owner
515
+ ____startItemCooldown_12(____item_handle_11, ____opt_9 and ____opt_9.handle, cooldownRemaining)
516
+ end
517
+ },
518
+ true
519
+ )
517
520
  __TS__ObjectDefineProperty(
518
521
  ItemAbility,
519
522
  "onCreate",