warscript 0.0.1-dev.f0a9ffe → 0.0.1-dev.f0daa48

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 (132) 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/sound.lua +1 -1
  9. package/core/types/tileCell.d.ts +11 -1
  10. package/core/types/tileCell.lua +97 -0
  11. package/core/types/timer.d.ts +3 -2
  12. package/core/types/timer.lua +22 -2
  13. package/decl/native.d.ts +2 -2
  14. package/destroyable.d.ts +1 -0
  15. package/destroyable.lua +9 -0
  16. package/engine/behavior.d.ts +12 -1
  17. package/engine/behavior.lua +199 -65
  18. package/engine/behaviour/ability/apply-buff.lua +4 -4
  19. package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
  20. package/engine/behaviour/ability/remove-buffs.lua +21 -0
  21. package/engine/behaviour/ability.d.ts +11 -6
  22. package/engine/behaviour/ability.lua +31 -1
  23. package/engine/behaviour/unit/stun-immunity.d.ts +9 -5
  24. package/engine/behaviour/unit/stun-immunity.lua +17 -7
  25. package/engine/behaviour/unit.d.ts +15 -5
  26. package/engine/behaviour/unit.lua +126 -22
  27. package/engine/buff.d.ts +64 -21
  28. package/engine/buff.lua +360 -178
  29. package/engine/internal/ability.d.ts +3 -1
  30. package/engine/internal/ability.lua +26 -9
  31. package/engine/internal/item+owner.lua +12 -6
  32. package/engine/internal/item.d.ts +13 -15
  33. package/engine/internal/item.lua +63 -49
  34. package/engine/internal/mechanics/cast-ability.lua +6 -3
  35. package/engine/internal/misc/frame-coordinates.lua +21 -0
  36. package/engine/internal/misc/get-terrain-z.d.ts +2 -0
  37. package/engine/internal/misc/get-terrain-z.lua +11 -0
  38. package/engine/internal/misc/player-local-handle.d.ts +2 -0
  39. package/engine/internal/misc/player-local-handle.lua +5 -0
  40. package/engine/internal/object-data/armor-bonus.d.ts +2 -0
  41. package/engine/internal/object-data/attribute-bonus.lua +2 -2
  42. package/engine/internal/object-data/health-bonus.d.ts +2 -0
  43. package/engine/internal/object-data/health-bonus.lua +16 -0
  44. package/engine/internal/object-data/mana-bonus.d.ts +2 -0
  45. package/engine/internal/object-data/mana-bonus.lua +16 -0
  46. package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts +2 -0
  47. package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua +16 -0
  48. package/engine/internal/unit/ability.d.ts +14 -14
  49. package/engine/internal/unit/ability.lua +72 -45
  50. package/engine/internal/unit/attributes.d.ts +17 -0
  51. package/engine/internal/unit/attributes.lua +46 -0
  52. package/engine/internal/unit/bonus.d.ts +6 -0
  53. package/engine/internal/unit/bonus.lua +33 -3
  54. package/engine/internal/unit/fly-height.d.ts +7 -0
  55. package/engine/internal/unit/fly-height.lua +20 -0
  56. package/engine/internal/unit/interrupts.d.ts +12 -0
  57. package/engine/internal/unit/interrupts.lua +28 -0
  58. package/engine/internal/unit/item.lua +1 -1
  59. package/engine/internal/unit/main-selected.lua +12 -27
  60. package/engine/internal/unit/range-event.d.ts +12 -0
  61. package/engine/internal/unit/range-event.lua +90 -0
  62. package/engine/internal/unit/scale.d.ts +7 -0
  63. package/engine/internal/unit/scale.lua +20 -0
  64. package/engine/internal/unit+ability.lua +10 -1
  65. package/engine/internal/unit+bonus.lua +3 -3
  66. package/engine/internal/unit-missile-launch.lua +51 -20
  67. package/engine/internal/unit.d.ts +18 -22
  68. package/engine/internal/unit.lua +179 -200
  69. package/engine/local-client.d.ts +2 -0
  70. package/engine/local-client.lua +30 -0
  71. package/engine/object-data/auxiliary/health-regeneration-type.d.ts +8 -0
  72. package/engine/object-data/auxiliary/health-regeneration-type.lua +2 -0
  73. package/engine/object-data/auxiliary/unit-attribute.lua +1 -1
  74. package/engine/object-data/entry/ability-type/{armor-increase.d.ts → armor-bonus.d.ts} +3 -3
  75. package/engine/object-data/entry/ability-type/{armor-increase.lua → armor-bonus.lua} +9 -9
  76. package/engine/object-data/entry/ability-type/health-bonus.d.ts +8 -0
  77. package/engine/object-data/entry/ability-type/health-bonus.lua +26 -0
  78. package/engine/object-data/entry/ability-type/mana-bonus.d.ts +8 -0
  79. package/engine/object-data/entry/ability-type/mana-bonus.lua +26 -0
  80. package/engine/object-data/entry/ability-type/mana-regeneration.d.ts +8 -0
  81. package/engine/object-data/entry/ability-type/mana-regeneration.lua +26 -0
  82. package/engine/object-data/entry/ability-type/reincarnation.d.ts +8 -0
  83. package/engine/object-data/entry/ability-type/reincarnation.lua +26 -0
  84. package/engine/object-data/entry/ability-type.d.ts +2 -0
  85. package/engine/object-data/entry/ability-type.lua +88 -5
  86. package/engine/object-data/entry/buff-type/applicable.lua +113 -109
  87. package/engine/object-data/entry/destructible-type.d.ts +27 -1
  88. package/engine/object-data/entry/destructible-type.lua +155 -0
  89. package/engine/object-data/entry/unit-type.d.ts +4 -0
  90. package/engine/object-data/entry/unit-type.lua +76 -32
  91. package/engine/object-field/ability.d.ts +3 -3
  92. package/engine/object-field/ability.lua +9 -8
  93. package/engine/object-field/unit.d.ts +20 -5
  94. package/engine/object-field/unit.lua +61 -0
  95. package/engine/object-field.d.ts +12 -4
  96. package/engine/object-field.lua +273 -126
  97. package/engine/random.d.ts +10 -0
  98. package/engine/random.lua +21 -0
  99. package/engine/standard/fields/ability.d.ts +2 -2
  100. package/engine/standard/fields/ability.lua +2 -2
  101. package/engine/standard/fields/unit.d.ts +11 -3
  102. package/engine/standard/fields/unit.lua +15 -2
  103. package/engine/synchronization.d.ts +11 -0
  104. package/engine/synchronization.lua +77 -0
  105. package/engine/text-tag.d.ts +1 -1
  106. package/engine/text-tag.lua +92 -17
  107. package/engine/unit.d.ts +5 -0
  108. package/engine/unit.lua +5 -0
  109. package/lualib_bundle.lua +118 -47
  110. package/net/socket.lua +1 -1
  111. package/objutil/buff.lua +10 -8
  112. package/objutil/object.lua +1 -1
  113. package/operation.lua +23 -17
  114. package/package.json +5 -5
  115. package/patch-lua.lua +15 -0
  116. package/patch-lualib.lua +1 -1
  117. package/utility/arrays.d.ts +1 -0
  118. package/utility/arrays.lua +8 -0
  119. package/utility/callback-array.d.ts +17 -0
  120. package/utility/callback-array.lua +61 -0
  121. package/utility/linked-map.d.ts +34 -0
  122. package/utility/linked-map.lua +101 -0
  123. package/utility/linked-set.d.ts +3 -1
  124. package/utility/linked-set.lua +40 -1
  125. package/utility/lua-maps.d.ts +11 -2
  126. package/utility/lua-maps.lua +33 -2
  127. package/utility/records.lua +20 -1
  128. package/utility/types.d.ts +3 -0
  129. /package/engine/internal/{object-data/armor-increase.d.ts → misc/frame-coordinates.d.ts} +0 -0
  130. /package/engine/internal/object-data/{armor-increase.lua → armor-bonus.lua} +0 -0
  131. /package/engine/object-data/entry/ability-type/{attribute-increase.d.ts → attribute-bonus.d.ts} +0 -0
  132. /package/engine/object-data/entry/ability-type/{attribute-increase.lua → attribute-bonus.lua} +0 -0
@@ -4,17 +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 = {
8
- buffTypeIds?: LuaSet<BuffTypeId>;
7
+ import { BehaviorPriority } from "../../behavior";
8
+ export type StunImmunityUnitBehaviorParameters = {
9
+ readonly priority?: BehaviorPriority;
10
+ buffTypeIds?: readonly 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
- readonly parameters: Readonly<StunImmunityUnitBehaviourParameters>;
14
- static defaultParameters: StunImmunityUnitBehaviourParameters;
15
- constructor(unit: Unit, parameters?: Readonly<StunImmunityUnitBehaviourParameters>);
16
+ readonly parameters: Readonly<StunImmunityUnitBehaviorParameters>;
17
+ static defaultParameters: StunImmunityUnitBehaviorParameters;
18
+ constructor(unit: Unit, parameters?: Readonly<StunImmunityUnitBehaviorParameters>);
16
19
  protected onDestroy(): Destructor;
17
20
  onDamageReceived(): void;
18
21
  onTargetingAbilityChannelingStart(): void;
19
22
  onTargetingAbilityImpact(): void;
23
+ protected onEffect(): void;
20
24
  }
@@ -8,14 +8,15 @@ local UnitBehavior = ____unit.UnitBehavior
8
8
  local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
9
9
  local AbilityType = ____ability_2Dtype.AbilityType
10
10
  local ____arrays = require("utility.arrays")
11
- local flatMapToLuaSet = ____arrays.flatMapToLuaSet
11
+ local distinct = ____arrays.distinct
12
+ local flatMap = ____arrays.flatMap
12
13
  local map = ____arrays.map
13
14
  local ____text_2Dtag = require("engine.text-tag")
14
15
  local TextTag = ____text_2Dtag.TextTag
15
16
  local ____timer = require("core.types.timer")
16
17
  local Timer = ____timer.Timer
17
18
  local DEFAULT_BUFF_TYPE_IDS = postcompile(function()
18
- return flatMapToLuaSet(
19
+ return distinct(flatMap(
19
20
  AbilityType:getAllByBaseIds(map({
20
21
  "AHtb",
21
22
  "AHbh",
@@ -41,15 +42,22 @@ local DEFAULT_BUFF_TYPE_IDS = postcompile(function()
41
42
  "ACcb"
42
43
  }, fourCC)),
43
44
  function(abilityType) return __TS__ArrayFlat(abilityType.buffTypeIds) end
44
- )
45
+ ))
45
46
  end)
46
47
  local function process(behavior)
47
48
  local hasRemovedBuffs = false
48
- for buffTypeId in pairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
49
+ for ____, buffTypeId in ipairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
49
50
  hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
50
51
  end
51
- if hasRemovedBuffs and behavior.parameters.textTagText ~= nil then
52
- TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
52
+ if hasRemovedBuffs then
53
+ behavior.onEffect(behavior)
54
+ if behavior.parameters.textTagText ~= nil then
55
+ TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
56
+ end
57
+ local ____opt_0 = behavior.parameters.additionalAction
58
+ if ____opt_0 ~= nil then
59
+ ____opt_0(behavior.unit)
60
+ end
53
61
  end
54
62
  end
55
63
  ____exports.StunImmunityUnitBehavior = __TS__Class()
@@ -60,7 +68,7 @@ function StunImmunityUnitBehavior.prototype.____constructor(self, unit, paramete
60
68
  if parameters == nil then
61
69
  parameters = ____exports.StunImmunityUnitBehavior.defaultParameters
62
70
  end
63
- UnitBehavior.prototype.____constructor(self, unit)
71
+ UnitBehavior.prototype.____constructor(self, unit, parameters.priority)
64
72
  self.parameters = parameters
65
73
  unit:decrementStunCounter()
66
74
  process(self)
@@ -79,5 +87,7 @@ end
79
87
  function StunImmunityUnitBehavior.prototype.onTargetingAbilityImpact(self)
80
88
  process(self)
81
89
  end
90
+ function StunImmunityUnitBehavior.prototype.onEffect(self)
91
+ end
82
92
  StunImmunityUnitBehavior.defaultParameters = {buffTypeIds = DEFAULT_BUFF_TYPE_IDS, textTagPreset = TextTag.MISS, textTagText = nil}
83
93
  return ____exports
@@ -1,23 +1,30 @@
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
11
  import type { Widget } from "../../core/types/widget";
12
12
  import { Destructable } from "../../core/types/destructable";
13
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";
14
17
  export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
15
18
  export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
16
- constructor(unit: Unit);
17
- protected onDestroy(): Destructor;
18
19
  readonly sourceAbilityBehavior?: AbilityBehavior;
20
+ private _bonusIdByBonusType?;
21
+ constructor(unit: Unit, priority?: BehaviorPriority);
22
+ protected onDestroy(): Destructor;
19
23
  get unit(): Unit;
20
- 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;
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;
21
28
  onImmediateOrder(orderId: number): void;
22
29
  onTargetOrder(orderId: number, target: Widget): void;
23
30
  onPointOrder(orderId: number, x: number, y: number): void;
@@ -44,6 +51,7 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
44
51
  onTargetingAbilityChannelingStart(ability: Ability, source: Unit): void;
45
52
  onTargetingAbilityImpact(ability: Ability, source: Unit): void;
46
53
  onBuffGained(buff: Buff): void;
54
+ onBuffLost(buff: Buff): void;
47
55
  onItemDropped(item: Item): void;
48
56
  onItemPickedUp(item: Item): void;
49
57
  onItemUsed(item: Item): void;
@@ -51,4 +59,6 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
51
59
  onItemChargesChanged(item: Item): void;
52
60
  onKill(target: Unit): void;
53
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;
54
64
  }
@@ -17,63 +17,137 @@ 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 ____linked_2Dmap = require("utility.linked-map")
25
+ local LinkedMap = ____linked_2Dmap.LinkedMap
26
+ local safeCall = warpack.safeCall
27
+ local createBehaviorFunctionsByUnitTypeId = {}
28
+ local behaviorsByOwningPlayerEvent = {}
29
+ local listenerByBehaviorByOwningPlayerEvent = {}
30
+ local owningPlayerEventsByBehavior = {}
31
+ local behaviorsByInRangeUnitEvent = {}
32
+ local rangeByBehaviorByInRangeUnitEvent = {}
33
+ local listenerByBehaviorByInRangeUnitEvent = {}
34
+ local inRangeUnitEventsByBehavior = {}
24
35
  ____exports.UnitBehavior = __TS__Class()
25
36
  local UnitBehavior = ____exports.UnitBehavior
26
37
  UnitBehavior.name = "UnitBehavior"
27
38
  __TS__ClassExtends(UnitBehavior, Behavior)
28
- function UnitBehavior.prototype.____constructor(self, unit)
29
- Behavior.prototype.____constructor(self, unit)
39
+ function UnitBehavior.prototype.____constructor(self, unit, priority)
40
+ Behavior.prototype.____constructor(self, unit, priority)
30
41
  end
31
42
  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]
43
+ local owningPlayerEvents = owningPlayerEventsByBehavior[self]
44
+ if owningPlayerEvents ~= nil then
45
+ for event in pairs(owningPlayerEvents) do
46
+ local ____opt_0 = behaviorsByOwningPlayerEvent[event]
36
47
  if ____opt_0 ~= nil then
37
48
  ____opt_0:remove(self)
38
49
  end
39
- local ____opt_2 = rangeByBehaviorByEvent[event]
50
+ local ____opt_2 = listenerByBehaviorByOwningPlayerEvent[event]
40
51
  if ____opt_2 ~= nil then
41
52
  ____opt_2[self] = nil
42
53
  end
43
- local ____opt_4 = listenerByBehaviorByEvent[event]
54
+ end
55
+ owningPlayerEventsByBehavior[self] = nil
56
+ end
57
+ local inRangeUnitEvents = inRangeUnitEventsByBehavior[self]
58
+ if inRangeUnitEvents ~= nil then
59
+ for event in pairs(inRangeUnitEvents) do
60
+ local ____opt_4 = behaviorsByInRangeUnitEvent[event]
44
61
  if ____opt_4 ~= nil then
45
- ____opt_4[self] = nil
62
+ ____opt_4:remove(self)
63
+ end
64
+ local ____opt_6 = rangeByBehaviorByInRangeUnitEvent[event]
65
+ if ____opt_6 ~= nil then
66
+ ____opt_6[self] = nil
67
+ end
68
+ local ____opt_8 = listenerByBehaviorByInRangeUnitEvent[event]
69
+ if ____opt_8 ~= nil then
70
+ ____opt_8[self] = nil
46
71
  end
47
72
  end
48
- eventsByBehavior[self] = nil
73
+ inRangeUnitEventsByBehavior[self] = nil
74
+ end
75
+ if self._bonusIdByBonusType ~= nil then
76
+ for bonusType, bonusId in pairs(self._bonusIdByBonusType) do
77
+ removeUnitBonus(self.object, bonusType, bonusId)
78
+ end
49
79
  end
50
80
  return Behavior.prototype.onDestroy(self)
51
81
  end
82
+ function UnitBehavior.prototype.getUnitBonus(self, bonusType)
83
+ local ____opt_10 = self._bonusIdByBonusType
84
+ local bonusId = ____opt_10 and ____opt_10:get(bonusType)
85
+ return bonusId == nil and 0 or getUnitBonus(self.object, bonusType, bonusId)
86
+ end
87
+ function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
88
+ local bonusIdByBonusType = self._bonusIdByBonusType
89
+ if bonusIdByBonusType == nil then
90
+ bonusIdByBonusType = __TS__New(LinkedMap)
91
+ self._bonusIdByBonusType = bonusIdByBonusType
92
+ end
93
+ bonusIdByBonusType:put(
94
+ bonusType,
95
+ addOrUpdateOrRemoveUnitBonus(
96
+ self.object,
97
+ bonusType,
98
+ bonusIdByBonusType:get(bonusType),
99
+ value
100
+ )
101
+ )
102
+ end
103
+ function UnitBehavior.prototype.registerOwningPlayerEvent(self, event, extractPlayer, listener)
104
+ local listenerByBehavior = getOrPut(listenerByBehaviorByOwningPlayerEvent, event, mutableLuaMap)
105
+ listenerByBehavior[self] = listener
106
+ getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
107
+ local behaviors = behaviorsByOwningPlayerEvent[event]
108
+ if behaviors == nil then
109
+ event:addListener(function(...)
110
+ local behaviors = behaviorsByOwningPlayerEvent[event]
111
+ if behaviors ~= nil then
112
+ local player = extractPlayer(...)
113
+ if player ~= nil then
114
+ for behavior in pairs(behaviors) do
115
+ if behavior.unit.owner == player then
116
+ safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
117
+ end
118
+ end
119
+ end
120
+ end
121
+ end)
122
+ behaviors = __TS__New(LinkedSet)
123
+ behaviorsByOwningPlayerEvent[event] = behaviors
124
+ end
125
+ behaviors:add(self)
126
+ end
52
127
  function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
53
- local rangeByBehavior = getOrPut(rangeByBehaviorByEvent, event, mutableLuaMap)
128
+ local rangeByBehavior = getOrPut(rangeByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
54
129
  rangeByBehavior[self] = range
55
- local listenerByBehavior = getOrPut(listenerByBehaviorByEvent, event, mutableLuaMap)
130
+ local listenerByBehavior = getOrPut(listenerByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
56
131
  listenerByBehavior[self] = listener
57
- getOrPut(eventsByBehavior, self, mutableLuaSet)[event] = true
58
- local behaviors = behaviorsByEvent[event]
132
+ getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
133
+ local behaviors = behaviorsByInRangeUnitEvent[event]
59
134
  if behaviors == nil then
60
135
  event:addListener(function(...)
61
- local behaviors = behaviorsByEvent[event]
136
+ local behaviors = behaviorsByInRangeUnitEvent[event]
62
137
  if behaviors ~= nil then
63
138
  local unit = extractUnit(...)
64
139
  if unit ~= nil then
65
140
  for behavior in pairs(behaviors) do
66
141
  local range = rangeByBehavior[behavior]
67
142
  if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
68
- local ____self_6 = behavior
69
- ____self_6[listenerByBehavior[behavior]](____self_6, ...)
143
+ safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
70
144
  end
71
145
  end
72
146
  end
73
147
  end
74
148
  end)
75
149
  behaviors = __TS__New(LinkedSet)
76
- behaviorsByEvent[event] = behaviors
150
+ behaviorsByInRangeUnitEvent[event] = behaviors
77
151
  end
78
152
  behaviors:add(self)
79
153
  end
@@ -129,6 +203,8 @@ function UnitBehavior.prototype.onTargetingAbilityImpact(self, ability, source)
129
203
  end
130
204
  function UnitBehavior.prototype.onBuffGained(self, buff)
131
205
  end
206
+ function UnitBehavior.prototype.onBuffLost(self, buff)
207
+ end
132
208
  function UnitBehavior.prototype.onItemDropped(self, item)
133
209
  end
134
210
  function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -143,6 +219,23 @@ function UnitBehavior.prototype.onKill(self, target)
143
219
  end
144
220
  function UnitBehavior.prototype.onDeath(self, source)
145
221
  end
222
+ function UnitBehavior.prototype.onOwnerChange(self, previousOwner)
223
+ end
224
+ function UnitBehavior.bindUnitType(self, unitTypeId, ...)
225
+ local args = {...}
226
+ local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unitTypeId]
227
+ if createBehaviorFunctions == nil then
228
+ createBehaviorFunctions = {}
229
+ createBehaviorFunctionsByUnitTypeId[unitTypeId] = createBehaviorFunctions
230
+ end
231
+ createBehaviorFunctions[#createBehaviorFunctions + 1] = function(unit)
232
+ return __TS__New(
233
+ self,
234
+ unit,
235
+ table.unpack(args)
236
+ )
237
+ end
238
+ end
146
239
  __TS__SetDescriptor(
147
240
  UnitBehavior.prototype,
148
241
  "unit",
@@ -254,7 +347,18 @@ __TS__SetDescriptor(
254
347
  Unit.itemChargesChangedEvent:addListener(function(unit, item)
255
348
  ____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
256
349
  end)
350
+ Unit.onOwnerChange:addListener(function(unit, previousOwner)
351
+ ____exports.UnitBehavior:forAll(unit, "onOwnerChange", previousOwner)
352
+ end)
257
353
  end)(UnitBehavior)
354
+ Unit.onCreate:addListener(function(unit)
355
+ local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unit.typeId]
356
+ if createBehaviorFunctions ~= nil then
357
+ for ____, createBehavior in ipairs(createBehaviorFunctions) do
358
+ createBehavior(unit)
359
+ end
360
+ end
361
+ end)
258
362
  Unit.destroyEvent:addListener(function(unit)
259
363
  ____exports.UnitBehavior:forAll(unit, "destroy")
260
364
  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;
@@ -30,8 +31,10 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
30
31
  source?: Unit;
31
32
  behaviorConstructors?: (new (unit: Unit) => UnitBehavior)[];
32
33
  abilityTypeIds?: Record<AbilityTypeId, {
33
- [numberField: (AbilityNumberField | AbilityNumberLevelField) & symbol]: NumberParameterValueType;
34
- } & {
34
+ readonly fields?: [
35
+ AbilityNumberField | AbilityNumberLevelField,
36
+ NumberParameterValueType
37
+ ][];
35
38
  /** Default `true`. */
36
39
  readonly isButtonVisible?: boolean;
37
40
  /** Default is the level of the source ability or 0 if it is absent. */
@@ -53,9 +56,11 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
53
56
  damageIncrease?: NumberParameterValueType;
54
57
  damageIncreaseFactor?: NumberParameterValueType;
55
58
  armorIncrease?: NumberParameterValueType;
56
- armorIncreaseFactor?: NumberParameterValueType;
59
+ maxHealthIncrease?: NumberParameterValueType;
60
+ maxManaIncrease?: NumberParameterValueType;
57
61
  attackSpeedIncreaseFactor?: NumberParameterValueType;
58
62
  movementSpeedIncreaseFactor?: NumberParameterValueType;
63
+ manaRegenerationRateIncreaseFactor?: NumberParameterValueType;
59
64
  evasionProbability?: NumberParameterValueType;
60
65
  missProbability?: NumberParameterValueType;
61
66
  damageFactor?: NumberParameterValueType;
@@ -75,10 +80,14 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
75
80
  maximumAutoAttackCount?: IntegerParameterValueType;
76
81
  maximumDamageDealtEventCount?: IntegerParameterValueType;
77
82
  maximumDamageReceivedEventCount?: IntegerParameterValueType;
83
+ absorbedDamageFactor?: NumberParameterValueType;
84
+ maximumDamageAbsorbed?: NumberParameterValueType;
85
+ destroysOnMaximumDamageAbsorbed?: BooleanParameterValueType;
78
86
  damageOnExpiration?: NumberParameterValueType;
79
87
  healingOnExpiration?: NumberParameterValueType;
80
88
  killsOnExpiration?: BooleanParameterValueType;
81
89
  explodesOnExpiration?: BooleanParameterValueType;
90
+ abilityCooldownFactor?: NumberParameterValueType;
82
91
  uniqueGroup?: BuffUniqueGroup;
83
92
  } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
84
93
  declare const enum BuffPropertyKey {
@@ -117,20 +126,26 @@ declare const enum BuffPropertyKey {
117
126
  MAXIMUM_DAMAGE_DEALT_EVENT_COUNT = 132,
118
127
  DAMAGE_RECEIVED_EVENT_COUNT = 133,
119
128
  MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT = 134,
120
- TURNS_INTO_GHOST = 135,
121
- STUNS = 136,
122
- IGNORES_STUN_IMMUNITY = 137,
123
- DISABLES_AUTO_ATTACK = 138,
124
- PROVIDES_INVULNERABILITY = 139,
125
- KILLS_ON_EXPIRATION = 140,
126
- EXPLODES_ON_EXPIRATION = 141,
127
- MISS_PROBABILITY = 142
129
+ ABSORBED_DAMAGE_FACTOR = 135,
130
+ MAXIMUM_DAMAGE_ABSORBED = 136,
131
+ DAMAGE_ABSORBED = 137,
132
+ DESTROYS_ON_MAXIMUM_DAMAGE_ABSORBED = 138,
133
+ TURNS_INTO_GHOST = 139,
134
+ STUNS = 140,
135
+ IGNORES_STUN_IMMUNITY = 141,
136
+ DISABLES_AUTO_ATTACK = 142,
137
+ PROVIDES_INVULNERABILITY = 143,
138
+ KILLS_ON_EXPIRATION = 144,
139
+ EXPLODES_ON_EXPIRATION = 145,
140
+ MISS_PROBABILITY = 146,
141
+ ABILITY_COOLDOWN_FACTOR = 147,
142
+ ABILITY_COOLDOWN_MODIFIER = 148
128
143
  }
129
144
  export declare const enum BuffTypeIdSelectionPolicy {
130
145
  LEAST_DURATION = 0
131
146
  }
132
147
  export type BuffAdditionalParameters = Prohibit<Record<string, any>, keyof BuffParameters>;
133
- export type BuffConstructorParameters<AdditionalParameters extends BuffAdditionalParameters> = [
148
+ export type BuffConstructorParameters<T extends Buff<BuffAdditionalParameters>> = T extends Buff<infer AdditionalParameters> ? [
134
149
  ...typeId: [ApplicableBuffTypeId] | [
135
150
  typeIds: ReadonlyNonEmptyArray<ApplicableBuffTypeId>,
136
151
  typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
@@ -138,10 +153,12 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
138
153
  polarity: BuffPolarityParameterType,
139
154
  resistanceType: BuffResistanceTypeParameterType,
140
155
  ...abilityOrParameters: [
141
- ability?: Ability,
156
+ ability?: Ability | AbilityBehavior,
142
157
  parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
143
- ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
144
- ];
158
+ ] | [
159
+ parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
160
+ ]
161
+ ] : never;
145
162
  export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = object> extends UnitBehavior {
146
163
  private _unit;
147
164
  protected readonly __additionalParametersBrand?: AdditionalParameters;
@@ -180,6 +197,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
180
197
  private [BuffPropertyKey.DAMAGE_DEALT_EVENT_COUNT]?;
181
198
  private [BuffPropertyKey.MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT]?;
182
199
  private [BuffPropertyKey.DAMAGE_RECEIVED_EVENT_COUNT]?;
200
+ private [BuffPropertyKey.ABSORBED_DAMAGE_FACTOR]?;
201
+ private [BuffPropertyKey.MAXIMUM_DAMAGE_ABSORBED]?;
202
+ private [BuffPropertyKey.DAMAGE_ABSORBED]?;
203
+ private [BuffPropertyKey.DESTROYS_ON_MAXIMUM_DAMAGE_ABSORBED]?;
183
204
  private [BuffPropertyKey.TURNS_INTO_GHOST]?;
184
205
  private [BuffPropertyKey.STUNS]?;
185
206
  private [BuffPropertyKey.IGNORES_STUN_IMMUNITY]?;
@@ -187,12 +208,14 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
187
208
  private [BuffPropertyKey.PROVIDES_INVULNERABILITY]?;
188
209
  private [BuffPropertyKey.KILLS_ON_EXPIRATION]?;
189
210
  private [BuffPropertyKey.EXPLODES_ON_EXPIRATION]?;
211
+ private [BuffPropertyKey.ABILITY_COOLDOWN_FACTOR]?;
212
+ private [BuffPropertyKey.ABILITY_COOLDOWN_MODIFIER]?;
190
213
  protected static readonly defaultParameters: BuffParameters;
191
214
  get source(): Unit;
192
215
  readonly typeId: ApplicableBuffTypeId;
193
216
  readonly polarity: BuffPolarity;
194
217
  readonly resistanceType: BuffResistanceType;
195
- readonly parameters: IsExactlyAny<AdditionalParameters> extends true ? any : keyof AdditionalParameters extends never ? undefined : {
218
+ readonly parameters: IsExactlyAny<AdditionalParameters> extends true ? any : AdditionalParameters extends Record<PropertyKey, never> ? undefined : {
196
219
  [K in keyof Omit<AdditionalParameters, keyof BuffParameters>]: AdditionalParameters[K] extends AbilityDependentValue<infer T> ? T : AdditionalParameters[K];
197
220
  };
198
221
  private readonly handle;
@@ -201,12 +224,9 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
201
224
  private readonly _spellStealPriority?;
202
225
  private readonly _learnLevelMinimum?;
203
226
  private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
204
- private _bonusIdByBonusType?;
205
227
  private readonly _abilityTypeIds?;
206
228
  private _behaviors?;
207
- private getUnitBonus;
208
- private addOrUpdateOrRemoveUnitBonus;
209
- constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
229
+ constructor(target: Unit, ...parameters: BuffConstructorParameters<Buff<AdditionalParameters>>);
210
230
  get level(): number;
211
231
  get remainingDamageOverDuration(): number;
212
232
  set remainingDamageOverDuration(remainingDamageOverDuration: number);
@@ -234,6 +254,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
234
254
  set receivedDamageFactor(receivedDamageFactor: number);
235
255
  get armorIncrease(): number;
236
256
  set armorIncrease(armorIncrease: number);
257
+ get maxHealthIncrease(): number;
258
+ set maxHealthIncrease(maxHealthIncrease: number);
259
+ get maxManaIncrease(): number;
260
+ set maxManaIncrease(maxManaIncrease: number);
237
261
  get turnsIntoGhost(): boolean;
238
262
  set turnsIntoGhost(turnsIntoGhost: boolean);
239
263
  get stuns(): boolean;
@@ -262,14 +286,33 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
262
286
  set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: number);
263
287
  get evasionProbability(): number;
264
288
  set evasionProbability(evasionProbability: number);
289
+ get manaRegenerationRateIncreaseFactor(): number;
290
+ set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: number);
265
291
  get duration(): number;
292
+ set duration(duration: number);
266
293
  get remainingDuration(): number;
267
294
  set remainingDuration(remainingDuration: number);
295
+ get absorbedDamageFactor(): number;
296
+ set absorbedDamageFactor(absorbedDamageFactor: number);
297
+ get maximumDamageAbsorbed(): number;
298
+ set maximumDamageAbsorbed(maximumDamageAbsorbed: number);
299
+ get damageAbsorbed(): number;
300
+ get destroysOnMaximumDamageAbsorbed(): boolean;
301
+ set destroysOnMaximumDamageAbsorbed(destroysOnMaximumDamageAbsorbed: boolean);
302
+ get abilityCooldownFactor(): number;
303
+ set abilityCooldownFactor(abilityCooldownFactor: number);
304
+ onAbilityGained(ability: Ability): void;
305
+ onAbilityLost(ability: Ability): void;
268
306
  flashEffect(...parameters: [
269
307
  ...widgetOrXY: [] | [Widget] | [x: number, x: number],
270
308
  ...parametersOrDuration: [] | [EffectParameters] | [number]
271
309
  ]): void;
272
- flashSpecialEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
310
+ flashSpecialEffect(...parameters: [
311
+ ...widgetOrXY: [] | [Widget] | [x: number, x: number],
312
+ ...parametersOrDuration: [] | [EffectParameters] | [number]
313
+ ]): void;
314
+ private flash;
315
+ expire(): void;
273
316
  protected onCreate(): void;
274
317
  protected onDestroy(): Destructor;
275
318
  static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;