warscript 0.0.1-dev.d18f377 → 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 (175) 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 +2 -3
  6. package/core/types/effect.lua +95 -48
  7. package/core/types/frame.lua +10 -12
  8. package/core/types/player.lua +3 -1
  9. package/core/types/playerCamera.d.ts +2 -0
  10. package/core/types/playerCamera.lua +79 -5
  11. package/core/types/sound.d.ts +17 -24
  12. package/core/types/sound.lua +99 -24
  13. package/core/types/timer.d.ts +8 -8
  14. package/core/types/timer.lua +25 -23
  15. package/core/util.d.ts +1 -1
  16. package/core/util.lua +12 -1
  17. package/decl/native.d.ts +844 -788
  18. package/engine/behavior.d.ts +2 -0
  19. package/engine/behavior.lua +53 -27
  20. package/engine/behaviour/ability/always-enabled.d.ts +7 -0
  21. package/engine/behaviour/ability/always-enabled.lua +31 -0
  22. package/engine/behaviour/ability/apply-buff.d.ts +5 -0
  23. package/engine/behaviour/ability/apply-buff.lua +32 -0
  24. package/engine/behaviour/ability/apply-unit-behavior.lua +1 -0
  25. package/engine/behaviour/ability/damage.d.ts +9 -3
  26. package/engine/behaviour/ability/damage.lua +26 -38
  27. package/engine/behaviour/ability/emulate-impact.d.ts +1 -1
  28. package/engine/behaviour/ability/emulate-impact.lua +22 -8
  29. package/engine/behaviour/ability/on-command-impact.lua +7 -0
  30. package/engine/behaviour/ability/restore-mana.d.ts +1 -1
  31. package/engine/behaviour/ability/restore-mana.lua +6 -6
  32. package/engine/behaviour/ability.d.ts +15 -3
  33. package/engine/behaviour/ability.lua +85 -22
  34. package/engine/behaviour/unit/stun-immunity.d.ts +5 -3
  35. package/engine/behaviour/unit/stun-immunity.lua +43 -27
  36. package/engine/behaviour/unit.d.ts +28 -0
  37. package/engine/behaviour/unit.lua +163 -4
  38. package/engine/buff.d.ts +57 -41
  39. package/engine/buff.lua +301 -228
  40. package/engine/internal/ability.d.ts +15 -1
  41. package/engine/internal/ability.lua +90 -2
  42. package/engine/internal/item/ability.lua +162 -4
  43. package/engine/internal/item.d.ts +7 -4
  44. package/engine/internal/item.lua +131 -28
  45. package/engine/internal/mechanics/ability-duration.lua +1 -1
  46. package/engine/internal/misc/ability-disable-counter.d.ts +2 -0
  47. package/engine/internal/misc/ability-disable-counter.lua +13 -0
  48. package/engine/internal/misc/damage-metadata-by-target.d.ts +2 -0
  49. package/engine/internal/misc/damage-metadata-by-target.lua +5 -0
  50. package/engine/internal/misc/frame-coordinates.d.ts +2 -0
  51. package/engine/internal/misc/frame-coordinates.lua +21 -0
  52. package/engine/internal/misc/get-terrain-z.d.ts +2 -0
  53. package/engine/internal/misc/get-terrain-z.lua +11 -0
  54. package/engine/internal/misc/player-local-handle.d.ts +2 -0
  55. package/engine/internal/misc/player-local-handle.lua +5 -0
  56. package/engine/internal/object-data/auto-attack-speed-increase.d.ts +1 -1
  57. package/engine/internal/object-data/auto-attack-speed-increase.lua +2 -0
  58. package/engine/internal/object-data/evasion-probability.d.ts +2 -0
  59. package/engine/internal/object-data/evasion-probability.lua +16 -0
  60. package/engine/internal/unit/ability.d.ts +35 -0
  61. package/engine/internal/unit/ability.lua +62 -0
  62. package/engine/internal/unit/add-item-to-slot-init.d.ts +2 -0
  63. package/engine/internal/unit/add-item-to-slot-init.lua +23 -0
  64. package/engine/internal/unit/add-item-to-slot.d.ts +2 -0
  65. package/engine/internal/unit/add-item-to-slot.lua +52 -0
  66. package/engine/internal/unit/allowed-targets.d.ts +1 -1
  67. package/engine/internal/unit/allowed-targets.lua +9 -1
  68. package/engine/internal/unit/bonus.d.ts +2 -0
  69. package/engine/internal/unit/bonus.lua +17 -0
  70. package/engine/internal/unit/ignore-events-items.d.ts +2 -0
  71. package/engine/internal/unit/ignore-events-items.lua +5 -0
  72. package/engine/internal/unit/item.lua +6 -12
  73. package/engine/internal/unit/order.d.ts +20 -0
  74. package/engine/internal/unit/order.lua +136 -0
  75. package/engine/internal/unit+damage.d.ts +2 -11
  76. package/engine/internal/unit+damage.lua +10 -14
  77. package/engine/internal/unit+spellSteal.lua +1 -2
  78. package/engine/internal/unit-missile-launch.lua +9 -2
  79. package/engine/internal/unit.d.ts +32 -8
  80. package/engine/internal/unit.lua +302 -107
  81. package/engine/internal/utility.lua +12 -0
  82. package/engine/lightning.d.ts +12 -5
  83. package/engine/lightning.lua +48 -14
  84. package/engine/object-data/auxiliary/animation-name.d.ts +1 -0
  85. package/engine/object-data/auxiliary/animation-name.lua +16 -0
  86. package/engine/object-data/auxiliary/armor-type.d.ts +11 -0
  87. package/engine/object-data/auxiliary/armor-type.lua +46 -0
  88. package/engine/object-data/auxiliary/attachment-preset.d.ts +7 -2
  89. package/engine/object-data/auxiliary/attachment-preset.lua +4 -3
  90. package/engine/object-data/auxiliary/attack-type.d.ts +7 -8
  91. package/engine/object-data/auxiliary/attack-type.lua +42 -0
  92. package/engine/object-data/auxiliary/movement-type.d.ts +7 -7
  93. package/engine/object-data/auxiliary/movement-type.lua +22 -0
  94. package/engine/object-data/auxiliary/sound-eax.d.ts +10 -0
  95. package/engine/object-data/auxiliary/sound-eax.lua +2 -0
  96. package/engine/object-data/auxiliary/tech-tree-dependency.d.ts +1 -1
  97. package/engine/object-data/auxiliary/unit-attribute.d.ts +6 -0
  98. package/engine/object-data/auxiliary/unit-attribute.lua +9 -0
  99. package/engine/object-data/entry/ability-type/berserk.d.ts +2 -0
  100. package/engine/object-data/entry/ability-type/berserk.lua +13 -0
  101. package/engine/object-data/entry/ability-type/blank-configurable.lua +12 -1
  102. package/engine/object-data/entry/ability-type/carrion-swarm.d.ts +14 -0
  103. package/engine/object-data/entry/ability-type/carrion-swarm.lua +65 -0
  104. package/engine/object-data/entry/ability-type/disease-cloud.lua +2 -2
  105. package/engine/object-data/entry/ability-type/engineering-upgrade.lua +2 -2
  106. package/engine/object-data/entry/ability-type/ensnare.d.ts +12 -0
  107. package/engine/object-data/entry/ability-type/ensnare.lua +52 -0
  108. package/engine/object-data/entry/ability-type/feral-spirit.lua +2 -2
  109. package/engine/object-data/entry/ability-type/permanent-invisibility.d.ts +8 -0
  110. package/engine/object-data/entry/ability-type/permanent-invisibility.lua +26 -0
  111. package/engine/object-data/entry/ability-type/phase-shift.d.ts +10 -0
  112. package/engine/object-data/entry/ability-type/phase-shift.lua +39 -0
  113. package/engine/object-data/entry/ability-type/phoenix-morph.lua +4 -4
  114. package/engine/object-data/entry/ability-type/raise-dead.d.ts +17 -0
  115. package/engine/object-data/entry/ability-type/raise-dead.lua +78 -0
  116. package/engine/object-data/entry/ability-type/shock-wave.d.ts +4 -0
  117. package/engine/object-data/entry/ability-type/shock-wave.lua +26 -0
  118. package/engine/object-data/entry/ability-type/slow-poison.d.ts +10 -0
  119. package/engine/object-data/entry/ability-type/slow-poison.lua +58 -0
  120. package/engine/object-data/entry/ability-type/summon-quilbeast.lua +2 -2
  121. package/engine/object-data/entry/ability-type/summon-water-elemental.lua +2 -2
  122. package/engine/object-data/entry/ability-type/web.d.ts +12 -0
  123. package/engine/object-data/entry/ability-type/web.lua +52 -0
  124. package/engine/object-data/entry/ability-type.d.ts +19 -17
  125. package/engine/object-data/entry/ability-type.lua +90 -36
  126. package/engine/object-data/entry/buff-type/applicable.lua +18 -37
  127. package/engine/object-data/entry/buff-type.d.ts +6 -12
  128. package/engine/object-data/entry/buff-type.lua +13 -29
  129. package/engine/object-data/entry/destructible-type.d.ts +1 -1
  130. package/engine/object-data/entry/item-type.d.ts +3 -1
  131. package/engine/object-data/entry/item-type.lua +15 -2
  132. package/engine/object-data/entry/lightning-type.d.ts +1 -1
  133. package/engine/object-data/entry/sound-preset.d.ts +33 -0
  134. package/engine/object-data/entry/sound-preset.lua +140 -0
  135. package/engine/object-data/entry/unit-type.d.ts +21 -5
  136. package/engine/object-data/entry/unit-type.lua +214 -93
  137. package/engine/object-data/entry/upgrade.d.ts +1 -1
  138. package/engine/object-data/entry/upgrade.lua +4 -4
  139. package/engine/object-data/entry.d.ts +16 -14
  140. package/engine/object-data/entry.lua +60 -32
  141. package/engine/object-data/utility/object-data-entry-id-generator.lua +7 -0
  142. package/engine/object-field/ability.d.ts +10 -4
  143. package/engine/object-field/ability.lua +3 -0
  144. package/engine/object-field/unit.d.ts +57 -3
  145. package/engine/object-field/unit.lua +207 -7
  146. package/engine/object-field.d.ts +17 -6
  147. package/engine/object-field.lua +187 -89
  148. package/engine/standard/entries/buff-type.d.ts +3 -0
  149. package/engine/standard/entries/buff-type.lua +3 -0
  150. package/engine/standard/entries/sound-preset.d.ts +10 -0
  151. package/engine/standard/entries/sound-preset.lua +10 -0
  152. package/engine/standard/fields/ability.d.ts +2 -0
  153. package/engine/standard/fields/ability.lua +2 -0
  154. package/engine/standard/fields/unit.d.ts +4 -0
  155. package/engine/standard/fields/unit.lua +7 -0
  156. package/engine/text-tag.d.ts +36 -2
  157. package/engine/text-tag.lua +249 -10
  158. package/engine/unit.d.ts +2 -0
  159. package/engine/unit.lua +2 -0
  160. package/objutil/buff.lua +1 -2
  161. package/objutil/unit.lua +8 -0
  162. package/package.json +2 -2
  163. package/utility/arrays.d.ts +1 -0
  164. package/utility/arrays.lua +3 -0
  165. package/utility/functions.d.ts +8 -0
  166. package/utility/functions.lua +13 -0
  167. package/utility/linked-set.d.ts +1 -0
  168. package/utility/linked-set.lua +3 -0
  169. package/utility/lua-maps.d.ts +4 -0
  170. package/utility/lua-maps.lua +20 -0
  171. package/utility/lua-sets.d.ts +2 -0
  172. package/utility/lua-sets.lua +7 -0
  173. package/utility/reflection.lua +11 -7
  174. package/core/types/order.d.ts +0 -25
  175. 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
@@ -8,6 +8,7 @@ declare const enum EffectPropertyKey {
8
8
  ROLL = 102
9
9
  }
10
10
  export type EffectParameters = {
11
+ readonly delay?: number;
11
12
  readonly scale?: number;
12
13
  readonly color?: PlayerColor;
13
14
  readonly pitch?: number;
@@ -29,12 +30,10 @@ export declare class Effect extends Handle<jeffect> {
29
30
  set pitch(pitch: number);
30
31
  get roll(): number;
31
32
  set roll(roll: number);
32
- static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, pos: Vec2): T;
33
- static createTarget<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, target: Widget, attachPoint: string): T;
33
+ static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), modelPath: string, xOrWidget: number | Widget, yOrAttachmentPoint?: number | string, parameters?: EffectParameters): T;
34
34
  static flash(modelPath: string, ...args: [
35
35
  ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint?: string],
36
36
  ...parametersOrDuration: [parametersOrDuration?: EffectParameters | number] | [duration?: number, parameters?: EffectParameters]
37
37
  ]): void;
38
- static flashTarget(model: string, target: Widget, attachPoint: string, duration?: number): void;
39
38
  }
40
39
  export {};
@@ -1,10 +1,10 @@
1
1
  local ____lualib = require("lualib_bundle")
2
2
  local __TS__Class = ____lualib.__TS__Class
3
3
  local __TS__ClassExtends = ____lualib.__TS__ClassExtends
4
- local __TS__InstanceOf = ____lualib.__TS__InstanceOf
5
4
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
5
+ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
6
6
  local ____exports = {}
7
- local dummyPlayer
7
+ local dummyPlayer, addSpecialEffectInternal, flash
8
8
  local ____handle = require("core.types.handle")
9
9
  local Handle = ____handle.Handle
10
10
  local ____playerColor = require("core.types.playerColor")
@@ -119,10 +119,18 @@ local function setSpecialEffectColor(effect, color)
119
119
  dummyPlayer.color = dummyColor
120
120
  end
121
121
  local setters = {scale = setSpecialEffectScale, color = setSpecialEffectColor, pitch = setSpecialEffectPitchDegrees, roll = setSpecialEffectRollDegrees}
122
+ local setterProperties = {"scale", "color", "pitch", "roll"}
122
123
  dummyPlayer = Player.neutralExtra
123
124
  local temporaryEffects = {}
124
125
  local temporaryEffectsDurations = {}
125
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
126
134
  local period = 1 / 32
127
135
  Timer.onPeriod[period]:addListener(function()
128
136
  local i = 1
@@ -131,12 +139,36 @@ Timer.onPeriod[period]:addListener(function()
131
139
  if duration <= 0 then
132
140
  destroyEffect(temporaryEffects[i])
133
141
  temporaryEffects[i] = temporaryEffects[temporaryEffectsCount]
142
+ temporaryEffectsDurations[i] = temporaryEffectsDurations[temporaryEffectsCount]
134
143
  temporaryEffectsCount = temporaryEffectsCount - 1
135
144
  else
136
145
  temporaryEffectsDurations[i] = duration - period
137
146
  i = i + 1
138
147
  end
139
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
140
172
  end)
141
173
  ____exports.Effect = __TS__Class()
142
174
  local Effect = ____exports.Effect
@@ -146,66 +178,44 @@ function Effect.prototype.onDestroy(self)
146
178
  destroyEffect(self.handle)
147
179
  return Handle.prototype.onDestroy(self)
148
180
  end
149
- function Effect.create(self, model, pos)
150
- return self:of(addSpecialEffect(model, pos.x, pos.y))
151
- end
152
- function Effect.createTarget(self, model, target, attachPoint)
153
- 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
154
189
  end
155
190
  function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, parametersOrDuration, parameters)
156
191
  if type(parametersOrDuration) ~= "number" then
157
192
  parameters = parametersOrDuration
158
193
  parametersOrDuration = nil
159
194
  end
160
- local coordinatesProvided = type(xOrWidget) == "number"
161
- local isPositional = coordinatesProvided or (parameters and parameters.detached) == true
162
- local x = not isPositional and 0 or (coordinatesProvided and xOrWidget or xOrWidget.x)
163
- local y = not isPositional and 0 or (coordinatesProvided and yOrOrAttachmentPoint or xOrWidget.y)
164
- local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint or "origin")
165
- if isPositional and not coordinatesProvided and (parameters and parameters.scale) == nil and __TS__InstanceOf(xOrWidget, Unit) then
166
- setSpecialEffectScale(effect, xOrWidget.scale)
167
- end
168
- if parameters ~= nil then
169
- for key, value in ____pairs(parameters) do
170
- if key ~= "zOffset" and key ~= "detached" and key ~= "scaleZOffset" then
171
- setters[key](effect, value)
172
- end
173
- end
174
- if isPositional and parameters.zOffset ~= nil then
175
- moveLocation(location, x, y)
176
- local z = __TS__InstanceOf(xOrWidget, Unit) and getLocationZ(location) + xOrWidget.flyHeight or getLocationZ(location)
177
- BlzSetSpecialEffectZ(
178
- effect,
179
- z + parameters.zOffset * (parameters.scaleZOffset and getSpecialEffectScale(effect) or 1)
180
- )
181
- end
182
- end
183
- if parametersOrDuration ~= nil and parametersOrDuration > 0 then
184
- temporaryEffectsCount = temporaryEffectsCount + 1
185
- temporaryEffects[temporaryEffectsCount] = effect
186
- 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
187
203
  return
188
204
  end
189
- destroyEffect(effect)
190
- end
191
- function Effect.flashTarget(self, model, target, attachPoint, duration)
192
- local effect = addSpecialEffectTarget(model, target.handle, attachPoint)
193
- if effect ~= nil then
194
- if duration and duration > 0 then
195
- temporaryEffectsCount = temporaryEffectsCount + 1
196
- temporaryEffects[temporaryEffectsCount] = effect
197
- temporaryEffectsDurations[temporaryEffectsCount] = duration
198
- else
199
- destroyEffect(effect)
200
- end
201
- end
205
+ flash(
206
+ modelPath,
207
+ xOrWidget,
208
+ yOrOrAttachmentPoint,
209
+ parametersOrDuration,
210
+ parameters
211
+ )
202
212
  end
203
213
  __TS__SetDescriptor(
204
214
  Effect.prototype,
205
215
  "color",
206
216
  {
207
217
  get = function(self)
208
- return self[100] or PlayerColor.black
218
+ return self[100] or PlayerColor.red
209
219
  end,
210
220
  set = function(self, color)
211
221
  setSpecialEffectColor(self.handle, color)
@@ -255,4 +265,41 @@ __TS__SetDescriptor(
255
265
  },
256
266
  true
257
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
258
305
  return ____exports
@@ -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
@@ -344,27 +348,21 @@ __TS__ObjectDefineProperty(
344
348
  Frame,
345
349
  "minX",
346
350
  {get = function(self)
347
- local w = BlzGetLocalClientWidth()
348
- local h = BlzGetLocalClientHeight()
349
- local width4by3 = (w - h / 600 * 800) / 2
350
- local pxtodpi = 0.6 / h
351
- return -width4by3 * pxtodpi
351
+ local minX = getFrameMinXMaxX()
352
+ return minX
352
353
  end}
353
354
  )
354
355
  __TS__ObjectDefineProperty(
355
356
  Frame,
356
357
  "maxX",
357
358
  {get = function(self)
358
- local w = BlzGetLocalClientWidth()
359
- local h = BlzGetLocalClientHeight()
360
- local width4by3 = (w - h / 600 * 800) / 2
361
- local pxtodpi = 0.6 / h
362
- return (-width4by3 + w) * pxtodpi
359
+ local ____, maxX = getFrameMinXMaxX()
360
+ return maxX
363
361
  end}
364
362
  )
365
363
  Frame.centerX = 0.4
366
- Frame.minY = 0
367
- Frame.maxY = 0.6
364
+ Frame.minY = FRAME_MIN_Y
365
+ Frame.maxY = FRAME_MAX_Y
368
366
  Frame.centerY = 0.3
369
367
  __TS__SetDescriptor(
370
368
  Frame.prototype,
@@ -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
@@ -1,6 +1,7 @@
1
1
  /** @noSelfInFile */
2
2
  import { Handle, HandleDestructor } from "./handle";
3
3
  import { Unit } from "./unit";
4
+ import { SoundEax } from "../../engine/object-data/auxiliary/sound-eax";
4
5
  export declare enum SoundChannel {
5
6
  General = 0,
6
7
  UnitSelection = 1,
@@ -18,16 +19,7 @@ export declare enum SoundChannel {
18
19
  Birth = 13,
19
20
  Fire = 14
20
21
  }
21
- export declare enum SoundEax {
22
- Default = "DefaultEAXON",
23
- Acknowledgements = "HeroAcksEAX",
24
- Environment = "DoodadsEAX",
25
- Drums = "KotoDrumsEAX",
26
- Attacks = "CombatSoundsEAX",
27
- Abilities = "SpellsEAX",
28
- Missiles = "MissilesEAX"
29
- }
30
- export type SoundPreset = Readonly<{
22
+ export type SoundSettings = Readonly<{
31
23
  channel?: SoundChannel;
32
24
  eax?: SoundEax;
33
25
  fadeInRate?: number;
@@ -36,19 +28,19 @@ export type SoundPreset = Readonly<{
36
28
  volume?: number;
37
29
  pitch?: number;
38
30
  }>;
39
- export type Sound3DPreset = SoundPreset & Readonly<{
31
+ export type Sound3DSettings = SoundSettings & Readonly<{
40
32
  stopWhenOutOfRange?: boolean;
41
33
  minDistance?: number;
42
34
  maxDistance?: number;
43
35
  distanceCutoff?: number;
44
36
  }>;
45
- export declare namespace SoundPreset {
46
- const UI: SoundPreset;
47
- const Music: SoundPreset;
48
- const Attack: Sound3DPreset;
49
- const Ability: Sound3DPreset;
50
- const AbilityLooping: Sound3DPreset;
51
- const Missile: Sound3DPreset;
37
+ export declare namespace SoundSettings {
38
+ const UI: SoundSettings;
39
+ const Music: SoundSettings;
40
+ const Attack: Sound3DSettings;
41
+ const Ability: Sound3DSettings;
42
+ const AbilityLooping: Sound3DSettings;
43
+ const Missile: Sound3DSettings;
52
44
  }
53
45
  export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
54
46
  private _volume?;
@@ -58,12 +50,13 @@ export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
58
50
  start(milliseconds?: number): void;
59
51
  stop(fadeOut?: boolean): void;
60
52
  restart(milliseconds?: number): void;
61
- static play(fileName: string, preset: SoundPreset): void;
62
- static create(fileName: string, preset: SoundPreset): Sound;
53
+ static play(fileName: string, preset: SoundSettings): void;
54
+ static create(fileName: string, preset: SoundSettings): Sound;
63
55
  }
64
56
  export declare class Sound3D extends Sound {
65
- static playAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): void;
66
- static playOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): void;
67
- static createAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): Sound3D;
68
- static createOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): Sound3D;
57
+ static playAtPosition(fileName: string, preset: Sound3DSettings, x?: number, y?: number, z?: number): void;
58
+ static playOnUnit(fileName: string, preset: Sound3DSettings, unit: Unit): void;
59
+ static playFromLabel(label: string, preset: Sound3DSettings, ...positionOrUnit: [Unit] | [number, number, number?]): void;
60
+ static createAtPosition(fileName: string, preset: Sound3DSettings, x?: number, y?: number, z?: number): Sound3D;
61
+ static createOnUnit(fileName: string, preset: Sound3DSettings, unit: Unit): Sound3D;
69
62
  }