warscript 0.0.1-dev.e196516 → 0.0.1-dev.e3899e3

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 (110) 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/destroyable.d.ts +1 -0
  14. package/destroyable.lua +9 -0
  15. package/engine/behavior.d.ts +14 -1
  16. package/engine/behavior.lua +230 -70
  17. package/engine/behaviour/ability/apply-buff.lua +5 -5
  18. package/engine/behaviour/ability/emulate-impact.d.ts +1 -1
  19. package/engine/behaviour/ability/emulate-impact.lua +2 -1
  20. package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
  21. package/engine/behaviour/ability/remove-buffs.lua +21 -0
  22. package/engine/behaviour/ability/restore-mana.d.ts +1 -1
  23. package/engine/behaviour/ability/restore-mana.lua +6 -6
  24. package/engine/behaviour/ability.d.ts +2 -1
  25. package/engine/behaviour/ability.lua +9 -17
  26. package/engine/behaviour/unit/stun-immunity.d.ts +11 -5
  27. package/engine/behaviour/unit/stun-immunity.lua +53 -28
  28. package/engine/behaviour/unit.d.ts +26 -5
  29. package/engine/behaviour/unit.lua +170 -27
  30. package/engine/buff.d.ts +17 -6
  31. package/engine/buff.lua +160 -97
  32. package/engine/internal/ability.d.ts +3 -1
  33. package/engine/internal/ability.lua +34 -11
  34. package/engine/internal/item/ability.lua +51 -1
  35. package/engine/internal/item+owner.lua +12 -6
  36. package/engine/internal/item.d.ts +13 -15
  37. package/engine/internal/item.lua +63 -49
  38. package/engine/internal/misc/frame-coordinates.d.ts +2 -0
  39. package/engine/internal/misc/frame-coordinates.lua +21 -0
  40. package/engine/internal/misc/get-terrain-z.d.ts +2 -0
  41. package/engine/internal/misc/get-terrain-z.lua +11 -0
  42. package/engine/internal/misc/player-local-handle.d.ts +2 -0
  43. package/engine/internal/misc/player-local-handle.lua +5 -0
  44. package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts +2 -0
  45. package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua +16 -0
  46. package/engine/internal/unit/ability.d.ts +35 -5
  47. package/engine/internal/unit/ability.lua +96 -21
  48. package/engine/internal/unit/bonus.d.ts +2 -0
  49. package/engine/internal/unit/bonus.lua +10 -0
  50. package/engine/internal/unit/fly-height.d.ts +7 -0
  51. package/engine/internal/unit/fly-height.lua +20 -0
  52. package/engine/internal/unit/main-selected.lua +12 -27
  53. package/engine/internal/unit/order.d.ts +20 -0
  54. package/engine/internal/unit/order.lua +136 -0
  55. package/engine/internal/unit/scale.d.ts +7 -0
  56. package/engine/internal/unit/scale.lua +20 -0
  57. package/engine/internal/unit+ability.lua +10 -1
  58. package/engine/internal/unit-missile-launch.lua +45 -14
  59. package/engine/internal/unit.d.ts +19 -16
  60. package/engine/internal/unit.lua +170 -136
  61. package/engine/local-client.d.ts +2 -0
  62. package/engine/local-client.lua +30 -0
  63. package/engine/object-data/auxiliary/armor-type.d.ts +11 -0
  64. package/engine/object-data/auxiliary/armor-type.lua +46 -0
  65. package/engine/object-data/auxiliary/health-regeneration-type.d.ts +8 -0
  66. package/engine/object-data/auxiliary/health-regeneration-type.lua +2 -0
  67. package/engine/object-data/entry/ability-type/mana-regeneration.d.ts +8 -0
  68. package/engine/object-data/entry/ability-type/mana-regeneration.lua +26 -0
  69. package/engine/object-data/entry/ability-type.lua +5 -4
  70. package/engine/object-data/entry/destructible-type.d.ts +27 -1
  71. package/engine/object-data/entry/destructible-type.lua +155 -0
  72. package/engine/object-data/entry/unit-type.d.ts +15 -2
  73. package/engine/object-data/entry/unit-type.lua +135 -33
  74. package/engine/object-field/ability.d.ts +3 -3
  75. package/engine/object-field/ability.lua +7 -6
  76. package/engine/object-field/unit.d.ts +31 -5
  77. package/engine/object-field/unit.lua +95 -0
  78. package/engine/object-field.d.ts +9 -3
  79. package/engine/object-field.lua +242 -119
  80. package/engine/random.d.ts +9 -0
  81. package/engine/random.lua +13 -0
  82. package/engine/standard/fields/ability.d.ts +2 -2
  83. package/engine/standard/fields/ability.lua +2 -2
  84. package/engine/standard/fields/unit.d.ts +7 -0
  85. package/engine/standard/fields/unit.lua +13 -0
  86. package/engine/synchronization.d.ts +11 -0
  87. package/engine/synchronization.lua +77 -0
  88. package/engine/text-tag.d.ts +26 -3
  89. package/engine/text-tag.lua +217 -11
  90. package/engine/unit.d.ts +3 -0
  91. package/engine/unit.lua +3 -0
  92. package/net/socket.lua +1 -1
  93. package/objutil/buff.lua +1 -1
  94. package/package.json +2 -2
  95. package/patch-lualib.lua +1 -1
  96. package/utility/arrays.d.ts +1 -0
  97. package/utility/arrays.lua +8 -0
  98. package/utility/callback-array.d.ts +17 -0
  99. package/utility/callback-array.lua +61 -0
  100. package/utility/functions.d.ts +7 -0
  101. package/utility/functions.lua +12 -0
  102. package/utility/linked-set.d.ts +1 -0
  103. package/utility/linked-set.lua +19 -1
  104. package/utility/lua-maps.d.ts +11 -2
  105. package/utility/lua-maps.lua +33 -2
  106. package/utility/lua-sets.d.ts +1 -0
  107. package/utility/lua-sets.lua +4 -0
  108. package/utility/types.d.ts +3 -0
  109. package/core/types/order.d.ts +0 -26
  110. package/core/types/order.lua +0 -65
@@ -15,15 +15,15 @@ end
15
15
  function RestoreManaSelfAbilityBehavior.prototype.onImpact(self, caster)
16
16
  caster.mana = caster.mana + self:resolveCurrentAbilityDependentValue(self.mana)
17
17
  end
18
- ____exports.RestoreManaAbilityBehavior = __TS__Class()
19
- local RestoreManaAbilityBehavior = ____exports.RestoreManaAbilityBehavior
20
- RestoreManaAbilityBehavior.name = "RestoreManaAbilityBehavior"
21
- __TS__ClassExtends(RestoreManaAbilityBehavior, AbilityBehavior)
22
- function RestoreManaAbilityBehavior.prototype.____constructor(self, ability, mana)
18
+ ____exports.RestoreManaTargetAbilityBehavior = __TS__Class()
19
+ local RestoreManaTargetAbilityBehavior = ____exports.RestoreManaTargetAbilityBehavior
20
+ RestoreManaTargetAbilityBehavior.name = "RestoreManaTargetAbilityBehavior"
21
+ __TS__ClassExtends(RestoreManaTargetAbilityBehavior, AbilityBehavior)
22
+ function RestoreManaTargetAbilityBehavior.prototype.____constructor(self, ability, mana)
23
23
  AbilityBehavior.prototype.____constructor(self, ability)
24
24
  self.mana = mana
25
25
  end
26
- function RestoreManaAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
26
+ function RestoreManaTargetAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
27
27
  target.mana = target.mana + self:resolveCurrentAbilityDependentValue(self.mana)
28
28
  end
29
29
  return ____exports
@@ -1,6 +1,7 @@
1
1
  /** @noSelfInFile */
2
2
  import { Behavior } from "../behavior";
3
- import { Unit } from "../unit";
3
+ import { Unit } from "../internal/unit";
4
+ import "../internal/unit/ability";
4
5
  import { Ability } from "../internal/ability";
5
6
  import { AbilityTypeId } from "../object-data/entry/ability-type";
6
7
  import { Widget } from "../../core/types/widget";
@@ -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
@@ -275,12 +267,12 @@ __TS__SetDescriptor(
275
267
  Unit.abilityPointTargetChannelingStartEvent:addListener(createUnitEventListener("onPointTargetChannelingStart"))
276
268
  Unit.abilityNoTargetChannelingStartEvent:addListener(createUnitEventListener("onNoTargetChannelingStart"))
277
269
  Unit.abilityImpactEvent:addListener(createUnitEventListener("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"))
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,21 +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
+ 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";
12
17
  export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
13
18
  export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
14
- constructor(unit: Unit);
15
- protected onDestroy(): Destructor;
16
19
  readonly sourceAbilityBehavior?: AbilityBehavior;
20
+ private _bonusIdByBonusType?;
21
+ constructor(unit: Unit, priority?: BehaviorPriority);
22
+ protected onDestroy(): Destructor;
17
23
  get unit(): Unit;
18
- 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;
19
28
  onImmediateOrder(orderId: number): void;
20
29
  onTargetOrder(orderId: number, target: Widget): void;
21
30
  onPointOrder(orderId: number, x: number, y: number): void;
@@ -31,8 +40,18 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
31
40
  onAbilityLost(ability: Ability): void;
32
41
  onAbilityChannelingStart(ability: Ability): void;
33
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;
34
49
  onAbilityChannelingFinish(ability: Ability): void;
35
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;
36
55
  onItemDropped(item: Item): void;
37
56
  onItemPickedUp(item: Item): void;
38
57
  onItemUsed(item: Item): void;
@@ -40,4 +59,6 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
40
59
  onItemChargesChanged(item: Item): void;
41
60
  onKill(target: Unit): void;
42
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;
43
64
  }
@@ -17,60 +17,127 @@ 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
@@ -104,10 +171,30 @@ function UnitBehavior.prototype.onAbilityChannelingStart(self, ability)
104
171
  end
105
172
  function UnitBehavior.prototype.onAbilityImpact(self, ability)
106
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
107
186
  function UnitBehavior.prototype.onAbilityChannelingFinish(self, ability)
108
187
  end
109
188
  function UnitBehavior.prototype.onAbilityStop(self, ability)
110
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
111
198
  function UnitBehavior.prototype.onItemDropped(self, item)
112
199
  end
113
200
  function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -122,6 +209,23 @@ function UnitBehavior.prototype.onKill(self, target)
122
209
  end
123
210
  function UnitBehavior.prototype.onDeath(self, source)
124
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
125
229
  __TS__SetDescriptor(
126
230
  UnitBehavior.prototype,
127
231
  "unit",
@@ -175,9 +279,37 @@ __TS__SetDescriptor(
175
279
  Unit.abilityChannelingStartEvent:addListener(function(source, ability)
176
280
  ____exports.UnitBehavior:forAll(source, "onAbilityChannelingStart", ability)
177
281
  end)
282
+ Unit.abilityUnitTargetChannelingStartEvent:addListener(function(source, ability, target)
283
+ ____exports.UnitBehavior:forAll(target, "onTargetingAbilityChannelingStart", ability, source)
284
+ end)
178
285
  Unit.abilityImpactEvent:addListener(function(source, ability)
179
286
  ____exports.UnitBehavior:forAll(source, "onAbilityImpact", ability)
180
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)
181
313
  Unit.abilityChannelingFinishEvent:addListener(function(source, ability)
182
314
  ____exports.UnitBehavior:forAll(source, "onAbilityChannelingFinish", ability)
183
315
  end)
@@ -205,7 +337,18 @@ __TS__SetDescriptor(
205
337
  Unit.itemChargesChangedEvent:addListener(function(unit, item)
206
338
  ____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
207
339
  end)
340
+ Unit.onOwnerChange:addListener(function(unit, previousOwner)
341
+ ____exports.UnitBehavior:forAll(unit, "onOwnerChange", previousOwner)
342
+ end)
208
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)
209
352
  Unit.destroyEvent:addListener(function(unit)
210
353
  ____exports.UnitBehavior:forAll(unit, "destroy")
211
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;
@@ -56,6 +57,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
56
57
  armorIncreaseFactor?: NumberParameterValueType;
57
58
  attackSpeedIncreaseFactor?: NumberParameterValueType;
58
59
  movementSpeedIncreaseFactor?: NumberParameterValueType;
60
+ manaRegenerationRateIncreaseFactor?: NumberParameterValueType;
59
61
  evasionProbability?: NumberParameterValueType;
60
62
  missProbability?: NumberParameterValueType;
61
63
  damageFactor?: NumberParameterValueType;
@@ -79,6 +81,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
79
81
  healingOnExpiration?: NumberParameterValueType;
80
82
  killsOnExpiration?: BooleanParameterValueType;
81
83
  explodesOnExpiration?: BooleanParameterValueType;
84
+ abilityCooldownFactor?: NumberParameterValueType;
82
85
  uniqueGroup?: BuffUniqueGroup;
83
86
  } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
84
87
  declare const enum BuffPropertyKey {
@@ -124,7 +127,9 @@ declare const enum BuffPropertyKey {
124
127
  PROVIDES_INVULNERABILITY = 139,
125
128
  KILLS_ON_EXPIRATION = 140,
126
129
  EXPLODES_ON_EXPIRATION = 141,
127
- MISS_PROBABILITY = 142
130
+ MISS_PROBABILITY = 142,
131
+ ABILITY_COOLDOWN_FACTOR = 143,
132
+ ABILITY_COOLDOWN_MODIFIER = 144
128
133
  }
129
134
  export declare const enum BuffTypeIdSelectionPolicy {
130
135
  LEAST_DURATION = 0
@@ -138,7 +143,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
138
143
  polarity: BuffPolarityParameterType,
139
144
  resistanceType: BuffResistanceTypeParameterType,
140
145
  ...abilityOrParameters: [
141
- ability?: Ability,
146
+ ability?: Ability | AbilityBehavior,
142
147
  parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
143
148
  ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
144
149
  ];
@@ -187,6 +192,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
187
192
  private [BuffPropertyKey.PROVIDES_INVULNERABILITY]?;
188
193
  private [BuffPropertyKey.KILLS_ON_EXPIRATION]?;
189
194
  private [BuffPropertyKey.EXPLODES_ON_EXPIRATION]?;
195
+ private [BuffPropertyKey.ABILITY_COOLDOWN_FACTOR]?;
196
+ private [BuffPropertyKey.ABILITY_COOLDOWN_MODIFIER]?;
190
197
  protected static readonly defaultParameters: BuffParameters;
191
198
  get source(): Unit;
192
199
  readonly typeId: ApplicableBuffTypeId;
@@ -201,11 +208,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
201
208
  private readonly _spellStealPriority?;
202
209
  private readonly _learnLevelMinimum?;
203
210
  private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
204
- private _bonusIdByBonusType?;
205
211
  private readonly _abilityTypeIds?;
206
212
  private _behaviors?;
207
- private getUnitBonus;
208
- private addOrUpdateOrRemoveUnitBonus;
209
213
  constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
210
214
  get level(): number;
211
215
  get remainingDamageOverDuration(): number;
@@ -262,9 +266,15 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
262
266
  set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: number);
263
267
  get evasionProbability(): number;
264
268
  set evasionProbability(evasionProbability: number);
269
+ get manaRegenerationRateIncreaseFactor(): number;
270
+ set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: number);
265
271
  get duration(): number;
266
272
  get remainingDuration(): number;
267
273
  set remainingDuration(remainingDuration: number);
274
+ get abilityCooldownFactor(): number;
275
+ set abilityCooldownFactor(abilityCooldownFactor: number);
276
+ onAbilityGained(ability: Ability): void;
277
+ onAbilityLost(ability: Ability): void;
268
278
  flashEffect(...parameters: [
269
279
  ...widgetOrXY: [] | [Widget] | [x: number, x: number],
270
280
  ...parametersOrDuration: [] | [EffectParameters] | [number]
@@ -278,6 +288,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
278
288
  onDeath(source: Unit | undefined): void;
279
289
  onDamageDealt(target: Unit, event: DamageEvent): void;
280
290
  onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
281
- static readonly destroyEvent: Event<[Buff<object>]>;
291
+ static readonly createdEvent: Event<[Buff<object>]>;
292
+ static readonly beingDestroyedEvent: Event<[Buff<object>]>;
282
293
  }
283
294
  export {};