warscript 0.0.1-dev.b026cc2 → 0.0.1-dev.b37c533

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 (78) 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 +6 -0
  4. package/core/types/frame.lua +89 -1
  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/apply-buff.d.ts +3 -5
  12. package/engine/behaviour/ability/emulate-impact.d.ts +6 -0
  13. package/engine/behaviour/ability/emulate-impact.lua +28 -0
  14. package/engine/behaviour/ability/instant-impact.d.ts +2 -2
  15. package/engine/behaviour/ability/instant-impact.lua +4 -19
  16. package/engine/behaviour/ability/on-command-impact.d.ts +8 -0
  17. package/engine/behaviour/ability/on-command-impact.lua +25 -0
  18. package/engine/behaviour/ability/remove-buffs.d.ts +16 -0
  19. package/engine/behaviour/ability/remove-buffs.lua +28 -0
  20. package/engine/behaviour/ability.d.ts +14 -3
  21. package/engine/behaviour/ability.lua +79 -33
  22. package/engine/behaviour/unit.d.ts +5 -0
  23. package/engine/behaviour/unit.lua +20 -0
  24. package/engine/buff.d.ts +38 -12
  25. package/engine/buff.lua +171 -79
  26. package/engine/internal/ability.d.ts +16 -13
  27. package/engine/internal/ability.lua +82 -76
  28. package/engine/internal/item/ability.lua +106 -0
  29. package/engine/internal/item+owner.lua +2 -2
  30. package/engine/internal/misc/ability-disable-counter.d.ts +2 -0
  31. package/engine/internal/misc/ability-disable-counter.lua +13 -0
  32. package/engine/internal/unit/ability.d.ts +10 -1
  33. package/engine/internal/unit/ability.lua +36 -14
  34. package/engine/internal/unit/bonus.d.ts +4 -2
  35. package/engine/internal/unit/bonus.lua +6 -1
  36. package/engine/internal/unit/ignore-events-items.d.ts +2 -0
  37. package/engine/internal/unit/ignore-events-items.lua +5 -0
  38. package/engine/internal/unit/item.d.ts +24 -0
  39. package/engine/internal/unit/item.lua +128 -0
  40. package/engine/internal/unit/main-selected.d.ts +13 -0
  41. package/engine/internal/unit/main-selected.lua +51 -0
  42. package/engine/internal/unit+ability.lua +2 -2
  43. package/engine/internal/unit-missile-launch.lua +24 -5
  44. package/engine/internal/unit.d.ts +25 -10
  45. package/engine/internal/unit.lua +153 -81
  46. package/engine/internal/utility.lua +12 -0
  47. package/engine/local-client.d.ts +7 -2
  48. package/engine/local-client.lua +82 -0
  49. package/engine/object-data/auxiliary/sound-preset-name.d.ts +5 -1
  50. package/engine/object-data/entry/ability-type.lua +8 -12
  51. package/engine/object-data/entry/item-type.d.ts +14 -0
  52. package/engine/object-data/entry/item-type.lua +91 -0
  53. package/engine/object-data/utility/object-data-entry-id-generator.lua +7 -0
  54. package/engine/object-field/ability.d.ts +26 -3
  55. package/engine/object-field/ability.lua +54 -1
  56. package/engine/object-field.d.ts +2 -2
  57. package/engine/object-field.lua +4 -0
  58. package/engine/standard/fields/ability.d.ts +2 -0
  59. package/engine/standard/fields/ability.lua +2 -0
  60. package/engine/unit.d.ts +2 -0
  61. package/engine/unit.lua +2 -0
  62. package/index.d.ts +1 -0
  63. package/index.lua +1 -0
  64. package/net/socket.d.ts +7 -1
  65. package/net/socket.lua +45 -4
  66. package/network.d.ts +1 -0
  67. package/network.lua +3 -2
  68. package/objutil/buff.lua +1 -1
  69. package/package.json +1 -1
  70. package/patch-lua.d.ts +0 -0
  71. package/patch-lua.lua +10 -0
  72. package/utility/arrays.d.ts +8 -1
  73. package/utility/arrays.lua +34 -3
  74. package/utility/lazy.d.ts +2 -0
  75. package/utility/lazy.lua +14 -0
  76. package/utility/linked-set.d.ts +11 -2
  77. package/utility/linked-set.lua +5 -2
  78. package/utility/types.d.ts +1 -0
@@ -0,0 +1,128 @@
1
+ local ____lualib = require("lualib_bundle")
2
+ local __TS__Class = ____lualib.__TS__Class
3
+ local __TS__New = ____lualib.__TS__New
4
+ local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
5
+ local ____exports = {}
6
+ local ____item = require("engine.internal.item")
7
+ local Item = ____item.Item
8
+ local ____unit = require("engine.internal.unit")
9
+ local Unit = ____unit.Unit
10
+ local ____utility = require("engine.internal.utility")
11
+ local findUnitItemSlot = ____utility.findUnitItemSlot
12
+ local ____blank = require("engine.object-data.entry.item-type.blank")
13
+ local BlankItemType = ____blank.BlankItemType
14
+ local ____arrays = require("utility.arrays")
15
+ local array = ____arrays.array
16
+ local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
17
+ local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
18
+ local rawset = _G.rawset
19
+ local ____type = _G.type
20
+ local isItemPowerup = IsItemPowerup
21
+ local setItemBooleanField = BlzSetItemBooleanField
22
+ local setItemVisible = SetItemVisible
23
+ local unitAddItem = UnitAddItem
24
+ local unitInventorySize = UnitInventorySize
25
+ local unitItemInSlot = UnitItemInSlot
26
+ local unitRemoveItem = UnitRemoveItem
27
+ local unitRemoveItemFromSlot = UnitRemoveItemFromSlot
28
+ local FILLER_ITEM_TYPE_ID = compiletime(function()
29
+ local itemType = BlankItemType:create()
30
+ itemType.name = "[Warscript/Dummy] Slot Filler"
31
+ return itemType.id
32
+ end)
33
+ local fillerItems = array(
34
+ 6,
35
+ function()
36
+ local item = CreateItem(FILLER_ITEM_TYPE_ID, 0, 0)
37
+ setItemVisible(item, false)
38
+ ignoreEventsItems[item] = true
39
+ return item
40
+ end
41
+ )
42
+ local unitsWithFillerItems = {}
43
+ local handleByUnitItems = setmetatable({}, {__mode = "k"})
44
+ local function unitItemsNext(handle, index)
45
+ local slot = index & 7
46
+ if index >> 3 == slot then
47
+ return nil, nil
48
+ end
49
+ return index + 1, Item:of(unitItemInSlot(handle, slot))
50
+ end
51
+ ____exports.UnitItems = __TS__Class()
52
+ local UnitItems = ____exports.UnitItems
53
+ UnitItems.name = "UnitItems"
54
+ function UnitItems.prototype.____constructor(self, handle)
55
+ handleByUnitItems[self] = handle
56
+ end
57
+ function UnitItems.prototype.findSlot(self, item)
58
+ return findUnitItemSlot(handleByUnitItems[self], item.handle)
59
+ end
60
+ function UnitItems.prototype.__newindex(self, slot, item)
61
+ local handle = handleByUnitItems[self]
62
+ if slot < 1 or slot > unitInventorySize(handle) then
63
+ return
64
+ end
65
+ unitRemoveItemFromSlot(handle, slot - 1)
66
+ if item ~= nil then
67
+ local itemHandle = item.handle
68
+ local isPowerup = isItemPowerup(itemHandle)
69
+ if isPowerup then
70
+ setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
71
+ end
72
+ for previousSlot = 0, slot - 2 do
73
+ if unitItemInSlot(handle, previousSlot) == nil then
74
+ unitAddItem(handle, fillerItems[previousSlot + 1])
75
+ unitsWithFillerItems[handle] = true
76
+ end
77
+ end
78
+ unitAddItem(handle, itemHandle)
79
+ if unitsWithFillerItems[handle] ~= nil then
80
+ for previousSlot = 0, slot - 2 do
81
+ local fillerItem = fillerItems[previousSlot + 1]
82
+ unitRemoveItem(handle, fillerItem)
83
+ setItemVisible(fillerItem, false)
84
+ end
85
+ unitsWithFillerItems[handle] = nil
86
+ end
87
+ if isPowerup then
88
+ setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
89
+ end
90
+ end
91
+ end
92
+ function UnitItems.prototype.__index(self, key)
93
+ if ____type(key) == "number" then
94
+ return Item:of(unitItemInSlot(handleByUnitItems[self], key - 1))
95
+ end
96
+ return rawget(____exports.UnitItems.prototype, key)
97
+ end
98
+ function UnitItems.prototype.__len(self)
99
+ return unitInventorySize(handleByUnitItems[self])
100
+ end
101
+ function UnitItems.prototype.__ipairs(self)
102
+ local handle = handleByUnitItems[self]
103
+ return unitItemsNext, handle, unitInventorySize(handle) << 3
104
+ end
105
+ Unit.itemPickedUpEvent:addListener(
106
+ 4,
107
+ function(unit)
108
+ local handle = unit.handle
109
+ if unitsWithFillerItems[handle] ~= nil then
110
+ for previousSlot = 1, 6 do
111
+ local fillerItem = fillerItems[previousSlot]
112
+ unitRemoveItem(handle, fillerItem)
113
+ setItemVisible(fillerItem, false)
114
+ end
115
+ unitsWithFillerItems[handle] = nil
116
+ end
117
+ end
118
+ )
119
+ __TS__ObjectDefineProperty(
120
+ Unit.prototype,
121
+ "items",
122
+ {get = function(self)
123
+ local items = __TS__New(____exports.UnitItems, self.handle)
124
+ rawset(self, "items", items)
125
+ return items
126
+ end}
127
+ )
128
+ return ____exports
@@ -0,0 +1,13 @@
1
+ /** @noSelfInFile */
2
+ import { Player } from "../../../core/types/player";
3
+ import { Event } from "../../../event";
4
+ declare module "../unit" {
5
+ namespace Unit {
6
+ const mainSelectedUnitChangeEvent: Event<[Player]>;
7
+ }
8
+ }
9
+ declare module "../unit" {
10
+ namespace Unit {
11
+ const getMainSelectedOf: (player: Player) => Unit | undefined;
12
+ }
13
+ }
@@ -0,0 +1,51 @@
1
+ local ____lualib = require("lualib_bundle")
2
+ local __TS__New = ____lualib.__TS__New
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
+ local ____local_2Dclient = require("engine.local-client")
10
+ local LocalClient = ____local_2Dclient.LocalClient
11
+ local ____unit = require("engine.internal.unit")
12
+ local Unit = ____unit.Unit
13
+ local ____event = require("event")
14
+ local Event = ____event.Event
15
+ local mainSelectedUnitChangeEvent = __TS__New(Event)
16
+ rawset(Unit, "mainSelectedUnitChangeEvent", mainSelectedUnitChangeEvent)
17
+ local mainSelectedUnitByPlayer = {}
18
+ local syncSlider = BlzCreateFrameByType(
19
+ "SLIDER",
20
+ "UnitSyncId",
21
+ BlzGetOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0),
22
+ "",
23
+ 0
24
+ )
25
+ BlzFrameSetMinMaxValue(syncSlider, MINIMUM_INTEGER, MAXIMUM_INTEGER)
26
+ 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)
30
+ 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
42
+ end
43
+ )
44
+ rawset(
45
+ Unit,
46
+ "getMainSelectedOf",
47
+ function(player)
48
+ return mainSelectedUnitByPlayer[player]
49
+ end
50
+ )
51
+ return ____exports
@@ -40,7 +40,7 @@ ItemAbility.onCreate:addListener(
40
40
  end
41
41
  end
42
42
  )
43
- Unit.onItemPickup:addListener(
43
+ Unit.itemPickedUpEvent:addListener(
44
44
  0,
45
45
  function(unit, item)
46
46
  for ____, ability in ipairs(item.abilities) do
@@ -48,7 +48,7 @@ Unit.onItemPickup:addListener(
48
48
  end
49
49
  end
50
50
  )
51
- Unit.onItemDrop:addListener(
51
+ Unit.itemDroppedEvent:addListener(
52
52
  4,
53
53
  function(unit, item)
54
54
  for ____, ability in ipairs(item.abilities) do
@@ -7,14 +7,33 @@ local ____event = require("event")
7
7
  local Event = ____event.Event
8
8
  local ____timer = require("core.types.timer")
9
9
  local Timer = ____timer.Timer
10
+ local ____lua_2Dsets = require("utility.lua-sets")
11
+ local luaSetOf = ____lua_2Dsets.luaSetOf
10
12
  local autoAttackFinishEvent = __TS__New(Event)
11
13
  rawset(Unit, "autoAttackFinishEvent", autoAttackFinishEvent)
12
14
  local eventTimerByUnit = {}
13
- local function reset(source)
14
- local eventTimer = eventTimerByUnit[source]
15
- if eventTimer then
16
- eventTimer:destroy()
17
- eventTimerByUnit[source] = nil
15
+ local instantOrderIds = luaSetOf(
16
+ orderId("avatar"),
17
+ orderId("berserk"),
18
+ orderId("divineshield"),
19
+ orderId("immolation"),
20
+ orderId("moveslot0"),
21
+ orderId("moveslot1"),
22
+ orderId("moveslot2"),
23
+ orderId("moveslot3"),
24
+ orderId("moveslot4"),
25
+ orderId("moveslot5"),
26
+ orderId("unavatar"),
27
+ orderId("undivineshield"),
28
+ orderId("unimmolation")
29
+ )
30
+ local function reset(source, orderId)
31
+ if not (instantOrderIds[orderId] ~= nil) then
32
+ local eventTimer = eventTimerByUnit[source]
33
+ if eventTimer then
34
+ eventTimer:destroy()
35
+ eventTimerByUnit[source] = nil
36
+ end
18
37
  end
19
38
  end
20
39
  Unit.onImmediateOrder:addListener(reset)
@@ -42,6 +42,7 @@ export interface DamagingEvent {
42
42
  damageType: jdamagetype;
43
43
  weaponType: jweapontype;
44
44
  readonly isAttack: boolean;
45
+ readonly originalAmount: number;
45
46
  }
46
47
  export type DamageEvent = DamagingEvent & {
47
48
  preventDeath<P extends any[]>(this: DamageEvent, callback: (this: void, ...parameters: P) => any, ...parameters: P): void;
@@ -93,14 +94,19 @@ export declare class UnitWeapon {
93
94
  set missileSpeed(missileSpeed: number);
94
95
  }
95
96
  declare const enum UnitPropertyKey {
96
- IS_PAUSED = 100,
97
- STUN_COUNTER = 101,
98
- DELAY_HEALTH_CHECKS_COUNTER = 102,
99
- DELAY_HEALTH_CHECKS_HEALTH_BONUS = 103,
100
- PREVENT_DEATH_HEALTH_BONUS = 104,
101
- IS_TEAM_GLOW_HIDDEN = 105
97
+ SYNC_ID = 100,
98
+ IS_PAUSED = 101,
99
+ STUN_COUNTER = 102,
100
+ DELAY_HEALTH_CHECKS_COUNTER = 103,
101
+ DELAY_HEALTH_CHECKS_HEALTH_BONUS = 104,
102
+ PREVENT_DEATH_HEALTH_BONUS = 105,
103
+ IS_TEAM_GLOW_HIDDEN = 106
102
104
  }
105
+ export type UnitSyncId = number & {
106
+ readonly __unitSyncId: unique symbol;
107
+ };
103
108
  export declare class Unit extends Handle<junit> {
109
+ readonly syncId: UnitSyncId;
104
110
  private [UnitPropertyKey.IS_PAUSED]?;
105
111
  private [UnitPropertyKey.STUN_COUNTER]?;
106
112
  private [UnitPropertyKey.DELAY_HEALTH_CHECKS_COUNTER]?;
@@ -287,7 +293,7 @@ export declare class Unit extends Handle<junit> {
287
293
  static getInRange(x: number, y: number, range: number, predicate?: (unit: Unit) => boolean): Unit[];
288
294
  static getInCollisionRange(x: number, y: number, range: number, predicate?: (unit: Unit) => boolean): Unit[];
289
295
  static getInSector(pos: Vec2, range: number, offsetAngle: number, centralAngle: number): Unit[];
290
- static getSelectionOf(player: Player): Unit[];
296
+ static getSelectionOf(player: Player, target?: Unit[]): Unit[];
291
297
  static readonly deathEvent: UnitTriggerEvent<[Unit]>;
292
298
  static readonly onDecay: UnitTriggerEvent<[]>;
293
299
  static readonly onResurrect: InitializingEvent<[Unit], void>;
@@ -322,9 +328,17 @@ export declare class Unit extends Handle<junit> {
322
328
  static readonly autoAttackStartEvent: UnitTriggerEvent<[Unit]>;
323
329
  static readonly onDamaging: Event<[source: Unit | undefined, target: Unit, event: DamagingEvent]>;
324
330
  static readonly onDamage: InitializingEvent<[source: Unit | undefined, target: Unit, event: DamageEvent], jtrigger>;
325
- static onItemDrop: UnitTriggerEvent<[Item]>;
326
- static onItemPickup: UnitTriggerEvent<[Item]>;
327
- static onItemUse: UnitTriggerEvent<[Item]>;
331
+ static itemDroppedEvent: UnitTriggerEvent<[Item]>;
332
+ static itemPickedUpEvent: UnitTriggerEvent<[Item]>;
333
+ static itemUsedEvent: UnitTriggerEvent<[Item]>;
334
+ static itemStackedEvent: UnitTriggerEvent<[Item]>;
335
+ static get itemUseOrderEvent(): Event<[unit: Unit, item: Item]>;
336
+ static get itemMoveOrderEvent(): Event<[
337
+ unit: Unit,
338
+ item: Item,
339
+ slotFrom: 0 | 1 | 2 | 3 | 4 | 5,
340
+ slotTo: 0 | 1 | 2 | 3 | 4 | 5
341
+ ]>;
328
342
  static get onCreate(): EventDispatcher<[Unit], [Unit]>;
329
343
  static get destroyEvent(): EventDispatcher<[Unit], [Unit]>;
330
344
  getField(field: junitintegerfield | junitrealfield): number;
@@ -335,5 +349,6 @@ export declare class Unit extends Handle<junit> {
335
349
  setField(field: junitbooleanfield, value: boolean): boolean;
336
350
  setField(field: junitstringfield, value: string): boolean;
337
351
  toString(): string;
352
+ static getBySyncId(syncId: UnitSyncId): Unit | undefined;
338
353
  }
339
354
  export {};