warscript 0.0.1-dev.c79b20b → 0.0.1-dev.c8224f3

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 (69) hide show
  1. package/core/types/effect.d.ts +13 -3
  2. package/core/types/effect.lua +116 -17
  3. package/core/types/frame.d.ts +4 -0
  4. package/core/types/frame.lua +71 -0
  5. package/core/util.d.ts +1 -1
  6. package/core/util.lua +12 -0
  7. package/engine/behavior.d.ts +2 -2
  8. package/engine/behavior.lua +6 -6
  9. package/engine/behaviour/ability/always-enabled.d.ts +7 -0
  10. package/engine/behaviour/ability/always-enabled.lua +31 -0
  11. package/engine/behaviour/ability/emulate-impact.d.ts +6 -0
  12. package/engine/behaviour/ability/emulate-impact.lua +28 -0
  13. package/engine/behaviour/ability/instant-impact.d.ts +2 -2
  14. package/engine/behaviour/ability/instant-impact.lua +4 -19
  15. package/engine/behaviour/ability/on-command-impact.d.ts +8 -0
  16. package/engine/behaviour/ability/on-command-impact.lua +25 -0
  17. package/engine/behaviour/ability/remove-buffs.d.ts +16 -0
  18. package/engine/behaviour/ability/remove-buffs.lua +28 -0
  19. package/engine/behaviour/ability.d.ts +14 -3
  20. package/engine/behaviour/ability.lua +79 -33
  21. package/engine/buff.d.ts +6 -1
  22. package/engine/buff.lua +29 -18
  23. package/engine/internal/ability.d.ts +16 -13
  24. package/engine/internal/ability.lua +80 -76
  25. package/engine/internal/item/ability.lua +106 -0
  26. package/engine/internal/misc/ability-disable-counter.d.ts +2 -0
  27. package/engine/internal/misc/ability-disable-counter.lua +13 -0
  28. package/engine/internal/unit/ability.d.ts +10 -1
  29. package/engine/internal/unit/ability.lua +36 -14
  30. package/engine/internal/unit/add-item-to-slot-init.d.ts +2 -0
  31. package/engine/internal/unit/add-item-to-slot-init.lua +23 -0
  32. package/engine/internal/unit/add-item-to-slot.d.ts +2 -0
  33. package/engine/internal/unit/add-item-to-slot.lua +50 -0
  34. package/engine/internal/unit/ignore-events-items.d.ts +2 -0
  35. package/engine/internal/unit/ignore-events-items.lua +5 -0
  36. package/engine/internal/{unit+item.d.ts → unit/item.d.ts} +5 -4
  37. package/engine/internal/{unit+item.lua → unit/item.lua} +32 -11
  38. package/engine/internal/unit/main-selected.d.ts +13 -0
  39. package/engine/internal/unit/main-selected.lua +51 -0
  40. package/engine/internal/unit-missile-launch.lua +24 -5
  41. package/engine/internal/unit.d.ts +21 -7
  42. package/engine/internal/unit.lua +152 -77
  43. package/engine/internal/utility.lua +12 -0
  44. package/engine/lightning.d.ts +8 -2
  45. package/engine/lightning.lua +27 -2
  46. package/engine/local-client.d.ts +7 -2
  47. package/engine/local-client.lua +82 -0
  48. package/engine/object-data/auxiliary/sound-preset-name.d.ts +5 -1
  49. package/engine/object-data/entry/ability-type.lua +8 -12
  50. package/engine/object-data/entry/item-type.d.ts +14 -0
  51. package/engine/object-data/entry/item-type.lua +91 -0
  52. package/engine/object-data/utility/object-data-entry-id-generator.lua +7 -0
  53. package/engine/object-field/ability.d.ts +9 -3
  54. package/engine/object-field/ability.lua +4 -1
  55. package/engine/object-field.d.ts +2 -2
  56. package/engine/object-field.lua +4 -0
  57. package/engine/standard/fields/ability.d.ts +2 -0
  58. package/engine/standard/fields/ability.lua +2 -0
  59. package/engine/unit.d.ts +3 -1
  60. package/engine/unit.lua +3 -1
  61. package/index.d.ts +1 -0
  62. package/index.lua +1 -0
  63. package/package.json +2 -2
  64. package/patch-lua.d.ts +0 -0
  65. package/patch-lua.lua +10 -0
  66. package/utility/arrays.d.ts +8 -1
  67. package/utility/arrays.lua +34 -3
  68. package/utility/lazy.d.ts +2 -0
  69. package/utility/lazy.lua +14 -0
@@ -2,7 +2,6 @@ local ____lualib = require("lualib_bundle")
2
2
  local __TS__ArrayMap = ____lualib.__TS__ArrayMap
3
3
  local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
4
4
  local __TS__Class = ____lualib.__TS__Class
5
- local __TS__New = ____lualib.__TS__New
6
5
  local __TS__ClassExtends = ____lualib.__TS__ClassExtends
7
6
  local __TS__InstanceOf = ____lualib.__TS__InstanceOf
8
7
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -11,7 +10,10 @@ local ____exports = {}
11
10
  local ____handle = require("core.types.handle")
12
11
  local Handle = ____handle.Handle
13
12
  local ____ability = require("engine.internal.item.ability")
13
+ local abilityActionDummy = ____ability.abilityActionDummy
14
14
  local doAbilityAction = ____ability.doAbilityAction
15
+ local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
16
+ local startItemCooldown = ____ability.startItemCooldown
15
17
  local getUnitAbilityLevel = GetUnitAbilityLevel
16
18
  local setUnitAbilityLevel = SetUnitAbilityLevel
17
19
  local setAbilityIntegerField = BlzSetAbilityIntegerField
@@ -33,7 +35,9 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
33
35
  local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
34
36
  local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
35
37
  local getHandleId = GetHandleId
36
- local getItemAbility = BlzGetItemAbility
38
+ local getItemBooleanField = BlzGetItemBooleanField
39
+ local setItemBooleanField = BlzSetItemBooleanField
40
+ local unitHideAbility = BlzUnitHideAbility
37
41
  local match = string.match
38
42
  local ____type = _G.type
39
43
  local ____tostring = _G.tostring
@@ -151,55 +155,6 @@ local orders = postcompile(function()
151
155
  end
152
156
  return orders
153
157
  end)
154
- local RealFields = __TS__Class()
155
- RealFields.name = "RealFields"
156
- function RealFields.prototype.____constructor(self, handle)
157
- self.handle = handle
158
- end
159
- function RealFields.prototype.set(self, field, value)
160
- return BlzSetAbilityRealField(self.handle, field, value)
161
- end
162
- function RealFields.prototype.get(self, field)
163
- return BlzGetAbilityRealField(self.handle, field)
164
- end
165
- function RealFields.prototype.has(self, field)
166
- local handle = self.handle
167
- return BlzSetAbilityRealField(
168
- handle,
169
- field,
170
- BlzGetAbilityRealField(handle, field)
171
- )
172
- end
173
- local RealLevelFields = __TS__Class()
174
- RealLevelFields.name = "RealLevelFields"
175
- function RealLevelFields.prototype.____constructor(self, handle, level)
176
- self.handle = handle
177
- self.level = level
178
- end
179
- function RealLevelFields.prototype.set(self, field, value)
180
- return BlzSetAbilityRealLevelField(self.handle, field, self.level, value)
181
- end
182
- function RealLevelFields.prototype.get(self, field)
183
- return BlzGetAbilityRealLevelField(self.handle, field, self.level)
184
- end
185
- function RealLevelFields.prototype.has(self, field)
186
- local handle = self.handle
187
- return BlzSetAbilityRealLevelField(
188
- handle,
189
- field,
190
- 0,
191
- BlzGetAbilityRealLevelField(handle, field, 0)
192
- )
193
- end
194
- local realLevelMetatable = {__index = self}
195
- local levelDescriptors = {realFields = function(self, handle, level)
196
- return __TS__New(RealLevelFields, handle, level)
197
- end}
198
- local levelMetatable = {__index = function(self, key)
199
- local fields = levelDescriptors[key](levelDescriptors, self.handle, self.level)
200
- rawset(self, key, fields)
201
- return fields
202
- end}
203
158
  local fieldGetters = {
204
159
  abilityintegerfield = function(ability, field)
205
160
  return getAbilityIntegerField(ability.handle, field)
@@ -346,43 +301,26 @@ __TS__SetDescriptor(
346
301
  )
347
302
  __TS__SetDescriptor(
348
303
  Ability.prototype,
349
- "orderId",
304
+ "orderTypeStringId",
350
305
  {get = function(self)
351
306
  local field = orderIdFieldByParentTypeId[self.parentTypeId]
352
- return order2orderId(field ~= nil and getAbilityStringLevelField(self.handle, ABILITY_SLF_BASE_ORDER_ID_NCL6, self.level) or (orders[self.parentTypeId] or ""))
307
+ return field ~= nil and getAbilityStringLevelField(self.handle, field, self.level) or (orders[self.parentTypeId] or "")
353
308
  end},
354
309
  true
355
310
  )
356
311
  __TS__SetDescriptor(
357
312
  Ability.prototype,
358
- "realFields",
313
+ "orderTypeId",
359
314
  {get = function(self)
360
- local realFields = __TS__New(RealFields, self.handle)
361
- rawset(self, "realFields", realFields)
362
- return realFields
315
+ return order2orderId(self.orderTypeStringId)
363
316
  end},
364
317
  true
365
318
  )
366
319
  __TS__SetDescriptor(
367
320
  Ability.prototype,
368
- "levels",
321
+ "levelCount",
369
322
  {get = function(self)
370
- local handle = self.handle
371
- local levels = setmetatable(
372
- {},
373
- {
374
- __len = function(self)
375
- return BlzGetAbilityIntegerField(handle, ABILITY_IF_LEVELS)
376
- end,
377
- __index = function(self, i)
378
- local level = setmetatable({handle = handle, level = i - 1}, levelMetatable)
379
- self[i] = level
380
- return level
381
- end
382
- }
383
- )
384
- rawset(self, "levels", levels)
385
- return levels
323
+ return self:getField(ABILITY_IF_LEVELS)
386
324
  end},
387
325
  true
388
326
  )
@@ -393,6 +331,17 @@ __TS__SetDescriptor(
393
331
  end},
394
332
  true
395
333
  )
334
+ __TS__SetDescriptor(
335
+ Ability.prototype,
336
+ "cooldownRemaining",
337
+ {
338
+ get = function(self)
339
+ end,
340
+ set = function(self, cooldownRemaining)
341
+ end
342
+ },
343
+ true
344
+ )
396
345
  __TS__ObjectDefineProperty(
397
346
  Ability,
398
347
  "onCreate",
@@ -416,6 +365,8 @@ function UnrecognizedAbility.prototype.____constructor(self, typeId, owner)
416
365
  UnrecognizedAbility.____super.prototype.____constructor(self, nil, typeId)
417
366
  self.owner = owner
418
367
  end
368
+ function UnrecognizedAbility.prototype.interruptCast(self)
369
+ end
419
370
  __TS__SetDescriptor(
420
371
  UnrecognizedAbility.prototype,
421
372
  "level",
@@ -424,6 +375,18 @@ __TS__SetDescriptor(
424
375
  end},
425
376
  true
426
377
  )
378
+ __TS__SetDescriptor(
379
+ UnrecognizedAbility.prototype,
380
+ "cooldownRemaining",
381
+ {
382
+ get = function(self)
383
+ return 0
384
+ end,
385
+ set = function(self, _)
386
+ end
387
+ },
388
+ true
389
+ )
427
390
  ____exports.UnitAbility = __TS__Class()
428
391
  local UnitAbility = ____exports.UnitAbility
429
392
  UnitAbility.name = "UnitAbility"
@@ -433,6 +396,15 @@ function UnitAbility.prototype.____constructor(self, handle, typeId, owner)
433
396
  self.owner = owner
434
397
  self.u = owner.handle
435
398
  end
399
+ function UnitAbility.prototype.incrementHideCounter(self)
400
+ unitHideAbility(self.u, self.typeId, true)
401
+ end
402
+ function UnitAbility.prototype.decrementHideCounter(self)
403
+ unitHideAbility(self.u, self.typeId, false)
404
+ end
405
+ function UnitAbility.prototype.interruptCast(self)
406
+ self.owner:interruptCast(self.typeId)
407
+ end
436
408
  __TS__SetDescriptor(
437
409
  UnitAbility.prototype,
438
410
  "level",
@@ -453,8 +425,8 @@ __TS__SetDescriptor(
453
425
  get = function(self)
454
426
  return getUnitAbilityCooldownRemaining(self.u, self.typeId)
455
427
  end,
456
- set = function(self, v)
457
- startUnitAbilityCooldown(self.u, self.typeId, v)
428
+ set = function(self, cooldownRemaining)
429
+ startUnitAbilityCooldown(self.u, self.typeId, cooldownRemaining)
458
430
  end
459
431
  },
460
432
  true
@@ -479,6 +451,9 @@ end
479
451
  local function setAbilityField(_, ability, field, levelOrValue, value)
480
452
  return ____exports.Ability.prototype.setField(ability, field, levelOrValue, value)
481
453
  end
454
+ local function getAbilityCooldown(_, abilityTypeId)
455
+ return getUnitAbilityCooldownRemaining(abilityActionDummy, abilityTypeId)
456
+ end
482
457
  ____exports.ItemAbility = __TS__Class()
483
458
  local ItemAbility = ____exports.ItemAbility
484
459
  ItemAbility.name = "ItemAbility"
@@ -506,6 +481,14 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
506
481
  value
507
482
  )
508
483
  end
484
+ function ItemAbility.prototype.interruptCast(self)
485
+ local handle = self.owner.handle
486
+ local activelyUsed = getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED)
487
+ if activelyUsed then
488
+ setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, false)
489
+ setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, true)
490
+ end
491
+ end
509
492
  __TS__SetDescriptor(
510
493
  ItemAbility.prototype,
511
494
  "level",
@@ -514,6 +497,27 @@ __TS__SetDescriptor(
514
497
  end},
515
498
  true
516
499
  )
500
+ __TS__SetDescriptor(
501
+ ItemAbility.prototype,
502
+ "cooldownRemaining",
503
+ {
504
+ get = function(self)
505
+ local item = self.owner
506
+ local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
507
+ local ____item_handle_3 = item.handle
508
+ local ____opt_1 = item.owner
509
+ return ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, getAbilityCooldown, self.typeId)
510
+ end,
511
+ set = function(self, cooldownRemaining)
512
+ local item = self.owner
513
+ local ____startItemCooldown_8 = startItemCooldown
514
+ local ____item_handle_7 = item.handle
515
+ local ____opt_5 = item.owner
516
+ ____startItemCooldown_8(____item_handle_7, ____opt_5 and ____opt_5.handle, cooldownRemaining)
517
+ end
518
+ },
519
+ true
520
+ )
517
521
  __TS__ObjectDefineProperty(
518
522
  ItemAbility,
519
523
  "onCreate",
@@ -1,16 +1,60 @@
1
1
  local ____exports = {}
2
+ local restoreCooldownGroup
2
3
  local ____player = require("core.types.player")
3
4
  local Player = ____player.Player
4
5
  local ____dummy = require("objutil.dummy")
5
6
  local dummyUnitId = ____dummy.dummyUnitId
7
+ local ____utility = require("engine.internal.utility")
8
+ local findUnitItemSlot = ____utility.findUnitItemSlot
9
+ local ____blank = require("engine.object-data.entry.item-type.blank")
10
+ local BlankItemType = ____blank.BlankItemType
11
+ local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
12
+ local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
13
+ local ____math = require("math")
14
+ local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
15
+ local ____timer = require("core.types.timer")
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
6
21
  local isItemOwned = IsItemOwned
7
22
  local isItemPowerup = IsItemPowerup
8
23
  local getItemX = GetItemX
9
24
  local getItemY = GetItemY
25
+ local setAbilityRealLevelField = BlzSetAbilityRealLevelField
26
+ local setItemIntegerField = BlzSetItemIntegerField
27
+ local getItemIntegerField = BlzGetItemIntegerField
10
28
  local setItemBooleanField = BlzSetItemBooleanField
11
29
  local setItemPosition = SetItemPosition
12
30
  local unitAddItem = UnitAddItem
13
31
  local unitRemoveItem = UnitRemoveItem
32
+ local unitUseItem = UnitUseItem
33
+ local unitResetCooldown = UnitResetCooldown
34
+ local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
35
+ if not currentMap then
36
+ return 0
37
+ end
38
+ local abilityType = currentMap.objects.ability:newObject(
39
+ util.id2s(abilityTypeIdGenerator:next()),
40
+ "Absk"
41
+ )
42
+ abilityType["bsk1+0"] = 0
43
+ abilityType["bsk2+0"] = 0
44
+ abilityType["bsk3+0"] = 0
45
+ abilityType["amcs+0"] = 0
46
+ abilityType["adur+0"] = MINIMUM_POSITIVE_NORMALIZED_FLOAT
47
+ abilityType["ahdu+0"] = MINIMUM_POSITIVE_NORMALIZED_FLOAT
48
+ return util.s2id(abilityType.id)
49
+ end)
50
+ local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
51
+ local itemType = BlankItemType:create()
52
+ itemType.name = "[Warscript/Dummy] Item Cooldown Starter"
53
+ itemType.abilityTypeIds = {COOLDOWN_STARTER_ABILITY_TYPE_ID}
54
+ itemType.cooldownGroupId = COOLDOWN_STARTER_ABILITY_TYPE_ID
55
+ itemType.activelyUsed = true
56
+ return itemType.id
57
+ end)
14
58
  local dummy = assert(CreateUnit(
15
59
  Player.neutralVictim.handle,
16
60
  dummyUnitId,
@@ -18,10 +62,37 @@ local dummy = assert(CreateUnit(
18
62
  0,
19
63
  270
20
64
  ))
65
+ local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
66
+ local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
21
67
  ShowUnit(dummy, false)
68
+ local function startItemCooldownInternal(handle, cooldown)
69
+ local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
70
+ setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, COOLDOWN_STARTER_ABILITY_TYPE_ID)
71
+ setAbilityRealLevelField(cooldownStarterAbility, ABILITY_RLF_COOLDOWN, 0, cooldown)
72
+ unitResetCooldown(dummy)
73
+ unitUseItem(dummy, cooldownStarterItem)
74
+ Timer:run(restoreCooldownGroup, handle, cooldownGroup)
75
+ end
76
+ restoreCooldownGroup = function(handle, cooldownGroup)
77
+ if getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP) == COOLDOWN_STARTER_ABILITY_TYPE_ID then
78
+ setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, cooldownGroup)
79
+ end
80
+ end
81
+ ---
82
+ -- @internal For use by internal systems only.
83
+ ____exports.startItemCooldown = function(handle, owner, cooldown)
84
+ ____exports.doAbilityActionForceDummy(handle, owner, startItemCooldownInternal, cooldown)
85
+ end
86
+ ---
87
+ -- @internal For use by internal systems only.
88
+ ____exports.abilityActionDummy = dummy
22
89
  ---
23
90
  -- @internal For use by internal systems only.
24
91
  ____exports.doAbilityAction = function(handle, action, ...)
92
+ local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
93
+ if not isAlreadyIgnoredInEvents then
94
+ ignoreEventsItems[handle] = true
95
+ end
25
96
  local isOwned = isItemOwned(handle)
26
97
  local isPowerup
27
98
  local x
@@ -43,6 +114,41 @@ ____exports.doAbilityAction = function(handle, action, ...)
43
114
  setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
44
115
  end
45
116
  end
117
+ if not isAlreadyIgnoredInEvents then
118
+ ignoreEventsItems[handle] = nil
119
+ end
120
+ return result
121
+ end
122
+ ---
123
+ -- @internal For use by internal systems only.
124
+ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
125
+ if owner == nil then
126
+ return ____exports.doAbilityAction(handle, action, ...)
127
+ end
128
+ local slot = findUnitItemSlot(owner, handle)
129
+ if slot == nil then
130
+ return ____exports.doAbilityAction(handle, action, ...)
131
+ end
132
+ local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
133
+ if not isAlreadyIgnoredInEvents then
134
+ ignoreEventsItems[handle] = true
135
+ end
136
+ local isPowerup
137
+ if isItemPowerup(handle) then
138
+ setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
139
+ isPowerup = true
140
+ end
141
+ unitRemoveItem(owner, handle)
142
+ unitAddItem(dummy, handle)
143
+ local result = action(handle, ...)
144
+ unitRemoveItem(dummy, handle)
145
+ unitAddItemToSlot(owner, handle, slot)
146
+ if isPowerup then
147
+ setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
148
+ end
149
+ if not isAlreadyIgnoredInEvents then
150
+ ignoreEventsItems[handle] = nil
151
+ end
46
152
  return result
47
153
  end
48
154
  return ____exports
@@ -0,0 +1,2 @@
1
+ /** @noSelfInFile */
2
+ export {};
@@ -0,0 +1,13 @@
1
+ local ____exports = {}
2
+ local disableAbility = BlzUnitDisableAbility
3
+ ---
4
+ -- @internal For use by internal systems only.
5
+ ____exports.increaseAbilityDisableCounter = function(unit, abilityTypeId, times)
6
+ for _ = 1, times do
7
+ disableAbility(unit, abilityTypeId, true, false)
8
+ end
9
+ for _ = times, -1 do
10
+ disableAbility(unit, abilityTypeId, false, false)
11
+ end
12
+ end
13
+ return ____exports
@@ -3,7 +3,7 @@ import { Ability } from "../ability";
3
3
  import { Destructable } from "../../../core/types/destructable";
4
4
  import { Item } from "../item";
5
5
  import { Widget } from "../../../core/types/widget";
6
- import { DispatchingEvent } from "../../../event";
6
+ import { DispatchingEvent, Event } from "../../../event";
7
7
  declare module "../unit" {
8
8
  namespace Unit {
9
9
  const abilityCastingStartEvent: DispatchingEvent<[Unit, Ability]>;
@@ -141,3 +141,12 @@ declare module "../unit" {
141
141
  const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
142
142
  }
143
143
  }
144
+ declare module "../unit" {
145
+ namespace Unit {
146
+ const abilityCommandEvent: {
147
+ readonly [abilityTypeId: number]: {
148
+ readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
149
+ };
150
+ };
151
+ }
152
+ }
@@ -15,8 +15,15 @@ local UnitTriggerEvent = ____unit.UnitTriggerEvent
15
15
  local ____event = require("event")
16
16
  local createDispatchingEvent = ____event.createDispatchingEvent
17
17
  local DependentInitializingEvent = ____event.DependentInitializingEvent
18
+ local Event = ____event.Event
19
+ local InitializingEvent = ____event.InitializingEvent
18
20
  local ____preconditions = require("utility.preconditions")
19
21
  local checkNotNull = ____preconditions.checkNotNull
22
+ local ____lazy = require("utility.lazy")
23
+ local lazyRecord = ____lazy.lazyRecord
24
+ local eventInvoke = Event.invoke
25
+ local condition = Condition
26
+ local createTrigger = CreateTrigger
20
27
  local getItemAbility = BlzGetItemAbility
21
28
  local getSpellAbility = GetSpellAbility
22
29
  local getSpellAbilityId = GetSpellAbilityId
@@ -26,11 +33,10 @@ local getSpellTargetUnit = GetSpellTargetUnit
26
33
  local getSpellTargetX = GetSpellTargetX
27
34
  local getSpellTargetY = GetSpellTargetY
28
35
  local getTriggerUnit = GetTriggerUnit
29
- local getUnitAbility = BlzGetUnitAbility
30
- local unitAddAbility = UnitAddAbility
36
+ local triggerAddCondition = TriggerAddCondition
37
+ local triggerRegisterCommandEvent = TriggerRegisterCommandEvent
31
38
  local unitInventorySize = UnitInventorySize
32
39
  local unitItemInSlot = UnitItemInSlot
33
- local unitRemoveAbility = UnitRemoveAbility
34
40
  local function retrieveAbility(unit, ability, abilityId)
35
41
  if ability == nil then
36
42
  return __TS__New(
@@ -39,17 +45,6 @@ local function retrieveAbility(unit, ability, abilityId)
39
45
  Unit:of(unit)
40
46
  )
41
47
  end
42
- if not unitAddAbility(unit, abilityId) then
43
- if getUnitAbility(unit, abilityId) == ability then
44
- return UnitAbility:of(
45
- ability,
46
- abilityId,
47
- Unit:of(unit)
48
- )
49
- end
50
- else
51
- unitRemoveAbility(unit, abilityId)
52
- end
53
48
  for i = 0, unitInventorySize(unit) - 1 do
54
49
  local item = unitItemInSlot(unit, i)
55
50
  if getItemAbility(item, abilityId) == ability then
@@ -366,4 +361,31 @@ rawset(
366
361
  extractAbilityTypeId
367
362
  )
368
363
  )
364
+ rawset(
365
+ Unit,
366
+ "abilityCommandEvent",
367
+ lazyRecord(function(abilityTypeId)
368
+ return lazyRecord(function(orderTypeStringId)
369
+ return __TS__New(
370
+ InitializingEvent,
371
+ function(event)
372
+ local trigger = createTrigger()
373
+ triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
374
+ triggerAddCondition(
375
+ trigger,
376
+ condition(function()
377
+ local unit = Unit:of(getTriggerUnit())
378
+ if unit ~= nil then
379
+ local ability = unit:getAbilityById(abilityTypeId)
380
+ if ability ~= nil then
381
+ eventInvoke(event, unit, ability, orderTypeStringId)
382
+ end
383
+ end
384
+ end)
385
+ )
386
+ end
387
+ )
388
+ end)
389
+ end)
390
+ )
369
391
  return ____exports
@@ -0,0 +1,2 @@
1
+ /** @noSelfInFile */
2
+ export {};
@@ -0,0 +1,23 @@
1
+ local ____exports = {}
2
+ local ____unit = require("engine.internal.unit")
3
+ local Unit = ____unit.Unit
4
+ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
5
+ local fillerItems = ____add_2Ditem_2Dto_2Dslot.fillerItems
6
+ local unitsWithFillerItems = ____add_2Ditem_2Dto_2Dslot.unitsWithFillerItems
7
+ local setItemVisible = SetItemVisible
8
+ local unitRemoveItem = UnitRemoveItem
9
+ Unit.itemPickedUpEvent:addListener(
10
+ 4,
11
+ function(unit)
12
+ local handle = unit.handle
13
+ if unitsWithFillerItems[handle] ~= nil then
14
+ for previousSlot = 1, 6 do
15
+ local fillerItem = fillerItems[previousSlot]
16
+ unitRemoveItem(handle, fillerItem)
17
+ setItemVisible(fillerItem, false)
18
+ end
19
+ unitsWithFillerItems[handle] = nil
20
+ end
21
+ end
22
+ )
23
+ return ____exports
@@ -0,0 +1,2 @@
1
+ /** @noSelfInFile */
2
+ export {};
@@ -0,0 +1,50 @@
1
+ local ____exports = {}
2
+ local ____blank = require("engine.object-data.entry.item-type.blank")
3
+ local BlankItemType = ____blank.BlankItemType
4
+ local ____arrays = require("utility.arrays")
5
+ local array = ____arrays.array
6
+ local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
7
+ local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
8
+ local setItemVisible = SetItemVisible
9
+ local unitAddItem = UnitAddItem
10
+ local unitItemInSlot = UnitItemInSlot
11
+ local unitRemoveItem = UnitRemoveItem
12
+ local FILLER_ITEM_TYPE_ID = compiletime(function()
13
+ local itemType = BlankItemType:create()
14
+ itemType.name = "[Warscript/Dummy] Slot Filler"
15
+ return itemType.id
16
+ end)
17
+ ---
18
+ -- @internal For use by internal systems only.
19
+ ____exports.fillerItems = array(
20
+ 6,
21
+ function()
22
+ local item = CreateItem(FILLER_ITEM_TYPE_ID, 0, 0)
23
+ setItemVisible(item, false)
24
+ ignoreEventsItems[item] = true
25
+ return item
26
+ end
27
+ )
28
+ ---
29
+ -- @internal For use by internal systems only.
30
+ ____exports.unitsWithFillerItems = {}
31
+ ---
32
+ -- @internal For use by internal systems only.
33
+ ____exports.unitAddItemToSlot = function(unit, item, slot)
34
+ for previousSlot = 0, slot - 1 do
35
+ if unitItemInSlot(unit, previousSlot) == nil then
36
+ unitAddItem(unit, ____exports.fillerItems[previousSlot + 1])
37
+ ____exports.unitsWithFillerItems[unit] = true
38
+ end
39
+ end
40
+ unitAddItem(unit, item)
41
+ if ____exports.unitsWithFillerItems[unit] ~= nil then
42
+ for previousSlot = 0, slot - 1 do
43
+ local fillerItem = ____exports.fillerItems[previousSlot + 1]
44
+ unitRemoveItem(unit, fillerItem)
45
+ setItemVisible(fillerItem, false)
46
+ end
47
+ ____exports.unitsWithFillerItems[unit] = nil
48
+ end
49
+ end
50
+ 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.ignoreEventsItems = {}
5
+ return ____exports
@@ -1,5 +1,5 @@
1
1
  /** @noSelfInFile */
2
- import { Item } from "./item";
2
+ import { Item } from "../item";
3
3
  export interface UnitItems extends ReadonlyArray<Item | undefined> {
4
4
  readonly length: 0 | 1 | 2 | 3 | 4 | 5 | 6;
5
5
  [0]: Item | undefined;
@@ -10,13 +10,14 @@ export interface UnitItems extends ReadonlyArray<Item | undefined> {
10
10
  [5]: Item | undefined;
11
11
  }
12
12
  export declare class UnitItems {
13
- private readonly handle;
14
13
  constructor(handle: junit);
14
+ findSlot(item: Item): 0 | 1 | 2 | 3 | 4 | 5 | undefined;
15
15
  protected __newindex(slot: number, item: Item | undefined): void;
16
- protected __index(slot: number): Item | undefined;
16
+ protected __index(key: string | number): unknown;
17
17
  protected __len(): number;
18
+ protected __ipairs(): LuaIterator<LuaMultiReturn<[number, Item | undefined]>, junit>;
18
19
  }
19
- declare module "./unit" {
20
+ declare module "../unit" {
20
21
  interface Unit {
21
22
  readonly items: UnitItems;
22
23
  }