warscript 0.0.1-dev.86b4b59 → 0.0.1-dev.87b6c38

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 (100) hide show
  1. package/attributes.d.ts +1 -0
  2. package/attributes.lua +9 -0
  3. package/core/types/frame.lua +24 -21
  4. package/core/types/player.d.ts +16 -0
  5. package/core/types/player.lua +60 -15
  6. package/core/types/playerCamera.d.ts +2 -0
  7. package/core/types/playerCamera.lua +123 -5
  8. package/core/types/tileCell.d.ts +11 -1
  9. package/core/types/tileCell.lua +97 -0
  10. package/core/types/timer.d.ts +3 -1
  11. package/core/types/timer.lua +27 -2
  12. package/decl/native.d.ts +6 -4
  13. package/engine/behavior.d.ts +12 -1
  14. package/engine/behavior.lua +172 -70
  15. package/engine/behaviour/ability/apply-buff.lua +5 -5
  16. package/engine/behaviour/ability/emulate-impact.d.ts +1 -1
  17. package/engine/behaviour/ability/emulate-impact.lua +11 -3
  18. package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
  19. package/engine/behaviour/ability/remove-buffs.lua +21 -0
  20. package/engine/behaviour/ability/restore-mana.d.ts +1 -1
  21. package/engine/behaviour/ability/restore-mana.lua +6 -6
  22. package/engine/behaviour/ability.d.ts +2 -1
  23. package/engine/behaviour/ability.lua +10 -18
  24. package/engine/behaviour/unit/stun-immunity.d.ts +11 -5
  25. package/engine/behaviour/unit/stun-immunity.lua +53 -28
  26. package/engine/behaviour/unit.d.ts +35 -5
  27. package/engine/behaviour/unit.lua +220 -31
  28. package/engine/buff.d.ts +14 -6
  29. package/engine/buff.lua +145 -97
  30. package/engine/internal/ability.d.ts +5 -1
  31. package/engine/internal/ability.lua +44 -11
  32. package/engine/internal/item/ability.lua +63 -11
  33. package/engine/internal/item+owner.lua +12 -6
  34. package/engine/internal/item.d.ts +16 -16
  35. package/engine/internal/item.lua +135 -49
  36. package/engine/internal/misc/frame-coordinates.d.ts +2 -0
  37. package/engine/internal/misc/frame-coordinates.lua +21 -0
  38. package/engine/internal/misc/get-terrain-z.d.ts +2 -0
  39. package/engine/internal/misc/get-terrain-z.lua +11 -0
  40. package/engine/internal/misc/player-local-handle.d.ts +2 -0
  41. package/engine/internal/misc/player-local-handle.lua +5 -0
  42. package/engine/internal/unit/ability.d.ts +35 -0
  43. package/engine/internal/unit/ability.lua +98 -9
  44. package/engine/internal/unit/fly-height.d.ts +7 -0
  45. package/engine/internal/unit/fly-height.lua +20 -0
  46. package/engine/internal/unit/main-selected.lua +12 -27
  47. package/engine/internal/unit/order.d.ts +20 -0
  48. package/engine/internal/unit/order.lua +136 -0
  49. package/engine/internal/unit/scale.d.ts +7 -0
  50. package/engine/internal/unit/scale.lua +20 -0
  51. package/engine/internal/unit+ability.lua +10 -1
  52. package/engine/internal/unit-missile-launch.lua +45 -14
  53. package/engine/internal/unit.d.ts +20 -16
  54. package/engine/internal/unit.lua +185 -136
  55. package/engine/local-client.d.ts +2 -0
  56. package/engine/local-client.lua +30 -0
  57. package/engine/object-data/auxiliary/armor-type.d.ts +11 -0
  58. package/engine/object-data/auxiliary/armor-type.lua +46 -0
  59. package/engine/object-data/entry/ability-type.lua +5 -4
  60. package/engine/object-data/entry/destructible-type.d.ts +15 -1
  61. package/engine/object-data/entry/destructible-type.lua +77 -0
  62. package/engine/object-data/entry/unit-type.d.ts +15 -2
  63. package/engine/object-data/entry/unit-type.lua +135 -33
  64. package/engine/object-field/ability.d.ts +3 -3
  65. package/engine/object-field/ability.lua +7 -6
  66. package/engine/object-field/unit.d.ts +24 -1
  67. package/engine/object-field/unit.lua +91 -0
  68. package/engine/object-field.d.ts +15 -6
  69. package/engine/object-field.lua +225 -124
  70. package/engine/random.d.ts +9 -0
  71. package/engine/random.lua +13 -0
  72. package/engine/standard/fields/ability.d.ts +2 -2
  73. package/engine/standard/fields/ability.lua +2 -2
  74. package/engine/standard/fields/unit.d.ts +6 -0
  75. package/engine/standard/fields/unit.lua +11 -0
  76. package/engine/synchronization.d.ts +11 -0
  77. package/engine/synchronization.lua +77 -0
  78. package/engine/text-tag.d.ts +36 -2
  79. package/engine/text-tag.lua +250 -10
  80. package/engine/unit.d.ts +3 -0
  81. package/engine/unit.lua +3 -0
  82. package/net/socket.lua +1 -1
  83. package/objutil/buff.lua +1 -1
  84. package/package.json +2 -2
  85. package/patch-lualib.lua +1 -1
  86. package/utility/arrays.d.ts +1 -0
  87. package/utility/arrays.lua +8 -0
  88. package/utility/callback-array.d.ts +17 -0
  89. package/utility/callback-array.lua +61 -0
  90. package/utility/functions.d.ts +7 -0
  91. package/utility/functions.lua +12 -0
  92. package/utility/linked-set.d.ts +1 -0
  93. package/utility/linked-set.lua +19 -1
  94. package/utility/lua-maps.d.ts +12 -2
  95. package/utility/lua-maps.lua +37 -2
  96. package/utility/lua-sets.d.ts +1 -0
  97. package/utility/lua-sets.lua +4 -0
  98. package/utility/types.d.ts +3 -0
  99. package/core/types/order.d.ts +0 -26
  100. package/core/types/order.lua +0 -65
@@ -5,11 +5,11 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
5
5
  local __TS__New = ____lualib.__TS__New
6
6
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
7
7
  local ____exports = {}
8
- local createUnitEventListener
9
8
  local ____behavior = require("engine.behavior")
10
9
  local Behavior = ____behavior.Behavior
11
- local ____unit = require("engine.unit")
10
+ local ____unit = require("engine.internal.unit")
12
11
  local Unit = ____unit.Unit
12
+ require("engine.internal.unit.ability")
13
13
  local ____ability = require("engine.internal.ability")
14
14
  local Ability = ____ability.Ability
15
15
  local ____effect = require("core.types.effect")
@@ -30,17 +30,9 @@ local ____ability = require("engine.object-field.ability")
30
30
  local AbilityField = ____ability.AbilityField
31
31
  local AbilityLevelField = ____ability.AbilityLevelField
32
32
  local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
33
- local ____timer = require("core.types.timer")
34
- local Timer = ____timer.Timer
35
33
  local createBehaviorFunctionsByAbilityTypeId = {}
36
34
  local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
37
- local function createZeroTimerUnitEventListener(key)
38
- local unitEventListener = createUnitEventListener(key)
39
- return function(unit, ability, ...)
40
- Timer:run(unitEventListener, unit, ability, ...)
41
- end
42
- end
43
- createUnitEventListener = function(key)
35
+ local function createUnitEventListener(key)
44
36
  return function(unit, ability, ...)
45
37
  ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
46
38
  end
@@ -274,13 +266,13 @@ __TS__SetDescriptor(
274
266
  Unit.abilityDestructibleTargetChannelingStartEvent:addListener(createUnitEventListener("onDestructibleTargetChannelingStart"))
275
267
  Unit.abilityPointTargetChannelingStartEvent:addListener(createUnitEventListener("onPointTargetChannelingStart"))
276
268
  Unit.abilityNoTargetChannelingStartEvent:addListener(createUnitEventListener("onNoTargetChannelingStart"))
277
- Unit.abilityChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onImpact"))
278
- Unit.abilityWidgetTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onWidgetTargetImpact"))
279
- Unit.abilityUnitTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onUnitTargetImpact"))
280
- Unit.abilityItemTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onItemTargetImpact"))
281
- Unit.abilityDestructibleTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onDestructibleTargetImpact"))
282
- Unit.abilityPointTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onPointTargetImpact"))
283
- Unit.abilityNoTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onNoTargetImpact"))
269
+ Unit.abilityImpactEvent:addListener(createUnitEventListener("onImpact"))
270
+ Unit.abilityWidgetTargetImpactEvent:addListener(createUnitEventListener("onWidgetTargetImpact"))
271
+ Unit.abilityUnitTargetImpactEvent:addListener(createUnitEventListener("onUnitTargetImpact"))
272
+ Unit.abilityItemTargetImpactEvent:addListener(createUnitEventListener("onItemTargetImpact"))
273
+ Unit.abilityDestructibleTargetImpactEvent:addListener(createUnitEventListener("onDestructibleTargetImpact"))
274
+ Unit.abilityPointTargetImpactEvent:addListener(createUnitEventListener("onPointTargetImpact"))
275
+ Unit.abilityNoTargetImpactEvent:addListener(createUnitEventListener("onNoTargetImpact"))
284
276
  Unit.abilityChannelingFinishEvent:addListener(createUnitEventListener("onChannelingFinish"))
285
277
  Unit.abilityStopEvent:addListener(createUnitEventListener("onStop"))
286
278
  end)(AbilityBehavior)
@@ -4,15 +4,21 @@ import { Unit } from "../../unit";
4
4
  import { BuffTypeId } from "../../object-data/entry/buff-type";
5
5
  import { TextTagPreset } from "../../text-tag";
6
6
  import { Destructor } from "../../../destroyable";
7
- export type StunImmunityUnitBehaviourParameters = {
7
+ import { BehaviorPriority } from "../../behavior";
8
+ export type StunImmunityUnitBehaviorParameters = {
9
+ readonly priority?: BehaviorPriority;
8
10
  buffTypeIds?: LuaSet<BuffTypeId>;
9
11
  textTagPreset?: TextTagPreset;
10
12
  textTagText?: string;
13
+ additionalAction?: (this: void, unit: Unit) => void;
11
14
  };
12
15
  export declare class StunImmunityUnitBehavior extends UnitBehavior {
13
- private readonly parameters;
14
- static defaultParameters: StunImmunityUnitBehaviourParameters;
15
- constructor(unit: Unit, parameters?: StunImmunityUnitBehaviourParameters);
16
+ readonly parameters: Readonly<StunImmunityUnitBehaviorParameters>;
17
+ static defaultParameters: StunImmunityUnitBehaviorParameters;
18
+ constructor(unit: Unit, parameters?: Readonly<StunImmunityUnitBehaviorParameters>);
16
19
  protected onDestroy(): Destructor;
17
- private onBuffsCheck;
20
+ onDamageReceived(): void;
21
+ onTargetingAbilityChannelingStart(): void;
22
+ onTargetingAbilityImpact(): void;
23
+ protected onEffect(): void;
18
24
  }
@@ -12,31 +12,53 @@ local flatMapToLuaSet = ____arrays.flatMapToLuaSet
12
12
  local map = ____arrays.map
13
13
  local ____text_2Dtag = require("engine.text-tag")
14
14
  local TextTag = ____text_2Dtag.TextTag
15
+ local ____timer = require("core.types.timer")
16
+ local Timer = ____timer.Timer
15
17
  local DEFAULT_BUFF_TYPE_IDS = postcompile(function()
16
18
  return flatMapToLuaSet(
17
19
  AbilityType:getAllByBaseIds(map({
18
- "Aslo",
19
- "AHtc",
20
- "Aens",
21
- "Aprg",
22
- "Apg2",
23
- "AOeq",
24
- "SNeq",
25
- "Aweb",
26
- "Afra",
27
- "Afrb",
28
- "Afrc",
29
- "Afr2",
30
- "Acri",
31
- "Scri",
32
- "AUfn",
33
- "Aspo",
34
- "AEer",
35
- "ACwb"
20
+ "AHtb",
21
+ "AHbh",
22
+ "AOws",
23
+ "AOw2",
24
+ "AUim",
25
+ "Acyc",
26
+ "ANfb",
27
+ "ANsb",
28
+ "ANcs",
29
+ "ANc1",
30
+ "ANc2",
31
+ "ANc3",
32
+ "ACbh",
33
+ "ANbh",
34
+ "SCc1",
35
+ "ACcy",
36
+ "ANb2",
37
+ "Awrs",
38
+ "Awrh",
39
+ "Awrg",
40
+ "ACtb",
41
+ "ACcb"
36
42
  }, fourCC)),
37
43
  function(abilityType) return __TS__ArrayFlat(abilityType.buffTypeIds) end
38
44
  )
39
45
  end)
46
+ local function process(behavior)
47
+ local hasRemovedBuffs = false
48
+ for buffTypeId in pairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
49
+ hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
50
+ end
51
+ if hasRemovedBuffs then
52
+ behavior.onEffect(behavior)
53
+ if behavior.parameters.textTagText ~= nil then
54
+ TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
55
+ end
56
+ local ____opt_0 = behavior.parameters.additionalAction
57
+ if ____opt_0 ~= nil then
58
+ ____opt_0(behavior.unit)
59
+ end
60
+ end
61
+ end
40
62
  ____exports.StunImmunityUnitBehavior = __TS__Class()
41
63
  local StunImmunityUnitBehavior = ____exports.StunImmunityUnitBehavior
42
64
  StunImmunityUnitBehavior.name = "StunImmunityUnitBehavior"
@@ -45,23 +67,26 @@ function StunImmunityUnitBehavior.prototype.____constructor(self, unit, paramete
45
67
  if parameters == nil then
46
68
  parameters = ____exports.StunImmunityUnitBehavior.defaultParameters
47
69
  end
48
- UnitBehavior.prototype.____constructor(self, unit)
70
+ UnitBehavior.prototype.____constructor(self, unit, parameters.priority)
49
71
  self.parameters = parameters
50
72
  unit:decrementStunCounter()
51
- self:onBuffsCheck()
73
+ process(self)
52
74
  end
53
75
  function StunImmunityUnitBehavior.prototype.onDestroy(self)
54
76
  self.unit:incrementStunCounter()
55
77
  return UnitBehavior.prototype.onDestroy(self)
56
78
  end
57
- function StunImmunityUnitBehavior.prototype.onBuffsCheck(self)
58
- local hasRemovedBuffs = false
59
- for buffTypeId in pairs(self.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
60
- hasRemovedBuffs = hasRemovedBuffs or self.unit:removeBuff(buffTypeId)
61
- end
62
- if hasRemovedBuffs and self.parameters.textTagText ~= nil then
63
- TextTag:flash(TextTag.MISS, self.parameters.textTagText, self.unit.x, self.unit.y)
64
- end
79
+ function StunImmunityUnitBehavior.prototype.onDamageReceived(self)
80
+ process(self)
81
+ Timer:run(process, self)
82
+ end
83
+ function StunImmunityUnitBehavior.prototype.onTargetingAbilityChannelingStart(self)
84
+ process(self)
85
+ end
86
+ function StunImmunityUnitBehavior.prototype.onTargetingAbilityImpact(self)
87
+ process(self)
88
+ end
89
+ function StunImmunityUnitBehavior.prototype.onEffect(self)
65
90
  end
66
91
  StunImmunityUnitBehavior.defaultParameters = {buffTypeIds = DEFAULT_BUFF_TYPE_IDS, textTagPreset = TextTag.MISS, textTagText = nil}
67
92
  return ____exports
@@ -1,20 +1,33 @@
1
1
  /** @noSelfInFile */
2
- import { Behavior } from "../behavior";
2
+ import { Behavior, BehaviorPriority } from "../behavior";
3
3
  import { Ability } from "../internal/ability";
4
4
  import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
5
5
  import "../internal/unit+ability";
6
6
  import "../internal/unit-missile-launch";
7
7
  import { Item } from "../internal/item";
8
- import type { AbilityBehavior } from "./ability";
8
+ import { AbilityBehavior } from "./ability";
9
9
  import { Event } from "../../event";
10
10
  import { Destructor } from "../../destroyable";
11
+ import type { Widget } from "../../core/types/widget";
12
+ import { Destructable } from "../../core/types/destructable";
13
+ import type { Buff } from "../buff";
14
+ import { UnitBonusType } from "../internal/unit/bonus";
15
+ import { Player } from "../../core/types/player";
16
+ import { UnitTypeId } from "../object-data/entry/unit-type";
11
17
  export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
12
18
  export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
13
- constructor(unit: Unit);
14
- protected onDestroy(): Destructor;
15
19
  readonly sourceAbilityBehavior?: AbilityBehavior;
20
+ private _bonusIdByBonusType?;
21
+ constructor(unit: Unit, priority?: BehaviorPriority);
22
+ protected onDestroy(): Destructor;
16
23
  get unit(): Unit;
17
- registerInRangeUnitEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, unit: Unit, ...args: Args) => unknown>, event: Event<[Unit, ...Args]>, range: number, listener: T): void;
24
+ protected getUnitBonus(bonusType: UnitBonusType): number;
25
+ protected addOrUpdateOrRemoveUnitBonus(bonusType: UnitBonusType, value: number): void;
26
+ protected registerOwningPlayerEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractPlayer: (...args: Args) => Player | undefined, listener: T): void;
27
+ protected registerInRangeUnitEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractUnit: (...args: Args) => Unit | undefined, range: number, listener: T): void;
28
+ onImmediateOrder(orderId: number): void;
29
+ onTargetOrder(orderId: number, target: Widget): void;
30
+ onPointOrder(orderId: number, x: number, y: number): void;
18
31
  onAutoAttackStart(target: Unit): void;
19
32
  onAutoAttackFinish(target: Unit): void;
20
33
  onTargetingAutoAttackStart(source: Unit): void;
@@ -25,10 +38,27 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
25
38
  onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
26
39
  onAbilityGained(ability: Ability): void;
27
40
  onAbilityLost(ability: Ability): void;
41
+ onAbilityChannelingStart(ability: Ability): void;
42
+ onAbilityImpact(ability: Ability): void;
43
+ onAbilityWidgetTargetImpact(ability: Ability, target: Widget): void;
44
+ onAbilityUnitTargetImpact(ability: Ability, target: Unit): void;
45
+ onAbilityItemTargetImpact(ability: Ability, target: Item): void;
46
+ onAbilityDestructibleTargetImpact(ability: Ability, target: Destructable): void;
47
+ onAbilityPointTargetImpact(ability: Ability, x: number, y: number): void;
48
+ onAbilityNoTargetImpact(ability: Ability): void;
49
+ onAbilityChannelingFinish(ability: Ability): void;
50
+ onAbilityStop(ability: Ability): void;
51
+ onTargetingAbilityChannelingStart(ability: Ability, source: Unit): void;
52
+ onTargetingAbilityImpact(ability: Ability, source: Unit): void;
53
+ onBuffGained(buff: Buff): void;
54
+ onBuffLost(buff: Buff): void;
28
55
  onItemDropped(item: Item): void;
29
56
  onItemPickedUp(item: Item): void;
30
57
  onItemUsed(item: Item): void;
31
58
  onItemStacked(item: Item): void;
59
+ onItemChargesChanged(item: Item): void;
32
60
  onKill(target: Unit): void;
33
61
  onDeath(source: Unit | undefined): void;
62
+ onOwnerChange(previousOwner: Player): void;
63
+ static bindUnitType<Args extends any[]>(this: UnitBehaviorConstructor<Args>, unitTypeId: UnitTypeId, ...args: Args): void;
34
64
  }
@@ -17,63 +17,136 @@ local getOrPut = ____lua_2Dmaps.getOrPut
17
17
  local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
18
18
  local ____lua_2Dsets = require("utility.lua-sets")
19
19
  local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
20
- local behaviorsByEvent = {}
21
- local rangeByBehaviorByEvent = {}
22
- local listenerByBehaviorByEvent = {}
23
- local eventsByBehavior = {}
20
+ local ____bonus = require("engine.internal.unit.bonus")
21
+ local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
22
+ local getUnitBonus = ____bonus.getUnitBonus
23
+ local removeUnitBonus = ____bonus.removeUnitBonus
24
+ local safeCall = warpack.safeCall
25
+ local createBehaviorFunctionsByUnitTypeId = {}
26
+ local behaviorsByOwningPlayerEvent = {}
27
+ local listenerByBehaviorByOwningPlayerEvent = {}
28
+ local owningPlayerEventsByBehavior = {}
29
+ local behaviorsByInRangeUnitEvent = {}
30
+ local rangeByBehaviorByInRangeUnitEvent = {}
31
+ local listenerByBehaviorByInRangeUnitEvent = {}
32
+ local inRangeUnitEventsByBehavior = {}
24
33
  ____exports.UnitBehavior = __TS__Class()
25
34
  local UnitBehavior = ____exports.UnitBehavior
26
35
  UnitBehavior.name = "UnitBehavior"
27
36
  __TS__ClassExtends(UnitBehavior, Behavior)
28
- function UnitBehavior.prototype.____constructor(self, unit)
29
- Behavior.prototype.____constructor(self, unit)
37
+ function UnitBehavior.prototype.____constructor(self, unit, priority)
38
+ Behavior.prototype.____constructor(self, unit, priority)
30
39
  end
31
40
  function UnitBehavior.prototype.onDestroy(self)
32
- local events = eventsByBehavior[self]
33
- if events ~= nil then
34
- for event in pairs(events) do
35
- local ____opt_0 = behaviorsByEvent[event]
41
+ local owningPlayerEvents = owningPlayerEventsByBehavior[self]
42
+ if owningPlayerEvents ~= nil then
43
+ for event in pairs(owningPlayerEvents) do
44
+ local ____opt_0 = behaviorsByOwningPlayerEvent[event]
36
45
  if ____opt_0 ~= nil then
37
46
  ____opt_0:remove(self)
38
47
  end
39
- local ____opt_2 = rangeByBehaviorByEvent[event]
48
+ local ____opt_2 = listenerByBehaviorByOwningPlayerEvent[event]
40
49
  if ____opt_2 ~= nil then
41
50
  ____opt_2[self] = nil
42
51
  end
43
- local ____opt_4 = listenerByBehaviorByEvent[event]
52
+ end
53
+ owningPlayerEventsByBehavior[self] = nil
54
+ end
55
+ local inRangeUnitEvents = inRangeUnitEventsByBehavior[self]
56
+ if inRangeUnitEvents ~= nil then
57
+ for event in pairs(inRangeUnitEvents) do
58
+ local ____opt_4 = behaviorsByInRangeUnitEvent[event]
44
59
  if ____opt_4 ~= nil then
45
- ____opt_4[self] = nil
60
+ ____opt_4:remove(self)
61
+ end
62
+ local ____opt_6 = rangeByBehaviorByInRangeUnitEvent[event]
63
+ if ____opt_6 ~= nil then
64
+ ____opt_6[self] = nil
65
+ end
66
+ local ____opt_8 = listenerByBehaviorByInRangeUnitEvent[event]
67
+ if ____opt_8 ~= nil then
68
+ ____opt_8[self] = nil
46
69
  end
47
70
  end
48
- eventsByBehavior[self] = nil
71
+ inRangeUnitEventsByBehavior[self] = nil
72
+ end
73
+ if self._bonusIdByBonusType ~= nil then
74
+ for bonusType, bonusId in pairs(self._bonusIdByBonusType) do
75
+ removeUnitBonus(self.object, bonusType, bonusId)
76
+ end
49
77
  end
50
78
  return Behavior.prototype.onDestroy(self)
51
79
  end
52
- function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, range, listener)
53
- local rangeByBehavior = getOrPut(rangeByBehaviorByEvent, event, mutableLuaMap)
80
+ function UnitBehavior.prototype.getUnitBonus(self, bonusType)
81
+ local ____opt_10 = self._bonusIdByBonusType
82
+ local bonusId = ____opt_10 and ____opt_10[bonusType]
83
+ return bonusId == nil and 0 or getUnitBonus(self.object, bonusType, bonusId)
84
+ end
85
+ function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
86
+ local bonusIdByBonusType = self._bonusIdByBonusType
87
+ if bonusIdByBonusType == nil then
88
+ bonusIdByBonusType = {}
89
+ self._bonusIdByBonusType = bonusIdByBonusType
90
+ end
91
+ bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self.object, bonusType, bonusIdByBonusType[bonusType], value)
92
+ end
93
+ function UnitBehavior.prototype.registerOwningPlayerEvent(self, event, extractPlayer, listener)
94
+ local listenerByBehavior = getOrPut(listenerByBehaviorByOwningPlayerEvent, event, mutableLuaMap)
95
+ listenerByBehavior[self] = listener
96
+ getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
97
+ local behaviors = behaviorsByOwningPlayerEvent[event]
98
+ if behaviors == nil then
99
+ event:addListener(function(...)
100
+ local behaviors = behaviorsByOwningPlayerEvent[event]
101
+ if behaviors ~= nil then
102
+ local player = extractPlayer(...)
103
+ if player ~= nil then
104
+ for behavior in pairs(behaviors) do
105
+ if behavior.unit.owner == player then
106
+ safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
107
+ end
108
+ end
109
+ end
110
+ end
111
+ end)
112
+ behaviors = __TS__New(LinkedSet)
113
+ behaviorsByOwningPlayerEvent[event] = behaviors
114
+ end
115
+ behaviors:add(self)
116
+ end
117
+ function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
118
+ local rangeByBehavior = getOrPut(rangeByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
54
119
  rangeByBehavior[self] = range
55
- local listenerByBehavior = getOrPut(listenerByBehaviorByEvent, event, mutableLuaMap)
120
+ local listenerByBehavior = getOrPut(listenerByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
56
121
  listenerByBehavior[self] = listener
57
- getOrPut(eventsByBehavior, self, mutableLuaSet)[event] = true
58
- local behaviors = behaviorsByEvent[event]
122
+ getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
123
+ local behaviors = behaviorsByInRangeUnitEvent[event]
59
124
  if behaviors == nil then
60
- event:addListener(function(unit, ...)
61
- local behaviors = behaviorsByEvent[event]
125
+ event:addListener(function(...)
126
+ local behaviors = behaviorsByInRangeUnitEvent[event]
62
127
  if behaviors ~= nil then
63
- for behavior in pairs(behaviors) do
64
- local range = rangeByBehavior[behavior]
65
- if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
66
- local ____self_6 = behavior
67
- ____self_6[listenerByBehavior[behavior]](____self_6, unit, ...)
128
+ local unit = extractUnit(...)
129
+ if unit ~= nil then
130
+ for behavior in pairs(behaviors) do
131
+ local range = rangeByBehavior[behavior]
132
+ if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
133
+ safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
134
+ end
68
135
  end
69
136
  end
70
137
  end
71
138
  end)
72
139
  behaviors = __TS__New(LinkedSet)
73
- behaviorsByEvent[event] = behaviors
140
+ behaviorsByInRangeUnitEvent[event] = behaviors
74
141
  end
75
142
  behaviors:add(self)
76
143
  end
144
+ function UnitBehavior.prototype.onImmediateOrder(self, orderId)
145
+ end
146
+ function UnitBehavior.prototype.onTargetOrder(self, orderId, target)
147
+ end
148
+ function UnitBehavior.prototype.onPointOrder(self, orderId, x, y)
149
+ end
77
150
  function UnitBehavior.prototype.onAutoAttackStart(self, target)
78
151
  end
79
152
  function UnitBehavior.prototype.onAutoAttackFinish(self, target)
@@ -94,6 +167,34 @@ function UnitBehavior.prototype.onAbilityGained(self, ability)
94
167
  end
95
168
  function UnitBehavior.prototype.onAbilityLost(self, ability)
96
169
  end
170
+ function UnitBehavior.prototype.onAbilityChannelingStart(self, ability)
171
+ end
172
+ function UnitBehavior.prototype.onAbilityImpact(self, ability)
173
+ end
174
+ function UnitBehavior.prototype.onAbilityWidgetTargetImpact(self, ability, target)
175
+ end
176
+ function UnitBehavior.prototype.onAbilityUnitTargetImpact(self, ability, target)
177
+ end
178
+ function UnitBehavior.prototype.onAbilityItemTargetImpact(self, ability, target)
179
+ end
180
+ function UnitBehavior.prototype.onAbilityDestructibleTargetImpact(self, ability, target)
181
+ end
182
+ function UnitBehavior.prototype.onAbilityPointTargetImpact(self, ability, x, y)
183
+ end
184
+ function UnitBehavior.prototype.onAbilityNoTargetImpact(self, ability)
185
+ end
186
+ function UnitBehavior.prototype.onAbilityChannelingFinish(self, ability)
187
+ end
188
+ function UnitBehavior.prototype.onAbilityStop(self, ability)
189
+ end
190
+ function UnitBehavior.prototype.onTargetingAbilityChannelingStart(self, ability, source)
191
+ end
192
+ function UnitBehavior.prototype.onTargetingAbilityImpact(self, ability, source)
193
+ end
194
+ function UnitBehavior.prototype.onBuffGained(self, buff)
195
+ end
196
+ function UnitBehavior.prototype.onBuffLost(self, buff)
197
+ end
97
198
  function UnitBehavior.prototype.onItemDropped(self, item)
98
199
  end
99
200
  function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -102,10 +203,29 @@ function UnitBehavior.prototype.onItemUsed(self, item)
102
203
  end
103
204
  function UnitBehavior.prototype.onItemStacked(self, item)
104
205
  end
206
+ function UnitBehavior.prototype.onItemChargesChanged(self, item)
207
+ end
105
208
  function UnitBehavior.prototype.onKill(self, target)
106
209
  end
107
210
  function UnitBehavior.prototype.onDeath(self, source)
108
211
  end
212
+ function UnitBehavior.prototype.onOwnerChange(self, previousOwner)
213
+ end
214
+ function UnitBehavior.bindUnitType(self, unitTypeId, ...)
215
+ local args = {...}
216
+ local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unitTypeId]
217
+ if createBehaviorFunctions == nil then
218
+ createBehaviorFunctions = {}
219
+ createBehaviorFunctionsByUnitTypeId[unitTypeId] = createBehaviorFunctions
220
+ end
221
+ createBehaviorFunctions[#createBehaviorFunctions + 1] = function(unit)
222
+ return __TS__New(
223
+ self,
224
+ unit,
225
+ table.unpack(args)
226
+ )
227
+ end
228
+ end
109
229
  __TS__SetDescriptor(
110
230
  UnitBehavior.prototype,
111
231
  "unit",
@@ -115,6 +235,21 @@ __TS__SetDescriptor(
115
235
  true
116
236
  );
117
237
  (function(self)
238
+ Unit.onImmediateOrder:addListener(function(source, orderId)
239
+ ____exports.UnitBehavior:forAll(source, "onImmediateOrder", orderId)
240
+ end)
241
+ Unit.onTargetOrder:addListener(function(source, orderId, target)
242
+ ____exports.UnitBehavior:forAll(source, "onTargetOrder", orderId, target)
243
+ end)
244
+ Unit.onPointOrder:addListener(function(source, orderId, x, y)
245
+ ____exports.UnitBehavior:forAll(
246
+ source,
247
+ "onPointOrder",
248
+ orderId,
249
+ x,
250
+ y
251
+ )
252
+ end)
118
253
  Unit.autoAttackStartEvent:addListener(function(source, target)
119
254
  ____exports.UnitBehavior:forAll(source, "onAutoAttackStart", target)
120
255
  ____exports.UnitBehavior:forAll(target, "onTargetingAutoAttackStart", source)
@@ -135,11 +270,51 @@ __TS__SetDescriptor(
135
270
  end
136
271
  ____exports.UnitBehavior:forAll(target, "onDamageReceived", source, event)
137
272
  end)
138
- Unit.abilityGainedEvent:addListener(function(source, target)
139
- ____exports.UnitBehavior:forAll(source, "onAbilityGained", target)
273
+ Unit.abilityGainedEvent:addListener(function(source, ability)
274
+ ____exports.UnitBehavior:forAll(source, "onAbilityGained", ability)
275
+ end)
276
+ Unit.abilityLostEvent:addListener(function(source, ability)
277
+ ____exports.UnitBehavior:forAll(source, "onAbilityLost", ability)
140
278
  end)
141
- Unit.abilityLostEvent:addListener(function(source, target)
142
- ____exports.UnitBehavior:forAll(source, "onAbilityLost", target)
279
+ Unit.abilityChannelingStartEvent:addListener(function(source, ability)
280
+ ____exports.UnitBehavior:forAll(source, "onAbilityChannelingStart", ability)
281
+ end)
282
+ Unit.abilityUnitTargetChannelingStartEvent:addListener(function(source, ability, target)
283
+ ____exports.UnitBehavior:forAll(target, "onTargetingAbilityChannelingStart", ability, source)
284
+ end)
285
+ Unit.abilityImpactEvent:addListener(function(source, ability)
286
+ ____exports.UnitBehavior:forAll(source, "onAbilityImpact", ability)
287
+ end)
288
+ Unit.abilityWidgetTargetImpactEvent:addListener(function(source, ability, target)
289
+ ____exports.UnitBehavior:forAll(source, "onAbilityWidgetTargetImpact", ability, target)
290
+ end)
291
+ Unit.abilityUnitTargetImpactEvent:addListener(function(source, ability, target)
292
+ ____exports.UnitBehavior:forAll(source, "onAbilityUnitTargetImpact", ability, target)
293
+ ____exports.UnitBehavior:forAll(target, "onTargetingAbilityImpact", ability, source)
294
+ end)
295
+ Unit.abilityItemTargetImpactEvent:addListener(function(source, ability, target)
296
+ ____exports.UnitBehavior:forAll(source, "onAbilityItemTargetImpact", ability, target)
297
+ end)
298
+ Unit.abilityDestructibleTargetImpactEvent:addListener(function(source, ability, target)
299
+ ____exports.UnitBehavior:forAll(source, "onAbilityDestructibleTargetImpact", ability, target)
300
+ end)
301
+ Unit.abilityPointTargetImpactEvent:addListener(function(source, ability, x, y)
302
+ ____exports.UnitBehavior:forAll(
303
+ source,
304
+ "onAbilityPointTargetImpact",
305
+ ability,
306
+ x,
307
+ y
308
+ )
309
+ end)
310
+ Unit.abilityNoTargetImpactEvent:addListener(function(source, ability)
311
+ ____exports.UnitBehavior:forAll(source, "onAbilityNoTargetImpact", ability)
312
+ end)
313
+ Unit.abilityChannelingFinishEvent:addListener(function(source, ability)
314
+ ____exports.UnitBehavior:forAll(source, "onAbilityChannelingFinish", ability)
315
+ end)
316
+ Unit.abilityStopEvent:addListener(function(source, ability)
317
+ ____exports.UnitBehavior:forAll(source, "onAbilityStop", ability)
143
318
  end)
144
319
  Unit.deathEvent:addListener(function(target, source)
145
320
  if source ~= nil then
@@ -159,7 +334,21 @@ __TS__SetDescriptor(
159
334
  Unit.itemStackedEvent:addListener(function(unit, item)
160
335
  ____exports.UnitBehavior:forAll(unit, "onItemStacked", item)
161
336
  end)
337
+ Unit.itemChargesChangedEvent:addListener(function(unit, item)
338
+ ____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
339
+ end)
340
+ Unit.onOwnerChange:addListener(function(unit, previousOwner)
341
+ ____exports.UnitBehavior:forAll(unit, "onOwnerChange", previousOwner)
342
+ end)
162
343
  end)(UnitBehavior)
344
+ Unit.onCreate:addListener(function(unit)
345
+ local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unit.typeId]
346
+ if createBehaviorFunctions ~= nil then
347
+ for ____, createBehavior in ipairs(createBehaviorFunctions) do
348
+ createBehavior(unit)
349
+ end
350
+ end
351
+ end)
163
352
  Unit.destroyEvent:addListener(function(unit)
164
353
  ____exports.UnitBehavior:forAll(unit, "destroy")
165
354
  end)
package/engine/buff.d.ts CHANGED
@@ -13,6 +13,7 @@ import { UnitBehavior } from "./behaviour/unit";
13
13
  import type { Widget } from "../core/types/widget";
14
14
  import { Destructor } from "../destroyable";
15
15
  import { Event } from "../event";
16
+ import { AbilityBehavior } from "./behaviour/ability";
16
17
  export type BuffConstructor<T extends Buff<any> = Buff<any>, Args extends any[] = any> = OmitConstructor<typeof Buff<any>> & (new (...args: Args) => T);
17
18
  type EnumParameterValueType<T extends number> = T | AbilityEnumLevelField<T>;
18
19
  type NumberParameterValueType = number | AbilityNumberField | AbilityNumberLevelField;
@@ -79,6 +80,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
79
80
  healingOnExpiration?: NumberParameterValueType;
80
81
  killsOnExpiration?: BooleanParameterValueType;
81
82
  explodesOnExpiration?: BooleanParameterValueType;
83
+ abilityCooldownFactor?: NumberParameterValueType;
82
84
  uniqueGroup?: BuffUniqueGroup;
83
85
  } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
84
86
  declare const enum BuffPropertyKey {
@@ -124,7 +126,9 @@ declare const enum BuffPropertyKey {
124
126
  PROVIDES_INVULNERABILITY = 139,
125
127
  KILLS_ON_EXPIRATION = 140,
126
128
  EXPLODES_ON_EXPIRATION = 141,
127
- MISS_PROBABILITY = 142
129
+ MISS_PROBABILITY = 142,
130
+ ABILITY_COOLDOWN_FACTOR = 143,
131
+ ABILITY_COOLDOWN_MODIFIER = 144
128
132
  }
129
133
  export declare const enum BuffTypeIdSelectionPolicy {
130
134
  LEAST_DURATION = 0
@@ -138,7 +142,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
138
142
  polarity: BuffPolarityParameterType,
139
143
  resistanceType: BuffResistanceTypeParameterType,
140
144
  ...abilityOrParameters: [
141
- ability?: Ability,
145
+ ability?: Ability | AbilityBehavior,
142
146
  parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
143
147
  ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
144
148
  ];
@@ -187,6 +191,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
187
191
  private [BuffPropertyKey.PROVIDES_INVULNERABILITY]?;
188
192
  private [BuffPropertyKey.KILLS_ON_EXPIRATION]?;
189
193
  private [BuffPropertyKey.EXPLODES_ON_EXPIRATION]?;
194
+ private [BuffPropertyKey.ABILITY_COOLDOWN_FACTOR]?;
195
+ private [BuffPropertyKey.ABILITY_COOLDOWN_MODIFIER]?;
190
196
  protected static readonly defaultParameters: BuffParameters;
191
197
  get source(): Unit;
192
198
  readonly typeId: ApplicableBuffTypeId;
@@ -201,11 +207,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
201
207
  private readonly _spellStealPriority?;
202
208
  private readonly _learnLevelMinimum?;
203
209
  private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
204
- private _bonusIdByBonusType?;
205
210
  private readonly _abilityTypeIds?;
206
211
  private _behaviors?;
207
- private getUnitBonus;
208
- private addOrUpdateOrRemoveUnitBonus;
209
212
  constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
210
213
  get level(): number;
211
214
  get remainingDamageOverDuration(): number;
@@ -265,6 +268,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
265
268
  get duration(): number;
266
269
  get remainingDuration(): number;
267
270
  set remainingDuration(remainingDuration: number);
271
+ get abilityCooldownFactor(): number;
272
+ set abilityCooldownFactor(abilityCooldownFactor: number);
273
+ onAbilityGained(ability: Ability): void;
274
+ onAbilityLost(ability: Ability): void;
268
275
  flashEffect(...parameters: [
269
276
  ...widgetOrXY: [] | [Widget] | [x: number, x: number],
270
277
  ...parametersOrDuration: [] | [EffectParameters] | [number]
@@ -278,6 +285,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
278
285
  onDeath(source: Unit | undefined): void;
279
286
  onDamageDealt(target: Unit, event: DamageEvent): void;
280
287
  onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
281
- static readonly destroyEvent: Event<[Buff<object>]>;
288
+ static readonly createdEvent: Event<[Buff<object>]>;
289
+ static readonly beingDestroyedEvent: Event<[Buff<object>]>;
282
290
  }
283
291
  export {};