warscript 0.0.1-dev.d1328b7 → 0.0.1-dev.d1983c6

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 (187) hide show
  1. package/attributes.d.ts +5 -0
  2. package/attributes.lua +8 -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 +3 -0
  8. package/core/types/frame.lua +69 -12
  9. package/core/types/player.lua +3 -1
  10. package/core/types/playerCamera.d.ts +2 -0
  11. package/core/types/playerCamera.lua +79 -5
  12. package/core/types/sound.d.ts +17 -24
  13. package/core/types/sound.lua +99 -24
  14. package/core/types/timer.d.ts +8 -8
  15. package/core/types/timer.lua +25 -23
  16. package/core/util.d.ts +1 -1
  17. package/core/util.lua +12 -1
  18. package/decl/native.d.ts +844 -788
  19. package/engine/behavior.d.ts +2 -0
  20. package/engine/behavior.lua +53 -27
  21. package/engine/behaviour/ability/always-enabled.d.ts +7 -0
  22. package/engine/behaviour/ability/always-enabled.lua +31 -0
  23. package/engine/behaviour/ability/apply-buff.d.ts +5 -0
  24. package/engine/behaviour/ability/apply-buff.lua +32 -0
  25. package/engine/behaviour/ability/apply-unit-behavior.lua +1 -0
  26. package/engine/behaviour/ability/damage.d.ts +9 -3
  27. package/engine/behaviour/ability/damage.lua +26 -38
  28. package/engine/behaviour/ability/emulate-impact.d.ts +6 -0
  29. package/engine/behaviour/ability/emulate-impact.lua +43 -0
  30. package/engine/behaviour/ability/instant-impact.d.ts +2 -2
  31. package/engine/behaviour/ability/instant-impact.lua +4 -19
  32. package/engine/behaviour/ability/on-command-impact.d.ts +8 -0
  33. package/engine/behaviour/ability/on-command-impact.lua +25 -0
  34. package/engine/behaviour/ability/remove-buffs.d.ts +16 -0
  35. package/engine/behaviour/ability/remove-buffs.lua +28 -0
  36. package/engine/behaviour/ability/restore-mana.d.ts +1 -1
  37. package/engine/behaviour/ability/restore-mana.lua +6 -6
  38. package/engine/behaviour/ability.d.ts +20 -4
  39. package/engine/behaviour/ability.lua +111 -47
  40. package/engine/behaviour/unit/stun-immunity.d.ts +5 -3
  41. package/engine/behaviour/unit/stun-immunity.lua +43 -27
  42. package/engine/behaviour/unit.d.ts +28 -0
  43. package/engine/behaviour/unit.lua +163 -4
  44. package/engine/buff.d.ts +63 -42
  45. package/engine/buff.lua +318 -234
  46. package/engine/internal/ability.d.ts +17 -2
  47. package/engine/internal/ability.lua +100 -4
  48. package/engine/internal/item/ability.lua +162 -4
  49. package/engine/internal/item.d.ts +7 -4
  50. package/engine/internal/item.lua +131 -28
  51. package/engine/internal/mechanics/ability-duration.lua +1 -1
  52. package/engine/internal/misc/ability-disable-counter.d.ts +2 -0
  53. package/engine/internal/misc/ability-disable-counter.lua +13 -0
  54. package/engine/internal/misc/damage-metadata-by-target.d.ts +2 -0
  55. package/engine/internal/misc/damage-metadata-by-target.lua +5 -0
  56. package/engine/internal/misc/frame-coordinates.d.ts +2 -0
  57. package/engine/internal/misc/frame-coordinates.lua +21 -0
  58. package/engine/internal/misc/get-terrain-z.d.ts +2 -0
  59. package/engine/internal/misc/get-terrain-z.lua +11 -0
  60. package/engine/internal/misc/player-local-handle.d.ts +2 -0
  61. package/engine/internal/misc/player-local-handle.lua +5 -0
  62. package/engine/internal/object-data/auto-attack-speed-increase.d.ts +1 -1
  63. package/engine/internal/object-data/auto-attack-speed-increase.lua +2 -0
  64. package/engine/internal/object-data/evasion-probability.d.ts +2 -0
  65. package/engine/internal/object-data/evasion-probability.lua +16 -0
  66. package/engine/internal/unit/ability.d.ts +45 -1
  67. package/engine/internal/unit/ability.lua +98 -14
  68. package/engine/internal/unit/add-item-to-slot-init.d.ts +2 -0
  69. package/engine/internal/unit/add-item-to-slot-init.lua +23 -0
  70. package/engine/internal/unit/add-item-to-slot.d.ts +2 -0
  71. package/engine/internal/unit/add-item-to-slot.lua +52 -0
  72. package/engine/internal/unit/allowed-targets.d.ts +1 -1
  73. package/engine/internal/unit/allowed-targets.lua +9 -1
  74. package/engine/internal/unit/bonus.d.ts +2 -0
  75. package/engine/internal/unit/bonus.lua +17 -0
  76. package/engine/internal/unit/ignore-events-items.d.ts +2 -0
  77. package/engine/internal/unit/ignore-events-items.lua +5 -0
  78. package/engine/internal/unit/item.d.ts +1 -0
  79. package/engine/internal/unit/item.lua +8 -4
  80. package/engine/internal/unit/main-selected.d.ts +6 -0
  81. package/engine/internal/unit/main-selected.lua +12 -1
  82. package/engine/internal/unit/order.d.ts +20 -0
  83. package/engine/internal/unit/order.lua +136 -0
  84. package/engine/internal/unit+damage.d.ts +2 -11
  85. package/engine/internal/unit+damage.lua +10 -14
  86. package/engine/internal/unit+spellSteal.lua +1 -2
  87. package/engine/internal/unit-missile-launch.lua +9 -2
  88. package/engine/internal/unit.d.ts +37 -7
  89. package/engine/internal/unit.lua +324 -116
  90. package/engine/internal/utility.lua +12 -0
  91. package/engine/lightning.d.ts +12 -5
  92. package/engine/lightning.lua +48 -14
  93. package/engine/object-data/auxiliary/animation-name.d.ts +1 -0
  94. package/engine/object-data/auxiliary/animation-name.lua +16 -0
  95. package/engine/object-data/auxiliary/armor-type.d.ts +11 -0
  96. package/engine/object-data/auxiliary/armor-type.lua +46 -0
  97. package/engine/object-data/auxiliary/attachment-preset.d.ts +7 -2
  98. package/engine/object-data/auxiliary/attachment-preset.lua +4 -3
  99. package/engine/object-data/auxiliary/attack-type.d.ts +7 -8
  100. package/engine/object-data/auxiliary/attack-type.lua +42 -0
  101. package/engine/object-data/auxiliary/movement-type.d.ts +7 -7
  102. package/engine/object-data/auxiliary/movement-type.lua +22 -0
  103. package/engine/object-data/auxiliary/sound-eax.d.ts +10 -0
  104. package/engine/object-data/auxiliary/sound-eax.lua +2 -0
  105. package/engine/object-data/auxiliary/sound-preset-name.d.ts +5 -1
  106. package/engine/object-data/auxiliary/tech-tree-dependency.d.ts +1 -1
  107. package/engine/object-data/auxiliary/unit-attribute.d.ts +6 -0
  108. package/engine/object-data/auxiliary/unit-attribute.lua +9 -0
  109. package/engine/object-data/entry/ability-type/berserk.d.ts +2 -0
  110. package/engine/object-data/entry/ability-type/berserk.lua +13 -0
  111. package/engine/object-data/entry/ability-type/blank-configurable.lua +12 -1
  112. package/engine/object-data/entry/ability-type/carrion-swarm.d.ts +14 -0
  113. package/engine/object-data/entry/ability-type/carrion-swarm.lua +65 -0
  114. package/engine/object-data/entry/ability-type/disease-cloud.lua +2 -2
  115. package/engine/object-data/entry/ability-type/engineering-upgrade.lua +2 -2
  116. package/engine/object-data/entry/ability-type/ensnare.d.ts +12 -0
  117. package/engine/object-data/entry/ability-type/ensnare.lua +52 -0
  118. package/engine/object-data/entry/ability-type/feral-spirit.lua +2 -2
  119. package/engine/object-data/entry/ability-type/permanent-invisibility.d.ts +8 -0
  120. package/engine/object-data/entry/ability-type/permanent-invisibility.lua +26 -0
  121. package/engine/object-data/entry/ability-type/phase-shift.d.ts +10 -0
  122. package/engine/object-data/entry/ability-type/phase-shift.lua +39 -0
  123. package/engine/object-data/entry/ability-type/phoenix-morph.lua +4 -4
  124. package/engine/object-data/entry/ability-type/raise-dead.d.ts +17 -0
  125. package/engine/object-data/entry/ability-type/raise-dead.lua +78 -0
  126. package/engine/object-data/entry/ability-type/shock-wave.d.ts +4 -0
  127. package/engine/object-data/entry/ability-type/shock-wave.lua +26 -0
  128. package/engine/object-data/entry/ability-type/slow-poison.d.ts +10 -0
  129. package/engine/object-data/entry/ability-type/slow-poison.lua +58 -0
  130. package/engine/object-data/entry/ability-type/summon-quilbeast.lua +2 -2
  131. package/engine/object-data/entry/ability-type/summon-water-elemental.lua +2 -2
  132. package/engine/object-data/entry/ability-type/web.d.ts +12 -0
  133. package/engine/object-data/entry/ability-type/web.lua +52 -0
  134. package/engine/object-data/entry/ability-type.d.ts +19 -17
  135. package/engine/object-data/entry/ability-type.lua +90 -36
  136. package/engine/object-data/entry/buff-type/applicable.lua +18 -37
  137. package/engine/object-data/entry/buff-type.d.ts +6 -12
  138. package/engine/object-data/entry/buff-type.lua +13 -29
  139. package/engine/object-data/entry/destructible-type.d.ts +1 -1
  140. package/engine/object-data/entry/item-type.d.ts +3 -1
  141. package/engine/object-data/entry/item-type.lua +15 -2
  142. package/engine/object-data/entry/lightning-type.d.ts +1 -1
  143. package/engine/object-data/entry/sound-preset.d.ts +33 -0
  144. package/engine/object-data/entry/sound-preset.lua +140 -0
  145. package/engine/object-data/entry/unit-type.d.ts +21 -5
  146. package/engine/object-data/entry/unit-type.lua +214 -93
  147. package/engine/object-data/entry/upgrade.d.ts +1 -1
  148. package/engine/object-data/entry/upgrade.lua +4 -4
  149. package/engine/object-data/entry.d.ts +16 -14
  150. package/engine/object-data/entry.lua +60 -32
  151. package/engine/object-data/utility/object-data-entry-id-generator.lua +7 -0
  152. package/engine/object-field/ability.d.ts +10 -4
  153. package/engine/object-field/ability.lua +3 -0
  154. package/engine/object-field/unit.d.ts +57 -3
  155. package/engine/object-field/unit.lua +207 -7
  156. package/engine/object-field.d.ts +17 -6
  157. package/engine/object-field.lua +187 -89
  158. package/engine/standard/entries/buff-type.d.ts +3 -0
  159. package/engine/standard/entries/buff-type.lua +3 -0
  160. package/engine/standard/entries/sound-preset.d.ts +10 -0
  161. package/engine/standard/entries/sound-preset.lua +10 -0
  162. package/engine/standard/fields/ability.d.ts +2 -0
  163. package/engine/standard/fields/ability.lua +2 -0
  164. package/engine/standard/fields/unit.d.ts +4 -0
  165. package/engine/standard/fields/unit.lua +7 -0
  166. package/engine/text-tag.d.ts +36 -2
  167. package/engine/text-tag.lua +249 -10
  168. package/engine/unit.d.ts +2 -0
  169. package/engine/unit.lua +2 -0
  170. package/objutil/buff.lua +1 -2
  171. package/objutil/unit.lua +8 -0
  172. package/package.json +2 -2
  173. package/utility/arrays.d.ts +9 -1
  174. package/utility/arrays.lua +37 -3
  175. package/utility/functions.d.ts +8 -0
  176. package/utility/functions.lua +13 -0
  177. package/utility/lazy.d.ts +2 -0
  178. package/utility/lazy.lua +14 -0
  179. package/utility/linked-set.d.ts +1 -0
  180. package/utility/linked-set.lua +3 -0
  181. package/utility/lua-maps.d.ts +4 -0
  182. package/utility/lua-maps.lua +20 -0
  183. package/utility/lua-sets.d.ts +2 -0
  184. package/utility/lua-sets.lua +7 -0
  185. package/utility/reflection.lua +11 -7
  186. package/core/types/order.d.ts +0 -25
  187. package/core/types/order.lua +0 -55
package/attributes.d.ts CHANGED
@@ -1,8 +1,12 @@
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
  }
@@ -10,3 +14,4 @@ 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">;
12
16
  }
17
+ 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()
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
@@ -31,6 +31,7 @@ export declare class Frame extends Handle<jframehandle> {
31
31
  static readonly WORLD: Frame;
32
32
  static readonly CHAT: Frame;
33
33
  static readonly TIME_OF_DAY_CLOCK: Frame;
34
+ private static readonly SIMPLE_FRAME_TEST_CHILD;
34
35
  static get uiScale(): number;
35
36
  static get leftBorder(): Frame;
36
37
  static get rightBorder(): Frame;
@@ -79,6 +80,8 @@ export declare class Frame extends Handle<jframehandle> {
79
80
  get onMouseLeave(): FrameEvent;
80
81
  get onMouseUp(): FrameEvent;
81
82
  get onMouseWheel(): FrameEvent<[number]>;
83
+ get mouseEnterLocalEvent(): Event;
84
+ get mouseLeaveLocalEvent(): Event;
82
85
  get popupMenuItemChangeEvent(): FrameEvent<[
83
86
  popupMenu: Frame,
84
87
  previousValue: number,
@@ -15,6 +15,10 @@ 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
18
22
  local frameClick = BlzFrameClick
19
23
  local frameGetEnable = BlzFrameGetEnable
20
24
  local frameIsVisible = BlzFrameIsVisible
@@ -122,6 +126,7 @@ do
122
126
  FramePoint.BOTTOM = FRAMEPOINT_BOTTOM
123
127
  FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
124
128
  end
129
+ local tooltipByFrame = setmetatable({}, {__mode = "k"})
125
130
  ____exports.Frame = __TS__Class()
126
131
  local Frame = ____exports.Frame
127
132
  Frame.name = "Frame"
@@ -242,6 +247,7 @@ function Frame.prototype.setTextColor(self, color)
242
247
  end
243
248
  function Frame.prototype.setTooltip(self, tooltip)
244
249
  BlzFrameSetTooltip(self.handle, tooltip.handle)
250
+ tooltipByFrame[self] = tooltip
245
251
  end
246
252
  function Frame.prototype.setMinMaxValue(self, minValue, maxValue)
247
253
  BlzFrameSetMinMaxValue(self.handle, minValue, maxValue)
@@ -310,6 +316,7 @@ Frame.CONSOLE_BOTTOM_BAR = ____exports.Frame:byName("ConsoleBottomBar")
310
316
  Frame.WORLD = ____exports.Frame:byOrigin(ORIGIN_FRAME_WORLD_FRAME)
311
317
  Frame.CHAT = ____exports.Frame:byOrigin(ORIGIN_FRAME_CHAT_MSG)
312
318
  Frame.TIME_OF_DAY_CLOCK = ____exports.Frame.GAME_UI:getChild(5):getChild(0)
319
+ Frame.SIMPLE_FRAME_TEST_CHILD = ____exports.Frame:createByType("SIMPLEFRAME", "SimpleFrameTestParent", ____exports.Frame.CONSOLE_UI)
313
320
  __TS__ObjectDefineProperty(
314
321
  Frame,
315
322
  "uiScale",
@@ -341,27 +348,21 @@ __TS__ObjectDefineProperty(
341
348
  Frame,
342
349
  "minX",
343
350
  {get = function(self)
344
- local w = BlzGetLocalClientWidth()
345
- local h = BlzGetLocalClientHeight()
346
- local width4by3 = (w - h / 600 * 800) / 2
347
- local pxtodpi = 0.6 / h
348
- return -width4by3 * pxtodpi
351
+ local minX = getFrameMinXMaxX()
352
+ return minX
349
353
  end}
350
354
  )
351
355
  __TS__ObjectDefineProperty(
352
356
  Frame,
353
357
  "maxX",
354
358
  {get = function(self)
355
- local w = BlzGetLocalClientWidth()
356
- local h = BlzGetLocalClientHeight()
357
- local width4by3 = (w - h / 600 * 800) / 2
358
- local pxtodpi = 0.6 / h
359
- return (-width4by3 + w) * pxtodpi
359
+ local ____, maxX = getFrameMinXMaxX()
360
+ return maxX
360
361
  end}
361
362
  )
362
363
  Frame.centerX = 0.4
363
- Frame.minY = 0
364
- Frame.maxY = 0.6
364
+ Frame.minY = FRAME_MIN_Y
365
+ Frame.maxY = FRAME_MAX_Y
365
366
  Frame.centerY = 0.3
366
367
  __TS__SetDescriptor(
367
368
  Frame.prototype,
@@ -618,6 +619,62 @@ __TS__SetDescriptor(
618
619
  end},
619
620
  true
620
621
  )
622
+ __TS__SetDescriptor(
623
+ Frame.prototype,
624
+ "mouseEnterLocalEvent",
625
+ {get = function(self)
626
+ local event = __TS__New(Event)
627
+ if not (tooltipByFrame[self] ~= nil) then
628
+ ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
629
+ 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)
630
+ ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
631
+ self:setTooltip(tooltip)
632
+ end
633
+ local isMouseInside = false
634
+ Timer.onPeriod[1 / 64]:addListener(function()
635
+ local tooltip = tooltipByFrame[self]
636
+ if tooltip and tooltip.visible then
637
+ if not isMouseInside then
638
+ isMouseInside = true
639
+ Event.invoke(event)
640
+ end
641
+ else
642
+ isMouseInside = false
643
+ end
644
+ end)
645
+ rawset(self, "mouseEnterLocalEvent", event)
646
+ return event
647
+ end},
648
+ true
649
+ )
650
+ __TS__SetDescriptor(
651
+ Frame.prototype,
652
+ "mouseLeaveLocalEvent",
653
+ {get = function(self)
654
+ local event = __TS__New(Event)
655
+ if not (tooltipByFrame[self] ~= nil) then
656
+ ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
657
+ 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)
658
+ ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
659
+ self:setTooltip(tooltip)
660
+ end
661
+ local isMouseInside = false
662
+ Timer.onPeriod[1 / 64]:addListener(function()
663
+ local tooltip = tooltipByFrame[self]
664
+ if tooltip and tooltip.visible then
665
+ isMouseInside = true
666
+ else
667
+ if isMouseInside then
668
+ isMouseInside = false
669
+ Event.invoke(event)
670
+ end
671
+ end
672
+ end)
673
+ rawset(self, "mouseLeaveLocalEvent", event)
674
+ return event
675
+ end},
676
+ true
677
+ )
621
678
  __TS__SetDescriptor(
622
679
  Frame.prototype,
623
680
  "popupMenuItemChangeEvent",
@@ -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
  }
@@ -3,33 +3,49 @@ local __TS__Class = ____lualib.__TS__Class
3
3
  local __TS__New = ____lualib.__TS__New
4
4
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
5
5
  local ____exports = {}
6
+ local ____timer = require("core.types.timer")
7
+ local Timer = ____timer.Timer
8
+ local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
9
+ local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
10
+ local ____preconditions = require("utility.preconditions")
11
+ local check = ____preconditions.check
12
+ local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates")
13
+ local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
14
+ local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
15
+ local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
6
16
  local getHandleId = GetHandleId
7
17
  local setCameraField = SetCameraField
8
18
  local getCameraField = GetCameraField
9
19
  local setCameraPosition = SetCameraPosition
20
+ local getCameraEyePositionX = GetCameraEyePositionX
21
+ local getCameraEyePositionY = GetCameraEyePositionY
22
+ local getCameraEyePositionZ = GetCameraEyePositionZ
10
23
  local getCameraTargetPositionX = GetCameraTargetPositionX
11
24
  local getCameraTargetPositionY = GetCameraTargetPositionY
12
25
  local resetToGameCamera = ResetToGameCamera
26
+ local cos = math.cos
13
27
  local deg = math.deg
14
- local localPlayer = GetLocalPlayer()
28
+ local sin = math.sin
15
29
  local memoized = {}
16
30
  ____exports.PlayerCamera = __TS__Class()
17
31
  local PlayerCamera = ____exports.PlayerCamera
18
32
  PlayerCamera.name = "PlayerCamera"
19
33
  function PlayerCamera.prototype.____constructor(self, player)
20
34
  local id = getHandleId(player)
21
- if memoized[id] then
22
- error("Double-constructor run player camera!")
23
- end
35
+ check(memoized[id] == nil)
24
36
  memoized[id] = self
25
37
  self.player = player
26
- self.isLocal = player == localPlayer
38
+ self.isLocal = player == PLAYER_LOCAL_HANDLE
27
39
  end
28
40
  function PlayerCamera.prototype.reset(self)
29
41
  if self.isLocal then
30
42
  resetToGameCamera(0)
31
43
  end
32
44
  end
45
+ function PlayerCamera.isUnitInView(self, unit)
46
+ local ____, ____, isInView = ____exports.worldCoordinatesToFrame(unit.x, unit.y, unit.z)
47
+ return isInView
48
+ end
33
49
  function PlayerCamera.of(self, player)
34
50
  return memoized[getHandleId(player)] or __TS__New(____exports.PlayerCamera, player)
35
51
  end
@@ -159,4 +175,62 @@ __TS__SetDescriptor(
159
175
  },
160
176
  true
161
177
  )
178
+ local cameraEyeX = 0
179
+ local cameraEyeY = 0
180
+ local cameraEyeZ = 0
181
+ local cameraAngleOfAttack = 0
182
+ local cameraAngleOfAttackCos = 0
183
+ local cameraAngleOfAttackSin = 0
184
+ local cameraRotation = 0
185
+ local cameraRotationCos = 0
186
+ local cameraRotationSin = 0
187
+ local cameraAngleOfAttackCosRotationCos = 0
188
+ local cameraAngleOfAttackCosRotationSin = 0
189
+ local cameraAngleOfAttackSinRotationCos = 0
190
+ local cameraAngleOfAttackSinRotationSin = 0
191
+ local yCenterScreenShift = 0
192
+ local scaleFactor = 0
193
+ local frameMinX = 0
194
+ local frameMaxX = 0
195
+ local isCameraViewPrecalculated = false
196
+ local function precalculateCameraView()
197
+ cameraEyeX = getCameraEyePositionX()
198
+ cameraEyeY = getCameraEyePositionY()
199
+ cameraEyeZ = getCameraEyePositionZ()
200
+ cameraAngleOfAttack = getCameraField(CAMERA_FIELD_ANGLE_OF_ATTACK)
201
+ cameraAngleOfAttackCos = cos(cameraAngleOfAttack)
202
+ cameraAngleOfAttackSin = sin(cameraAngleOfAttack)
203
+ cameraRotation = getCameraField(CAMERA_FIELD_ROTATION)
204
+ cameraRotationCos = cos(cameraRotation)
205
+ cameraRotationSin = sin(cameraRotation)
206
+ cameraAngleOfAttackCosRotationCos = cameraAngleOfAttackCos * cameraRotationCos
207
+ cameraAngleOfAttackCosRotationSin = cameraAngleOfAttackCos * cameraRotationSin
208
+ cameraAngleOfAttackSinRotationCos = cameraAngleOfAttackSin * cameraRotationCos
209
+ cameraAngleOfAttackSinRotationSin = cameraAngleOfAttackSin * cameraRotationSin
210
+ yCenterScreenShift = 0.1284 * cameraAngleOfAttackCos
211
+ local cameraFieldOfView = getCameraField(CAMERA_FIELD_FIELD_OF_VIEW)
212
+ scaleFactor = 0.0524 * cameraFieldOfView ^ 3 - 0.0283 * cameraFieldOfView ^ 2 + 1.061 * cameraFieldOfView
213
+ frameMinX, frameMaxX = getFrameMinXMaxX()
214
+ isCameraViewPrecalculated = true
215
+ end
216
+ Timer.onPeriod[1 / 64]:addListener(
217
+ 4,
218
+ function()
219
+ isCameraViewPrecalculated = false
220
+ end
221
+ )
222
+ ---
223
+ -- @internal For use by internal systems only.
224
+ ____exports.worldCoordinatesToFrame = function(x, y, z)
225
+ if not isCameraViewPrecalculated then
226
+ precalculateCameraView()
227
+ end
228
+ local dx = x - cameraEyeX
229
+ local dy = y - cameraEyeY
230
+ local dz = z - cameraEyeZ
231
+ local xPrime = scaleFactor * (-cameraAngleOfAttackCosRotationCos * dx - cameraAngleOfAttackCosRotationSin * dy - cameraAngleOfAttackSin * dz)
232
+ local frameX = 0.4 + (cameraRotationCos * dy - cameraRotationSin * dx) / xPrime
233
+ local frameY = 0.42625 - yCenterScreenShift + (cameraAngleOfAttackSinRotationCos * dx + cameraAngleOfAttackSinRotationSin * dy - cameraAngleOfAttackCos * dz) / xPrime
234
+ return frameX, frameY, xPrime < 0 and frameX >= frameMinX and frameX <= frameMaxX and frameY >= FRAME_MIN_Y and frameY <= FRAME_MAX_Y
235
+ end
162
236
  return ____exports