warscript 0.0.1-dev.effa673 → 0.0.1-dev.f0a9ffe

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 (90) hide show
  1. package/attributes.d.ts +5 -0
  2. package/attributes.lua +8 -1
  3. package/core/types/sound.lua +5 -0
  4. package/core/types/timer.d.ts +8 -8
  5. package/core/types/timer.lua +25 -23
  6. package/decl/native.d.ts +844 -788
  7. package/engine/behavior.d.ts +2 -0
  8. package/engine/behavior.lua +53 -27
  9. package/engine/behaviour/ability/apply-buff.lua +1 -1
  10. package/engine/behaviour/ability/damage.d.ts +6 -3
  11. package/engine/behaviour/ability/damage.lua +24 -36
  12. package/engine/behaviour/ability/emulate-impact.d.ts +1 -1
  13. package/engine/behaviour/ability/emulate-impact.lua +18 -3
  14. package/engine/behaviour/ability/restore-mana.d.ts +1 -1
  15. package/engine/behaviour/ability/restore-mana.lua +6 -6
  16. package/engine/behaviour/ability.lua +8 -17
  17. package/engine/behaviour/unit/stun-immunity.d.ts +5 -3
  18. package/engine/behaviour/unit/stun-immunity.lua +43 -27
  19. package/engine/behaviour/unit.d.ts +26 -0
  20. package/engine/behaviour/unit.lua +163 -4
  21. package/engine/buff.d.ts +2 -1
  22. package/engine/buff.lua +9 -3
  23. package/engine/internal/ability.d.ts +4 -0
  24. package/engine/internal/ability.lua +23 -0
  25. package/engine/internal/item/ability.lua +63 -11
  26. package/engine/internal/item.d.ts +5 -2
  27. package/engine/internal/item.lua +75 -3
  28. package/engine/internal/misc/damage-metadata-by-target.d.ts +2 -0
  29. package/engine/internal/misc/damage-metadata-by-target.lua +5 -0
  30. package/engine/internal/unit/ability.d.ts +35 -0
  31. package/engine/internal/unit/ability.lua +62 -0
  32. package/engine/internal/unit/allowed-targets.d.ts +1 -1
  33. package/engine/internal/unit/allowed-targets.lua +9 -1
  34. package/engine/internal/unit/order.d.ts +20 -0
  35. package/engine/internal/unit/order.lua +136 -0
  36. package/engine/internal/unit+damage.d.ts +2 -11
  37. package/engine/internal/unit+damage.lua +10 -14
  38. package/engine/internal/unit+spellSteal.lua +1 -2
  39. package/engine/internal/unit-missile-launch.lua +9 -2
  40. package/engine/internal/unit.d.ts +23 -6
  41. package/engine/internal/unit.lua +233 -94
  42. package/engine/object-data/auxiliary/armor-type.d.ts +11 -0
  43. package/engine/object-data/auxiliary/armor-type.lua +46 -0
  44. package/engine/object-data/auxiliary/attachment-preset.d.ts +1 -1
  45. package/engine/object-data/auxiliary/attachment-preset.lua +3 -2
  46. package/engine/object-data/auxiliary/attack-type.d.ts +7 -8
  47. package/engine/object-data/auxiliary/attack-type.lua +42 -0
  48. package/engine/object-data/auxiliary/movement-type.d.ts +7 -7
  49. package/engine/object-data/auxiliary/movement-type.lua +22 -0
  50. package/engine/object-data/auxiliary/unit-attribute.d.ts +6 -0
  51. package/engine/object-data/auxiliary/unit-attribute.lua +9 -0
  52. package/engine/object-data/entry/ability-type/berserk.d.ts +2 -0
  53. package/engine/object-data/entry/ability-type/berserk.lua +13 -0
  54. package/engine/object-data/entry/ability-type/permanent-invisibility.d.ts +8 -0
  55. package/engine/object-data/entry/ability-type/permanent-invisibility.lua +26 -0
  56. package/engine/object-data/entry/ability-type/slow-poison.d.ts +10 -0
  57. package/engine/object-data/entry/ability-type/slow-poison.lua +58 -0
  58. package/engine/object-data/entry/ability-type.lua +8 -3
  59. package/engine/object-data/entry/buff-type/applicable.lua +5 -0
  60. package/engine/object-data/entry/buff-type.d.ts +5 -11
  61. package/engine/object-data/entry/buff-type.lua +11 -27
  62. package/engine/object-data/entry/unit-type.d.ts +13 -4
  63. package/engine/object-data/entry/unit-type.lua +153 -85
  64. package/engine/object-field/ability.d.ts +1 -1
  65. package/engine/object-field/unit.d.ts +57 -3
  66. package/engine/object-field/unit.lua +207 -7
  67. package/engine/object-field.d.ts +15 -4
  68. package/engine/object-field.lua +184 -90
  69. package/engine/standard/entries/buff-type.d.ts +3 -0
  70. package/engine/standard/entries/buff-type.lua +3 -0
  71. package/engine/standard/fields/unit.d.ts +4 -0
  72. package/engine/standard/fields/unit.lua +7 -0
  73. package/engine/text-tag.d.ts +36 -2
  74. package/engine/text-tag.lua +175 -10
  75. package/engine/unit.d.ts +1 -0
  76. package/engine/unit.lua +1 -0
  77. package/objutil/buff.lua +1 -2
  78. package/package.json +2 -2
  79. package/utility/arrays.d.ts +1 -0
  80. package/utility/arrays.lua +3 -0
  81. package/utility/functions.d.ts +8 -0
  82. package/utility/functions.lua +13 -0
  83. package/utility/linked-set.d.ts +1 -0
  84. package/utility/linked-set.lua +3 -0
  85. package/utility/lua-maps.d.ts +4 -0
  86. package/utility/lua-maps.lua +20 -0
  87. package/utility/lua-sets.d.ts +2 -0
  88. package/utility/lua-sets.lua +7 -0
  89. package/core/types/order.d.ts +0 -25
  90. package/core/types/order.lua +0 -55
@@ -1,6 +1,7 @@
1
1
  local ____lualib = require("lualib_bundle")
2
2
  local __TS__Class = ____lualib.__TS__Class
3
3
  local __TS__ClassExtends = ____lualib.__TS__ClassExtends
4
+ local __TS__New = ____lualib.__TS__New
4
5
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
5
6
  local ____exports = {}
6
7
  local ____behavior = require("engine.behavior")
@@ -9,6 +10,17 @@ local ____unit = require("engine.internal.unit")
9
10
  local Unit = ____unit.Unit
10
11
  require("engine.internal.unit+ability")
11
12
  require("engine.internal.unit-missile-launch")
13
+ local ____linked_2Dset = require("utility.linked-set")
14
+ local LinkedSet = ____linked_2Dset.LinkedSet
15
+ local ____lua_2Dmaps = require("utility.lua-maps")
16
+ local getOrPut = ____lua_2Dmaps.getOrPut
17
+ local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
18
+ local ____lua_2Dsets = require("utility.lua-sets")
19
+ local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
20
+ local behaviorsByEvent = {}
21
+ local rangeByBehaviorByEvent = {}
22
+ local listenerByBehaviorByEvent = {}
23
+ local eventsByBehavior = {}
12
24
  ____exports.UnitBehavior = __TS__Class()
13
25
  local UnitBehavior = ____exports.UnitBehavior
14
26
  UnitBehavior.name = "UnitBehavior"
@@ -16,10 +28,69 @@ __TS__ClassExtends(UnitBehavior, Behavior)
16
28
  function UnitBehavior.prototype.____constructor(self, unit)
17
29
  Behavior.prototype.____constructor(self, unit)
18
30
  end
31
+ 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]
36
+ if ____opt_0 ~= nil then
37
+ ____opt_0:remove(self)
38
+ end
39
+ local ____opt_2 = rangeByBehaviorByEvent[event]
40
+ if ____opt_2 ~= nil then
41
+ ____opt_2[self] = nil
42
+ end
43
+ local ____opt_4 = listenerByBehaviorByEvent[event]
44
+ if ____opt_4 ~= nil then
45
+ ____opt_4[self] = nil
46
+ end
47
+ end
48
+ eventsByBehavior[self] = nil
49
+ end
50
+ return Behavior.prototype.onDestroy(self)
51
+ end
52
+ function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
53
+ local rangeByBehavior = getOrPut(rangeByBehaviorByEvent, event, mutableLuaMap)
54
+ rangeByBehavior[self] = range
55
+ local listenerByBehavior = getOrPut(listenerByBehaviorByEvent, event, mutableLuaMap)
56
+ listenerByBehavior[self] = listener
57
+ getOrPut(eventsByBehavior, self, mutableLuaSet)[event] = true
58
+ local behaviors = behaviorsByEvent[event]
59
+ if behaviors == nil then
60
+ event:addListener(function(...)
61
+ local behaviors = behaviorsByEvent[event]
62
+ if behaviors ~= nil then
63
+ local unit = extractUnit(...)
64
+ if unit ~= nil then
65
+ for behavior in pairs(behaviors) do
66
+ local range = rangeByBehavior[behavior]
67
+ if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
68
+ local ____self_6 = behavior
69
+ ____self_6[listenerByBehavior[behavior]](____self_6, ...)
70
+ end
71
+ end
72
+ end
73
+ end
74
+ end)
75
+ behaviors = __TS__New(LinkedSet)
76
+ behaviorsByEvent[event] = behaviors
77
+ end
78
+ behaviors:add(self)
79
+ end
80
+ function UnitBehavior.prototype.onImmediateOrder(self, orderId)
81
+ end
82
+ function UnitBehavior.prototype.onTargetOrder(self, orderId, target)
83
+ end
84
+ function UnitBehavior.prototype.onPointOrder(self, orderId, x, y)
85
+ end
19
86
  function UnitBehavior.prototype.onAutoAttackStart(self, target)
20
87
  end
21
88
  function UnitBehavior.prototype.onAutoAttackFinish(self, target)
22
89
  end
90
+ function UnitBehavior.prototype.onTargetingAutoAttackStart(self, source)
91
+ end
92
+ function UnitBehavior.prototype.onTargetingAutoAttackFinish(self, source)
93
+ end
23
94
  function UnitBehavior.prototype.onDamageDealing(self, target, event)
24
95
  end
25
96
  function UnitBehavior.prototype.onDamageDealt(self, target, event)
@@ -32,6 +103,32 @@ function UnitBehavior.prototype.onAbilityGained(self, ability)
32
103
  end
33
104
  function UnitBehavior.prototype.onAbilityLost(self, ability)
34
105
  end
106
+ function UnitBehavior.prototype.onAbilityChannelingStart(self, ability)
107
+ end
108
+ function UnitBehavior.prototype.onAbilityImpact(self, ability)
109
+ end
110
+ function UnitBehavior.prototype.onAbilityWidgetTargetImpact(self, ability, target)
111
+ end
112
+ function UnitBehavior.prototype.onAbilityUnitTargetImpact(self, ability, target)
113
+ end
114
+ function UnitBehavior.prototype.onAbilityItemTargetImpact(self, ability, target)
115
+ end
116
+ function UnitBehavior.prototype.onAbilityDestructibleTargetImpact(self, ability, target)
117
+ end
118
+ function UnitBehavior.prototype.onAbilityPointTargetImpact(self, ability, x, y)
119
+ end
120
+ function UnitBehavior.prototype.onAbilityNoTargetImpact(self, ability)
121
+ end
122
+ function UnitBehavior.prototype.onAbilityChannelingFinish(self, ability)
123
+ end
124
+ function UnitBehavior.prototype.onAbilityStop(self, ability)
125
+ end
126
+ function UnitBehavior.prototype.onTargetingAbilityChannelingStart(self, ability, source)
127
+ end
128
+ function UnitBehavior.prototype.onTargetingAbilityImpact(self, ability, source)
129
+ end
130
+ function UnitBehavior.prototype.onBuffGained(self, buff)
131
+ end
35
132
  function UnitBehavior.prototype.onItemDropped(self, item)
36
133
  end
37
134
  function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -40,6 +137,8 @@ function UnitBehavior.prototype.onItemUsed(self, item)
40
137
  end
41
138
  function UnitBehavior.prototype.onItemStacked(self, item)
42
139
  end
140
+ function UnitBehavior.prototype.onItemChargesChanged(self, item)
141
+ end
43
142
  function UnitBehavior.prototype.onKill(self, target)
44
143
  end
45
144
  function UnitBehavior.prototype.onDeath(self, source)
@@ -53,11 +152,28 @@ __TS__SetDescriptor(
53
152
  true
54
153
  );
55
154
  (function(self)
155
+ Unit.onImmediateOrder:addListener(function(source, orderId)
156
+ ____exports.UnitBehavior:forAll(source, "onImmediateOrder", orderId)
157
+ end)
158
+ Unit.onTargetOrder:addListener(function(source, orderId, target)
159
+ ____exports.UnitBehavior:forAll(source, "onTargetOrder", orderId, target)
160
+ end)
161
+ Unit.onPointOrder:addListener(function(source, orderId, x, y)
162
+ ____exports.UnitBehavior:forAll(
163
+ source,
164
+ "onPointOrder",
165
+ orderId,
166
+ x,
167
+ y
168
+ )
169
+ end)
56
170
  Unit.autoAttackStartEvent:addListener(function(source, target)
57
171
  ____exports.UnitBehavior:forAll(source, "onAutoAttackStart", target)
172
+ ____exports.UnitBehavior:forAll(target, "onTargetingAutoAttackStart", source)
58
173
  end)
59
174
  Unit.autoAttackFinishEvent:addListener(function(source, target)
60
175
  ____exports.UnitBehavior:forAll(source, "onAutoAttackFinish", target)
176
+ ____exports.UnitBehavior:forAll(target, "onTargetingAutoAttackFinish", source)
61
177
  end)
62
178
  Unit.onDamaging:addListener(function(source, target, event)
63
179
  if source ~= nil then
@@ -71,11 +187,51 @@ __TS__SetDescriptor(
71
187
  end
72
188
  ____exports.UnitBehavior:forAll(target, "onDamageReceived", source, event)
73
189
  end)
74
- Unit.abilityGainedEvent:addListener(function(source, target)
75
- ____exports.UnitBehavior:forAll(source, "onAbilityGained", target)
190
+ Unit.abilityGainedEvent:addListener(function(source, ability)
191
+ ____exports.UnitBehavior:forAll(source, "onAbilityGained", ability)
192
+ end)
193
+ Unit.abilityLostEvent:addListener(function(source, ability)
194
+ ____exports.UnitBehavior:forAll(source, "onAbilityLost", ability)
195
+ end)
196
+ Unit.abilityChannelingStartEvent:addListener(function(source, ability)
197
+ ____exports.UnitBehavior:forAll(source, "onAbilityChannelingStart", ability)
198
+ end)
199
+ Unit.abilityUnitTargetChannelingStartEvent:addListener(function(source, ability, target)
200
+ ____exports.UnitBehavior:forAll(target, "onTargetingAbilityChannelingStart", ability, source)
76
201
  end)
77
- Unit.abilityLostEvent:addListener(function(source, target)
78
- ____exports.UnitBehavior:forAll(source, "onAbilityLost", target)
202
+ Unit.abilityImpactEvent:addListener(function(source, ability)
203
+ ____exports.UnitBehavior:forAll(source, "onAbilityImpact", ability)
204
+ end)
205
+ Unit.abilityWidgetTargetImpactEvent:addListener(function(source, ability, target)
206
+ ____exports.UnitBehavior:forAll(source, "onAbilityWidgetTargetImpact", ability, target)
207
+ end)
208
+ Unit.abilityUnitTargetImpactEvent:addListener(function(source, ability, target)
209
+ ____exports.UnitBehavior:forAll(source, "onAbilityUnitTargetImpact", ability, target)
210
+ ____exports.UnitBehavior:forAll(target, "onTargetingAbilityImpact", ability, source)
211
+ end)
212
+ Unit.abilityItemTargetImpactEvent:addListener(function(source, ability, target)
213
+ ____exports.UnitBehavior:forAll(source, "onAbilityItemTargetImpact", ability, target)
214
+ end)
215
+ Unit.abilityDestructibleTargetImpactEvent:addListener(function(source, ability, target)
216
+ ____exports.UnitBehavior:forAll(source, "onAbilityDestructibleTargetImpact", ability, target)
217
+ end)
218
+ Unit.abilityPointTargetImpactEvent:addListener(function(source, ability, x, y)
219
+ ____exports.UnitBehavior:forAll(
220
+ source,
221
+ "onAbilityPointTargetImpact",
222
+ ability,
223
+ x,
224
+ y
225
+ )
226
+ end)
227
+ Unit.abilityNoTargetImpactEvent:addListener(function(source, ability)
228
+ ____exports.UnitBehavior:forAll(source, "onAbilityNoTargetImpact", ability)
229
+ end)
230
+ Unit.abilityChannelingFinishEvent:addListener(function(source, ability)
231
+ ____exports.UnitBehavior:forAll(source, "onAbilityChannelingFinish", ability)
232
+ end)
233
+ Unit.abilityStopEvent:addListener(function(source, ability)
234
+ ____exports.UnitBehavior:forAll(source, "onAbilityStop", ability)
79
235
  end)
80
236
  Unit.deathEvent:addListener(function(target, source)
81
237
  if source ~= nil then
@@ -95,6 +251,9 @@ __TS__SetDescriptor(
95
251
  Unit.itemStackedEvent:addListener(function(unit, item)
96
252
  ____exports.UnitBehavior:forAll(unit, "onItemStacked", item)
97
253
  end)
254
+ Unit.itemChargesChangedEvent:addListener(function(unit, item)
255
+ ____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
256
+ end)
98
257
  end)(UnitBehavior)
99
258
  Unit.destroyEvent:addListener(function(unit)
100
259
  ____exports.UnitBehavior:forAll(unit, "destroy")
package/engine/buff.d.ts CHANGED
@@ -278,6 +278,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
278
278
  onDeath(source: Unit | undefined): void;
279
279
  onDamageDealt(target: Unit, event: DamageEvent): void;
280
280
  onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
281
- static readonly destroyEvent: Event<[Buff<object>]>;
281
+ static readonly createdEvent: Event<[Buff<object>]>;
282
+ static readonly beingDestroyedEvent: Event<[Buff<object>]>;
282
283
  }
283
284
  export {};
package/engine/buff.lua CHANGED
@@ -304,7 +304,8 @@ buffHealingIntervalTimerCallback = function(buff)
304
304
  source:healTarget(buff[101], healingPerInterval)
305
305
  end
306
306
  end
307
- local buffDestroyEvent = __TS__New(Event)
307
+ local buffCreatedEvent = __TS__New(Event)
308
+ local buffBeingDestroyedEvent = __TS__New(Event)
308
309
  ____exports.Buff = __TS__Class()
309
310
  local Buff = ____exports.Buff
310
311
  Buff.name = "Buff"
@@ -506,6 +507,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
506
507
  end
507
508
  self:onCreate()
508
509
  self[100] = 1
510
+ Event.invoke(buffCreatedEvent, self)
509
511
  end
510
512
  function Buff.prototype.getUnitBonus(self, bonusType)
511
513
  local ____opt_38 = self._bonusIdByBonusType
@@ -619,7 +621,7 @@ function Buff.prototype.onDestroy(self)
619
621
  removeUnitBonus(unit, bonusType, bonusId)
620
622
  end
621
623
  end
622
- Event.invoke(buffDestroyEvent, self)
624
+ Event.invoke(buffBeingDestroyedEvent, self)
623
625
  self[100] = 3
624
626
  return UnitBehavior.prototype.onDestroy(self)
625
627
  end
@@ -1288,7 +1290,8 @@ __TS__SetDescriptor(
1288
1290
  },
1289
1291
  true
1290
1292
  )
1291
- Buff.destroyEvent = buffDestroyEvent;
1293
+ Buff.createdEvent = buffCreatedEvent
1294
+ Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
1292
1295
  (function(self)
1293
1296
  local function destroyBuffIfNeeded(buff)
1294
1297
  if getUnitAbility(buff[101].handle, buff.typeId) ~= buff.handle and buff[100] == 1 then
@@ -1342,5 +1345,8 @@ Buff.destroyEvent = buffDestroyEvent;
1342
1345
  ____exports.checkBuffs(target)
1343
1346
  end
1344
1347
  )
1348
+ buffCreatedEvent:addListener(function(buff)
1349
+ UnitBehavior:forAll(buff.unit, "onBuffGained", buff)
1350
+ end)
1345
1351
  end)(Buff)
1346
1352
  return ____exports
@@ -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,31 @@ 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
+ local unit = self.u
408
+ local typeId = self.typeId
409
+ unitHideAbility(unit, typeId, true)
410
+ unitDisableAbility(unit, typeId, true, false)
411
+ self.d = (self.d or 0) + 1
412
+ end
413
+ function UnitAbility.prototype.decrementDisableCounter(self)
414
+ local unit = self.u
415
+ local typeId = self.typeId
416
+ unitDisableAbility(unit, typeId, false, false)
417
+ unitHideAbility(unit, typeId, true)
418
+ self.d = (self.d or 0) - 1
419
+ end
405
420
  function UnitAbility.prototype.interruptCast(self)
406
421
  self.owner:interruptCast(self.typeId)
407
422
  end
423
+ __TS__SetDescriptor(
424
+ UnitAbility.prototype,
425
+ "isDisabled",
426
+ {get = function(self)
427
+ return self.d ~= nil and self.d > 0
428
+ end},
429
+ true
430
+ )
408
431
  __TS__SetDescriptor(
409
432
  UnitAbility.prototype,
410
433
  "level",
@@ -20,6 +20,7 @@ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slo
20
20
  local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
21
21
  local isItemOwned = IsItemOwned
22
22
  local isItemPowerup = IsItemPowerup
23
+ local getItemAbility = BlzGetItemAbility
23
24
  local getItemX = GetItemX
24
25
  local getItemY = GetItemY
25
26
  local setAbilityRealLevelField = BlzSetAbilityRealLevelField
@@ -31,6 +32,8 @@ local unitAddItem = UnitAddItem
31
32
  local unitRemoveItem = UnitRemoveItem
32
33
  local unitUseItem = UnitUseItem
33
34
  local unitResetCooldown = UnitResetCooldown
35
+ local unitInventorySize = UnitInventorySize
36
+ local unitItemInSlot = UnitItemInSlot
34
37
  local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
35
38
  if not currentMap then
36
39
  return 0
@@ -55,22 +58,24 @@ local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
55
58
  itemType.activelyUsed = true
56
59
  return itemType.id
57
60
  end)
58
- local dummy = assert(CreateUnit(
61
+ ---
62
+ -- @internal For use by internal systems only.
63
+ ____exports.itemAbilityDummy = assert(CreateUnit(
59
64
  Player.neutralVictim.handle,
60
65
  dummyUnitId,
61
66
  0,
62
67
  0,
63
68
  270
64
69
  ))
65
- local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
66
- local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
67
- 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)
68
73
  local function startItemCooldownInternal(handle, cooldown)
69
74
  local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
70
75
  setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, COOLDOWN_STARTER_ABILITY_TYPE_ID)
71
76
  setAbilityRealLevelField(cooldownStarterAbility, ABILITY_RLF_COOLDOWN, 0, cooldown)
72
- unitResetCooldown(dummy)
73
- unitUseItem(dummy, cooldownStarterItem)
77
+ unitResetCooldown(____exports.itemAbilityDummy)
78
+ unitUseItem(____exports.itemAbilityDummy, cooldownStarterItem)
74
79
  Timer:run(restoreCooldownGroup, handle, cooldownGroup)
75
80
  end
76
81
  restoreCooldownGroup = function(handle, cooldownGroup)
@@ -85,7 +90,7 @@ ____exports.startItemCooldown = function(handle, owner, cooldown)
85
90
  end
86
91
  ---
87
92
  -- @internal For use by internal systems only.
88
- ____exports.abilityActionDummy = dummy
93
+ ____exports.abilityActionDummy = ____exports.itemAbilityDummy
89
94
  ---
90
95
  -- @internal For use by internal systems only.
91
96
  ____exports.doAbilityAction = function(handle, action, ...)
@@ -104,11 +109,11 @@ ____exports.doAbilityAction = function(handle, action, ...)
104
109
  end
105
110
  x = getItemX(handle)
106
111
  y = getItemY(handle)
107
- unitAddItem(dummy, handle)
112
+ unitAddItem(____exports.itemAbilityDummy, handle)
108
113
  end
109
114
  local result = action(handle, ...)
110
115
  if not isOwned then
111
- unitRemoveItem(dummy, handle)
116
+ unitRemoveItem(____exports.itemAbilityDummy, handle)
112
117
  setItemPosition(handle, x, y)
113
118
  if isPowerup then
114
119
  setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
@@ -139,9 +144,9 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
139
144
  isPowerup = true
140
145
  end
141
146
  unitRemoveItem(owner, handle)
142
- unitAddItem(dummy, handle)
147
+ unitAddItem(____exports.itemAbilityDummy, handle)
143
148
  local result = action(handle, ...)
144
- unitRemoveItem(dummy, handle)
149
+ unitRemoveItem(____exports.itemAbilityDummy, handle)
145
150
  unitAddItemToSlot(owner, handle, slot)
146
151
  if isPowerup then
147
152
  setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
@@ -151,4 +156,51 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
151
156
  end
152
157
  return result
153
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
204
+ return result
205
+ end
154
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,6 +73,8 @@ 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;
@@ -82,5 +84,6 @@ export declare class Item extends Handle<jitem> {
82
84
  static getInRect(rect: ReadonlyRect): Item[];
83
85
  static get onCreate(): Event<[Item]>;
84
86
  static get destroyEvent(): Event<[Item]>;
87
+ static readonly chargesChangedEvent: Event<[Item]>;
85
88
  }
86
89
  export {};
@@ -1,26 +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
18
24
  local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
19
25
  local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
20
26
  local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
21
27
  local SLOT_FILLER_ITEM_TYPE_ID = ____add_2Ditem_2Dto_2Dslot.SLOT_FILLER_ITEM_TYPE_ID
22
28
  local ____vec2 = require("math.vec2")
23
29
  local distance = ____vec2.distance
30
+ local itemChargesChangeEvent = __TS__New(Event)
24
31
  local itemAddAbility = BlzItemAddAbility
25
32
  local itemRemoveAbility = BlzItemRemoveAbility
26
33
  local getItemAbility = BlzGetItemAbility
@@ -36,10 +43,26 @@ local getEnumItem = GetEnumItem
36
43
  local getItemTypeId = GetItemTypeId
37
44
  local getItemX = GetItemX
38
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
39
59
  local getItemIntegerField = BlzGetItemIntegerField
40
60
  local setItemBooleanField = BlzSetItemBooleanField
41
61
  local getItemBooleanField = BlzGetItemBooleanField
62
+ invoke = Event.invoke
42
63
  local enumRect = Rect:create(0, 0, 0, 0).handle
64
+ ---
65
+ -- @internal For use by internal systems only.
43
66
  ____exports.addAndGetAbility = function(handle, abilityTypeId)
44
67
  if itemAddAbility(handle, abilityTypeId) then
45
68
  return getItemAbility(handle, abilityTypeId)
@@ -65,6 +88,23 @@ local function getItemAbilities(handle, item)
65
88
  end
66
89
  return abilities
67
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
68
108
  local targetCollection
69
109
  local targetCollectionNextIndex
70
110
  local centerX
@@ -116,6 +156,36 @@ end
116
156
  function Item.create(self, id, x, y, skinId)
117
157
  return self:of(BlzCreateItemWithSkin(id, x, y, skinId or id))
118
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
119
189
  function Item.prototype.addAbility(self, abilityTypeId)
120
190
  local nativeAbility = doAbilityAction(self.handle, ____exports.addAndGetAbility, abilityTypeId)
121
191
  if nativeAbility ~= nil then
@@ -301,7 +371,7 @@ __TS__SetDescriptor(
301
371
  "perishable",
302
372
  {
303
373
  get = function(self)
304
- return BlzGetItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
374
+ return getItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
305
375
  end,
306
376
  set = function(self, v)
307
377
  BlzSetItemBooleanField(self.handle, ITEM_BF_PERISHABLE, v)
@@ -557,10 +627,11 @@ __TS__SetDescriptor(
557
627
  "charges",
558
628
  {
559
629
  get = function(self)
560
- return GetItemCharges(self.handle)
630
+ return getItemCharges(self.handle)
561
631
  end,
562
632
  set = function(self, v)
563
- SetItemCharges(self.handle, v)
633
+ setItemCharges(self.handle, v)
634
+ invoke(itemChargesChangeEvent, self)
564
635
  end
565
636
  },
566
637
  true
@@ -587,6 +658,7 @@ __TS__ObjectDefineProperty(
587
658
  return self.onDestroyEvent
588
659
  end}
589
660
  )
661
+ Item.chargesChangedEvent = itemChargesChangeEvent
590
662
  local getManipulatedItem = GetManipulatedItem
591
663
  local trigger = CreateTrigger()
592
664
  TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_PICKUP_ITEM)
@@ -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