warscript 0.0.1-dev.ec4cf89 → 0.0.1-dev.eda504c

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 (207) hide show
  1. package/attributes.d.ts +6 -0
  2. package/attributes.lua +17 -1
  3. package/config.d.ts +5 -0
  4. package/config.lua +10 -0
  5. package/core/types/effect.d.ts +14 -6
  6. package/core/types/effect.lua +131 -35
  7. package/core/types/frame.d.ts +6 -0
  8. package/core/types/frame.lua +115 -22
  9. package/core/types/player.lua +3 -1
  10. package/core/types/playerCamera.d.ts +2 -0
  11. package/core/types/playerCamera.lua +123 -5
  12. package/core/types/sound.d.ts +17 -24
  13. package/core/types/sound.lua +99 -24
  14. package/core/types/tileCell.d.ts +9 -0
  15. package/core/types/tileCell.lua +92 -0
  16. package/core/types/timer.d.ts +9 -8
  17. package/core/types/timer.lua +45 -23
  18. package/core/util.d.ts +1 -1
  19. package/core/util.lua +18 -1
  20. package/decl/native.d.ts +846 -790
  21. package/engine/behavior.d.ts +7 -2
  22. package/engine/behavior.lua +112 -33
  23. package/engine/behaviour/ability/always-enabled.d.ts +7 -0
  24. package/engine/behaviour/ability/always-enabled.lua +31 -0
  25. package/engine/behaviour/ability/apply-buff.d.ts +8 -5
  26. package/engine/behaviour/ability/apply-buff.lua +32 -0
  27. package/engine/behaviour/ability/apply-unit-behavior.lua +1 -0
  28. package/engine/behaviour/ability/damage.d.ts +9 -3
  29. package/engine/behaviour/ability/damage.lua +26 -38
  30. package/engine/behaviour/ability/emulate-impact.d.ts +6 -0
  31. package/engine/behaviour/ability/emulate-impact.lua +43 -0
  32. package/engine/behaviour/ability/instant-impact.d.ts +2 -2
  33. package/engine/behaviour/ability/instant-impact.lua +4 -19
  34. package/engine/behaviour/ability/on-command-impact.d.ts +8 -0
  35. package/engine/behaviour/ability/on-command-impact.lua +25 -0
  36. package/engine/behaviour/ability/remove-buffs.d.ts +16 -0
  37. package/engine/behaviour/ability/remove-buffs.lua +28 -0
  38. package/engine/behaviour/ability/restore-mana.d.ts +1 -1
  39. package/engine/behaviour/ability/restore-mana.lua +6 -6
  40. package/engine/behaviour/ability.d.ts +20 -4
  41. package/engine/behaviour/ability.lua +111 -47
  42. package/engine/behaviour/unit/stun-immunity.d.ts +7 -3
  43. package/engine/behaviour/unit/stun-immunity.lua +52 -27
  44. package/engine/behaviour/unit.d.ts +39 -0
  45. package/engine/behaviour/unit.lua +210 -4
  46. package/engine/buff.d.ts +85 -46
  47. package/engine/buff.lua +373 -229
  48. package/engine/internal/ability.d.ts +23 -14
  49. package/engine/internal/ability.lua +129 -85
  50. package/engine/internal/item/ability.lua +162 -4
  51. package/engine/internal/item+owner.lua +12 -6
  52. package/engine/internal/item.d.ts +20 -19
  53. package/engine/internal/item.lua +191 -74
  54. package/engine/internal/mechanics/ability-duration.lua +1 -1
  55. package/engine/internal/misc/ability-disable-counter.d.ts +2 -0
  56. package/engine/internal/misc/ability-disable-counter.lua +13 -0
  57. package/engine/internal/misc/damage-metadata-by-target.d.ts +2 -0
  58. package/engine/internal/misc/damage-metadata-by-target.lua +5 -0
  59. package/engine/internal/misc/frame-coordinates.d.ts +2 -0
  60. package/engine/internal/misc/frame-coordinates.lua +21 -0
  61. package/engine/internal/misc/get-terrain-z.d.ts +2 -0
  62. package/engine/internal/misc/get-terrain-z.lua +11 -0
  63. package/engine/internal/misc/player-local-handle.d.ts +2 -0
  64. package/engine/internal/misc/player-local-handle.lua +5 -0
  65. package/engine/internal/object-data/auto-attack-speed-increase.d.ts +1 -1
  66. package/engine/internal/object-data/auto-attack-speed-increase.lua +2 -0
  67. package/engine/internal/object-data/evasion-probability.d.ts +2 -0
  68. package/engine/internal/object-data/evasion-probability.lua +16 -0
  69. package/engine/internal/unit/ability.d.ts +45 -1
  70. package/engine/internal/unit/ability.lua +128 -17
  71. package/engine/internal/unit/add-item-to-slot-init.d.ts +2 -0
  72. package/engine/internal/unit/add-item-to-slot-init.lua +23 -0
  73. package/engine/internal/unit/add-item-to-slot.d.ts +2 -0
  74. package/engine/internal/unit/add-item-to-slot.lua +52 -0
  75. package/engine/internal/unit/allowed-targets.d.ts +1 -1
  76. package/engine/internal/unit/allowed-targets.lua +9 -1
  77. package/engine/internal/unit/bonus.d.ts +6 -2
  78. package/engine/internal/unit/bonus.lua +23 -1
  79. package/engine/internal/unit/ignore-events-items.d.ts +2 -0
  80. package/engine/internal/unit/ignore-events-items.lua +5 -0
  81. package/engine/internal/unit/item.d.ts +24 -0
  82. package/engine/internal/unit/item.lua +78 -0
  83. package/engine/internal/unit/main-selected.d.ts +13 -0
  84. package/engine/internal/unit/main-selected.lua +51 -0
  85. package/engine/internal/unit/order.d.ts +20 -0
  86. package/engine/internal/unit/order.lua +136 -0
  87. package/engine/internal/unit+ability.lua +12 -3
  88. package/engine/internal/unit+damage.d.ts +2 -11
  89. package/engine/internal/unit+damage.lua +10 -14
  90. package/engine/internal/unit+spellSteal.lua +1 -2
  91. package/engine/internal/unit-missile-launch.lua +60 -13
  92. package/engine/internal/unit.d.ts +58 -18
  93. package/engine/internal/unit.lua +399 -161
  94. package/engine/internal/utility.lua +12 -0
  95. package/engine/lightning.d.ts +12 -5
  96. package/engine/lightning.lua +48 -14
  97. package/engine/local-client.d.ts +7 -2
  98. package/engine/local-client.lua +82 -0
  99. package/engine/object-data/auxiliary/animation-name.d.ts +1 -0
  100. package/engine/object-data/auxiliary/animation-name.lua +16 -0
  101. package/engine/object-data/auxiliary/armor-type.d.ts +11 -0
  102. package/engine/object-data/auxiliary/armor-type.lua +46 -0
  103. package/engine/object-data/auxiliary/attachment-preset.d.ts +7 -2
  104. package/engine/object-data/auxiliary/attachment-preset.lua +4 -3
  105. package/engine/object-data/auxiliary/attack-type.d.ts +7 -8
  106. package/engine/object-data/auxiliary/attack-type.lua +42 -0
  107. package/engine/object-data/auxiliary/movement-type.d.ts +7 -7
  108. package/engine/object-data/auxiliary/movement-type.lua +22 -0
  109. package/engine/object-data/auxiliary/sound-eax.d.ts +10 -0
  110. package/engine/object-data/auxiliary/sound-eax.lua +2 -0
  111. package/engine/object-data/auxiliary/sound-preset-name.d.ts +5 -1
  112. package/engine/object-data/auxiliary/tech-tree-dependency.d.ts +1 -1
  113. package/engine/object-data/auxiliary/unit-attribute.d.ts +6 -0
  114. package/engine/object-data/auxiliary/unit-attribute.lua +9 -0
  115. package/engine/object-data/entry/ability-type/berserk.d.ts +2 -0
  116. package/engine/object-data/entry/ability-type/berserk.lua +13 -0
  117. package/engine/object-data/entry/ability-type/blank-configurable.lua +12 -1
  118. package/engine/object-data/entry/ability-type/carrion-swarm.d.ts +14 -0
  119. package/engine/object-data/entry/ability-type/carrion-swarm.lua +65 -0
  120. package/engine/object-data/entry/ability-type/disease-cloud.lua +2 -2
  121. package/engine/object-data/entry/ability-type/engineering-upgrade.lua +2 -2
  122. package/engine/object-data/entry/ability-type/ensnare.d.ts +12 -0
  123. package/engine/object-data/entry/ability-type/ensnare.lua +52 -0
  124. package/engine/object-data/entry/ability-type/feral-spirit.lua +2 -2
  125. package/engine/object-data/entry/ability-type/permanent-invisibility.d.ts +8 -0
  126. package/engine/object-data/entry/ability-type/permanent-invisibility.lua +26 -0
  127. package/engine/object-data/entry/ability-type/phase-shift.d.ts +10 -0
  128. package/engine/object-data/entry/ability-type/phase-shift.lua +39 -0
  129. package/engine/object-data/entry/ability-type/phoenix-morph.lua +4 -4
  130. package/engine/object-data/entry/ability-type/raise-dead.d.ts +17 -0
  131. package/engine/object-data/entry/ability-type/raise-dead.lua +78 -0
  132. package/engine/object-data/entry/ability-type/shock-wave.d.ts +4 -0
  133. package/engine/object-data/entry/ability-type/shock-wave.lua +26 -0
  134. package/engine/object-data/entry/ability-type/slow-poison.d.ts +10 -0
  135. package/engine/object-data/entry/ability-type/slow-poison.lua +58 -0
  136. package/engine/object-data/entry/ability-type/summon-quilbeast.lua +2 -2
  137. package/engine/object-data/entry/ability-type/summon-water-elemental.lua +2 -2
  138. package/engine/object-data/entry/ability-type/web.d.ts +12 -0
  139. package/engine/object-data/entry/ability-type/web.lua +52 -0
  140. package/engine/object-data/entry/ability-type.d.ts +19 -17
  141. package/engine/object-data/entry/ability-type.lua +93 -36
  142. package/engine/object-data/entry/buff-type/applicable.lua +18 -37
  143. package/engine/object-data/entry/buff-type.d.ts +6 -12
  144. package/engine/object-data/entry/buff-type.lua +13 -29
  145. package/engine/object-data/entry/destructible-type.d.ts +1 -1
  146. package/engine/object-data/entry/item-type.d.ts +15 -1
  147. package/engine/object-data/entry/item-type.lua +93 -2
  148. package/engine/object-data/entry/lightning-type.d.ts +1 -1
  149. package/engine/object-data/entry/sound-preset.d.ts +33 -0
  150. package/engine/object-data/entry/sound-preset.lua +140 -0
  151. package/engine/object-data/entry/unit-type.d.ts +21 -5
  152. package/engine/object-data/entry/unit-type.lua +214 -93
  153. package/engine/object-data/entry/upgrade.d.ts +1 -1
  154. package/engine/object-data/entry/upgrade.lua +4 -4
  155. package/engine/object-data/entry.d.ts +16 -14
  156. package/engine/object-data/entry.lua +60 -32
  157. package/engine/object-data/utility/object-data-entry-id-generator.lua +7 -0
  158. package/engine/object-field/ability.d.ts +28 -5
  159. package/engine/object-field/ability.lua +59 -5
  160. package/engine/object-field/unit.d.ts +57 -3
  161. package/engine/object-field/unit.lua +207 -7
  162. package/engine/object-field.d.ts +17 -6
  163. package/engine/object-field.lua +190 -90
  164. package/engine/random.d.ts +9 -0
  165. package/engine/random.lua +13 -0
  166. package/engine/standard/entries/buff-type.d.ts +3 -0
  167. package/engine/standard/entries/buff-type.lua +3 -0
  168. package/engine/standard/entries/sound-preset.d.ts +10 -0
  169. package/engine/standard/entries/sound-preset.lua +10 -0
  170. package/engine/standard/fields/ability.d.ts +2 -0
  171. package/engine/standard/fields/ability.lua +2 -0
  172. package/engine/standard/fields/unit.d.ts +4 -0
  173. package/engine/standard/fields/unit.lua +7 -0
  174. package/engine/text-tag.d.ts +36 -2
  175. package/engine/text-tag.lua +249 -10
  176. package/engine/unit.d.ts +4 -0
  177. package/engine/unit.lua +4 -0
  178. package/index.d.ts +1 -0
  179. package/index.lua +1 -0
  180. package/net/socket.d.ts +7 -1
  181. package/net/socket.lua +45 -4
  182. package/network.d.ts +1 -0
  183. package/network.lua +3 -2
  184. package/objutil/buff.lua +3 -4
  185. package/objutil/unit.lua +8 -0
  186. package/package.json +2 -2
  187. package/patch-lua.d.ts +0 -0
  188. package/patch-lua.lua +10 -0
  189. package/patch-lualib.lua +1 -1
  190. package/utility/arrays.d.ts +10 -1
  191. package/utility/arrays.lua +45 -3
  192. package/utility/callback-array.d.ts +17 -0
  193. package/utility/callback-array.lua +61 -0
  194. package/utility/functions.d.ts +8 -0
  195. package/utility/functions.lua +13 -0
  196. package/utility/lazy.d.ts +2 -0
  197. package/utility/lazy.lua +14 -0
  198. package/utility/linked-set.d.ts +12 -2
  199. package/utility/linked-set.lua +10 -3
  200. package/utility/lua-maps.d.ts +15 -2
  201. package/utility/lua-maps.lua +53 -2
  202. package/utility/lua-sets.d.ts +2 -0
  203. package/utility/lua-sets.lua +7 -0
  204. package/utility/reflection.lua +11 -7
  205. package/utility/types.d.ts +4 -0
  206. package/core/types/order.d.ts +0 -25
  207. package/core/types/order.lua +0 -55
package/attributes.d.ts CHANGED
@@ -1,12 +1,18 @@
1
1
  /** @noSelfInFile */
2
+ declare const marker: {};
2
3
  export type Attribute<T> = {
3
4
  readonly __attribute: unique symbol;
4
5
  readonly __type: T;
6
+ readonly __marker: typeof marker;
5
7
  } & symbol;
8
+ export declare const attribute: <T>() => Attribute<T>;
9
+ export declare const isAttribute: (value: unknown) => value is Attribute<unknown>;
6
10
  export declare namespace Attribute {
7
11
  const create: <T>() => Attribute<T>;
8
12
  }
9
13
  export declare class AttributesHolder {
10
14
  readonly get: (<T>(attribute: Attribute<T>) => T | undefined) & LuaExtension<"TableGetMethod">;
11
15
  readonly set: (<T>(attribute: Attribute<T>, value: T | undefined) => void) & LuaExtension<"TableSetMethod">;
16
+ getOrPut<T>(attribute: Attribute<T>, defaultValue: () => T): T;
12
17
  }
18
+ export {};
package/attributes.lua CHANGED
@@ -1,11 +1,18 @@
1
1
  local ____lualib = require("lualib_bundle")
2
2
  local __TS__Class = ____lualib.__TS__Class
3
3
  local ____exports = {}
4
+ local marker = {}
5
+ ____exports.attribute = function()
6
+ return {__marker = marker}
7
+ end
8
+ ____exports.isAttribute = function(value)
9
+ return type(value) == "table" and rawget(value, "__marker") == marker
10
+ end
4
11
  ____exports.Attribute = {}
5
12
  local Attribute = ____exports.Attribute
6
13
  do
7
14
  Attribute.create = function()
8
- return {}
15
+ return {__marker = marker}
9
16
  end
10
17
  end
11
18
  ____exports.AttributesHolder = __TS__Class()
@@ -13,4 +20,13 @@ local AttributesHolder = ____exports.AttributesHolder
13
20
  AttributesHolder.name = "AttributesHolder"
14
21
  function AttributesHolder.prototype.____constructor(self)
15
22
  end
23
+ function AttributesHolder.prototype.getOrPut(self, attribute, defaultValue)
24
+ local value = self[attribute]
25
+ if value ~= nil then
26
+ return value
27
+ end
28
+ value = defaultValue()
29
+ self[attribute] = value
30
+ return value
31
+ end
16
32
  return ____exports
package/config.d.ts ADDED
@@ -0,0 +1,5 @@
1
+ /** @noSelfInFile */
2
+ export declare class WarscriptConfig {
3
+ private constructor();
4
+ static AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH: boolean;
5
+ }
package/config.lua ADDED
@@ -0,0 +1,10 @@
1
+ local ____lualib = require("lualib_bundle")
2
+ local __TS__Class = ____lualib.__TS__Class
3
+ local ____exports = {}
4
+ ____exports.WarscriptConfig = __TS__Class()
5
+ local WarscriptConfig = ____exports.WarscriptConfig
6
+ WarscriptConfig.name = "WarscriptConfig"
7
+ function WarscriptConfig.prototype.____constructor(self)
8
+ end
9
+ WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH = true
10
+ return ____exports
@@ -4,15 +4,23 @@ import { Widget } from "./widget";
4
4
  import { PlayerColor } from "./playerColor";
5
5
  declare const enum EffectPropertyKey {
6
6
  COLOR = 100,
7
- PITCH = 101
7
+ PITCH = 101,
8
+ ROLL = 102
8
9
  }
9
10
  export type EffectParameters = {
11
+ readonly delay?: number;
10
12
  readonly scale?: number;
11
13
  readonly color?: PlayerColor;
14
+ readonly pitch?: number;
15
+ readonly roll?: number;
16
+ readonly detached?: boolean;
17
+ readonly zOffset?: number;
18
+ readonly scaleZOffset?: boolean;
12
19
  };
13
20
  export declare class Effect extends Handle<jeffect> {
14
21
  private [EffectPropertyKey.COLOR]?;
15
22
  private [EffectPropertyKey.PITCH]?;
23
+ private [EffectPropertyKey.ROLL]?;
16
24
  protected onDestroy(): HandleDestructor;
17
25
  get color(): PlayerColor;
18
26
  set color(color: PlayerColor);
@@ -20,12 +28,12 @@ export declare class Effect extends Handle<jeffect> {
20
28
  set scale(scale: number);
21
29
  get pitch(): number;
22
30
  set pitch(pitch: number);
23
- static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, pos: Vec2): T;
24
- static createTarget<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, target: Widget, attachPoint: string): T;
31
+ get roll(): number;
32
+ set roll(roll: number);
33
+ static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), modelPath: string, xOrWidget: number | Widget, yOrAttachmentPoint?: number | string, parameters?: EffectParameters): T;
25
34
  static flash(modelPath: string, ...args: [
26
- ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint: string],
27
- ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]
35
+ ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint?: string],
36
+ ...parametersOrDuration: [parametersOrDuration?: EffectParameters | number] | [duration?: number, parameters?: EffectParameters]
28
37
  ]): void;
29
- static flashTarget(model: string, target: Widget, attachPoint: string, duration?: number): void;
30
38
  }
31
39
  export {};
@@ -2,8 +2,9 @@ local ____lualib = require("lualib_bundle")
2
2
  local __TS__Class = ____lualib.__TS__Class
3
3
  local __TS__ClassExtends = ____lualib.__TS__ClassExtends
4
4
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
5
+ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
5
6
  local ____exports = {}
6
- local dummyPlayer
7
+ local dummyPlayer, addSpecialEffectInternal, flash
7
8
  local ____handle = require("core.types.handle")
8
9
  local Handle = ____handle.Handle
9
10
  local ____playerColor = require("core.types.playerColor")
@@ -12,6 +13,8 @@ local ____player = require("core.types.player")
12
13
  local Player = ____player.Player
13
14
  local ____timer = require("core.types.timer")
14
15
  local Timer = ____timer.Timer
16
+ local ____unit = require("engine.internal.unit")
17
+ local Unit = ____unit.Unit
15
18
  local ____pairs = _G.pairs
16
19
  local select = _G.select
17
20
  local mathRad = math.rad
@@ -22,10 +25,28 @@ local getSpecialEffectScale = BlzGetSpecialEffectScale
22
25
  local playSpecialEffect = BlzPlaySpecialEffect
23
26
  local setSpecialEffectScale = BlzSetSpecialEffectScale
24
27
  local setSpecialEffectPitch = BlzSetSpecialEffectPitch
28
+ local setSpecialEffectRoll = BlzSetSpecialEffectRoll
25
29
  local setSpecialEffectColorByPlayer = BlzSetSpecialEffectColorByPlayer
26
30
  local specialEffectAddSubAnimation = BlzSpecialEffectAddSubAnimation
27
31
  local specialEffectClearSubAnimations = BlzSpecialEffectClearSubAnimations
28
32
  local specialEffectRemoveSubAnimation = BlzSpecialEffectRemoveSubAnimation
33
+ local setSpecialEffectZ = BlzSetSpecialEffectZ
34
+ local getLocationZ = GetLocationZ
35
+ local getUnitZ = BlzGetUnitZ
36
+ local moveLocation = MoveLocation
37
+ local location = Location(0, 0)
38
+ local function setSpecialEffectPitchDegrees(effect, pitch)
39
+ setSpecialEffectPitch(
40
+ effect,
41
+ -mathRad(pitch)
42
+ )
43
+ end
44
+ local function setSpecialEffectRollDegrees(effect, roll)
45
+ setSpecialEffectRoll(
46
+ effect,
47
+ -mathRad(roll)
48
+ )
49
+ end
29
50
  local animTypeByAnimationName = {
30
51
  attack = ANIM_TYPE_ATTACK,
31
52
  birth = ANIM_TYPE_BIRTH,
@@ -97,11 +118,19 @@ local function setSpecialEffectColor(effect, color)
97
118
  setSpecialEffectColorByPlayer(effect, dummyPlayer.handle)
98
119
  dummyPlayer.color = dummyColor
99
120
  end
100
- local setters = {scale = setSpecialEffectScale, color = setSpecialEffectColor}
121
+ local setters = {scale = setSpecialEffectScale, color = setSpecialEffectColor, pitch = setSpecialEffectPitchDegrees, roll = setSpecialEffectRollDegrees}
122
+ local setterProperties = {"scale", "color", "pitch", "roll"}
101
123
  dummyPlayer = Player.neutralExtra
102
124
  local temporaryEffects = {}
103
125
  local temporaryEffectsDurations = {}
104
126
  local temporaryEffectsCount = 0
127
+ local delayedEffectsModelPath = {}
128
+ local delayedEffectsXOrWidget = {}
129
+ local delayedEffectsYOrAttachmentPoint = {}
130
+ local delayedEffectsDuration = {}
131
+ local delayedEffectsParameters = {}
132
+ local delayedEffectsDelay = {}
133
+ local delayedEffectsCount = 0
105
134
  local period = 1 / 32
106
135
  Timer.onPeriod[period]:addListener(function()
107
136
  local i = 1
@@ -110,12 +139,36 @@ Timer.onPeriod[period]:addListener(function()
110
139
  if duration <= 0 then
111
140
  destroyEffect(temporaryEffects[i])
112
141
  temporaryEffects[i] = temporaryEffects[temporaryEffectsCount]
142
+ temporaryEffectsDurations[i] = temporaryEffectsDurations[temporaryEffectsCount]
113
143
  temporaryEffectsCount = temporaryEffectsCount - 1
114
144
  else
115
145
  temporaryEffectsDurations[i] = duration - period
116
146
  i = i + 1
117
147
  end
118
148
  end
149
+ i = 1
150
+ while i <= delayedEffectsCount do
151
+ local delay = delayedEffectsDelay[i]
152
+ if delay <= 0 then
153
+ flash(
154
+ delayedEffectsModelPath[i],
155
+ delayedEffectsXOrWidget[i],
156
+ delayedEffectsYOrAttachmentPoint[i],
157
+ delayedEffectsDuration[i],
158
+ delayedEffectsParameters[i]
159
+ )
160
+ delayedEffectsModelPath[i] = delayedEffectsModelPath[delayedEffectsCount]
161
+ delayedEffectsXOrWidget[i] = delayedEffectsXOrWidget[delayedEffectsCount]
162
+ delayedEffectsYOrAttachmentPoint[i] = delayedEffectsYOrAttachmentPoint[delayedEffectsCount]
163
+ delayedEffectsDuration[i] = delayedEffectsDuration[delayedEffectsCount]
164
+ delayedEffectsParameters[i] = delayedEffectsParameters[delayedEffectsCount]
165
+ delayedEffectsDelay[i] = delayedEffectsDelay[delayedEffectsCount]
166
+ delayedEffectsCount = delayedEffectsCount - 1
167
+ else
168
+ delayedEffectsDelay[i] = delay - period
169
+ i = i + 1
170
+ end
171
+ end
119
172
  end)
120
173
  ____exports.Effect = __TS__Class()
121
174
  local Effect = ____exports.Effect
@@ -125,49 +178,44 @@ function Effect.prototype.onDestroy(self)
125
178
  destroyEffect(self.handle)
126
179
  return Handle.prototype.onDestroy(self)
127
180
  end
128
- function Effect.create(self, model, pos)
129
- return self:of(addSpecialEffect(model, pos.x, pos.y))
130
- end
131
- function Effect.createTarget(self, model, target, attachPoint)
132
- return self:of(addSpecialEffectTarget(model, target.handle, attachPoint))
181
+ function Effect.create(self, modelPath, xOrWidget, yOrAttachmentPoint, parameters)
182
+ local effect = self:of(addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters))
183
+ if parameters ~= nil then
184
+ effect[100] = parameters.color
185
+ effect[101] = parameters.pitch
186
+ effect[102] = parameters.roll
187
+ end
188
+ return effect
133
189
  end
134
190
  function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, parametersOrDuration, parameters)
135
191
  if type(parametersOrDuration) ~= "number" then
136
192
  parameters = parametersOrDuration
137
193
  parametersOrDuration = nil
138
194
  end
139
- local effect = type(xOrWidget) == "number" and addSpecialEffect(modelPath, xOrWidget, yOrOrAttachmentPoint) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint)
140
- if parameters ~= nil then
141
- for key, value in ____pairs(parameters) do
142
- setters[key](effect, value)
143
- end
144
- end
145
- if parametersOrDuration ~= nil and parametersOrDuration > 0 then
146
- temporaryEffectsCount = temporaryEffectsCount + 1
147
- temporaryEffects[temporaryEffectsCount] = effect
148
- temporaryEffectsDurations[temporaryEffectsCount] = parametersOrDuration
195
+ if parameters and (parameters.delay or 0) > 0 then
196
+ delayedEffectsCount = delayedEffectsCount + 1
197
+ delayedEffectsModelPath[delayedEffectsCount] = modelPath
198
+ delayedEffectsXOrWidget[delayedEffectsCount] = xOrWidget
199
+ delayedEffectsYOrAttachmentPoint[delayedEffectsCount] = yOrOrAttachmentPoint
200
+ delayedEffectsDuration[delayedEffectsCount] = parametersOrDuration
201
+ delayedEffectsParameters[delayedEffectsCount] = parameters
202
+ delayedEffectsDelay[delayedEffectsCount] = parameters.delay
149
203
  return
150
204
  end
151
- destroyEffect(effect)
152
- end
153
- function Effect.flashTarget(self, model, target, attachPoint, duration)
154
- local effect = addSpecialEffectTarget(model, target.handle, attachPoint)
155
- if effect ~= nil then
156
- if duration and duration > 0 then
157
- temporaryEffectsCount = temporaryEffectsCount + 1
158
- temporaryEffects[temporaryEffectsCount] = effect
159
- temporaryEffectsDurations[temporaryEffectsCount] = duration
160
- else
161
- destroyEffect(effect)
162
- end
163
- end
205
+ flash(
206
+ modelPath,
207
+ xOrWidget,
208
+ yOrOrAttachmentPoint,
209
+ parametersOrDuration,
210
+ parameters
211
+ )
164
212
  end
165
213
  __TS__SetDescriptor(
166
214
  Effect.prototype,
167
215
  "color",
168
216
  {
169
217
  get = function(self)
170
- return self[100] or PlayerColor.black
218
+ return self[100] or PlayerColor.red
171
219
  end,
172
220
  set = function(self, color)
173
221
  setSpecialEffectColor(self.handle, color)
@@ -197,13 +245,61 @@ __TS__SetDescriptor(
197
245
  return self[101] or 0
198
246
  end,
199
247
  set = function(self, pitch)
200
- setSpecialEffectPitch(
201
- self.handle,
202
- -mathRad(pitch)
203
- )
248
+ setSpecialEffectPitchDegrees(self.handle, pitch)
204
249
  self[101] = pitch
205
250
  end
206
251
  },
207
252
  true
208
253
  )
254
+ __TS__SetDescriptor(
255
+ Effect.prototype,
256
+ "roll",
257
+ {
258
+ get = function(self)
259
+ return self[102] or 0
260
+ end,
261
+ set = function(self, roll)
262
+ setSpecialEffectRollDegrees(self.handle, roll)
263
+ self[102] = roll
264
+ end
265
+ },
266
+ true
267
+ )
268
+ addSpecialEffectInternal = function(modelPath, xOrWidget, yOrAttachmentPoint, parameters)
269
+ local coordinatesProvided = type(xOrWidget) == "number"
270
+ local isPositional = coordinatesProvided or (parameters and parameters.detached) == true
271
+ local x = not isPositional and 0 or (coordinatesProvided and xOrWidget or xOrWidget.x)
272
+ local y = not isPositional and 0 or (coordinatesProvided and yOrAttachmentPoint or xOrWidget.y)
273
+ local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrAttachmentPoint or "origin")
274
+ if parameters ~= nil then
275
+ if isPositional and parameters.scale == nil and __TS__InstanceOf(xOrWidget, Unit) then
276
+ setSpecialEffectScale(effect, xOrWidget.scale)
277
+ end
278
+ for ____, property in ipairs(setterProperties) do
279
+ local value = parameters[property]
280
+ if value ~= nil then
281
+ setters[property](effect, value)
282
+ end
283
+ end
284
+ if isPositional and parameters.zOffset ~= nil then
285
+ moveLocation(location, x, y)
286
+ local z = __TS__InstanceOf(xOrWidget, Unit) and getLocationZ(location) + xOrWidget.flyHeight or getLocationZ(location)
287
+ setSpecialEffectZ(
288
+ effect,
289
+ z + parameters.zOffset * (parameters.scaleZOffset and getSpecialEffectScale(effect) or 1)
290
+ )
291
+ end
292
+ end
293
+ return effect
294
+ end
295
+ flash = function(modelPath, xOrWidget, yOrAttachmentPoint, duration, parameters)
296
+ local effect = addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters)
297
+ if duration ~= nil and duration > 0 then
298
+ temporaryEffectsCount = temporaryEffectsCount + 1
299
+ temporaryEffects[temporaryEffectsCount] = effect
300
+ temporaryEffectsDurations[temporaryEffectsCount] = duration
301
+ return
302
+ end
303
+ destroyEffect(effect)
304
+ end
209
305
  return ____exports
@@ -25,11 +25,14 @@ export declare class Frame extends Handle<jframehandle> {
25
25
  static readonly GAME_UI: Frame;
26
26
  static readonly CONSOLE_UI: Frame;
27
27
  static readonly CONSOLE_UI_BACKDROP: Frame;
28
+ private static readonly CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD;
28
29
  static readonly CONSOLE_TOP_BAR: Frame;
29
30
  static readonly CONSOLE_BOTTOM_BAR: Frame;
30
31
  static readonly WORLD: Frame;
31
32
  static readonly CHAT: Frame;
32
33
  static readonly TIME_OF_DAY_CLOCK: Frame;
34
+ private static readonly SIMPLE_FRAME_TEST_CHILD;
35
+ static get uiScale(): number;
33
36
  static get leftBorder(): Frame;
34
37
  static get rightBorder(): Frame;
35
38
  static get minX(): number;
@@ -77,6 +80,8 @@ export declare class Frame extends Handle<jframehandle> {
77
80
  get onMouseLeave(): FrameEvent;
78
81
  get onMouseUp(): FrameEvent;
79
82
  get onMouseWheel(): FrameEvent<[number]>;
83
+ get mouseEnterLocalEvent(): Event;
84
+ get mouseLeaveLocalEvent(): Event;
80
85
  get popupMenuItemChangeEvent(): FrameEvent<[
81
86
  popupMenu: Frame,
82
87
  previousValue: number,
@@ -106,6 +111,7 @@ export declare class Frame extends Handle<jframehandle> {
106
111
  enable(): void;
107
112
  addText(text: string): void;
108
113
  clearAllPoints(): void;
114
+ get children(): Frame[];
109
115
  getChild(index: number): Frame;
110
116
  getChildrenCount(): number;
111
117
  setSize(width: number, height: number): void;
@@ -15,13 +15,20 @@ local Event = ____event.Event
15
15
  local TriggerEvent = ____event.TriggerEvent
16
16
  local ____timer = require("core.types.timer")
17
17
  local Timer = ____timer.Timer
18
+ local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates")
19
+ local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
20
+ local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
21
+ local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
22
+ local ____playerCamera = require("core.types.playerCamera")
23
+ local frameCoordinatesToWorld = ____playerCamera.frameCoordinatesToWorld
24
+ local worldCoordinatesToFrame = ____playerCamera.worldCoordinatesToFrame
25
+ local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
26
+ local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
18
27
  local frameClick = BlzFrameClick
19
28
  local frameGetEnable = BlzFrameGetEnable
20
29
  local frameIsVisible = BlzFrameIsVisible
21
30
  local frameSetEnable = BlzFrameSetEnable
22
31
  local frameSetScale = BlzFrameSetScale
23
- local getCameraTargetPositionX = GetCameraTargetPositionX
24
- local getCameraTargetPositionY = GetCameraTargetPositionY
25
32
  local ____rawget = _G.rawget
26
33
  local rawset = _G.rawset
27
34
  local invoke = Event.invoke
@@ -62,8 +69,10 @@ local function updateBorders()
62
69
  local width4by3 = (w - h / 600 * 800) / 2
63
70
  local pxtodpi = 0.6 / h
64
71
  BlzFrameSetAbsPoint(leftBorder, FRAMEPOINT_TOPLEFT, -width4by3 * pxtodpi, 0.6)
72
+ BlzFrameSetScale(leftBorder, 1)
65
73
  BlzFrameSetSize(leftBorder, 0.001, 0.6)
66
74
  BlzFrameSetAbsPoint(rightBorder, FRAMEPOINT_TOPRIGHT, (-width4by3 + w) * pxtodpi, 0.6)
75
+ BlzFrameSetScale(rightBorder, 1)
67
76
  BlzFrameSetSize(rightBorder, 0.001, 0.6)
68
77
  end
69
78
  local worldFrame = BlzGetOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0)
@@ -120,6 +129,7 @@ do
120
129
  FramePoint.BOTTOM = FRAMEPOINT_BOTTOM
121
130
  FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
122
131
  end
132
+ local tooltipByFrame = setmetatable({}, {__mode = "k"})
123
133
  ____exports.Frame = __TS__Class()
124
134
  local Frame = ____exports.Frame
125
135
  Frame.name = "Frame"
@@ -240,6 +250,7 @@ function Frame.prototype.setTextColor(self, color)
240
250
  end
241
251
  function Frame.prototype.setTooltip(self, tooltip)
242
252
  BlzFrameSetTooltip(self.handle, tooltip.handle)
253
+ tooltipByFrame[self] = tooltip
243
254
  end
244
255
  function Frame.prototype.setMinMaxValue(self, minValue, maxValue)
245
256
  BlzFrameSetMinMaxValue(self.handle, minValue, maxValue)
@@ -267,7 +278,16 @@ function Frame.createSimple(self, name, parent, createContext)
267
278
  ))
268
279
  end
269
280
  function Frame.create(self, name, parent, priority, createContext)
270
- return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
281
+ if parent == ____exports.Frame.CONSOLE_UI_BACKDROP then
282
+ local helper = ____exports.Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD.handle
283
+ BlzFrameSetScale(helper, 1)
284
+ local frame = BlzCreateFrame(name, helper, priority or 0, createContext or 0)
285
+ BlzFrameSetScale(helper, ____exports.Frame.uiScale)
286
+ BlzFrameSetParent(frame, ____exports.Frame.CONSOLE_UI_BACKDROP.handle)
287
+ return self:of(frame)
288
+ else
289
+ return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
290
+ end
271
291
  end
272
292
  function Frame.createByType(self, typeName, name, parent, inherits, createContext)
273
293
  return self:of(BlzCreateFrameByType(
@@ -293,11 +313,20 @@ end
293
313
  Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
294
314
  Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)
295
315
  Frame.CONSOLE_UI_BACKDROP = ____exports.Frame:byName("ConsoleUIBackdrop")
316
+ Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD = ____exports.Frame:createByType("FRAME", "ConsoleUIBackdropUIScaleHelperChild", ____exports.Frame.CONSOLE_UI_BACKDROP)
296
317
  Frame.CONSOLE_TOP_BAR = ____exports.Frame:byName("ConsoleTopBar")
297
318
  Frame.CONSOLE_BOTTOM_BAR = ____exports.Frame:byName("ConsoleBottomBar")
298
319
  Frame.WORLD = ____exports.Frame:byOrigin(ORIGIN_FRAME_WORLD_FRAME)
299
320
  Frame.CHAT = ____exports.Frame:byOrigin(ORIGIN_FRAME_CHAT_MSG)
300
321
  Frame.TIME_OF_DAY_CLOCK = ____exports.Frame.GAME_UI:getChild(5):getChild(0)
322
+ Frame.SIMPLE_FRAME_TEST_CHILD = ____exports.Frame:createByType("SIMPLEFRAME", "SimpleFrameTestParent", ____exports.Frame.CONSOLE_UI)
323
+ __TS__ObjectDefineProperty(
324
+ Frame,
325
+ "uiScale",
326
+ {get = function(self)
327
+ return ____exports.Frame.CONSOLE_BOTTOM_BAR.width / 0.8
328
+ end}
329
+ )
301
330
  __TS__ObjectDefineProperty(
302
331
  Frame,
303
332
  "leftBorder",
@@ -322,27 +351,21 @@ __TS__ObjectDefineProperty(
322
351
  Frame,
323
352
  "minX",
324
353
  {get = function(self)
325
- local w = BlzGetLocalClientWidth()
326
- local h = BlzGetLocalClientHeight()
327
- local width4by3 = (w - h / 600 * 800) / 2
328
- local pxtodpi = 0.6 / h
329
- return -width4by3 * pxtodpi
354
+ local minX = getFrameMinXMaxX()
355
+ return minX
330
356
  end}
331
357
  )
332
358
  __TS__ObjectDefineProperty(
333
359
  Frame,
334
360
  "maxX",
335
361
  {get = function(self)
336
- local w = BlzGetLocalClientWidth()
337
- local h = BlzGetLocalClientHeight()
338
- local width4by3 = (w - h / 600 * 800) / 2
339
- local pxtodpi = 0.6 / h
340
- return (-width4by3 + w) * pxtodpi
362
+ local ____, maxX = getFrameMinXMaxX()
363
+ return maxX
341
364
  end}
342
365
  )
343
366
  Frame.centerX = 0.4
344
- Frame.minY = 0
345
- Frame.maxY = 0.6
367
+ Frame.minY = FRAME_MIN_Y
368
+ Frame.maxY = FRAME_MAX_Y
346
369
  Frame.centerY = 0.3
347
370
  __TS__SetDescriptor(
348
371
  Frame.prototype,
@@ -599,6 +622,62 @@ __TS__SetDescriptor(
599
622
  end},
600
623
  true
601
624
  )
625
+ __TS__SetDescriptor(
626
+ Frame.prototype,
627
+ "mouseEnterLocalEvent",
628
+ {get = function(self)
629
+ local event = __TS__New(Event)
630
+ if not (tooltipByFrame[self] ~= nil) then
631
+ ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
632
+ local tooltip = ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent == self and ____exports.Frame:createByType("SIMPLEFRAME", "", ____exports.Frame.CONSOLE_UI) or ____exports.Frame:createByType("FRAME", "", ____exports.Frame.GAME_UI)
633
+ ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
634
+ self:setTooltip(tooltip)
635
+ end
636
+ local isMouseInside = false
637
+ Timer.onPeriod[1 / 64]:addListener(function()
638
+ local tooltip = tooltipByFrame[self]
639
+ if tooltip and tooltip.visible then
640
+ if not isMouseInside then
641
+ isMouseInside = true
642
+ Event.invoke(event)
643
+ end
644
+ else
645
+ isMouseInside = false
646
+ end
647
+ end)
648
+ rawset(self, "mouseEnterLocalEvent", event)
649
+ return event
650
+ end},
651
+ true
652
+ )
653
+ __TS__SetDescriptor(
654
+ Frame.prototype,
655
+ "mouseLeaveLocalEvent",
656
+ {get = function(self)
657
+ local event = __TS__New(Event)
658
+ if not (tooltipByFrame[self] ~= nil) then
659
+ ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
660
+ local tooltip = ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent == self and ____exports.Frame:createByType("SIMPLEFRAME", "", ____exports.Frame.CONSOLE_UI) or ____exports.Frame:createByType("FRAME", "", ____exports.Frame.GAME_UI)
661
+ ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
662
+ self:setTooltip(tooltip)
663
+ end
664
+ local isMouseInside = false
665
+ Timer.onPeriod[1 / 64]:addListener(function()
666
+ local tooltip = tooltipByFrame[self]
667
+ if tooltip and tooltip.visible then
668
+ isMouseInside = true
669
+ else
670
+ if isMouseInside then
671
+ isMouseInside = false
672
+ Event.invoke(event)
673
+ end
674
+ end
675
+ end)
676
+ rawset(self, "mouseLeaveLocalEvent", event)
677
+ return event
678
+ end},
679
+ true
680
+ )
602
681
  __TS__SetDescriptor(
603
682
  Frame.prototype,
604
683
  "popupMenuItemChangeEvent",
@@ -701,6 +780,18 @@ __TS__SetDescriptor(
701
780
  end},
702
781
  true
703
782
  )
783
+ __TS__SetDescriptor(
784
+ Frame.prototype,
785
+ "children",
786
+ {get = function(self)
787
+ local children = {}
788
+ for i = 0, self:getChildrenCount() - 1 do
789
+ children[i + 1] = self:getChild(i)
790
+ end
791
+ return children
792
+ end},
793
+ true
794
+ )
704
795
  __TS__ObjectDefineProperty(
705
796
  Frame,
706
797
  "onKeyPress",
@@ -848,16 +939,19 @@ __TS__ObjectDefineProperty(
848
939
  local event = __TS__New(Event)
849
940
  local syncX = 0
850
941
  local syncY = 0
851
- local syncCamX = getCameraTargetPositionX()
852
- local syncCamY = getCameraTargetPositionY()
942
+ local syncFrameX = 0
943
+ local syncFrameY = 0
853
944
  local lastX = syncX
854
945
  local lastY = syncY
855
946
  self.onMouseMove:addListener(function(player, x, y)
856
947
  if player.isLocal then
857
948
  syncX = x
858
949
  syncY = y
859
- syncCamX = getCameraTargetPositionX()
860
- syncCamY = getCameraTargetPositionY()
950
+ syncFrameX, syncFrameY = worldCoordinatesToFrame(
951
+ x,
952
+ y,
953
+ getTerrainZ(x, y)
954
+ )
861
955
  lastX = x
862
956
  lastY = y
863
957
  invoke(event, x, y)
@@ -867,9 +961,8 @@ __TS__ObjectDefineProperty(
867
961
  if syncX == 0 and syncY == 0 then
868
962
  return
869
963
  end
870
- local x = syncX + (getCameraTargetPositionX() - syncCamX)
871
- local y = syncY + (getCameraTargetPositionY() - syncCamY)
872
- if x ~= lastX or y ~= lastY then
964
+ local x, y, ____, isDefinite = frameCoordinatesToWorld(syncFrameX, syncFrameY)
965
+ if isDefinite and (x ~= lastX or y ~= lastY) then
873
966
  lastX = x
874
967
  lastY = y
875
968
  invoke(event, x, y)
@@ -21,6 +21,8 @@ local ____exception = require("exception")
21
21
  local IllegalStateException = ____exception.IllegalStateException
22
22
  local ____math = require("math")
23
23
  local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
24
+ local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
25
+ local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
24
26
  local getPlayerColor = GetPlayerColor
25
27
  local getPlayerName = GetPlayerName
26
28
  local getPlayerTechCount = GetPlayerTechCount
@@ -249,7 +251,7 @@ Player.all = (function()
249
251
  end
250
252
  return all
251
253
  end)()
252
- Player["local"] = ____exports.Player:of(GetLocalPlayer())
254
+ Player["local"] = ____exports.Player:of(PLAYER_LOCAL_HANDLE)
253
255
  Player.neutralPassive = ____exports.Player.all[PLAYER_NEUTRAL_PASSIVE + 1]
254
256
  Player.neutralAggressive = ____exports.Player.all[PLAYER_NEUTRAL_AGGRESSIVE + 1]
255
257
  Player.neutralVictim = ____exports.Player.all[bj_PLAYER_NEUTRAL_VICTIM + 1]
@@ -1,4 +1,5 @@
1
1
  /** @noSelfInFile */
2
+ import type { Unit } from "../../engine/internal/unit";
2
3
  export declare class PlayerCamera {
3
4
  private readonly player;
4
5
  private readonly isLocal;
@@ -28,5 +29,6 @@ export declare class PlayerCamera {
28
29
  get roll(): number;
29
30
  set roll(v: number);
30
31
  reset(): void;
32
+ static isUnitInView(unit: Unit): boolean;
31
33
  static of(player: jplayer): PlayerCamera;
32
34
  }