warscript 0.0.1-dev.22d575b → 0.0.1-dev.22f399b

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 (77) hide show
  1. package/attributes.d.ts +0 -1
  2. package/core/types/frame.d.ts +2 -1
  3. package/core/types/frame.lua +2 -0
  4. package/core/types/group.d.ts +0 -1
  5. package/core/types/image.d.ts +0 -1
  6. package/core/types/missile.d.ts +2 -2
  7. package/core/types/missile.lua +8 -2
  8. package/core/types/unit.lua +8 -0
  9. package/decl/index.d.ts +1 -0
  10. package/engine/ability.d.ts +1 -1
  11. package/engine/behavior.d.ts +10 -10
  12. package/engine/behaviour/ability/apply-unit-behavior.d.ts +6 -1
  13. package/engine/behaviour/ability/damage.d.ts +33 -11
  14. package/engine/behaviour/ability/damage.lua +89 -31
  15. package/engine/behaviour/ability/heal.d.ts +33 -6
  16. package/engine/behaviour/ability/heal.lua +89 -10
  17. package/engine/behaviour/ability/restore-mana.d.ts +15 -0
  18. package/engine/behaviour/ability/restore-mana.lua +29 -0
  19. package/engine/behaviour/ability.d.ts +8 -1
  20. package/engine/behaviour/ability.lua +62 -0
  21. package/engine/behaviour/unit/stun-immunity.d.ts +0 -1
  22. package/engine/behaviour/unit.d.ts +3 -2
  23. package/engine/behaviour/unit.lua +7 -0
  24. package/engine/buff.d.ts +2 -2
  25. package/engine/buff.lua +8 -10
  26. package/engine/game-map.d.ts +7 -0
  27. package/engine/game-map.lua +32 -0
  28. package/engine/internal/unit/bonus.d.ts +5 -6
  29. package/engine/internal/unit+transport.lua +4 -10
  30. package/engine/internal/unit.d.ts +1 -2
  31. package/engine/internal/unit.lua +34 -26
  32. package/engine/object-data/auxiliary/attachment-preset.d.ts +0 -1
  33. package/engine/object-data/auxiliary/combat-classification.d.ts +0 -2
  34. package/engine/object-data/entry/ability-type/blank-configurable.d.ts +0 -1
  35. package/engine/object-data/entry/ability-type/blank-passive.d.ts +0 -1
  36. package/engine/object-data/entry/ability-type/channel.d.ts +0 -1
  37. package/engine/object-data/entry/ability-type/mine.d.ts +2 -2
  38. package/engine/object-data/entry/ability-type/mine.lua +2 -2
  39. package/engine/object-data/entry/ability-type.d.ts +0 -1
  40. package/engine/object-data/entry/buff-type/applicable.d.ts +0 -1
  41. package/engine/object-data/entry/buff-type/blank.d.ts +0 -1
  42. package/engine/object-data/entry/buff-type.d.ts +0 -1
  43. package/engine/object-data/entry/destructible-type.d.ts +0 -1
  44. package/engine/object-data/entry/item-type/blank.d.ts +0 -1
  45. package/engine/object-data/entry/item-type.d.ts +0 -1
  46. package/engine/object-data/entry/lightning-type.d.ts +0 -1
  47. package/engine/object-data/entry/unit-type.d.ts +0 -1
  48. package/engine/object-data/entry/upgrade/blank.d.ts +0 -1
  49. package/engine/object-data/entry/upgrade.d.ts +0 -1
  50. package/engine/object-data/entry.d.ts +2 -3
  51. package/engine/object-field/ability.d.ts +1 -1
  52. package/engine/object-field.d.ts +0 -1
  53. package/engine/random.d.ts +1 -0
  54. package/engine/random.lua +9 -0
  55. package/engine/standard/fields/ability.d.ts +1 -1
  56. package/engine/standard/fields/ability.lua +1 -1
  57. package/engine/unit.lua +9 -2
  58. package/event.d.ts +2 -3
  59. package/event.lua +9 -5
  60. package/lualib_bundle.lua +146 -42
  61. package/math/vec2.d.ts +2 -9
  62. package/math.d.ts +0 -2
  63. package/objutil/ability.d.ts +0 -1
  64. package/objutil/buff.d.ts +0 -1
  65. package/objutil/object.d.ts +0 -1
  66. package/objutil/unit.d.ts +0 -1
  67. package/package.json +13 -13
  68. package/string.d.ts +16 -0
  69. package/string.lua +5 -0
  70. package/util/stream.d.ts +0 -1
  71. package/utility/arrays.d.ts +3 -4
  72. package/utility/bit-set.d.ts +0 -2
  73. package/utility/linked-set.d.ts +1 -2
  74. package/utility/lua-maps.d.ts +1 -2
  75. package/utility/lua-sets.d.ts +1 -2
  76. package/core/mapbounds.d.ts +0 -8
  77. package/core/mapbounds.lua +0 -12
@@ -15,13 +15,52 @@ local Effect = ____effect.Effect
15
15
  local ____ability = require("engine.standard.fields.ability")
16
16
  local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
17
17
  local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
18
+ local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
19
+ local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
20
+ local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_INTEGER_FIELD
18
21
  local SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD = ____ability.SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD
19
22
  local SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
20
23
  local ____ability = require("engine.object-field.ability")
21
24
  local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
22
25
  local ____timer = require("core.types.timer")
23
26
  local Timer = ____timer.Timer
27
+ local ____missile = require("core.types.missile")
28
+ local Missile = ____missile.Missile
24
29
  local createBehaviorFunctionsByAbilityTypeId = {}
30
+ local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
31
+ if success then
32
+ abilityBehavior:onMissileArrival(...)
33
+ end
34
+ end
35
+ local ____class_0 = __TS__Class()
36
+ ____class_0.name = ""
37
+ function ____class_0.prototype.____constructor(self, abilityBehavior)
38
+ self.abilityBehavior = abilityBehavior
39
+ end
40
+ __TS__SetDescriptor(
41
+ ____class_0.prototype,
42
+ "art",
43
+ {get = function(self)
44
+ return MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.abilityBehavior.ability, 0)
45
+ end},
46
+ true
47
+ )
48
+ __TS__SetDescriptor(
49
+ ____class_0.prototype,
50
+ "arc",
51
+ {get = function(self)
52
+ return MISSILE_ARC_ABILITY_FLOAT_FIELD:getValue(self.abilityBehavior.ability)
53
+ end},
54
+ true
55
+ )
56
+ __TS__SetDescriptor(
57
+ ____class_0.prototype,
58
+ "speed",
59
+ {get = function(self)
60
+ return MISSILE_SPEED_ABILITY_INTEGER_FIELD:getValue(self.abilityBehavior.ability)
61
+ end},
62
+ true
63
+ )
25
64
  ____exports.AbilityBehavior = __TS__Class()
26
65
  local AbilityBehavior = ____exports.AbilityBehavior
27
66
  AbilityBehavior.name = "AbilityBehavior"
@@ -65,6 +104,18 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
65
104
  )
66
105
  end
67
106
  end
107
+ function AbilityBehavior.prototype.launchMissile(self, source, target, ...)
108
+ Missile:launch(
109
+ self.missileLaunchConfig,
110
+ source,
111
+ target,
112
+ invokeOnMissileArrival,
113
+ self,
114
+ ...
115
+ )
116
+ end
117
+ function AbilityBehavior.prototype.onMissileArrival(self, ...)
118
+ end
68
119
  function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
69
120
  end
70
121
  function AbilityBehavior.prototype.onUnitLoseAbility(self, _unit)
@@ -127,6 +178,17 @@ __TS__SetDescriptor(
127
178
  return self.object
128
179
  end},
129
180
  true
181
+ )
182
+ AbilityBehavior.MissileLaunchConfig = ____class_0
183
+ __TS__SetDescriptor(
184
+ AbilityBehavior.prototype,
185
+ "missileLaunchConfig",
186
+ {get = function(self)
187
+ local missileLaunchConfig = __TS__New(____exports.AbilityBehavior.MissileLaunchConfig, self)
188
+ rawset(self, "missileLaunchConfig", missileLaunchConfig)
189
+ return missileLaunchConfig
190
+ end},
191
+ true
130
192
  );
131
193
  (function(self)
132
194
  local function createUnitEventListener(key)
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { UnitBehavior } from "../unit";
4
3
  import { Unit } from "../../unit";
@@ -2,6 +2,7 @@
2
2
  import { Behavior } from "../behavior";
3
3
  import { Ability } from "../internal/ability";
4
4
  import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
5
+ import "../internal/unit+ability";
5
6
  import "../internal/unit-missile-launch";
6
7
  export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
7
8
  export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
@@ -13,8 +14,8 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
13
14
  onDamageDealt(target: Unit, event: DamageEvent): void;
14
15
  onDamageReceiving(source: Unit | undefined, event: DamagingEvent): void;
15
16
  onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
16
- protected onAbilityGained(ability: Ability): void;
17
- protected onAbilityLost(ability: Ability): void;
17
+ onAbilityGained(ability: Ability): void;
18
+ onAbilityLost(ability: Ability): void;
18
19
  onKill(target: Unit): void;
19
20
  onDeath(source: Unit | undefined): void;
20
21
  }
@@ -7,6 +7,7 @@ local ____behavior = require("engine.behavior")
7
7
  local Behavior = ____behavior.Behavior
8
8
  local ____unit = require("engine.internal.unit")
9
9
  local Unit = ____unit.Unit
10
+ require("engine.internal.unit+ability")
10
11
  require("engine.internal.unit-missile-launch")
11
12
  ____exports.UnitBehavior = __TS__Class()
12
13
  local UnitBehavior = ____exports.UnitBehavior
@@ -62,6 +63,12 @@ __TS__SetDescriptor(
62
63
  end
63
64
  ____exports.UnitBehavior:forAll(target, "onDamageReceived", source, event)
64
65
  end)
66
+ Unit.abilityGainedEvent:addListener(function(source, target)
67
+ ____exports.UnitBehavior:forAll(source, "onAbilityGained", target)
68
+ end)
69
+ Unit.abilityLostEvent:addListener(function(source, target)
70
+ ____exports.UnitBehavior:forAll(source, "onAbilityLost", target)
71
+ end)
65
72
  Unit.deathEvent:addListener(function(target, source)
66
73
  if source ~= nil then
67
74
  ____exports.UnitBehavior:forAll(source, "onKill", target)
package/engine/buff.d.ts CHANGED
@@ -65,7 +65,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
65
65
  destroysOnDamage?: BooleanParameterValueType;
66
66
  maximumAutoAttackCount?: IntegerParameterValueType;
67
67
  uniqueGroup?: BuffUniqueGroup;
68
- } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : {});
68
+ } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
69
69
  declare const enum BuffPropertyKey {
70
70
  UNIT = 100,
71
71
  SOURCE = 101,
@@ -116,7 +116,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
116
116
  parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
117
117
  ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
118
118
  ];
119
- export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = {}> extends UnitBehavior {
119
+ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = object> extends UnitBehavior {
120
120
  private _unit;
121
121
  protected readonly __additionalParametersBrand?: AdditionalParameters;
122
122
  private [BuffPropertyKey.UNIT];
package/engine/buff.lua CHANGED
@@ -1035,24 +1035,22 @@ __TS__SetDescriptor(
1035
1035
  true
1036
1036
  );
1037
1037
  (function(self)
1038
+ local function destroyBuffIfNeeded(buff)
1039
+ if getUnitAbility(buff[100].handle, buff.typeId) ~= buff.handle then
1040
+ buff:destroy()
1041
+ end
1042
+ end
1038
1043
  ____exports.checkBuff = function(unit, buffTypeId)
1039
1044
  local buffByTypeId = buffByTypeIdByUnit[unit]
1040
1045
  if buffByTypeId ~= nil then
1041
1046
  local buff = buffByTypeId[buffTypeId]
1042
- if buff ~= nil and getUnitAbility(unit.handle, buffTypeId) ~= buff.handle then
1043
- buff:destroy()
1047
+ if buff ~= nil then
1048
+ destroyBuffIfNeeded(buff)
1044
1049
  end
1045
1050
  end
1046
1051
  end
1047
1052
  ____exports.checkBuffs = function(unit)
1048
- local buffByTypeId = buffByTypeIdByUnit[unit]
1049
- if buffByTypeId ~= nil then
1050
- for ____, buff in pairs(buffByTypeId) do
1051
- if getUnitAbility(unit.handle, buff.typeId) ~= buff.handle then
1052
- buff:destroy()
1053
- end
1054
- end
1055
- end
1053
+ ____exports.Buff:forAll(unit, destroyBuffIfNeeded)
1056
1054
  end
1057
1055
  Unit.abilityChannelingStartEvent:addListener(
1058
1056
  0,
@@ -0,0 +1,7 @@
1
+ /** @noSelfInFile */
2
+ import { Rect } from "../core/types/rect";
3
+ import { Region } from "../core/types/region";
4
+ export declare class GameMap {
5
+ static get worldBoundsRect(): Rect;
6
+ static get worldBoundsRegion(): Region;
7
+ }
@@ -0,0 +1,32 @@
1
+ local ____lualib = require("lualib_bundle")
2
+ local __TS__Class = ____lualib.__TS__Class
3
+ local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
4
+ local ____exports = {}
5
+ local ____rect = require("core.types.rect")
6
+ local Rect = ____rect.Rect
7
+ local ____region = require("core.types.region")
8
+ local Region = ____region.Region
9
+ ____exports.GameMap = __TS__Class()
10
+ local GameMap = ____exports.GameMap
11
+ GameMap.name = "GameMap"
12
+ function GameMap.prototype.____constructor(self)
13
+ end
14
+ __TS__ObjectDefineProperty(
15
+ GameMap,
16
+ "worldBoundsRect",
17
+ {get = function(self)
18
+ local rect = Rect:of(GetWorldBounds())
19
+ rawset(self, "worldBoundsRect", rect)
20
+ return rect
21
+ end}
22
+ )
23
+ __TS__ObjectDefineProperty(
24
+ GameMap,
25
+ "worldBoundsRegion",
26
+ {get = function(self)
27
+ local region = Region:create(self.worldBoundsRect)
28
+ rawset(self, "worldBoundsRegion", region)
29
+ return region
30
+ end}
31
+ )
32
+ return ____exports
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { Unit } from "../unit";
4
3
  import { AbilityTypeId } from "../../object-data/entry/ability-type";
@@ -34,8 +33,8 @@ export declare namespace UnitBonusType {
34
33
  const DAMAGE: UnitBonusType<UnitDamageBonusId>;
35
34
  const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
36
35
  }
37
- export declare const addUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
38
- export declare const removeUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;
39
- export declare const updateUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id, value: number) => boolean;
40
- export declare const addOrUpdateOrRemoveUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id | undefined, value: number) => Id | undefined;
41
- export declare const getUnitBonus: <Id extends UnitBonusId<any>>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => number;
36
+ export declare const addUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
37
+ export declare const removeUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;
38
+ export declare const updateUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id, value: number) => boolean;
39
+ export declare const addOrUpdateOrRemoveUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id | undefined, value: number) => Id | undefined;
40
+ export declare const getUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => number;
@@ -6,9 +6,8 @@ local ____unit = require("engine.internal.unit")
6
6
  local Unit = ____unit.Unit
7
7
  local ____event = require("event")
8
8
  local Event = ____event.Event
9
- local ____mapbounds = require("core.mapbounds")
10
- local boundMax = ____mapbounds.boundMax
11
- local boundRegion = ____mapbounds.boundRegion
9
+ local ____game_2Dmap = require("engine.game-map")
10
+ local GameMap = ____game_2Dmap.GameMap
12
11
  local eventInvoke = Event.invoke
13
12
  local tableRemove = table.remove
14
13
  local ____assert = _G.assert
@@ -58,8 +57,8 @@ triggerAddCondition(
58
57
  deboard(unit)
59
58
  end
60
59
  if not unitAlive(handle) then
61
- unit.x = boundMax.x
62
- unit.y = boundMax.y
60
+ unit.x = GameMap.worldBoundsRect.maxX
61
+ unit.y = GameMap.worldBoundsRect.maxY
63
62
  end
64
63
  local transport = Unit:of(getTransportUnit())
65
64
  transportByUnit[unit] = transport
@@ -68,11 +67,6 @@ triggerAddCondition(
68
67
  eventInvoke(onBoardEvent, unit, transport)
69
68
  end)
70
69
  )
71
- boundRegion.onUnitEnter:addListener(function(unit)
72
- if transportByUnit[unit] ~= nil and not isUnitLoaded(unit.handle) then
73
- deboard(unit)
74
- end
75
- end)
76
70
  Unit.deathEvent:addListener(function(unit)
77
71
  if transportByUnit[unit] ~= nil then
78
72
  deboard(unit)
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { Handle, HandleDestructor } from "../../core/types/handle";
4
3
  import { Player } from "../../core/types/player";
@@ -228,7 +227,7 @@ export declare class Unit extends Handle<junit> {
228
227
  isSelected(player: Player): boolean;
229
228
  explode(): void;
230
229
  kill(): void;
231
- revive(pos: Vec2, doEffect: boolean): void;
230
+ revive(x: number, y: number, doEffect?: boolean): void;
232
231
  healTarget(target: Widget, amount: number): void;
233
232
  useItem(item: Item): boolean;
234
233
  issueImmediateOrder(order: number): boolean;
@@ -7,6 +7,9 @@ local __TS__Class = ____lualib.__TS__Class
7
7
  local __TS__ClassExtends = ____lualib.__TS__ClassExtends
8
8
  local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
9
9
  local __TS__ArraySetLength = ____lualib.__TS__ArraySetLength
10
+ local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
11
+ local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
12
+ local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
10
13
  local __TS__InstanceOf = ____lualib.__TS__InstanceOf
11
14
  local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
12
15
  local Set = ____lualib.Set
@@ -279,16 +282,14 @@ function UnitTriggerEvent.prototype.____constructor(self, eventType, c)
279
282
  end
280
283
  local function dispatch(event, idGetter, argsGetter)
281
284
  local initialized = false
282
- local x = {}
283
285
  return setmetatable(
284
- x,
286
+ {},
285
287
  {
286
288
  __index = function(self, id)
287
289
  if type(id) ~= "number" then
288
290
  return event[id]
289
291
  end
290
292
  if not initialized then
291
- local invoke = Event.invoke
292
293
  event:addListener(function(...)
293
294
  local id = idGetter(...)
294
295
  local dispatched = rawget(self, id)
@@ -326,7 +327,6 @@ local function dispatchAbility(event)
326
327
  return event[id]
327
328
  end
328
329
  if not initialized then
329
- local invoke = Event.invoke
330
330
  event:addListener(function(unit, ability, ...)
331
331
  local dispatched = rawget(self, ability.typeId)
332
332
  if dispatched ~= nil then
@@ -817,8 +817,15 @@ end
817
817
  function Unit.prototype.kill(self)
818
818
  killUnit(self.handle)
819
819
  end
820
- function Unit.prototype.revive(self, pos, doEffect)
821
- ReviveHero(self.handle, pos.x, pos.y, doEffect)
820
+ function Unit.prototype.revive(self, x, y, doEffect)
821
+ local ____ReviveHero_4 = ReviveHero
822
+ local ____array_3 = __TS__SparseArrayNew(self.handle, x, y)
823
+ local ____doEffect_2 = doEffect
824
+ if ____doEffect_2 == nil then
825
+ ____doEffect_2 = false
826
+ end
827
+ __TS__SparseArrayPush(____array_3, ____doEffect_2)
828
+ ____ReviveHero_4(__TS__SparseArraySpread(____array_3))
822
829
  end
823
830
  function Unit.prototype.healTarget(self, target, amount)
824
831
  if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -1385,13 +1392,13 @@ __TS__SetDescriptor(
1385
1392
  end,
1386
1393
  set = function(self, isTeamGlowVisible)
1387
1394
  showUnitTeamGlow(self.handle, isTeamGlowVisible)
1388
- local ____temp_2
1395
+ local ____temp_5
1389
1396
  if not isTeamGlowVisible then
1390
- ____temp_2 = true
1397
+ ____temp_5 = true
1391
1398
  else
1392
- ____temp_2 = nil
1399
+ ____temp_5 = nil
1393
1400
  end
1394
- self[105] = ____temp_2
1401
+ self[105] = ____temp_5
1395
1402
  end
1396
1403
  },
1397
1404
  true
@@ -2055,7 +2062,6 @@ Unit.onDecay = __TS__New(
2055
2062
  Unit.onResurrect = __TS__New(
2056
2063
  InitializingEvent,
2057
2064
  function(event)
2058
- local invoke = Event.invoke
2059
2065
  local dead = setmetatable({}, {__mode = "k"})
2060
2066
  ____exports.Unit.deathEvent:addListener(function(unit)
2061
2067
  dead[unit] = true
@@ -2071,10 +2077,15 @@ Unit.onResurrect = __TS__New(
2071
2077
  Unit.morphEvent = __TS__New(
2072
2078
  InitializingEvent,
2073
2079
  function(event)
2080
+ local function ifNotLeft(unit)
2081
+ local handle = unit.handle
2082
+ if getUnitAbilityLevel(handle, leaveDetectAbilityId) ~= 0 and unitAddAbility(handle, morphDetectAbilityId) then
2083
+ invoke(event, unit)
2084
+ end
2085
+ end
2074
2086
  ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
2075
2087
  if getUnitAbilityLevel(unit.handle, morphDetectAbilityId) == 0 then
2076
- assert(unitAddAbility(unit.handle, morphDetectAbilityId))
2077
- Timer:run(Event.invoke, event, unit)
2088
+ Timer:run(ifNotLeft, unit)
2078
2089
  end
2079
2090
  end)
2080
2091
  end
@@ -2112,27 +2123,26 @@ Unit.onSpellEffect = dispatchId(__TS__New(
2112
2123
  Unit.onTargetCast = dispatchId(__TS__New(
2113
2124
  InitializingEvent,
2114
2125
  function(event)
2115
- local invoke = Event.invoke
2116
2126
  local function listener(unit, id)
2117
- local ____GetSpellTargetUnit_result_5
2127
+ local ____GetSpellTargetUnit_result_8
2118
2128
  if GetSpellTargetUnit() then
2119
- ____GetSpellTargetUnit_result_5 = ____exports.Unit:of(GetSpellTargetUnit())
2129
+ ____GetSpellTargetUnit_result_8 = ____exports.Unit:of(GetSpellTargetUnit())
2120
2130
  else
2121
- local ____GetSpellTargetItem_result_4
2131
+ local ____GetSpellTargetItem_result_7
2122
2132
  if GetSpellTargetItem() then
2123
- ____GetSpellTargetItem_result_4 = Item:of(GetSpellTargetItem())
2133
+ ____GetSpellTargetItem_result_7 = Item:of(GetSpellTargetItem())
2124
2134
  else
2125
- local ____GetSpellTargetDestructable_result_3
2135
+ local ____GetSpellTargetDestructable_result_6
2126
2136
  if GetSpellTargetDestructable() then
2127
- ____GetSpellTargetDestructable_result_3 = Destructable:of(GetSpellTargetDestructable())
2137
+ ____GetSpellTargetDestructable_result_6 = Destructable:of(GetSpellTargetDestructable())
2128
2138
  else
2129
- ____GetSpellTargetDestructable_result_3 = nil
2139
+ ____GetSpellTargetDestructable_result_6 = nil
2130
2140
  end
2131
- ____GetSpellTargetItem_result_4 = ____GetSpellTargetDestructable_result_3
2141
+ ____GetSpellTargetItem_result_7 = ____GetSpellTargetDestructable_result_6
2132
2142
  end
2133
- ____GetSpellTargetUnit_result_5 = ____GetSpellTargetItem_result_4
2143
+ ____GetSpellTargetUnit_result_8 = ____GetSpellTargetItem_result_7
2134
2144
  end
2135
- local target = ____GetSpellTargetUnit_result_5
2145
+ local target = ____GetSpellTargetUnit_result_8
2136
2146
  if target then
2137
2147
  invoke(event, unit, id, target)
2138
2148
  end
@@ -2329,7 +2339,6 @@ Unit.autoAttackStartEvent = __TS__New(
2329
2339
  )
2330
2340
  Unit.onDamaging = (function()
2331
2341
  local event = __TS__New(Event)
2332
- local invoke = Event.invoke
2333
2342
  local trigger = CreateTrigger()
2334
2343
  TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGING)
2335
2344
  TriggerAddCondition(
@@ -2428,7 +2437,6 @@ end)()
2428
2437
  Unit.onDamage = __TS__New(
2429
2438
  InitializingEvent,
2430
2439
  function(event)
2431
- local invoke = Event.invoke
2432
2440
  local trigger = CreateTrigger()
2433
2441
  TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGED)
2434
2442
  TriggerAddCondition(
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { ModelNodeName } from "./model-node-name";
4
3
  import { ModelNodeQualifier } from "./model-node-qualifier";
@@ -1,5 +1,3 @@
1
- /// <reference types="@warscript/language-extensions" />
2
- /// <reference types="@typescript-to-lua/language-extensions" />
3
1
  /** @noSelfInFile */
4
2
  export declare const enum CombatClassification {
5
3
  NONE = 1,// 2^0
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { ChannelAbilityType, ChannelAbilityTypeTargetingType } from "./channel";
4
3
  import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { DiseaseCloudAbilityType } from "./disease-cloud";
4
3
  export declare class BlankPassiveAbilityType extends DiseaseCloudAbilityType {
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { AbilityType, AbilityTypeId } from "../ability-type";
4
3
  import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
@@ -5,6 +5,6 @@ export declare class MineAbilityType extends AbilityType {
5
5
  static readonly BASE_ID: AbilityTypeId;
6
6
  get activationDelay(): number[];
7
7
  set activationDelay(activationDelay: ObjectDataEntryLevelFieldValueSupplier<number>);
8
- get invisibilityDelay(): boolean[];
9
- set invisibilityDelay(invisibilityDelay: ObjectDataEntryLevelFieldValueSupplier<boolean>);
8
+ get invisibilityDelay(): number[];
9
+ set invisibilityDelay(invisibilityDelay: ObjectDataEntryLevelFieldValueSupplier<number>);
10
10
  }
@@ -28,10 +28,10 @@ __TS__SetDescriptor(
28
28
  "invisibilityDelay",
29
29
  {
30
30
  get = function(self)
31
- return self:getBooleanLevelField("Min2")
31
+ return self:getNumberLevelField("Min2")
32
32
  end,
33
33
  set = function(self, invisibilityDelay)
34
- self:setBooleanLevelField("Min2", invisibilityDelay)
34
+ self:setNumberLevelField("Min2", invisibilityDelay)
35
35
  end
36
36
  },
37
37
  true
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import "../../internal/unit/ability";
4
3
  import { TupleOf } from "../../../utility/types";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { BuffPolarity } from "../../auxiliary/buff-polarity";
4
3
  import { BuffResistanceType } from "../../auxiliary/buff-resistance-type";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { BuffType, BuffTypeId } from "../buff-type";
4
3
  export declare class BlankBuffType extends BuffType {
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { TupleOf } from "../../../utility/types";
4
3
  import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { ArmorSoundType } from "../auxiliary/armor-sound-type";
4
3
  import { CombatClassifications } from "../auxiliary/combat-classification";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { ItemType, ItemTypeId } from "../item-type";
4
3
  export declare class BlankItemType extends ItemType {
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { ArmorSoundType } from "../auxiliary/armor-sound-type";
4
3
  import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
4
3
  import { Color } from "../../../core/types/color";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { TupleOf } from "../../../utility/types";
4
3
  import { ArmorSoundType } from "../auxiliary/armor-sound-type";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { Upgrade, UpgradeId } from "../upgrade";
4
3
  export declare class BlankUpgrade extends Upgrade {
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { TupleOf } from "../../../utility/types";
4
3
  import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
@@ -1,4 +1,3 @@
1
- /// <reference types="warpack-types/warpack" />
2
1
  /** @noSelfInFile */
3
2
  import { AttachmentPreset, AttachmentPresetInput } from "./auxiliary/attachment-preset";
4
3
  import { MutableKeys } from "../../utility/types";
@@ -10,8 +9,8 @@ export type ObjectDataEntryConstructor<T extends ObjectDataEntry> = OmitConstruc
10
9
  export type ObjectDataEntryAbstractConstructor<T extends ObjectDataEntry> = OmitConstructor<typeof ObjectDataEntry> & (abstract new (object: WarObject) => T);
11
10
  export type ObjectDataEntryProperties<T extends ObjectDataEntry> = Partial<T[MutableKeys<T>]>;
12
11
  export type ObjectDataEntryLevelFieldValueSupplier<ValueType extends string | number | boolean | undefined | Record<string, any>, InputValueType = ValueType> = ValueType | readonly ValueType[] | ((level: number, currentValue: InputValueType) => ValueType);
13
- export declare const extractObjectDataEntryLevelFieldValue: <ValueType extends string | number | boolean | Record<string, any> | undefined, InputValueType = ValueType>(supplier: ObjectDataEntryLevelFieldValueSupplier<ValueType, InputValueType>, level: number, currentValue: InputValueType) => ValueType;
14
- export declare const extractObjectDataEntryLevelArrayFieldValue: <T extends string | number | boolean | Record<string, any> | undefined, S extends T[]>(supplier: ObjectDataEntryLevelFieldValueSupplier<S, S>, level: number, currentValue: S) => S;
12
+ export declare const extractObjectDataEntryLevelFieldValue: <ValueType extends string | number | boolean | undefined | Record<string, any>, InputValueType = ValueType>(supplier: ObjectDataEntryLevelFieldValueSupplier<ValueType, InputValueType>, level: number, currentValue: InputValueType) => ValueType;
13
+ export declare const extractObjectDataEntryLevelArrayFieldValue: <T extends string | number | boolean | undefined | Record<string, any>, S extends T[]>(supplier: ObjectDataEntryLevelFieldValueSupplier<S>, level: number, currentValue: S) => S;
15
14
  export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = ObjectDataEntryId> {
16
15
  protected readonly object: WarObject;
17
16
  static readonly BASE_ID: ObjectDataEntryId;
@@ -114,4 +114,4 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
114
114
  protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
115
115
  }
116
116
  export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
117
- export declare const resolveCurrentAbilityDependentValue: <ValueType extends string | number | boolean>(ability: Ability, value: AbilityDependentValue<ValueType>) => ValueType;
117
+ export declare const resolveCurrentAbilityDependentValue: <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>) => ValueType;
@@ -1,4 +1,3 @@
1
- /// <reference types="@typescript-to-lua/language-extensions" />
2
1
  /** @noSelfInFile */
3
2
  import { DispatchingEvent } from "../event";
4
3
  import { AbstractConstructor } from "../utility/types";
@@ -8,3 +8,4 @@ export declare const randomFloat: {
8
8
  (upperBound?: number): number;
9
9
  (lowerBound: number, upperBound: number): number;
10
10
  };
11
+ export declare const randomXY: (centerX: number, centerY: number, range: number) => LuaMultiReturn<[x: number, y: number]>;
package/engine/random.lua CHANGED
@@ -1,9 +1,18 @@
1
1
  local ____exports = {}
2
2
  local ____math = require("math")
3
3
  local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
4
+ local PI = ____math.PI
4
5
  local getRandomInt = GetRandomInt
5
6
  local getRandomReal = GetRandomReal
7
+ local cos = math.cos
8
+ local sin = math.sin
9
+ local sqrt = math.sqrt
6
10
  ____exports.randomAngle = function() return getRandomReal(0, 360) end
7
11
  ____exports.randomInteger = function(m, n) return n ~= nil and getRandomInt(m, n) or getRandomInt(0, m or MAXIMUM_INTEGER) end
8
12
  ____exports.randomFloat = function(m, n) return n ~= nil and getRandomReal(m, n) or getRandomReal(0, m or MAXIMUM_INTEGER) end
13
+ ____exports.randomXY = function(centerX, centerY, range)
14
+ local r = range * sqrt(getRandomReal(0, 1))
15
+ local t = getRandomReal(0, 1) * 2 * PI
16
+ return centerX + r * cos(t), centerY + r * sin(t)
17
+ end
9
18
  return ____exports