warscript 0.0.1-dev.ee6f224 → 0.0.1-dev.ef189a5

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 (63) hide show
  1. package/attributes.d.ts +1 -0
  2. package/attributes.lua +9 -0
  3. package/core/types/player.d.ts +16 -0
  4. package/core/types/player.lua +57 -14
  5. package/core/types/tileCell.d.ts +2 -1
  6. package/core/types/tileCell.lua +5 -0
  7. package/core/types/timer.d.ts +3 -2
  8. package/core/types/timer.lua +8 -2
  9. package/engine/behavior.d.ts +7 -1
  10. package/engine/behavior.lua +88 -65
  11. package/engine/behaviour/ability/apply-buff.lua +4 -4
  12. package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
  13. package/engine/behaviour/ability/remove-buffs.lua +21 -0
  14. package/engine/behaviour/ability.d.ts +2 -1
  15. package/engine/behaviour/ability.lua +2 -1
  16. package/engine/behaviour/unit/stun-immunity.d.ts +8 -4
  17. package/engine/behaviour/unit/stun-immunity.lua +12 -3
  18. package/engine/behaviour/unit.d.ts +9 -3
  19. package/engine/behaviour/unit.lua +94 -22
  20. package/engine/buff.d.ts +12 -2
  21. package/engine/buff.lua +80 -17
  22. package/engine/internal/item.d.ts +12 -12
  23. package/engine/internal/item.lua +41 -26
  24. package/engine/internal/unit/ability.d.ts +14 -14
  25. package/engine/internal/unit/ability.lua +72 -45
  26. package/engine/internal/unit/fly-height.d.ts +7 -0
  27. package/engine/internal/unit/fly-height.lua +20 -0
  28. package/engine/internal/unit/main-selected.lua +12 -27
  29. package/engine/internal/unit/scale.d.ts +7 -0
  30. package/engine/internal/unit/scale.lua +20 -0
  31. package/engine/internal/unit-missile-launch.lua +44 -20
  32. package/engine/internal/unit.d.ts +13 -10
  33. package/engine/internal/unit.lua +83 -64
  34. package/engine/local-client.d.ts +2 -0
  35. package/engine/local-client.lua +30 -0
  36. package/engine/object-data/entry/ability-type.lua +4 -1
  37. package/engine/object-data/entry/destructible-type.d.ts +5 -1
  38. package/engine/object-data/entry/destructible-type.lua +12 -0
  39. package/engine/object-data/entry/unit-type.d.ts +4 -0
  40. package/engine/object-data/entry/unit-type.lua +76 -32
  41. package/engine/object-field/unit.d.ts +13 -1
  42. package/engine/object-field/unit.lua +57 -0
  43. package/engine/object-field.d.ts +7 -1
  44. package/engine/object-field.lua +199 -112
  45. package/engine/standard/fields/ability.d.ts +2 -2
  46. package/engine/standard/fields/ability.lua +2 -2
  47. package/engine/standard/fields/unit.d.ts +3 -1
  48. package/engine/standard/fields/unit.lua +4 -0
  49. package/engine/synchronization.d.ts +11 -0
  50. package/engine/synchronization.lua +77 -0
  51. package/engine/text-tag.lua +3 -2
  52. package/engine/unit.d.ts +2 -0
  53. package/engine/unit.lua +2 -0
  54. package/net/socket.lua +1 -1
  55. package/objutil/buff.lua +1 -1
  56. package/package.json +2 -2
  57. package/utility/arrays.d.ts +1 -0
  58. package/utility/arrays.lua +8 -0
  59. package/utility/callback-array.d.ts +5 -1
  60. package/utility/callback-array.lua +16 -1
  61. package/utility/linked-set.d.ts +1 -0
  62. package/utility/linked-set.lua +19 -1
  63. package/utility/types.d.ts +3 -0
@@ -50,6 +50,13 @@ local unitRemoveItem = UnitRemoveItem
50
50
  local unitUseItem = UnitUseItem
51
51
  local unitUseItemPoint = UnitUseItemPoint
52
52
  local unitUseItemTarget = UnitUseItemTarget
53
+ local setItemDropOnDeath = SetItemDropOnDeath
54
+ local setItemDroppable = SetItemDroppable
55
+ local setItemPawnable = SetItemPawnable
56
+ local isItemPawnable = IsItemPawnable
57
+ local getItemIntegerField = BlzGetItemIntegerField
58
+ local setItemBooleanField = BlzSetItemBooleanField
59
+ local getItemBooleanField = BlzGetItemBooleanField
53
60
  local tableRemove = table.remove
54
61
  _G.SetItemCharges = function(whichItem, charges)
55
62
  setItemCharges(whichItem, charges)
@@ -58,9 +65,6 @@ _G.SetItemCharges = function(whichItem, charges)
58
65
  ____exports.Item:of(whichItem)
59
66
  )
60
67
  end
61
- local getItemIntegerField = BlzGetItemIntegerField
62
- local setItemBooleanField = BlzSetItemBooleanField
63
- local getItemBooleanField = BlzGetItemBooleanField
64
68
  invoke = Event.invoke
65
69
  local enumRect = Rect:create(0, 0, 0, 0).handle
66
70
  ---
@@ -328,65 +332,68 @@ __TS__SetDescriptor(
328
332
  )
329
333
  __TS__SetDescriptor(
330
334
  Item.prototype,
331
- "dropOnDeath",
335
+ "dropsOnDeath",
332
336
  {
333
337
  get = function(self)
334
- return BlzGetItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
338
+ return getItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
335
339
  end,
336
- set = function(self, v)
337
- SetItemDropOnDeath(self.handle, v)
340
+ set = function(self, dropsOnDeath)
341
+ setItemDropOnDeath(self.handle, dropsOnDeath)
338
342
  end
339
343
  },
340
344
  true
341
345
  )
342
346
  __TS__SetDescriptor(
343
347
  Item.prototype,
344
- "droppable",
348
+ "canBeDropped",
345
349
  {
346
350
  get = function(self)
347
- return BlzGetItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
351
+ return getItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
348
352
  end,
349
- set = function(self, v)
350
- SetItemDroppable(self.handle, v)
353
+ set = function(self, canBeDropped)
354
+ setItemDroppable(self.handle, canBeDropped)
351
355
  end
352
356
  },
353
357
  true
354
358
  )
355
359
  __TS__SetDescriptor(
356
360
  Item.prototype,
357
- "pawnable",
361
+ "canBeSold",
358
362
  {
359
363
  get = function(self)
360
- return IsItemPawnable(self.handle)
364
+ return isItemPawnable(self.handle)
361
365
  end,
362
- set = function(self, v)
363
- SetItemPawnable(self.handle, v)
366
+ set = function(self, canBeSold)
367
+ setItemPawnable(self.handle, canBeSold)
364
368
  end
365
369
  },
366
370
  true
367
371
  )
368
372
  __TS__SetDescriptor(
369
373
  Item.prototype,
370
- "perishable",
374
+ "perishes",
371
375
  {
372
376
  get = function(self)
373
377
  return getItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
374
378
  end,
375
- set = function(self, v)
376
- BlzSetItemBooleanField(self.handle, ITEM_BF_PERISHABLE, v)
379
+ set = function(self, perishes)
380
+ local handle = self.handle
381
+ local powerUp = isItemPowerup(handle)
382
+ setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
383
+ setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
377
384
  end
378
385
  },
379
386
  true
380
387
  )
381
388
  __TS__SetDescriptor(
382
389
  Item.prototype,
383
- "powerup",
390
+ "isPowerUp",
384
391
  {
385
392
  get = function(self)
386
393
  return isItemPowerup(self.handle)
387
394
  end,
388
- set = function(self, v)
389
- setItemBooleanField(self.handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, v)
395
+ set = function(self, isPowerUp)
396
+ setItemBooleanField(self.handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, isPowerUp)
390
397
  end
391
398
  },
392
399
  true
@@ -422,16 +429,24 @@ __TS__SetDescriptor(
422
429
  )
423
430
  __TS__SetDescriptor(
424
431
  Item.prototype,
425
- "usable",
432
+ "isActivelyUsed",
426
433
  {
427
434
  get = function(self)
428
435
  return getItemBooleanField(self.handle, ITEM_BF_ACTIVELY_USED)
429
436
  end,
430
- set = function(self, v)
437
+ set = function(self, isActivelyUsed)
431
438
  local handle = self.handle
432
- local powerup = isItemPowerup(handle)
433
- setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, v)
434
- setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerup)
439
+ local powerUp = isItemPowerup(handle)
440
+ local perishes = getItemBooleanField(handle, ITEM_BF_PERISHABLE)
441
+ local dropsOnDeath = getItemBooleanField(handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
442
+ local canBeDropped = getItemBooleanField(handle, ITEM_BF_CAN_BE_DROPPED)
443
+ local canBeSold = isItemPawnable(handle)
444
+ setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, isActivelyUsed)
445
+ setItemPawnable(handle, canBeSold)
446
+ setItemDroppable(handle, canBeDropped)
447
+ setItemDropOnDeath(handle, dropsOnDeath)
448
+ setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
449
+ setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
435
450
  end
436
451
  },
437
452
  true
@@ -133,55 +133,55 @@ declare module "../unit" {
133
133
  }
134
134
  declare module "../unit" {
135
135
  namespace Unit {
136
- const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
136
+ const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;
137
137
  }
138
138
  }
139
139
  declare module "../unit" {
140
140
  namespace Unit {
141
- const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
141
+ const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
142
142
  }
143
143
  }
144
144
  declare module "../unit" {
145
145
  namespace Unit {
146
- const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
146
+ const abilityCommandEvent: {
147
+ readonly [abilityTypeId: number]: {
148
+ readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
149
+ };
150
+ };
147
151
  }
148
152
  }
149
153
  declare module "../unit" {
150
154
  namespace Unit {
151
- const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
155
+ const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
152
156
  }
153
157
  }
154
158
  declare module "../unit" {
155
159
  namespace Unit {
156
- const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
160
+ const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
157
161
  }
158
162
  }
159
163
  declare module "../unit" {
160
164
  namespace Unit {
161
- const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
165
+ const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
162
166
  }
163
167
  }
164
168
  declare module "../unit" {
165
169
  namespace Unit {
166
- const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
170
+ const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
167
171
  }
168
172
  }
169
173
  declare module "../unit" {
170
174
  namespace Unit {
171
- const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;
175
+ const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
172
176
  }
173
177
  }
174
178
  declare module "../unit" {
175
179
  namespace Unit {
176
- const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
180
+ const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
177
181
  }
178
182
  }
179
183
  declare module "../unit" {
180
184
  namespace Unit {
181
- const abilityCommandEvent: {
182
- readonly [abilityTypeId: number]: {
183
- readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
184
- };
185
- };
185
+ const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
186
186
  }
187
187
  }
@@ -22,7 +22,12 @@ local checkNotNull = ____preconditions.checkNotNull
22
22
  local ____lazy = require("utility.lazy")
23
23
  local lazyRecord = ____lazy.lazyRecord
24
24
  local ____timer = require("core.types.timer")
25
+ local consumeZeroTimerCallback = ____timer.consumeZeroTimerCallback
25
26
  local Timer = ____timer.Timer
27
+ local ____lua_2Dsets = require("utility.lua-sets")
28
+ local luaSetOf = ____lua_2Dsets.luaSetOf
29
+ local ____attributes = require("attributes")
30
+ local attribute = ____attributes.attribute
26
31
  local eventInvoke = Event.invoke
27
32
  local condition = Condition
28
33
  local createTrigger = CreateTrigger
@@ -347,10 +352,65 @@ rawset(
347
352
  extractAbilityTypeId
348
353
  )
349
354
  )
355
+ local internalAbilityChannelingFinishEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters)
356
+ rawset(
357
+ Unit,
358
+ "abilityChannelingFinishEvent",
359
+ createDispatchingEvent(internalAbilityChannelingFinishEvent, extractAbilityTypeId)
360
+ )
361
+ local internalAbilityStopEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters)
362
+ rawset(
363
+ Unit,
364
+ "abilityStopEvent",
365
+ createDispatchingEvent(internalAbilityStopEvent, extractAbilityTypeId)
366
+ )
367
+ rawset(
368
+ Unit,
369
+ "abilityCommandEvent",
370
+ lazyRecord(function(abilityTypeId)
371
+ return lazyRecord(function(orderTypeStringId)
372
+ return __TS__New(
373
+ InitializingEvent,
374
+ function(event)
375
+ local trigger = createTrigger()
376
+ triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
377
+ triggerAddCondition(
378
+ trigger,
379
+ condition(function()
380
+ local unit = Unit:of(getTriggerUnit())
381
+ if unit ~= nil then
382
+ local ability = unit:getAbility(abilityTypeId)
383
+ if ability ~= nil then
384
+ eventInvoke(event, unit, ability, orderTypeStringId)
385
+ end
386
+ end
387
+ end)
388
+ )
389
+ end
390
+ )
391
+ end)
392
+ end)
393
+ )
350
394
  local internalAbilityImpactEvent = __TS__New(Event)
351
- internalAbilityChannelingStartEvent:addListener(function(...)
352
- Timer:run(eventInvoke, internalAbilityImpactEvent, ...)
353
- end)
395
+ local impactCallbackIdAttribute = attribute()
396
+ local function invokeImpactEvent(unit, ability, ...)
397
+ ability[impactCallbackIdAttribute] = nil
398
+ eventInvoke(internalAbilityImpactEvent, unit, ability, ...)
399
+ end
400
+ internalAbilityChannelingStartEvent:addListener(
401
+ 999999,
402
+ function(unit, ability, ...)
403
+ ability[impactCallbackIdAttribute] = Timer:run(invokeImpactEvent, unit, ability, ...)
404
+ end
405
+ )
406
+ local function consumeImpactCallback(_, ability)
407
+ local impactCallbackId = ability[impactCallbackIdAttribute]
408
+ if impactCallbackId ~= nil then
409
+ consumeZeroTimerCallback(impactCallbackId)
410
+ end
411
+ end
412
+ internalAbilityChannelingFinishEvent:addListener(999999, consumeImpactCallback)
413
+ internalAbilityStopEvent:addListener(999999, consumeImpactCallback)
354
414
  rawset(
355
415
  Unit,
356
416
  "abilityImpactEvent",
@@ -407,47 +467,14 @@ rawset(
407
467
  extractAbilityTypeId
408
468
  )
409
469
  )
410
- rawset(
411
- Unit,
412
- "abilityChannelingFinishEvent",
413
- createDispatchingEvent(
414
- __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters),
415
- extractAbilityTypeId
416
- )
417
- )
418
- rawset(
419
- Unit,
420
- "abilityStopEvent",
421
- createDispatchingEvent(
422
- __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters),
423
- extractAbilityTypeId
424
- )
425
- )
426
- rawset(
427
- Unit,
428
- "abilityCommandEvent",
429
- lazyRecord(function(abilityTypeId)
430
- return lazyRecord(function(orderTypeStringId)
431
- return __TS__New(
432
- InitializingEvent,
433
- function(event)
434
- local trigger = createTrigger()
435
- triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
436
- triggerAddCondition(
437
- trigger,
438
- condition(function()
439
- local unit = Unit:of(getTriggerUnit())
440
- if unit ~= nil then
441
- local ability = unit:getAbility(abilityTypeId)
442
- if ability ~= nil then
443
- eventInvoke(event, unit, ability, orderTypeStringId)
444
- end
445
- end
446
- end)
447
- )
448
- end
449
- )
450
- end)
451
- end)
470
+ local spellEffectOnlyAbilityTypeIds = luaSetOf(fourCC("AAns"))
471
+ internalAbilityChannelingStartEvent:addListener(
472
+ -999999,
473
+ function(unit, ability)
474
+ if spellEffectOnlyAbilityTypeIds[ability.parentTypeId] ~= nil then
475
+ eventInvoke(internalAbilityChannelingFinishEvent, unit, ability)
476
+ eventInvoke(internalAbilityStopEvent, unit, ability)
477
+ end
478
+ end
452
479
  )
453
480
  return ____exports
@@ -0,0 +1,7 @@
1
+ /** @noSelfInFile */
2
+ declare module "../unit" {
3
+ interface Unit {
4
+ flyHeight: number;
5
+ }
6
+ }
7
+ export {};
@@ -0,0 +1,20 @@
1
+ local ____lualib = require("lualib_bundle")
2
+ local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
3
+ local ____exports = {}
4
+ local ____unit = require("engine.internal.unit")
5
+ local Unit = ____unit.Unit
6
+ local ____unit = require("engine.standard.fields.unit")
7
+ local FLY_HEIGHT_UNIT_FLOAT_FIELD = ____unit.FLY_HEIGHT_UNIT_FLOAT_FIELD
8
+ __TS__ObjectDefineProperty(
9
+ Unit.prototype,
10
+ "flyHeight",
11
+ {
12
+ get = function(self)
13
+ return FLY_HEIGHT_UNIT_FLOAT_FIELD:getValue(self)
14
+ end,
15
+ set = function(self, value)
16
+ FLY_HEIGHT_UNIT_FLOAT_FIELD:setValue(self, value)
17
+ end
18
+ }
19
+ )
20
+ return ____exports
@@ -1,46 +1,31 @@
1
1
  local ____lualib = require("lualib_bundle")
2
2
  local __TS__New = ____lualib.__TS__New
3
3
  local ____exports = {}
4
- local ____player = require("core.types.player")
5
- local Player = ____player.Player
6
- local ____math = require("math")
7
- local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
8
- local MINIMUM_INTEGER = ____math.MINIMUM_INTEGER
9
4
  local ____local_2Dclient = require("engine.local-client")
10
5
  local LocalClient = ____local_2Dclient.LocalClient
11
6
  local ____unit = require("engine.internal.unit")
12
7
  local Unit = ____unit.Unit
13
8
  local ____event = require("event")
14
9
  local Event = ____event.Event
10
+ local ____synchronization = require("engine.synchronization")
11
+ local ObjectBus = ____synchronization.ObjectBus
15
12
  local mainSelectedUnitChangeEvent = __TS__New(Event)
16
13
  rawset(Unit, "mainSelectedUnitChangeEvent", mainSelectedUnitChangeEvent)
17
14
  local mainSelectedUnitByPlayer = {}
18
- local syncSlider = BlzCreateFrameByType(
19
- "SLIDER",
20
- "UnitSyncId",
21
- BlzGetOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0),
22
- "",
23
- 0
15
+ local unitBus = __TS__New(
16
+ ObjectBus,
17
+ function(unit) return unit.syncId end,
18
+ function(syncId) return Unit:getBySyncId(syncId) end
24
19
  )
25
- BlzFrameSetMinMaxValue(syncSlider, MINIMUM_INTEGER, MAXIMUM_INTEGER)
26
20
  LocalClient.mainSelectedUnitChangeEvent:addListener(function()
27
- local ____opt_0 = LocalClient.mainSelectedUnit
28
- local syncId = ____opt_0 and ____opt_0.syncId
29
- BlzFrameSetValue(syncSlider, syncId or 0)
21
+ unitBus:send(LocalClient.mainSelectedUnit)
30
22
  end)
31
- local trg = CreateTrigger()
32
- BlzTriggerRegisterFrameEvent(trg, syncSlider, FRAMEEVENT_SLIDER_VALUE_CHANGED)
33
- TriggerAddAction(
34
- trg,
35
- function()
36
- local player = Player:of(GetTriggerPlayer())
37
- local mainSelectedUnit = Unit:getBySyncId(BlzGetTriggerFrameValue())
38
- if mainSelectedUnit ~= mainSelectedUnitByPlayer[player] then
39
- mainSelectedUnitByPlayer[player] = mainSelectedUnit
40
- Event.invoke(mainSelectedUnitChangeEvent, player)
41
- end
23
+ unitBus.event:addListener(function(player, unit)
24
+ if unit ~= mainSelectedUnitByPlayer[player] then
25
+ mainSelectedUnitByPlayer[player] = unit
26
+ Event.invoke(mainSelectedUnitChangeEvent, player)
42
27
  end
43
- )
28
+ end)
44
29
  rawset(
45
30
  Unit,
46
31
  "getMainSelectedOf",
@@ -0,0 +1,7 @@
1
+ /** @noSelfInFile */
2
+ declare module "../unit" {
3
+ interface Unit {
4
+ scale: number;
5
+ }
6
+ }
7
+ export {};
@@ -0,0 +1,20 @@
1
+ local ____lualib = require("lualib_bundle")
2
+ local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
3
+ local ____exports = {}
4
+ local ____unit = require("engine.internal.unit")
5
+ local Unit = ____unit.Unit
6
+ local ____unit = require("engine.standard.fields.unit")
7
+ local SCALING_VALUE_UNIT_FLOAT_FIELD = ____unit.SCALING_VALUE_UNIT_FLOAT_FIELD
8
+ __TS__ObjectDefineProperty(
9
+ Unit.prototype,
10
+ "scale",
11
+ {
12
+ get = function(self)
13
+ return SCALING_VALUE_UNIT_FLOAT_FIELD:getValue(self)
14
+ end,
15
+ set = function(self, value)
16
+ SCALING_VALUE_UNIT_FLOAT_FIELD:setValue(self, value)
17
+ end
18
+ }
19
+ )
20
+ return ____exports
@@ -9,11 +9,18 @@ local ____timer = require("core.types.timer")
9
9
  local Timer = ____timer.Timer
10
10
  local ____lua_2Dsets = require("utility.lua-sets")
11
11
  local luaSetOf = ____lua_2Dsets.luaSetOf
12
+ local ____attributes = require("attributes")
13
+ local attribute = ____attributes.attribute
14
+ local ____linked_2Dset = require("utility.linked-set")
15
+ local LinkedSet = ____linked_2Dset.LinkedSet
12
16
  local ____math = require("math")
13
- local min = ____math.min
17
+ local ceil = ____math.ceil
14
18
  local autoAttackFinishEvent = __TS__New(Event)
15
19
  rawset(Unit, "autoAttackFinishEvent", autoAttackFinishEvent)
16
- local eventTimerByUnit = {}
20
+ local units = __TS__New(LinkedSet)
21
+ local targetAttribute = attribute()
22
+ local impactDelayAttribute = attribute()
23
+ local passedTimeAttribute = attribute()
17
24
  local instantOrderIds = luaSetOf(
18
25
  orderId("avatar"),
19
26
  orderId("berserk"),
@@ -30,29 +37,46 @@ local instantOrderIds = luaSetOf(
30
37
  orderId("unimmolation")
31
38
  )
32
39
  local function reset(source, orderId)
33
- if not (instantOrderIds[orderId] ~= nil) then
34
- local eventTimer = eventTimerByUnit[source]
35
- if eventTimer then
36
- eventTimer:destroy()
37
- eventTimerByUnit[source] = nil
38
- end
40
+ if not (instantOrderIds[orderId] ~= nil) and units:remove(source) then
41
+ source[targetAttribute] = nil
42
+ source[impactDelayAttribute] = nil
43
+ source[passedTimeAttribute] = nil
39
44
  end
40
45
  end
41
46
  Unit.onImmediateOrder:addListener(reset)
42
47
  Unit.onPointOrder:addListener(reset)
43
48
  Unit.onTargetOrder:addListener(reset)
44
- local function timerCallback(source, target)
45
- eventTimerByUnit[source] = nil
46
- Event.invoke(autoAttackFinishEvent, source, target)
49
+ local timerPeriod = 1 / 64
50
+ local function invokeEvent(unit)
51
+ units:remove(unit)
52
+ local target = unit[targetAttribute]
53
+ unit[targetAttribute] = nil
54
+ unit[impactDelayAttribute] = nil
55
+ unit[passedTimeAttribute] = nil
56
+ Event.invoke(autoAttackFinishEvent, unit, target)
57
+ end
58
+ local function checkUnit(unit)
59
+ local passedTime = unit[passedTimeAttribute] + timerPeriod
60
+ local impactDelay = unit[impactDelayAttribute]
61
+ if passedTime >= impactDelay and ceil(passedTime / 0.02) >= ceil(impactDelay / 0.02) then
62
+ invokeEvent(unit)
63
+ else
64
+ unit[passedTimeAttribute] = passedTime
65
+ end
47
66
  end
48
- Unit.autoAttackStartEvent:addListener(function(source, target)
49
- local attackPoint = (source:chooseWeapon(target) or source.firstWeapon).impactDelay
50
- local timer = Timer:simple(
51
- attackPoint + min(0.001, attackPoint / 2),
52
- timerCallback,
53
- source,
54
- target
55
- )
56
- eventTimerByUnit[source] = timer
67
+ Timer.onPeriod[timerPeriod]:addListener(function()
68
+ units:forEach(checkUnit)
57
69
  end)
70
+ Unit.autoAttackStartEvent:addListener(
71
+ 999999,
72
+ function(source, target)
73
+ if source[targetAttribute] ~= nil then
74
+ invokeEvent(source)
75
+ end
76
+ source[targetAttribute] = target
77
+ source[impactDelayAttribute] = (source:chooseWeapon(target) or source.firstWeapon).impactDelay
78
+ source[passedTimeAttribute] = -timerPeriod
79
+ units:add(source)
80
+ end
81
+ )
58
82
  return ____exports
@@ -80,6 +80,8 @@ export declare class UnitWeapon {
80
80
  readonly unit: Unit;
81
81
  readonly index: 0 | 1;
82
82
  constructor(unit: Unit, index: 0 | 1);
83
+ get isEnabled(): boolean;
84
+ set isEnabled(isEnabled: boolean);
83
85
  get cooldown(): number;
84
86
  set cooldown(cooldown: number);
85
87
  get damage(): [minimumDamage: number, maximumDamage: number];
@@ -107,12 +109,13 @@ declare const enum UnitPropertyKey {
107
109
  SYNC_ID = 100,
108
110
  IS_PAUSED = 101,
109
111
  STUN_COUNTER = 102,
110
- DELAY_HEALTH_CHECKS_COUNTER = 103,
111
- DELAY_HEALTH_CHECKS_HEALTH_BONUS = 104,
112
- PREVENT_DEATH_HEALTH_BONUS = 105,
113
- IS_TEAM_GLOW_HIDDEN = 106,
114
- LAST_X = 107,
115
- LAST_Y = 108
112
+ FORCE_STUN_COUNTER = 103,
113
+ DELAY_HEALTH_CHECKS_COUNTER = 104,
114
+ DELAY_HEALTH_CHECKS_HEALTH_BONUS = 105,
115
+ PREVENT_DEATH_HEALTH_BONUS = 106,
116
+ IS_TEAM_GLOW_HIDDEN = 107,
117
+ LAST_X = 108,
118
+ LAST_Y = 109
116
119
  }
117
120
  export type UnitSyncId = number & {
118
121
  readonly __unitSyncId: unique symbol;
@@ -121,6 +124,7 @@ export declare class Unit extends Handle<junit> {
121
124
  readonly syncId: UnitSyncId;
122
125
  private [UnitPropertyKey.IS_PAUSED]?;
123
126
  private [UnitPropertyKey.STUN_COUNTER]?;
127
+ private [UnitPropertyKey.FORCE_STUN_COUNTER]?;
124
128
  private [UnitPropertyKey.DELAY_HEALTH_CHECKS_COUNTER]?;
125
129
  private [UnitPropertyKey.DELAY_HEALTH_CHECKS_HEALTH_BONUS]?;
126
130
  private [UnitPropertyKey.PREVENT_DEATH_HEALTH_BONUS]?;
@@ -216,8 +220,6 @@ export declare class Unit extends Handle<junit> {
216
220
  set facing(v: number);
217
221
  get speed(): number;
218
222
  set speed(v: number);
219
- get flyHeight(): number;
220
- set flyHeight(v: number);
221
223
  get x(): number;
222
224
  set x(v: number);
223
225
  get y(): number;
@@ -241,8 +243,6 @@ export declare class Unit extends Handle<junit> {
241
243
  get isInvulnerable(): boolean;
242
244
  get vertexColor(): Color;
243
245
  set vertexColor(v: Color);
244
- get scale(): number;
245
- set scale(v: number);
246
246
  get timeScale(): number;
247
247
  set timeScale(v: number);
248
248
  get collisionSize(): number;
@@ -292,6 +292,8 @@ export declare class Unit extends Handle<junit> {
292
292
  unpauseEx(): void;
293
293
  incrementStunCounter(): void;
294
294
  decrementStunCounter(): void;
295
+ incrementForceStunCounter(): void;
296
+ decrementForceStunCounter(): void;
295
297
  set waygateActive(v: boolean);
296
298
  get waygateActive(): boolean;
297
299
  set waygateDestination(v: Vec2);
@@ -373,5 +375,6 @@ export declare class Unit extends Handle<junit> {
373
375
  setField(field: junitstringfield, value: string): boolean;
374
376
  toString(): string;
375
377
  static getBySyncId(syncId: UnitSyncId): Unit | undefined;
378
+ static synchronize: (player: Player, object: Unit | undefined) => Promise<Unit | undefined>;
376
379
  }
377
380
  export {};