warscript 0.0.1-dev.f566ce7 → 0.0.1-dev.f594e71

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 (185) hide show
  1. package/core/types/frame.d.ts +1 -0
  2. package/core/types/frame.lua +65 -36
  3. package/core/types/handle.lua +9 -9
  4. package/core/types/player.d.ts +2 -1
  5. package/core/types/player.lua +18 -13
  6. package/core/types/playerColor.lua +4 -3
  7. package/core/types/sound.d.ts +1 -1
  8. package/core/types/sound.lua +13 -8
  9. package/core/types/unit.d.ts +4 -0
  10. package/core/types/unit.lua +4 -0
  11. package/decl/native.d.ts +705 -7
  12. package/engine/behaviour/ability/damage.lua +11 -14
  13. package/engine/behaviour/ability.d.ts +1 -0
  14. package/engine/behaviour/ability.lua +11 -0
  15. package/engine/behaviour/unit.d.ts +1 -0
  16. package/engine/behaviour/unit.lua +1 -0
  17. package/engine/buff.d.ts +12 -10
  18. package/engine/buff.lua +64 -16
  19. package/engine/index.d.ts +2 -1
  20. package/engine/internal/ability.d.ts +4 -0
  21. package/engine/internal/ability.lua +37 -18
  22. package/engine/internal/item+owner.d.ts +1 -0
  23. package/engine/internal/item+owner.lua +7 -0
  24. package/engine/internal/item.d.ts +16 -1
  25. package/engine/internal/item.lua +130 -20
  26. package/engine/internal/unit/ability.lua +15 -3
  27. package/engine/internal/unit/appearance.d.ts +15 -0
  28. package/engine/internal/unit/appearance.lua +85 -0
  29. package/engine/internal/unit/bag.d.ts +18 -0
  30. package/engine/internal/unit/bag.lua +63 -0
  31. package/engine/internal/unit/buff.d.ts +2 -2
  32. package/engine/internal/unit/buff.lua +34 -19
  33. package/engine/internal/unit/equipment.d.ts +36 -0
  34. package/engine/internal/unit/equipment.lua +169 -0
  35. package/engine/internal/unit/{item.d.ts → inventory.d.ts} +3 -3
  36. package/engine/internal/unit/{item.lua → inventory.lua} +25 -26
  37. package/engine/internal/unit/pseudo-passive-abilities.d.ts +2 -0
  38. package/engine/internal/unit/pseudo-passive-abilities.lua +11 -0
  39. package/engine/internal/unit+damage.d.ts +9 -0
  40. package/engine/internal/unit+damage.lua +33 -0
  41. package/engine/internal/unit-missile-data.lua +58 -32
  42. package/engine/internal/unit.d.ts +0 -1
  43. package/engine/internal/unit.lua +2 -7
  44. package/engine/local-client.d.ts +20 -0
  45. package/engine/local-client.lua +284 -53
  46. package/engine/object-data/auxiliary/equipment-slot.d.ts +12 -0
  47. package/engine/object-data/auxiliary/equipment-slot.lua +2 -0
  48. package/engine/object-data/auxiliary/equipment-type.d.ts +13 -0
  49. package/engine/object-data/auxiliary/equipment-type.lua +2 -0
  50. package/engine/object-data/auxiliary/item-tag.d.ts +12 -0
  51. package/engine/object-data/auxiliary/item-tag.lua +2 -0
  52. package/engine/object-data/auxiliary/sound-set-name.d.ts +14 -3
  53. package/engine/object-data/entry/ability-type/apprehend.d.ts +22 -0
  54. package/engine/object-data/entry/ability-type/apprehend.lua +66 -0
  55. package/engine/object-data/entry/ability-type/banshee.d.ts +8 -0
  56. package/engine/object-data/entry/ability-type/banshee.lua +13 -0
  57. package/engine/object-data/entry/ability-type/banshees-wail-damage-amp.d.ts +12 -0
  58. package/engine/object-data/entry/ability-type/banshees-wail-damage-amp.lua +27 -0
  59. package/engine/object-data/entry/ability-type/banshees-wail.d.ts +31 -0
  60. package/engine/object-data/entry/ability-type/banshees-wail.lua +117 -0
  61. package/engine/object-data/entry/ability-type/battering-ram.d.ts +33 -0
  62. package/engine/object-data/entry/ability-type/battering-ram.lua +130 -0
  63. package/engine/object-data/entry/ability-type/blank-configurable.d.ts +3 -0
  64. package/engine/object-data/entry/ability-type/blank-configurable.lua +30 -0
  65. package/engine/object-data/entry/ability-type/cleansing-fire.d.ts +27 -0
  66. package/engine/object-data/entry/ability-type/cleansing-fire.lua +104 -0
  67. package/engine/object-data/entry/ability-type/consecration.d.ts +15 -0
  68. package/engine/object-data/entry/ability-type/consecration.lua +52 -0
  69. package/engine/object-data/entry/ability-type/cooldown-reduction.d.ts +12 -0
  70. package/engine/object-data/entry/ability-type/cooldown-reduction.lua +39 -0
  71. package/engine/object-data/entry/ability-type/critical-strike-system.d.ts +18 -0
  72. package/engine/object-data/entry/ability-type/critical-strike-system.lua +65 -0
  73. package/engine/object-data/entry/ability-type/deathseeker-arrows.d.ts +21 -0
  74. package/engine/object-data/entry/ability-type/deathseeker-arrows.lua +78 -0
  75. package/engine/object-data/entry/ability-type/equipment-inventory-interface.d.ts +8 -0
  76. package/engine/object-data/entry/ability-type/equipment-inventory-interface.lua +13 -0
  77. package/engine/object-data/entry/ability-type/equipment-inventory.d.ts +13 -0
  78. package/engine/object-data/entry/ability-type/equipment-inventory.lua +27 -0
  79. package/engine/object-data/entry/ability-type/equipment.d.ts +13 -0
  80. package/engine/object-data/entry/ability-type/equipment.lua +27 -0
  81. package/engine/object-data/entry/ability-type/grant-talent-point.d.ts +8 -0
  82. package/engine/object-data/entry/ability-type/grant-talent-point.lua +13 -0
  83. package/engine/object-data/entry/ability-type/grim-conviction.d.ts +36 -0
  84. package/engine/object-data/entry/ability-type/grim-conviction.lua +131 -0
  85. package/engine/object-data/entry/ability-type/grit.d.ts +18 -0
  86. package/engine/object-data/entry/ability-type/grit.lua +65 -0
  87. package/engine/object-data/entry/ability-type/guiding-hand.d.ts +27 -0
  88. package/engine/object-data/entry/ability-type/guiding-hand.lua +104 -0
  89. package/engine/object-data/entry/ability-type/headsplitter.d.ts +27 -0
  90. package/engine/object-data/entry/ability-type/headsplitter.lua +104 -0
  91. package/engine/object-data/entry/ability-type/healing-modifier.d.ts +9 -0
  92. package/engine/object-data/entry/ability-type/healing-modifier.lua +26 -0
  93. package/engine/object-data/entry/ability-type/heroic-slash.d.ts +18 -0
  94. package/engine/object-data/entry/ability-type/heroic-slash.lua +65 -0
  95. package/engine/object-data/entry/ability-type/holy-wrath.d.ts +30 -0
  96. package/engine/object-data/entry/ability-type/holy-wrath.lua +117 -0
  97. package/engine/object-data/entry/ability-type/inspire-courage.d.ts +18 -0
  98. package/engine/object-data/entry/ability-type/inspire-courage.lua +65 -0
  99. package/engine/object-data/entry/ability-type/lights-mercy.d.ts +27 -0
  100. package/engine/object-data/entry/ability-type/lights-mercy.lua +104 -0
  101. package/engine/object-data/entry/ability-type/mana-efficiency.d.ts +12 -0
  102. package/engine/object-data/entry/ability-type/mana-efficiency.lua +39 -0
  103. package/engine/object-data/entry/ability-type/mind-control.d.ts +21 -0
  104. package/engine/object-data/entry/ability-type/mind-control.lua +78 -0
  105. package/engine/object-data/entry/ability-type/on-attack-cast-spell.d.ts +21 -0
  106. package/engine/object-data/entry/ability-type/on-attack-cast-spell.lua +52 -0
  107. package/engine/object-data/entry/ability-type/on-basic-attack-cast-spell.d.ts +19 -0
  108. package/engine/object-data/entry/ability-type/on-basic-attack-cast-spell.lua +65 -0
  109. package/engine/object-data/entry/ability-type/on-hit-cast-spell.d.ts +15 -0
  110. package/engine/object-data/entry/ability-type/on-hit-cast-spell.lua +26 -0
  111. package/engine/object-data/entry/ability-type/on-magic-attack-cast-spell.d.ts +6 -0
  112. package/engine/object-data/entry/ability-type/on-magic-attack-cast-spell.lua +12 -0
  113. package/engine/object-data/entry/ability-type/provoke.d.ts +21 -0
  114. package/engine/object-data/entry/ability-type/provoke.lua +66 -0
  115. package/engine/object-data/entry/ability-type/raise-the-banner.d.ts +9 -0
  116. package/engine/object-data/entry/ability-type/raise-the-banner.lua +26 -0
  117. package/engine/object-data/entry/ability-type/resolve.d.ts +12 -0
  118. package/engine/object-data/entry/ability-type/resolve.lua +39 -0
  119. package/engine/object-data/entry/ability-type/righteous-fury.d.ts +33 -0
  120. package/engine/object-data/entry/ability-type/righteous-fury.lua +130 -0
  121. package/engine/object-data/entry/ability-type/sacred-aura.d.ts +27 -0
  122. package/engine/object-data/entry/ability-type/sacred-aura.lua +104 -0
  123. package/engine/object-data/entry/ability-type/soul-lantern.d.ts +30 -0
  124. package/engine/object-data/entry/ability-type/soul-lantern.lua +117 -0
  125. package/engine/object-data/entry/ability-type/spell-amp.d.ts +15 -0
  126. package/engine/object-data/entry/ability-type/spell-amp.lua +52 -0
  127. package/engine/object-data/entry/ability-type/spell-critical-strike.d.ts +12 -0
  128. package/engine/object-data/entry/ability-type/spell-critical-strike.lua +39 -0
  129. package/engine/object-data/entry/ability-type/spell-vamp.d.ts +12 -0
  130. package/engine/object-data/entry/ability-type/spell-vamp.lua +39 -0
  131. package/engine/object-data/entry/ability-type/stackable-evasion.d.ts +9 -0
  132. package/engine/object-data/entry/ability-type/stackable-evasion.lua +13 -0
  133. package/engine/object-data/entry/ability-type/stackable-hardened-skin.d.ts +21 -0
  134. package/engine/object-data/entry/ability-type/stackable-hardened-skin.lua +78 -0
  135. package/engine/object-data/entry/ability-type/stackable-life-steal.d.ts +9 -0
  136. package/engine/object-data/entry/ability-type/stackable-life-steal.lua +26 -0
  137. package/engine/object-data/entry/ability-type/stackable-spell-damage-reduction.d.ts +9 -0
  138. package/engine/object-data/entry/ability-type/stackable-spell-damage-reduction.lua +13 -0
  139. package/engine/object-data/entry/ability-type/stackable-thorn-shield.d.ts +9 -0
  140. package/engine/object-data/entry/ability-type/stackable-thorn-shield.lua +13 -0
  141. package/engine/object-data/entry/ability-type/stat-details.d.ts +12 -0
  142. package/engine/object-data/entry/ability-type/stat-details.lua +27 -0
  143. package/engine/object-data/entry/ability-type/surge-of-light.d.ts +33 -0
  144. package/engine/object-data/entry/ability-type/surge-of-light.lua +130 -0
  145. package/engine/object-data/entry/ability-type/sweeping-strike.d.ts +57 -0
  146. package/engine/object-data/entry/ability-type/sweeping-strike.lua +234 -0
  147. package/engine/object-data/entry/ability-type/talents.d.ts +12 -0
  148. package/engine/object-data/entry/ability-type/talents.lua +27 -0
  149. package/engine/object-data/entry/ability-type/unyielding-guard.d.ts +30 -0
  150. package/engine/object-data/entry/ability-type/unyielding-guard.lua +117 -0
  151. package/engine/object-data/entry/ability-type/valiant-charge.d.ts +27 -0
  152. package/engine/object-data/entry/ability-type/valiant-charge.lua +104 -0
  153. package/engine/object-data/entry/ability-type/warcry.d.ts +9 -0
  154. package/engine/object-data/entry/ability-type/warcry.lua +26 -0
  155. package/engine/object-data/entry/ability-type/withering-fire.d.ts +21 -0
  156. package/engine/object-data/entry/ability-type/withering-fire.lua +78 -0
  157. package/engine/object-data/entry/ability-type.d.ts +10 -3
  158. package/engine/object-data/entry/ability-type.lua +53 -0
  159. package/engine/object-data/entry/buff-type.d.ts +6 -2
  160. package/engine/object-data/entry/buff-type.lua +26 -0
  161. package/engine/object-data/entry/destructible-type.d.ts +6 -2
  162. package/engine/object-data/entry/destructible-type.lua +26 -0
  163. package/engine/object-data/entry/item-type.d.ts +12 -3
  164. package/engine/object-data/entry/item-type.lua +52 -0
  165. package/engine/object-data/entry/lightning-type.d.ts +2 -2
  166. package/engine/object-data/entry/sound-preset.d.ts +2 -2
  167. package/engine/object-data/entry/unit-type.d.ts +47 -2
  168. package/engine/object-data/entry/unit-type.lua +383 -49
  169. package/engine/object-data/entry/upgrade.d.ts +2 -2
  170. package/engine/object-data/entry.d.ts +4 -1
  171. package/engine/standard/entries/ability-type.d.ts +3102 -7
  172. package/engine/standard/entries/ability-type.lua +0 -6
  173. package/engine/standard/entries/item-type.d.ts +1299 -0
  174. package/engine/standard/entries/item-type.lua +2 -0
  175. package/engine/standard/entries/unit-type.d.ts +5 -0
  176. package/engine/standard/entries/unit-type.lua +5 -0
  177. package/engine/unit.d.ts +4 -1
  178. package/engine/unit.lua +4 -1
  179. package/event.d.ts +1 -1
  180. package/network.lua +25 -1
  181. package/operation.d.ts +8 -1
  182. package/operation.lua +37 -14
  183. package/package.json +2 -22
  184. package/utility/random.d.ts +102 -0
  185. package/utility/random.lua +273 -0
@@ -4,8 +4,6 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
4
4
  local ____exports = {}
5
5
  local ____ability = require("engine.behaviour.ability")
6
6
  local AbilityBehavior = ____ability.AbilityBehavior
7
- local ____unit = require("engine.internal.unit")
8
- local Unit = ____unit.Unit
9
7
  local ____ability = require("engine.standard.fields.ability")
10
8
  local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD
11
9
  local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
@@ -82,21 +80,20 @@ function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, dama
82
80
  end
83
81
  function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
84
82
  local parameters = self.parameters
85
- local targets = Unit.getAllowedTargetsInCollisionRange(
86
- caster,
87
- self:resolveCurrentAbilityDependentValue(parameters and parameters.allowedTargetCombatClassifications or ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
83
+ caster:damageArea(
88
84
  x,
89
85
  y,
90
- self:resolveCurrentAbilityDependentValue(parameters and parameters.areaOfEffect or AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD)
86
+ self:resolveCurrentAbilityDependentValue(parameters and parameters.areaOfEffect or AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD),
87
+ self:resolveCurrentAbilityDependentValue(parameters and parameters.allowedTargetCombatClassifications or ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
88
+ self.precalculatedDamage or self:calculateDamage(caster),
89
+ self:resolveCurrentAbilityDependentValue(parameters and parameters.maximumDamage or 0),
90
+ nil,
91
+ nil,
92
+ self:resolveCurrentAbilityDependentValue(parameters and parameters.attackType),
93
+ parameters and parameters.damageType,
94
+ parameters and parameters.weaponType,
95
+ self:resolveCurrentAbilityDependentValue(parameters and parameters.metadata)
91
96
  )
92
- local damage = self.precalculatedDamage or self:calculateDamage(caster)
93
- local maximumDamage = self:resolveCurrentAbilityDependentValue(parameters and parameters.maximumDamage or 0)
94
- if maximumDamage ~= 0 and damage > maximumDamage then
95
- damage = maximumDamage / #targets
96
- end
97
- for ____, target in ipairs(targets) do
98
- self:damageTarget(caster, target, damage)
99
- end
100
97
  end
101
98
  ____exports.DamageSelfAreaAbilityBehavior = __TS__Class()
102
99
  local DamageSelfAreaAbilityBehavior = ____exports.DamageSelfAreaAbilityBehavior
@@ -26,6 +26,7 @@ export declare abstract class AbilityBehavior<Parameters extends {
26
26
  get unit(): Unit | undefined;
27
27
  protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
28
28
  protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value?: AbilityDependentValue<T>): T | undefined;
29
+ protected getDuration(widget: Widget): number;
29
30
  flashCasterEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
30
31
  flashTargetEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
31
32
  flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
@@ -9,6 +9,7 @@ local ____behavior = require("engine.behavior")
9
9
  local Behavior = ____behavior.Behavior
10
10
  local ____unit = require("engine.internal.unit")
11
11
  local Unit = ____unit.Unit
12
+ local UnitClassification = ____unit.UnitClassification
12
13
  require("engine.internal.unit.ability")
13
14
  local ____ability = require("engine.internal.ability")
14
15
  local Ability = ____ability.Ability
@@ -18,6 +19,8 @@ local ____ability = require("engine.standard.fields.ability")
18
19
  local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
19
20
  local CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = ____ability.CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD
20
21
  local CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
22
+ local DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD
23
+ local DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD
21
24
  local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
22
25
  local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
23
26
  local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
@@ -113,6 +116,14 @@ end
113
116
  function AbilityBehavior.prototype.resolveCurrentAbilityDependentValue(self, value)
114
117
  return resolveCurrentAbilityDependentValue(self.ability, value)
115
118
  end
119
+ function AbilityBehavior.prototype.getDuration(self, widget)
120
+ if __TS__InstanceOf(widget, Unit) then
121
+ if widget.isHero or widget:getField(UNIT_IF_LEVEL) >= 6 or widget:hasClassification(UnitClassification.RESISTANT) then
122
+ return self:resolveCurrentAbilityDependentValue(DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD)
123
+ end
124
+ end
125
+ return self:resolveCurrentAbilityDependentValue(DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD)
126
+ end
116
127
  function AbilityBehavior.prototype.flashCasterEffect(self, widget, ...)
117
128
  local attachmentPoint = CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
118
129
  Effect:flash(
@@ -2,6 +2,7 @@
2
2
  import { Behavior, BehaviorPriority } from "../behavior";
3
3
  import { Ability } from "../internal/ability";
4
4
  import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
5
+ import "../internal/unit/equipment";
5
6
  import "../internal/unit+ability";
6
7
  import "../internal/unit-missile-launch";
7
8
  import { Item } from "../internal/item";
@@ -8,6 +8,7 @@ local ____behavior = require("engine.behavior")
8
8
  local Behavior = ____behavior.Behavior
9
9
  local ____unit = require("engine.internal.unit")
10
10
  local Unit = ____unit.Unit
11
+ require("engine.internal.unit.equipment")
11
12
  require("engine.internal.unit+ability")
12
13
  require("engine.internal.unit-missile-launch")
13
14
  local ____linked_2Dset = require("utility.linked-set")
package/engine/buff.d.ts CHANGED
@@ -23,6 +23,13 @@ export type BuffPolarityParameterType = EnumParameterValueType<BuffPolarity>;
23
23
  export type BuffResistanceTypeParameterType = EnumParameterValueType<BuffResistanceType>;
24
24
  export declare class BuffUniqueGroup {
25
25
  }
26
+ export type BuffAbilityParameters = {
27
+ readonly fields?: [AbilityNumberField | AbilityNumberLevelField, NumberParameterValueType][];
28
+ /** Default `true`. */
29
+ readonly isButtonVisible?: boolean;
30
+ /** Default is the level of the source ability or 0 if it is absent. */
31
+ readonly level?: number;
32
+ };
26
33
  export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
27
34
  spellStealPriority?: number;
28
35
  level?: number;
@@ -30,16 +37,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
30
37
  learnLevelMinimum?: number;
31
38
  source?: Unit;
32
39
  behaviorConstructors?: (new (unit: Unit) => UnitBehavior)[];
33
- abilityTypeIds?: Record<AbilityTypeId, {
34
- readonly fields?: [
35
- AbilityNumberField | AbilityNumberLevelField,
36
- NumberParameterValueType
37
- ][];
38
- /** Default `true`. */
39
- readonly isButtonVisible?: boolean;
40
- /** Default is the level of the source ability or 0 if it is absent. */
41
- readonly level?: number;
42
- }>;
40
+ abilityTypeIds?: Partial<Record<AbilityTypeId, BuffAbilityParameters>>;
43
41
  damageUponDeathAllowedTargetCombatClassifications?: CombatClassifications | AbilityCombatClassificationsLevelField;
44
42
  damageUponDeath?: NumberParameterValueType;
45
43
  damageUponDeathRange?: NumberParameterValueType;
@@ -314,10 +312,14 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
314
312
  ]): void;
315
313
  private flash;
316
314
  expire(): void;
315
+ /** Dispels this buff, invoking onDispel before removing it. */
316
+ dispel(source?: Unit): void;
317
317
  protected onCreate(): void;
318
318
  protected onDestroy(): Destructor;
319
319
  static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;
320
320
  static getByTypeId<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, unit: Unit, typeId: ApplicableBuffTypeId): T | undefined;
321
+ /** Called for dispelling, never for a direct destroy() or replacement. */
322
+ onDispel(source: Unit | undefined): void;
321
323
  onExpiration(): void;
322
324
  onDeath(source: Unit | undefined): void;
323
325
  onDamageDealt(target: Unit, event: DamageEvent): void;
package/engine/buff.lua CHANGED
@@ -254,6 +254,10 @@ local function destroyBuff(buff)
254
254
  buff:destroy()
255
255
  end
256
256
  local function expireBuff(buff)
257
+ if buff.isDestroyed or buff[100] ~= 1 then
258
+ return
259
+ end
260
+ buff[100] = 2
257
261
  local remainingDamageOverDuration = buff[113] or 0
258
262
  local remainingHealingOverDuration = buff[113] or 0
259
263
  if remainingDamageOverDuration ~= 0 or remainingHealingOverDuration ~= 0 then
@@ -482,7 +486,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
482
486
  self._abilityTypeIds = abilityTypeIds
483
487
  end
484
488
  for ____, abilityTypeId in ipairs(sortedKeysUnnested(parametersAbilityTypeIds)) do
485
- local abilityParameters = parametersAbilityTypeIds[abilityTypeId]
489
+ local abilityParameters = checkNotNull(parametersAbilityTypeIds[abilityTypeId])
486
490
  local addedAbility = _unit:addAbility(abilityTypeId)
487
491
  if addedAbility ~= nil then
488
492
  _unit:makeAbilityPermanent(abilityTypeId, true)
@@ -591,6 +595,20 @@ end
591
595
  function Buff.prototype.expire(self)
592
596
  expireBuff(self)
593
597
  end
598
+ function Buff.prototype.dispel(self, source)
599
+ if self.isDestroyed or self[100] ~= 1 then
600
+ return
601
+ end
602
+ self[100] = 2
603
+ do
604
+ pcall(function()
605
+ self:onDispel(source)
606
+ end)
607
+ do
608
+ self:destroy()
609
+ end
610
+ end
611
+ end
594
612
  function Buff.prototype.onCreate(self)
595
613
  end
596
614
  function Buff.prototype.onDestroy(self)
@@ -681,6 +699,8 @@ function Buff.getByTypeId(self, unit, typeId)
681
699
  end
682
700
  return nil
683
701
  end
702
+ function Buff.prototype.onDispel(self, source)
703
+ end
684
704
  function Buff.prototype.onExpiration(self)
685
705
  local unit = self.unit
686
706
  if self[120] ~= nil then
@@ -1473,35 +1493,40 @@ __TS__SetDescriptor(
1473
1493
  Buff.createdEvent = buffCreatedEvent
1474
1494
  Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
1475
1495
  (function(self)
1476
- local function destroyBuffIfNeeded(buff)
1477
- if getUnitAbility(buff[101].handle, buff.typeId) ~= buff.handle and buff[100] == 1 then
1478
- buff:destroy()
1496
+ local function destroyBuffIfNeeded(buff, isDispel, source)
1497
+ local currentHandle = getUnitAbility(buff[101].handle, buff.typeId)
1498
+ if currentHandle ~= buff.handle and buff[100] == 1 then
1499
+ if isDispel and currentHandle == nil and buff.unit.isAlive and buff.resistanceType == 1 and (buff._timer == nil or buff.remainingDuration > 0) then
1500
+ buff:dispel(source)
1501
+ else
1502
+ buff:destroy()
1503
+ end
1479
1504
  end
1480
1505
  end
1481
- ____exports.checkBuff = function(unit, buffTypeId)
1506
+ ____exports.checkBuff = function(unit, buffTypeId, isDispel, source)
1482
1507
  local buffByTypeId = buffByTypeIdByUnit[unit]
1483
1508
  if buffByTypeId ~= nil then
1484
1509
  local buff = buffByTypeId[buffTypeId]
1485
1510
  if buff ~= nil then
1486
- destroyBuffIfNeeded(buff)
1511
+ destroyBuffIfNeeded(buff, isDispel, source)
1487
1512
  end
1488
1513
  end
1489
1514
  end
1490
- ____exports.checkBuffs = function(unit)
1491
- ____exports.Buff:forAll(unit, destroyBuffIfNeeded)
1515
+ ____exports.checkBuffs = function(unit, isDispel, source)
1516
+ ____exports.Buff:forAll(unit, destroyBuffIfNeeded, isDispel, source)
1492
1517
  end
1493
1518
  Unit.abilityChannelingStartEvent:addListener(
1494
1519
  0,
1495
1520
  function(caster)
1496
- ____exports.checkBuffs(caster)
1497
- Timer:run(____exports.checkBuffs, caster)
1521
+ ____exports.checkBuffs(caster, true, caster)
1522
+ Timer:run(____exports.checkBuffs, caster, true, caster)
1498
1523
  end
1499
1524
  )
1500
1525
  Unit.abilityUnitTargetChannelingStartEvent:addListener(
1501
1526
  0,
1502
1527
  function(caster, ability, target)
1503
- ____exports.checkBuffs(target)
1504
- Timer:run(____exports.checkBuffs, target)
1528
+ ____exports.checkBuffs(target, true, caster)
1529
+ Timer:run(____exports.checkBuffs, target, true, caster)
1505
1530
  end
1506
1531
  )
1507
1532
  Unit.abilityPointTargetChannelingStartEvent:addListener(
@@ -1512,17 +1537,40 @@ Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
1512
1537
  y,
1513
1538
  ability:getField(ABILITY_RLF_AREA_OF_EFFECT)
1514
1539
  )
1515
- forEach(units, ____exports.checkBuffs)
1516
- Timer:run(forEach, units, ____exports.checkBuffs)
1540
+ forEach(units, ____exports.checkBuffs, true, caster)
1541
+ Timer:run(
1542
+ forEach,
1543
+ units,
1544
+ ____exports.checkBuffs,
1545
+ true,
1546
+ caster
1547
+ )
1548
+ end
1549
+ )
1550
+ Unit.abilityNoTargetChannelingStartEvent:addListener(
1551
+ 0,
1552
+ function(caster, ability)
1553
+ local radius = ability:getField(ABILITY_RLF_AREA_OF_EFFECT)
1554
+ if radius > 0 then
1555
+ local units = Unit:getInCollisionRange(caster.x, caster.y, radius)
1556
+ forEach(units, ____exports.checkBuffs, true, caster)
1557
+ Timer:run(
1558
+ forEach,
1559
+ units,
1560
+ ____exports.checkBuffs,
1561
+ true,
1562
+ caster
1563
+ )
1564
+ end
1517
1565
  end
1518
1566
  )
1519
1567
  Unit.onDamage:addListener(
1520
1568
  0,
1521
1569
  function(source, target)
1522
1570
  if source ~= nil then
1523
- ____exports.checkBuffs(source)
1571
+ Timer:run(____exports.checkBuffs, source, false)
1524
1572
  end
1525
- ____exports.checkBuffs(target)
1573
+ Timer:run(____exports.checkBuffs, target, false)
1526
1574
  end
1527
1575
  )
1528
1576
  buffCreatedEvent:addListener(function(buff)
package/engine/index.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  /** @noSelfInFile */
2
2
  export declare const enum GraphicsMode {
3
3
  SD = 0,
4
- HD = 1
4
+ HD = 1,
5
+ DE = 2
5
6
  }
@@ -64,8 +64,12 @@ export declare class UnitAbility extends Ability {
64
64
  get isDisabled(): boolean;
65
65
  get level(): number;
66
66
  set level(v: number);
67
+ /** Uses the native percentage scale. */
68
+ get cooldownRemainingPercent(): number;
69
+ set cooldownRemainingPercent(percent: number);
67
70
  get cooldownRemaining(): number;
68
71
  set cooldownRemaining(cooldownRemaining: number);
72
+ startCooldown(cooldown: number): void;
69
73
  interruptCast(): void;
70
74
  protected onDestroy(): HandleDestructor;
71
75
  static get onCreate(): Event<[UnitAbility]>;
@@ -14,29 +14,33 @@ local abilityActionDummy = ____ability.abilityActionDummy
14
14
  local doAbilityAction = ____ability.doAbilityAction
15
15
  local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
16
16
  local startItemCooldown = ____ability.startItemCooldown
17
- local getUnitAbilityLevel = GetUnitAbilityLevel
18
- local setUnitAbilityLevel = SetUnitAbilityLevel
19
- local setAbilityIntegerField = BlzSetAbilityIntegerField
20
- local setAbilityRealField = BlzSetAbilityRealField
21
- local setAbilityBooleanField = BlzSetAbilityBooleanField
22
- local setAbilityStringField = BlzSetAbilityStringField
23
- local setAbilityIntegerLevelField = BlzSetAbilityIntegerLevelField
24
- local setAbilityRealLevelField = BlzSetAbilityRealLevelField
25
- local setAbilityBooleanLevelField = BlzSetAbilityBooleanLevelField
26
- local setAbilityStringLevelField = BlzSetAbilityStringLevelField
27
- local getAbilityIntegerField = BlzGetAbilityIntegerField
28
- local getAbilityRealField = BlzGetAbilityRealField
29
17
  local getAbilityBooleanField = BlzGetAbilityBooleanField
30
- local getAbilityStringField = BlzGetAbilityStringField
18
+ local getAbilityBooleanLevelField = BlzGetAbilityBooleanLevelField
19
+ local getAbilityIntegerField = BlzGetAbilityIntegerField
31
20
  local getAbilityIntegerLevelField = BlzGetAbilityIntegerLevelField
21
+ local getAbilityRealField = BlzGetAbilityRealField
32
22
  local getAbilityRealLevelField = BlzGetAbilityRealLevelField
33
- local getAbilityBooleanLevelField = BlzGetAbilityBooleanLevelField
23
+ local getAbilityStringField = BlzGetAbilityStringField
34
24
  local getAbilityStringLevelField = BlzGetAbilityStringLevelField
25
+ local getHandleId = GetHandleId
26
+ local getUnitAbilityCooldownPercent = BlzGetUnitAbilityCooldownPercent
35
27
  local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
28
+ local getUnitAbilityLevel = GetUnitAbilityLevel
29
+ local order2orderId = _G.OrderId
30
+ local setAbilityBooleanField = BlzSetAbilityBooleanField
31
+ local setAbilityBooleanLevelField = BlzSetAbilityBooleanLevelField
32
+ local setAbilityIntegerField = BlzSetAbilityIntegerField
33
+ local setAbilityIntegerLevelField = BlzSetAbilityIntegerLevelField
34
+ local setAbilityRealField = BlzSetAbilityRealField
35
+ local setAbilityRealLevelField = BlzSetAbilityRealLevelField
36
+ local setAbilityStringField = BlzSetAbilityStringField
37
+ local setAbilityStringLevelField = BlzSetAbilityStringLevelField
38
+ local setUnitAbilityCooldownPercent = BlzSetUnitAbilityCooldownPercent
39
+ local setUnitAbilityCooldownRemaining = BlzSetUnitAbilityCooldownRemaining
40
+ local setUnitAbilityLevel = SetUnitAbilityLevel
36
41
  local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
37
- local getHandleId = GetHandleId
38
- local unitHideAbility = BlzUnitHideAbility
39
42
  local unitDisableAbility = BlzUnitDisableAbility
43
+ local unitHideAbility = BlzUnitHideAbility
40
44
  local match = string.match
41
45
  local ____type = _G.type
42
46
  local ____tostring = _G.tostring
@@ -213,7 +217,6 @@ local levelRefreshFields = {
213
217
  [fourCC("Neg1")] = true
214
218
  }
215
219
  local levelsField = ABILITY_IF_LEVELS
216
- local order2orderId = _G.OrderId
217
220
  local orderIdFieldByParentTypeId = {
218
221
  [fourCC("ANcl")] = ABILITY_SLF_BASE_ORDER_ID_NCL6,
219
222
  [fourCC("Aspb")] = ABILITY_SLF_BASE_ORDER_ID_SPB5,
@@ -420,6 +423,9 @@ function UnitAbility.prototype.decrementDisableCounter(self)
420
423
  unitHideAbility(unit, typeId, true)
421
424
  self.d = (self.d or 0) - 1
422
425
  end
426
+ function UnitAbility.prototype.startCooldown(self, cooldown)
427
+ startUnitAbilityCooldown(self.u, self.typeId, cooldown)
428
+ end
423
429
  function UnitAbility.prototype.interruptCast(self)
424
430
  self.owner:interruptCast(self.typeId)
425
431
  end
@@ -450,6 +456,19 @@ __TS__SetDescriptor(
450
456
  },
451
457
  true
452
458
  )
459
+ __TS__SetDescriptor(
460
+ UnitAbility.prototype,
461
+ "cooldownRemainingPercent",
462
+ {
463
+ get = function(self)
464
+ return getUnitAbilityCooldownPercent(self.u, self.typeId)
465
+ end,
466
+ set = function(self, percent)
467
+ setUnitAbilityCooldownPercent(self.u, self.typeId, percent)
468
+ end
469
+ },
470
+ true
471
+ )
453
472
  __TS__SetDescriptor(
454
473
  UnitAbility.prototype,
455
474
  "cooldownRemaining",
@@ -458,7 +477,7 @@ __TS__SetDescriptor(
458
477
  return getUnitAbilityCooldownRemaining(self.u, self.typeId)
459
478
  end,
460
479
  set = function(self, cooldownRemaining)
461
- startUnitAbilityCooldown(self.u, self.typeId, cooldownRemaining)
480
+ setUnitAbilityCooldownRemaining(self.u, self.typeId, cooldownRemaining)
462
481
  end
463
482
  },
464
483
  true
@@ -1,5 +1,6 @@
1
1
  /** @noSelfInFile */
2
2
  import { Unit } from "./unit";
3
+ import "./unit/equipment";
3
4
  declare module "./item" {
4
5
  interface Item {
5
6
  readonly owner?: Unit;
@@ -5,6 +5,7 @@ local ____item = require("engine.internal.item")
5
5
  local Item = ____item.Item
6
6
  local ____unit = require("engine.internal.unit")
7
7
  local Unit = ____unit.Unit
8
+ require("engine.internal.unit.equipment")
8
9
  local ownerByItem = setmetatable({}, {__mode = "kv"})
9
10
  Unit.itemPickedUpEvent:addListener(
10
11
  4,
@@ -12,6 +13,12 @@ Unit.itemPickedUpEvent:addListener(
12
13
  ownerByItem[item] = unit
13
14
  end
14
15
  )
16
+ Unit.itemEquippedEvent:addListener(
17
+ 4,
18
+ function(unit, item)
19
+ ownerByItem[item] = unit
20
+ end
21
+ )
15
22
  Unit.itemDroppedEvent:addListener(
16
23
  4,
17
24
  function(unit, item)
@@ -2,19 +2,33 @@
2
2
  import { Handle, HandleDestructor } from "../../core/types/handle";
3
3
  import { Color } from "../../core/types/color";
4
4
  import { Event } from "../../event";
5
+ import { PlayerColor } from "../../core/types/playerColor";
6
+ import { EquipmentType } from "../object-data/auxiliary/equipment-type";
7
+ import { ItemTag } from "../object-data/auxiliary/item-tag";
5
8
  import { ReadonlyRect } from "../../core/types/rect";
6
9
  import { ItemAbility } from "./ability";
7
10
  import { AbilityTypeId } from "../object-data/entry/ability-type";
8
11
  import type { ItemTypeId } from "../object-data/entry/item-type";
9
12
  type DefenseType = 0 | 1 | 2 | 3 | 4 | 5;
10
13
  declare const enum ItemPropertyKey {
11
- ABILITIES = 100
14
+ ABILITIES = 100,
15
+ DEATH_TRIGGER = 101,
16
+ COLOR = 102
12
17
  }
13
18
  export declare class Item extends Handle<jitem> {
14
19
  private readonly [ItemPropertyKey.ABILITIES];
20
+ private readonly [ItemPropertyKey.DEATH_TRIGGER];
21
+ private [ItemPropertyKey.COLOR]?;
15
22
  constructor(handle: jitem);
16
23
  protected onDestroy(): HandleDestructor;
17
24
  static create<T extends Item>(this: typeof Item & (new (handle: jitem) => T), id: number, x: number, y: number, skinId?: number): T;
25
+ get isEquipped(): boolean;
26
+ get isInBag(): boolean;
27
+ get equipmentType(): EquipmentType;
28
+ get tag(): ItemTag;
29
+ get color(): PlayerColor;
30
+ set color(color: PlayerColor);
31
+ static getRandomTypeId(level: number, equipmentType?: EquipmentType, tag?: ItemTag, itemType?: jitemtype): ItemTypeId | undefined;
18
32
  get typeId(): ItemTypeId;
19
33
  set skinId(v: number);
20
34
  get skinId(): number;
@@ -78,6 +92,7 @@ export declare class Item extends Handle<jitem> {
78
92
  static getInRect(rect: ReadonlyRect): Item[];
79
93
  static get onCreate(): Event<[Item]>;
80
94
  static get destroyEvent(): Event<[Item]>;
95
+ static readonly deathEvent: Event<[Item]>;
81
96
  static readonly chargesChangedEvent: Event<[Item]>;
82
97
  }
83
98
  export {};