warscript 0.0.1-dev.4f7cd3b → 0.0.1-dev.5364eb0

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 (148) hide show
  1. package/attributes.d.ts +5 -0
  2. package/attributes.lua +8 -1
  3. package/config.d.ts +5 -0
  4. package/config.lua +10 -0
  5. package/core/types/effect.d.ts +1 -3
  6. package/core/types/effect.lua +26 -29
  7. package/core/types/sound.d.ts +17 -24
  8. package/core/types/sound.lua +99 -24
  9. package/core/types/timer.d.ts +7 -8
  10. package/core/types/timer.lua +18 -21
  11. package/core/util.lua +6 -1
  12. package/decl/native.d.ts +840 -786
  13. package/engine/behaviour/ability/apply-buff.d.ts +5 -0
  14. package/engine/behaviour/ability/apply-buff.lua +32 -0
  15. package/engine/behaviour/ability/apply-unit-behavior.lua +1 -0
  16. package/engine/behaviour/ability/damage.d.ts +9 -3
  17. package/engine/behaviour/ability/damage.lua +26 -38
  18. package/engine/behaviour/ability/emulate-impact.lua +16 -2
  19. package/engine/behaviour/ability.d.ts +7 -2
  20. package/engine/behaviour/ability.lua +42 -24
  21. package/engine/behaviour/unit/stun-immunity.d.ts +5 -3
  22. package/engine/behaviour/unit/stun-immunity.lua +43 -27
  23. package/engine/behaviour/unit.d.ts +28 -0
  24. package/engine/behaviour/unit.lua +163 -4
  25. package/engine/buff.d.ts +57 -41
  26. package/engine/buff.lua +301 -228
  27. package/engine/internal/ability.d.ts +4 -0
  28. package/engine/internal/ability.lua +17 -2
  29. package/engine/internal/item/ability.lua +82 -14
  30. package/engine/internal/item.d.ts +7 -4
  31. package/engine/internal/item.lua +131 -28
  32. package/engine/internal/mechanics/ability-duration.lua +1 -1
  33. package/engine/internal/misc/damage-metadata-by-target.d.ts +2 -0
  34. package/engine/internal/misc/damage-metadata-by-target.lua +5 -0
  35. package/engine/internal/object-data/auto-attack-speed-increase.d.ts +1 -1
  36. package/engine/internal/object-data/auto-attack-speed-increase.lua +2 -0
  37. package/engine/internal/object-data/evasion-probability.d.ts +2 -0
  38. package/engine/internal/object-data/evasion-probability.lua +16 -0
  39. package/engine/internal/unit/ability.d.ts +35 -0
  40. package/engine/internal/unit/ability.lua +62 -0
  41. package/engine/internal/unit/add-item-to-slot-init.d.ts +2 -0
  42. package/engine/internal/unit/add-item-to-slot-init.lua +23 -0
  43. package/engine/internal/unit/add-item-to-slot.d.ts +2 -0
  44. package/engine/internal/unit/add-item-to-slot.lua +52 -0
  45. package/engine/internal/unit/allowed-targets.d.ts +1 -1
  46. package/engine/internal/unit/allowed-targets.lua +9 -1
  47. package/engine/internal/unit/bonus.d.ts +2 -0
  48. package/engine/internal/unit/bonus.lua +17 -0
  49. package/engine/internal/unit/ignore-events-items.d.ts +2 -0
  50. package/engine/internal/unit/ignore-events-items.lua +5 -0
  51. package/engine/internal/unit/item.lua +3 -4
  52. package/engine/internal/unit/order.d.ts +20 -0
  53. package/engine/internal/unit/order.lua +136 -0
  54. package/engine/internal/unit+damage.d.ts +2 -11
  55. package/engine/internal/unit+damage.lua +10 -14
  56. package/engine/internal/unit+spellSteal.lua +1 -2
  57. package/engine/internal/unit-missile-launch.lua +1 -1
  58. package/engine/internal/unit.d.ts +29 -5
  59. package/engine/internal/unit.lua +259 -100
  60. package/engine/lightning.d.ts +12 -5
  61. package/engine/lightning.lua +48 -14
  62. package/engine/object-data/auxiliary/animation-name.d.ts +1 -0
  63. package/engine/object-data/auxiliary/animation-name.lua +16 -0
  64. package/engine/object-data/auxiliary/attachment-preset.d.ts +7 -2
  65. package/engine/object-data/auxiliary/attachment-preset.lua +4 -3
  66. package/engine/object-data/auxiliary/attack-type.d.ts +7 -8
  67. package/engine/object-data/auxiliary/attack-type.lua +42 -0
  68. package/engine/object-data/auxiliary/movement-type.d.ts +7 -7
  69. package/engine/object-data/auxiliary/movement-type.lua +22 -0
  70. package/engine/object-data/auxiliary/sound-eax.d.ts +10 -0
  71. package/engine/object-data/auxiliary/sound-eax.lua +2 -0
  72. package/engine/object-data/auxiliary/tech-tree-dependency.d.ts +1 -1
  73. package/engine/object-data/auxiliary/unit-attribute.d.ts +6 -0
  74. package/engine/object-data/auxiliary/unit-attribute.lua +9 -0
  75. package/engine/object-data/entry/ability-type/berserk.d.ts +2 -0
  76. package/engine/object-data/entry/ability-type/berserk.lua +13 -0
  77. package/engine/object-data/entry/ability-type/blank-configurable.lua +12 -1
  78. package/engine/object-data/entry/ability-type/carrion-swarm.d.ts +14 -0
  79. package/engine/object-data/entry/ability-type/carrion-swarm.lua +65 -0
  80. package/engine/object-data/entry/ability-type/disease-cloud.lua +2 -2
  81. package/engine/object-data/entry/ability-type/engineering-upgrade.lua +2 -2
  82. package/engine/object-data/entry/ability-type/ensnare.d.ts +12 -0
  83. package/engine/object-data/entry/ability-type/ensnare.lua +52 -0
  84. package/engine/object-data/entry/ability-type/feral-spirit.lua +2 -2
  85. package/engine/object-data/entry/ability-type/permanent-invisibility.d.ts +8 -0
  86. package/engine/object-data/entry/ability-type/permanent-invisibility.lua +26 -0
  87. package/engine/object-data/entry/ability-type/phase-shift.d.ts +10 -0
  88. package/engine/object-data/entry/ability-type/phase-shift.lua +39 -0
  89. package/engine/object-data/entry/ability-type/phoenix-morph.lua +4 -4
  90. package/engine/object-data/entry/ability-type/raise-dead.d.ts +17 -0
  91. package/engine/object-data/entry/ability-type/raise-dead.lua +78 -0
  92. package/engine/object-data/entry/ability-type/shock-wave.d.ts +4 -0
  93. package/engine/object-data/entry/ability-type/shock-wave.lua +26 -0
  94. package/engine/object-data/entry/ability-type/slow-poison.d.ts +10 -0
  95. package/engine/object-data/entry/ability-type/slow-poison.lua +58 -0
  96. package/engine/object-data/entry/ability-type/summon-quilbeast.lua +2 -2
  97. package/engine/object-data/entry/ability-type/summon-water-elemental.lua +2 -2
  98. package/engine/object-data/entry/ability-type/web.d.ts +12 -0
  99. package/engine/object-data/entry/ability-type/web.lua +52 -0
  100. package/engine/object-data/entry/ability-type.d.ts +19 -17
  101. package/engine/object-data/entry/ability-type.lua +81 -21
  102. package/engine/object-data/entry/buff-type/applicable.lua +18 -37
  103. package/engine/object-data/entry/buff-type.d.ts +6 -12
  104. package/engine/object-data/entry/buff-type.lua +13 -29
  105. package/engine/object-data/entry/destructible-type.d.ts +1 -1
  106. package/engine/object-data/entry/item-type.d.ts +1 -1
  107. package/engine/object-data/entry/item-type.lua +4 -4
  108. package/engine/object-data/entry/lightning-type.d.ts +1 -1
  109. package/engine/object-data/entry/sound-preset.d.ts +33 -0
  110. package/engine/object-data/entry/sound-preset.lua +140 -0
  111. package/engine/object-data/entry/unit-type.d.ts +10 -3
  112. package/engine/object-data/entry/unit-type.lua +155 -92
  113. package/engine/object-data/entry/upgrade.d.ts +1 -1
  114. package/engine/object-data/entry/upgrade.lua +4 -4
  115. package/engine/object-data/entry.d.ts +16 -14
  116. package/engine/object-data/entry.lua +60 -32
  117. package/engine/object-field/ability.d.ts +3 -2
  118. package/engine/object-field/ability.lua +3 -0
  119. package/engine/object-field/unit.d.ts +50 -3
  120. package/engine/object-field/unit.lua +186 -7
  121. package/engine/object-field.d.ts +17 -6
  122. package/engine/object-field.lua +187 -89
  123. package/engine/standard/entries/buff-type.d.ts +3 -0
  124. package/engine/standard/entries/buff-type.lua +3 -0
  125. package/engine/standard/entries/sound-preset.d.ts +10 -0
  126. package/engine/standard/entries/sound-preset.lua +10 -0
  127. package/engine/standard/fields/unit.d.ts +3 -0
  128. package/engine/standard/fields/unit.lua +5 -0
  129. package/engine/text-tag.d.ts +36 -2
  130. package/engine/text-tag.lua +175 -10
  131. package/engine/unit.d.ts +2 -0
  132. package/engine/unit.lua +2 -0
  133. package/objutil/buff.lua +1 -2
  134. package/objutil/unit.lua +8 -0
  135. package/package.json +2 -2
  136. package/utility/arrays.d.ts +1 -0
  137. package/utility/arrays.lua +3 -0
  138. package/utility/functions.d.ts +4 -0
  139. package/utility/functions.lua +4 -0
  140. package/utility/linked-set.d.ts +1 -0
  141. package/utility/linked-set.lua +3 -0
  142. package/utility/lua-maps.d.ts +4 -0
  143. package/utility/lua-maps.lua +20 -0
  144. package/utility/lua-sets.d.ts +1 -0
  145. package/utility/lua-sets.lua +3 -0
  146. package/utility/reflection.lua +11 -7
  147. package/core/types/order.d.ts +0 -25
  148. package/core/types/order.lua +0 -55
@@ -55,9 +55,13 @@ export declare class UnrecognizedAbility extends Ability {
55
55
  export declare class UnitAbility extends Ability {
56
56
  readonly owner: Unit;
57
57
  private readonly u;
58
+ private d?;
58
59
  constructor(handle: jability, typeId: number, owner: Unit);
59
60
  incrementHideCounter(): void;
60
61
  decrementHideCounter(): void;
62
+ incrementDisableCounter(): void;
63
+ decrementDisableCounter(): void;
64
+ get isDisabled(): boolean;
61
65
  get level(): number;
62
66
  set level(v: number);
63
67
  get cooldownRemaining(): number;
@@ -38,6 +38,7 @@ local getHandleId = GetHandleId
38
38
  local getItemBooleanField = BlzGetItemBooleanField
39
39
  local setItemBooleanField = BlzSetItemBooleanField
40
40
  local unitHideAbility = BlzUnitHideAbility
41
+ local unitDisableAbility = BlzUnitDisableAbility
41
42
  local match = string.match
42
43
  local ____type = _G.type
43
44
  local ____tostring = _G.tostring
@@ -402,9 +403,25 @@ end
402
403
  function UnitAbility.prototype.decrementHideCounter(self)
403
404
  unitHideAbility(self.u, self.typeId, false)
404
405
  end
406
+ function UnitAbility.prototype.incrementDisableCounter(self)
407
+ unitDisableAbility(self.u, self.typeId, true, false)
408
+ self.d = (self.d or 0) + 1
409
+ end
410
+ function UnitAbility.prototype.decrementDisableCounter(self)
411
+ unitDisableAbility(self.u, self.typeId, false, false)
412
+ self.d = (self.d or 0) - 1
413
+ end
405
414
  function UnitAbility.prototype.interruptCast(self)
406
415
  self.owner:interruptCast(self.typeId)
407
416
  end
417
+ __TS__SetDescriptor(
418
+ UnitAbility.prototype,
419
+ "isDisabled",
420
+ {get = function(self)
421
+ return self.d ~= nil and self.d > 0
422
+ end},
423
+ true
424
+ )
408
425
  __TS__SetDescriptor(
409
426
  UnitAbility.prototype,
410
427
  "level",
@@ -454,8 +471,6 @@ end
454
471
  local function getAbilityCooldown(_, abilityTypeId)
455
472
  return getUnitAbilityCooldownRemaining(abilityActionDummy, abilityTypeId)
456
473
  end
457
- local function doNothing()
458
- end
459
474
  ____exports.ItemAbility = __TS__Class()
460
475
  local ItemAbility = ____exports.ItemAbility
461
476
  ItemAbility.name = "ItemAbility"
@@ -14,8 +14,13 @@ local ____math = require("math")
14
14
  local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
15
15
  local ____timer = require("core.types.timer")
16
16
  local Timer = ____timer.Timer
17
+ local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
18
+ local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
19
+ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
20
+ local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
17
21
  local isItemOwned = IsItemOwned
18
22
  local isItemPowerup = IsItemPowerup
23
+ local getItemAbility = BlzGetItemAbility
19
24
  local getItemX = GetItemX
20
25
  local getItemY = GetItemY
21
26
  local setAbilityRealLevelField = BlzSetAbilityRealLevelField
@@ -24,10 +29,11 @@ local getItemIntegerField = BlzGetItemIntegerField
24
29
  local setItemBooleanField = BlzSetItemBooleanField
25
30
  local setItemPosition = SetItemPosition
26
31
  local unitAddItem = UnitAddItem
27
- local unitDropItemSlot = UnitDropItemSlot
28
32
  local unitRemoveItem = UnitRemoveItem
29
33
  local unitUseItem = UnitUseItem
30
34
  local unitResetCooldown = UnitResetCooldown
35
+ local unitInventorySize = UnitInventorySize
36
+ local unitItemInSlot = UnitItemInSlot
31
37
  local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
32
38
  if not currentMap then
33
39
  return 0
@@ -52,22 +58,24 @@ local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
52
58
  itemType.activelyUsed = true
53
59
  return itemType.id
54
60
  end)
55
- local dummy = assert(CreateUnit(
61
+ ---
62
+ -- @internal For use by internal systems only.
63
+ ____exports.itemAbilityDummy = assert(CreateUnit(
56
64
  Player.neutralVictim.handle,
57
65
  dummyUnitId,
58
66
  0,
59
67
  0,
60
68
  270
61
69
  ))
62
- local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
63
- local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
64
- ShowUnit(dummy, false)
70
+ local cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
71
+ local cooldownStarterAbility = getItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
72
+ ShowUnit(____exports.itemAbilityDummy, false)
65
73
  local function startItemCooldownInternal(handle, cooldown)
66
74
  local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
67
75
  setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, COOLDOWN_STARTER_ABILITY_TYPE_ID)
68
76
  setAbilityRealLevelField(cooldownStarterAbility, ABILITY_RLF_COOLDOWN, 0, cooldown)
69
- unitResetCooldown(dummy)
70
- unitUseItem(dummy, cooldownStarterItem)
77
+ unitResetCooldown(____exports.itemAbilityDummy)
78
+ unitUseItem(____exports.itemAbilityDummy, cooldownStarterItem)
71
79
  Timer:run(restoreCooldownGroup, handle, cooldownGroup)
72
80
  end
73
81
  restoreCooldownGroup = function(handle, cooldownGroup)
@@ -82,10 +90,14 @@ ____exports.startItemCooldown = function(handle, owner, cooldown)
82
90
  end
83
91
  ---
84
92
  -- @internal For use by internal systems only.
85
- ____exports.abilityActionDummy = dummy
93
+ ____exports.abilityActionDummy = ____exports.itemAbilityDummy
86
94
  ---
87
95
  -- @internal For use by internal systems only.
88
96
  ____exports.doAbilityAction = function(handle, action, ...)
97
+ local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
98
+ if not isAlreadyIgnoredInEvents then
99
+ ignoreEventsItems[handle] = true
100
+ end
89
101
  local isOwned = isItemOwned(handle)
90
102
  local isPowerup
91
103
  local x
@@ -97,16 +109,19 @@ ____exports.doAbilityAction = function(handle, action, ...)
97
109
  end
98
110
  x = getItemX(handle)
99
111
  y = getItemY(handle)
100
- unitAddItem(dummy, handle)
112
+ unitAddItem(____exports.itemAbilityDummy, handle)
101
113
  end
102
114
  local result = action(handle, ...)
103
115
  if not isOwned then
104
- unitRemoveItem(dummy, handle)
116
+ unitRemoveItem(____exports.itemAbilityDummy, handle)
105
117
  setItemPosition(handle, x, y)
106
118
  if isPowerup then
107
119
  setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
108
120
  end
109
121
  end
122
+ if not isAlreadyIgnoredInEvents then
123
+ ignoreEventsItems[handle] = nil
124
+ end
110
125
  return result
111
126
  end
112
127
  ---
@@ -119,20 +134,73 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
119
134
  if slot == nil then
120
135
  return ____exports.doAbilityAction(handle, action, ...)
121
136
  end
137
+ local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
138
+ if not isAlreadyIgnoredInEvents then
139
+ ignoreEventsItems[handle] = true
140
+ end
122
141
  local isPowerup
123
142
  if isItemPowerup(handle) then
124
143
  setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
125
144
  isPowerup = true
126
145
  end
127
146
  unitRemoveItem(owner, handle)
128
- unitAddItem(dummy, handle)
147
+ unitAddItem(____exports.itemAbilityDummy, handle)
129
148
  local result = action(handle, ...)
130
- unitRemoveItem(dummy, handle)
131
- unitAddItem(owner, handle)
132
- unitDropItemSlot(owner, handle, slot)
149
+ unitRemoveItem(____exports.itemAbilityDummy, handle)
150
+ unitAddItemToSlot(owner, handle, slot)
133
151
  if isPowerup then
134
152
  setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
135
153
  end
154
+ if not isAlreadyIgnoredInEvents then
155
+ ignoreEventsItems[handle] = nil
156
+ end
157
+ return result
158
+ end
159
+ local depth = 0
160
+ local itemBySlot = {}
161
+ ---
162
+ -- @internal For use by internal systems only.
163
+ ____exports.doUnitAbilityAction = function(unit, abilityTypeId, action, ...)
164
+ local ____depth_0 = depth
165
+ depth = ____depth_0 + 1
166
+ local offset = 6 * ____depth_0
167
+ for slot = 0, unitInventorySize(unit) - 1 do
168
+ local item = unitItemInSlot(unit, slot)
169
+ if getItemAbility(item, abilityTypeId) ~= nil then
170
+ local isAlreadyIgnoredInEvents = ignoreEventsItems[item] ~= nil
171
+ if not isAlreadyIgnoredInEvents then
172
+ ignoreEventsItems[item] = true
173
+ end
174
+ unitRemoveItem(unit, item)
175
+ if not isAlreadyIgnoredInEvents then
176
+ ignoreEventsItems[item] = nil
177
+ end
178
+ itemBySlot[offset + slot] = item
179
+ end
180
+ end
181
+ local result = action(unit, ...)
182
+ for slot = 0, unitInventorySize(unit) - 1 do
183
+ local item = itemBySlot[offset + slot]
184
+ if item ~= nil then
185
+ local isAlreadyIgnoredInEvents = ignoreEventsItems[item] ~= nil
186
+ if not isAlreadyIgnoredInEvents then
187
+ ignoreEventsItems[item] = true
188
+ end
189
+ local isPowerup = isItemPowerup(item)
190
+ if isPowerup then
191
+ setItemBooleanField(item, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
192
+ end
193
+ unitAddItemToSlot(unit, item, slot)
194
+ if isPowerup then
195
+ setItemBooleanField(item, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
196
+ end
197
+ if not isAlreadyIgnoredInEvents then
198
+ ignoreEventsItems[item] = nil
199
+ end
200
+ itemBySlot[offset + slot] = nil
201
+ end
202
+ end
203
+ depth = depth - 1
136
204
  return result
137
205
  end
138
206
  return ____exports
@@ -5,8 +5,8 @@ import { Event } from "../../event";
5
5
  import { ReadonlyRect } from "../../core/types/rect";
6
6
  import { ItemAbility } from "./ability";
7
7
  import { AbilityTypeId } from "../object-data/entry/ability-type";
8
+ import type { ItemTypeId } from "../object-data/entry/item-type";
8
9
  type DefenseType = 0 | 1 | 2 | 3 | 4 | 5;
9
- export declare const addAndGetAbility: (handle: jitem, abilityTypeId: AbilityTypeId) => jability | null;
10
10
  declare const enum ItemPropertyKey {
11
11
  ABILITIES = 100,
12
12
  LUA_INDEX_BY_ABILITY_TYPE_ID = 101
@@ -17,7 +17,7 @@ export declare class Item extends Handle<jitem> {
17
17
  constructor(handle: jitem);
18
18
  protected onDestroy(): HandleDestructor;
19
19
  static create<T extends Item>(this: typeof Item & (new (handle: jitem) => T), id: number, x: number, y: number, skinId?: number): T;
20
- get typeId(): number;
20
+ get typeId(): ItemTypeId;
21
21
  set skinId(v: number);
22
22
  get skinId(): number;
23
23
  set name(v: string);
@@ -73,14 +73,17 @@ export declare class Item extends Handle<jitem> {
73
73
  set position(v: Vec2);
74
74
  set charges(v: number);
75
75
  get charges(): number;
76
+ consumeCharge(): boolean;
77
+ consumeCharges(count: number): boolean;
76
78
  addAbility(abilityTypeId: AbilityTypeId): ItemAbility | undefined;
77
79
  removeAbility(abilityTypeId: AbilityTypeId): boolean;
78
80
  hasAbility(abilityTypeId: AbilityTypeId): boolean;
79
81
  getAbility(abilityTypeId: AbilityTypeId): ItemAbility | undefined;
80
82
  get abilities(): readonly ItemAbility[];
81
- static getInRange(pos: Vec2, range: number): Item[];
83
+ static getInRange(x: number, y: number, range: number): Item[];
82
84
  static getInRect(rect: ReadonlyRect): Item[];
83
85
  static get onCreate(): Event<[Item]>;
84
- static get onDestroy(): Event<[Item]>;
86
+ static get destroyEvent(): Event<[Item]>;
87
+ static readonly chargesChangedEvent: Event<[Item]>;
85
88
  }
86
89
  export {};
@@ -1,20 +1,33 @@
1
1
  local ____lualib = require("lualib_bundle")
2
+ local __TS__New = ____lualib.__TS__New
2
3
  local __TS__Class = ____lualib.__TS__Class
3
4
  local __TS__ClassExtends = ____lualib.__TS__ClassExtends
4
5
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
5
6
  local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
6
7
  local __TS__Delete = ____lualib.__TS__Delete
7
8
  local ____exports = {}
9
+ local invoke
8
10
  local ____handle = require("core.types.handle")
9
11
  local Handle = ____handle.Handle
10
12
  local ____color = require("core.types.color")
11
13
  local Color = ____color.Color
14
+ local ____event = require("event")
15
+ local Event = ____event.Event
12
16
  local ____rect = require("core.types.rect")
13
17
  local Rect = ____rect.Rect
14
18
  local ____ability = require("engine.internal.ability")
15
19
  local ItemAbility = ____ability.ItemAbility
16
20
  local ____ability = require("engine.internal.item.ability")
17
21
  local doAbilityAction = ____ability.doAbilityAction
22
+ local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
23
+ local itemAbilityDummy = ____ability.itemAbilityDummy
24
+ local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
25
+ local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
26
+ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
27
+ local SLOT_FILLER_ITEM_TYPE_ID = ____add_2Ditem_2Dto_2Dslot.SLOT_FILLER_ITEM_TYPE_ID
28
+ local ____vec2 = require("math.vec2")
29
+ local distance = ____vec2.distance
30
+ local itemChargesChangeEvent = __TS__New(Event)
18
31
  local itemAddAbility = BlzItemAddAbility
19
32
  local itemRemoveAbility = BlzItemRemoveAbility
20
33
  local getItemAbility = BlzGetItemAbility
@@ -24,10 +37,32 @@ local getAbilityId = BlzGetAbilityId
24
37
  local getWidgetLife = GetWidgetLife
25
38
  local removeItem = RemoveItem
26
39
  local getHandleId = GetHandleId
40
+ local setRect = SetRect
41
+ local enumItemsInRect = EnumItemsInRect
42
+ local getEnumItem = GetEnumItem
43
+ local getItemTypeId = GetItemTypeId
44
+ local getItemX = GetItemX
45
+ local getItemY = GetItemY
46
+ local getItemCharges = GetItemCharges
47
+ local setItemCharges = SetItemCharges
48
+ local unitRemoveAbility = UnitRemoveAbility
49
+ local unitUseItem = UnitUseItem
50
+ local unitUseItemPoint = UnitUseItemPoint
51
+ local unitUseItemTarget = UnitUseItemTarget
52
+ _G.SetItemCharges = function(whichItem, charges)
53
+ setItemCharges(whichItem, charges)
54
+ invoke(
55
+ itemChargesChangeEvent,
56
+ ____exports.Item:of(whichItem)
57
+ )
58
+ end
27
59
  local getItemIntegerField = BlzGetItemIntegerField
28
60
  local setItemBooleanField = BlzSetItemBooleanField
29
61
  local getItemBooleanField = BlzGetItemBooleanField
62
+ invoke = Event.invoke
30
63
  local enumRect = Rect:create(0, 0, 0, 0).handle
64
+ ---
65
+ -- @internal For use by internal systems only.
31
66
  ____exports.addAndGetAbility = function(handle, abilityTypeId)
32
67
  if itemAddAbility(handle, abilityTypeId) then
33
68
  return getItemAbility(handle, abilityTypeId)
@@ -53,6 +88,49 @@ local function getItemAbilities(handle, item)
53
88
  end
54
89
  return abilities
55
90
  end
91
+ local function consumeCharge(handle)
92
+ do
93
+ local i = 0
94
+ local ability = getItemAbilityByIndex(handle, i)
95
+ while ability ~= nil do
96
+ unitRemoveAbility(
97
+ itemAbilityDummy,
98
+ getAbilityId(ability)
99
+ )
100
+ do
101
+ i = i + 1
102
+ ability = getItemAbilityByIndex(handle, i)
103
+ end
104
+ end
105
+ end
106
+ return unitUseItem(itemAbilityDummy, handle) or unitUseItemPoint(itemAbilityDummy, handle, 0, 0) or unitUseItemTarget(itemAbilityDummy, handle, itemAbilityDummy)
107
+ end
108
+ local targetCollection
109
+ local targetCollectionNextIndex
110
+ local centerX
111
+ local centerY
112
+ local enumRange
113
+ local function collectIntoTarget()
114
+ local item = getEnumItem()
115
+ local typeId = getItemTypeId(item)
116
+ if typeId ~= DUMMY_ITEM_ID and typeId ~= SLOT_FILLER_ITEM_TYPE_ID then
117
+ targetCollection[targetCollectionNextIndex] = ____exports.Item:of(item)
118
+ targetCollectionNextIndex = targetCollectionNextIndex + 1
119
+ end
120
+ end
121
+ local function collectIntoTargetRange()
122
+ local item = getEnumItem()
123
+ local typeId = getItemTypeId(item)
124
+ if distance(
125
+ getItemX(item),
126
+ getItemY(item),
127
+ centerX,
128
+ centerY
129
+ ) <= enumRange and typeId ~= DUMMY_ITEM_ID and typeId ~= SLOT_FILLER_ITEM_TYPE_ID then
130
+ targetCollection[targetCollectionNextIndex] = ____exports.Item:of(item)
131
+ targetCollectionNextIndex = targetCollectionNextIndex + 1
132
+ end
133
+ end
56
134
  ____exports.Item = __TS__Class()
57
135
  local Item = ____exports.Item
58
136
  Item.name = "Item"
@@ -78,6 +156,36 @@ end
78
156
  function Item.create(self, id, x, y, skinId)
79
157
  return self:of(BlzCreateItemWithSkin(id, x, y, skinId or id))
80
158
  end
159
+ function Item.prototype.consumeCharge(self)
160
+ return self:consumeCharges(1)
161
+ end
162
+ function Item.prototype.consumeCharges(self, count)
163
+ local handle = self.handle
164
+ local charges = getItemCharges(handle)
165
+ if charges > count then
166
+ setItemCharges(handle, charges - count)
167
+ invoke(itemChargesChangeEvent, self)
168
+ return true
169
+ end
170
+ if charges == count then
171
+ if getItemBooleanField(handle, ITEM_BF_PERISHABLE) then
172
+ self:destroy()
173
+ return true
174
+ end
175
+ if not getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED) then
176
+ setItemCharges(handle, 0)
177
+ invoke(itemChargesChangeEvent, self)
178
+ return true
179
+ end
180
+ setItemCharges(handle, 1)
181
+ local ____doAbilityActionForceDummy_2 = doAbilityActionForceDummy
182
+ local ____opt_0 = self.owner
183
+ ____doAbilityActionForceDummy_2(handle, ____opt_0 and ____opt_0.handle, consumeCharge)
184
+ invoke(itemChargesChangeEvent, self)
185
+ return true
186
+ end
187
+ return false
188
+ end
81
189
  function Item.prototype.addAbility(self, abilityTypeId)
82
190
  local nativeAbility = doAbilityAction(self.handle, ____exports.addAndGetAbility, abilityTypeId)
83
191
  if nativeAbility ~= nil then
@@ -111,34 +219,27 @@ function Item.prototype.getAbility(self, abilityTypeId)
111
219
  local ability = self[101][abilityTypeId] ~= nil and doAbilityAction(self.handle, getItemAbility, abilityTypeId)
112
220
  return ability and ItemAbility:of(ability, abilityTypeId, self) or nil
113
221
  end
114
- function Item.getInRange(self, pos, range)
115
- local collection = {}
116
- SetRect(
222
+ function Item.getInRange(self, x, y, range)
223
+ targetCollection = {}
224
+ targetCollectionNextIndex = 1
225
+ centerX = x
226
+ centerY = y
227
+ enumRange = range
228
+ setRect(
117
229
  enumRect,
118
- pos.x - range,
119
- pos.y - range,
120
- pos.x + range,
121
- pos.y + range
230
+ x - range,
231
+ y - range,
232
+ x + range,
233
+ y + range
122
234
  )
123
- EnumItemsInRect(
124
- enumRect,
125
- nil,
126
- function()
127
- collection[#collection + 1] = self:of(GetEnumItem())
128
- end
129
- )
130
- return collection
235
+ enumItemsInRect(enumRect, nil, collectIntoTargetRange)
236
+ return targetCollection
131
237
  end
132
238
  function Item.getInRect(self, rect)
133
- local collection = {}
134
- EnumItemsInRect(
135
- rect.handle,
136
- nil,
137
- function()
138
- collection[#collection + 1] = self:of(GetEnumItem())
139
- end
140
- )
141
- return collection
239
+ targetCollection = {}
240
+ targetCollectionNextIndex = 1
241
+ enumItemsInRect(rect.handle, nil, collectIntoTarget)
242
+ return targetCollection
142
243
  end
143
244
  __TS__SetDescriptor(
144
245
  Item.prototype,
@@ -270,7 +371,7 @@ __TS__SetDescriptor(
270
371
  "perishable",
271
372
  {
272
373
  get = function(self)
273
- return BlzGetItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
374
+ return getItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
274
375
  end,
275
376
  set = function(self, v)
276
377
  BlzSetItemBooleanField(self.handle, ITEM_BF_PERISHABLE, v)
@@ -526,10 +627,11 @@ __TS__SetDescriptor(
526
627
  "charges",
527
628
  {
528
629
  get = function(self)
529
- return GetItemCharges(self.handle)
630
+ return getItemCharges(self.handle)
530
631
  end,
531
632
  set = function(self, v)
532
- SetItemCharges(self.handle, v)
633
+ setItemCharges(self.handle, v)
634
+ invoke(itemChargesChangeEvent, self)
533
635
  end
534
636
  },
535
637
  true
@@ -551,11 +653,12 @@ __TS__ObjectDefineProperty(
551
653
  )
552
654
  __TS__ObjectDefineProperty(
553
655
  Item,
554
- "onDestroy",
656
+ "destroyEvent",
555
657
  {get = function(self)
556
658
  return self.onDestroyEvent
557
659
  end}
558
660
  )
661
+ Item.chargesChangedEvent = itemChargesChangeEvent
559
662
  local getManipulatedItem = GetManipulatedItem
560
663
  local trigger = CreateTrigger()
561
664
  TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_PICKUP_ITEM)
@@ -8,6 +8,6 @@ local DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_NORMAL_AB
8
8
  -- @internal For use by internal systems only.
9
9
  ____exports.getAbilityDuration = function(ability, target)
10
10
  local level = ability.level
11
- return target ~= nil and target:hasClassification(UnitClassification.RESISTANT) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
11
+ return target ~= nil and (target.isHero or target:getField(UNIT_IF_LEVEL) >= 6 or target:hasClassification(UnitClassification.RESISTANT)) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
12
12
  end
13
13
  return ____exports
@@ -0,0 +1,2 @@
1
+ /** @noSelfInFile */
2
+ export {};
@@ -0,0 +1,5 @@
1
+ local ____exports = {}
2
+ ---
3
+ -- @internal For use by internal systems only.
4
+ ____exports.damageMetadataByTarget = setmetatable({}, {__mode = "k"})
5
+ return ____exports
@@ -1,2 +1,2 @@
1
1
  /** @noSelfInFile */
2
- export declare const AUTO_ATTACK_SPEED_INCREASE_FACTOR_ABILITY_FIELD: jabilityreallevelfield;
2
+ export {};
@@ -10,5 +10,7 @@ ____exports.AUTO_ATTACK_SPEED_INCREASE_DUMMY_ABILITY_TYPE_ID = compiletime(funct
10
10
  abilityType.autoAttackSpeedIncreaseFactor = 0
11
11
  return abilityType.id
12
12
  end)
13
+ ---
14
+ -- @internal For use by internal systems.
13
15
  ____exports.AUTO_ATTACK_SPEED_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_ATTACK_SPEED_INCREASE_ISX1
14
16
  return ____exports
@@ -0,0 +1,2 @@
1
+ /** @noSelfInFile */
2
+ export {};
@@ -0,0 +1,16 @@
1
+ local ____exports = {}
2
+ local ____evasion = require("engine.object-data.entry.ability-type.evasion")
3
+ local EvasionAbilityType = ____evasion.EvasionAbilityType
4
+ ---
5
+ -- @internal For use by internal systems.
6
+ ____exports.EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID = compiletime(function()
7
+ local abilityType = EvasionAbilityType:create()
8
+ abilityType.isInternal = true
9
+ abilityType.isButtonVisible = false
10
+ abilityType.evasionProbability = 0
11
+ return abilityType.id
12
+ end)
13
+ ---
14
+ -- @internal For use by internal systems.
15
+ ____exports.EVASION_PROBABILITY_ABILITY_FIELD = ABILITY_RLF_CHANCE_TO_EVADE_EEV1
16
+ return ____exports
@@ -131,6 +131,41 @@ declare module "../unit" {
131
131
  const abilityNoTargetChannelingStartEvent: DispatchingEvent<[Unit, Ability]>;
132
132
  }
133
133
  }
134
+ declare module "../unit" {
135
+ namespace Unit {
136
+ const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
137
+ }
138
+ }
139
+ declare module "../unit" {
140
+ namespace Unit {
141
+ const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
142
+ }
143
+ }
144
+ declare module "../unit" {
145
+ namespace Unit {
146
+ const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
147
+ }
148
+ }
149
+ declare module "../unit" {
150
+ namespace Unit {
151
+ const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
152
+ }
153
+ }
154
+ declare module "../unit" {
155
+ namespace Unit {
156
+ const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
157
+ }
158
+ }
159
+ declare module "../unit" {
160
+ namespace Unit {
161
+ const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
162
+ }
163
+ }
164
+ declare module "../unit" {
165
+ namespace Unit {
166
+ const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
167
+ }
168
+ }
134
169
  declare module "../unit" {
135
170
  namespace Unit {
136
171
  const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;
@@ -21,6 +21,8 @@ local ____preconditions = require("utility.preconditions")
21
21
  local checkNotNull = ____preconditions.checkNotNull
22
22
  local ____lazy = require("utility.lazy")
23
23
  local lazyRecord = ____lazy.lazyRecord
24
+ local ____timer = require("core.types.timer")
25
+ local Timer = ____timer.Timer
24
26
  local eventInvoke = Event.invoke
25
27
  local condition = Condition
26
28
  local createTrigger = CreateTrigger
@@ -345,6 +347,66 @@ rawset(
345
347
  extractAbilityTypeId
346
348
  )
347
349
  )
350
+ local internalAbilityImpactEvent = __TS__New(Event)
351
+ internalAbilityChannelingStartEvent:addListener(function(...)
352
+ Timer:run(eventInvoke, internalAbilityImpactEvent, ...)
353
+ end)
354
+ rawset(
355
+ Unit,
356
+ "abilityImpactEvent",
357
+ createDispatchingEvent(
358
+ createCommonEvent(internalAbilityImpactEvent),
359
+ extractAbilityTypeId
360
+ )
361
+ )
362
+ rawset(
363
+ Unit,
364
+ "abilityWidgetTargetImpactEvent",
365
+ createDispatchingEvent(
366
+ createWidgetTargetEvent(internalAbilityImpactEvent),
367
+ extractAbilityTypeId
368
+ )
369
+ )
370
+ rawset(
371
+ Unit,
372
+ "abilityUnitTargetImpactEvent",
373
+ createDispatchingEvent(
374
+ createUnitTargetEvent(internalAbilityImpactEvent),
375
+ extractAbilityTypeId
376
+ )
377
+ )
378
+ rawset(
379
+ Unit,
380
+ "abilityItemTargetImpactEvent",
381
+ createDispatchingEvent(
382
+ createItemTargetEvent(internalAbilityImpactEvent),
383
+ extractAbilityTypeId
384
+ )
385
+ )
386
+ rawset(
387
+ Unit,
388
+ "abilityDestructibleTargetImpactEvent",
389
+ createDispatchingEvent(
390
+ createDestructibleTargetEvent(internalAbilityImpactEvent),
391
+ extractAbilityTypeId
392
+ )
393
+ )
394
+ rawset(
395
+ Unit,
396
+ "abilityPointTargetImpactEvent",
397
+ createDispatchingEvent(
398
+ createPointTargetEvent(internalAbilityImpactEvent),
399
+ extractAbilityTypeId
400
+ )
401
+ )
402
+ rawset(
403
+ Unit,
404
+ "abilityNoTargetImpactEvent",
405
+ createDispatchingEvent(
406
+ createNoTargetEvent(internalAbilityImpactEvent),
407
+ extractAbilityTypeId
408
+ )
409
+ )
348
410
  rawset(
349
411
  Unit,
350
412
  "abilityChannelingFinishEvent",
@@ -0,0 +1,2 @@
1
+ /** @noSelfInFile */
2
+ export {};