warscript 0.0.1-dev.7278154 → 0.0.1-dev.72f8823
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.
- package/attributes.d.ts +1 -0
- package/attributes.lua +9 -0
- package/core/types/frame.lua +14 -9
- package/core/types/player.d.ts +15 -0
- package/core/types/player.lua +53 -13
- package/core/types/playerCamera.lua +44 -0
- package/core/types/tileCell.d.ts +11 -1
- package/core/types/tileCell.lua +97 -0
- package/core/types/timer.d.ts +3 -2
- package/core/types/timer.lua +8 -2
- package/decl/native.d.ts +2 -2
- package/engine/behavior.d.ts +8 -1
- package/engine/behavior.lua +97 -65
- package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
- package/engine/behaviour/ability/remove-buffs.lua +21 -0
- package/engine/behaviour/unit/stun-immunity.d.ts +8 -4
- package/engine/behaviour/unit/stun-immunity.lua +12 -3
- package/engine/behaviour/unit.d.ts +7 -3
- package/engine/behaviour/unit.lua +31 -2
- package/engine/buff.d.ts +10 -1
- package/engine/buff.lua +60 -7
- package/engine/internal/ability.lua +6 -5
- package/engine/internal/item.d.ts +13 -15
- package/engine/internal/item.lua +59 -48
- package/engine/internal/unit/ability.d.ts +14 -14
- package/engine/internal/unit/ability.lua +72 -45
- package/engine/internal/unit/fly-height.d.ts +7 -0
- package/engine/internal/unit/fly-height.lua +20 -0
- package/engine/internal/unit/main-selected.lua +12 -27
- package/engine/internal/unit/scale.d.ts +7 -0
- package/engine/internal/unit/scale.lua +20 -0
- package/engine/internal/unit-missile-launch.lua +44 -20
- package/engine/internal/unit.d.ts +15 -12
- package/engine/internal/unit.lua +89 -69
- package/engine/local-client.d.ts +2 -0
- package/engine/local-client.lua +30 -0
- package/engine/object-data/entry/ability-type.lua +4 -1
- package/engine/object-field/unit.d.ts +13 -1
- package/engine/object-field/unit.lua +57 -0
- package/engine/object-field.d.ts +7 -1
- package/engine/object-field.lua +199 -112
- package/engine/random.d.ts +9 -0
- package/engine/random.lua +13 -0
- package/engine/standard/fields/unit.d.ts +3 -1
- package/engine/standard/fields/unit.lua +4 -0
- package/engine/synchronization.d.ts +11 -0
- package/engine/synchronization.lua +77 -0
- package/engine/text-tag.lua +3 -2
- package/engine/unit.d.ts +2 -0
- package/engine/unit.lua +2 -0
- package/net/socket.lua +1 -1
- package/objutil/buff.lua +1 -1
- package/package.json +2 -2
- package/patch-lualib.lua +1 -1
- package/utility/arrays.d.ts +1 -0
- package/utility/arrays.lua +8 -0
- package/utility/callback-array.d.ts +5 -1
- package/utility/callback-array.lua +16 -1
- package/utility/linked-set.d.ts +1 -0
- package/utility/linked-set.lua +19 -1
- package/utility/lua-maps.d.ts +11 -2
- package/utility/lua-maps.lua +33 -2
- package/utility/types.d.ts +3 -0
package/attributes.d.ts
CHANGED
|
@@ -13,5 +13,6 @@ export declare namespace Attribute {
|
|
|
13
13
|
export declare class AttributesHolder {
|
|
14
14
|
readonly get: (<T>(attribute: Attribute<T>) => T | undefined) & LuaExtension<"TableGetMethod">;
|
|
15
15
|
readonly set: (<T>(attribute: Attribute<T>, value: T | undefined) => void) & LuaExtension<"TableSetMethod">;
|
|
16
|
+
getOrPut<T>(attribute: Attribute<T>, defaultValue: () => T): T;
|
|
16
17
|
}
|
|
17
18
|
export {};
|
package/attributes.lua
CHANGED
|
@@ -20,4 +20,13 @@ local AttributesHolder = ____exports.AttributesHolder
|
|
|
20
20
|
AttributesHolder.name = "AttributesHolder"
|
|
21
21
|
function AttributesHolder.prototype.____constructor(self)
|
|
22
22
|
end
|
|
23
|
+
function AttributesHolder.prototype.getOrPut(self, attribute, defaultValue)
|
|
24
|
+
local value = self[attribute]
|
|
25
|
+
if value ~= nil then
|
|
26
|
+
return value
|
|
27
|
+
end
|
|
28
|
+
value = defaultValue()
|
|
29
|
+
self[attribute] = value
|
|
30
|
+
return value
|
|
31
|
+
end
|
|
23
32
|
return ____exports
|
package/core/types/frame.lua
CHANGED
|
@@ -19,13 +19,16 @@ local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates"
|
|
|
19
19
|
local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
|
|
20
20
|
local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
|
|
21
21
|
local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
|
|
22
|
+
local ____playerCamera = require("core.types.playerCamera")
|
|
23
|
+
local frameCoordinatesToWorld = ____playerCamera.frameCoordinatesToWorld
|
|
24
|
+
local worldCoordinatesToFrame = ____playerCamera.worldCoordinatesToFrame
|
|
25
|
+
local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
|
|
26
|
+
local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
|
|
22
27
|
local frameClick = BlzFrameClick
|
|
23
28
|
local frameGetEnable = BlzFrameGetEnable
|
|
24
29
|
local frameIsVisible = BlzFrameIsVisible
|
|
25
30
|
local frameSetEnable = BlzFrameSetEnable
|
|
26
31
|
local frameSetScale = BlzFrameSetScale
|
|
27
|
-
local getCameraTargetPositionX = GetCameraTargetPositionX
|
|
28
|
-
local getCameraTargetPositionY = GetCameraTargetPositionY
|
|
29
32
|
local ____rawget = _G.rawget
|
|
30
33
|
local rawset = _G.rawset
|
|
31
34
|
local invoke = Event.invoke
|
|
@@ -936,16 +939,19 @@ __TS__ObjectDefineProperty(
|
|
|
936
939
|
local event = __TS__New(Event)
|
|
937
940
|
local syncX = 0
|
|
938
941
|
local syncY = 0
|
|
939
|
-
local
|
|
940
|
-
local
|
|
942
|
+
local syncFrameX = 0
|
|
943
|
+
local syncFrameY = 0
|
|
941
944
|
local lastX = syncX
|
|
942
945
|
local lastY = syncY
|
|
943
946
|
self.onMouseMove:addListener(function(player, x, y)
|
|
944
947
|
if player.isLocal then
|
|
945
948
|
syncX = x
|
|
946
949
|
syncY = y
|
|
947
|
-
|
|
948
|
-
|
|
950
|
+
syncFrameX, syncFrameY = worldCoordinatesToFrame(
|
|
951
|
+
x,
|
|
952
|
+
y,
|
|
953
|
+
getTerrainZ(x, y)
|
|
954
|
+
)
|
|
949
955
|
lastX = x
|
|
950
956
|
lastY = y
|
|
951
957
|
invoke(event, x, y)
|
|
@@ -955,9 +961,8 @@ __TS__ObjectDefineProperty(
|
|
|
955
961
|
if syncX == 0 and syncY == 0 then
|
|
956
962
|
return
|
|
957
963
|
end
|
|
958
|
-
local x
|
|
959
|
-
|
|
960
|
-
if x ~= lastX or y ~= lastY then
|
|
964
|
+
local x, y, ____, isDefinite = frameCoordinatesToWorld(syncFrameX, syncFrameY)
|
|
965
|
+
if isDefinite and (x ~= lastX or y ~= lastY) then
|
|
961
966
|
lastX = x
|
|
962
967
|
lastY = y
|
|
963
968
|
invoke(event, x, y)
|
package/core/types/player.d.ts
CHANGED
|
@@ -7,6 +7,18 @@ import { UpgradeId } from "../../engine/object-data/entry/upgrade";
|
|
|
7
7
|
interface Unit {
|
|
8
8
|
handle: junit;
|
|
9
9
|
}
|
|
10
|
+
export declare const enum PlayerAllianceType {
|
|
11
|
+
PASSIVE = 0,
|
|
12
|
+
RESCUABLE = 1,
|
|
13
|
+
HELP_REQUEST = 2,
|
|
14
|
+
HELP_RESPONSE = 3,
|
|
15
|
+
SHARED_XP = 4,
|
|
16
|
+
SHARED_SPELLS = 5,
|
|
17
|
+
SHARED_VISION = 6,
|
|
18
|
+
SHARED_VISION_FORCED = 7,
|
|
19
|
+
SHARED_CONTROL = 8,
|
|
20
|
+
SHARED_ADVANCED_CONTROL = 9
|
|
21
|
+
}
|
|
10
22
|
export declare class Player extends Handle<jplayer> {
|
|
11
23
|
static readonly all: Player[];
|
|
12
24
|
static readonly local: Player;
|
|
@@ -42,6 +54,8 @@ export declare class Player extends Handle<jplayer> {
|
|
|
42
54
|
forceUICancel(): void;
|
|
43
55
|
isAllyOf(other: Player): boolean;
|
|
44
56
|
isEnemyOf(other: Player): boolean;
|
|
57
|
+
setAlliance(other: Player, type: PlayerAllianceType, value: boolean): void;
|
|
58
|
+
getAlliance(other: Player, type: PlayerAllianceType): boolean;
|
|
45
59
|
setAbilityAvailable(abilityId: number, available: boolean): void;
|
|
46
60
|
getMaximumUpgradeLevel(upgradeId: UpgradeId): number;
|
|
47
61
|
setMaximumUpgradeLevel(upgradeId: UpgradeId, maximumLevel: number): void;
|
|
@@ -50,6 +64,7 @@ export declare class Player extends Handle<jplayer> {
|
|
|
50
64
|
setUpgradeLevel(upgradeId: UpgradeId, level: number): void;
|
|
51
65
|
private static getEvent;
|
|
52
66
|
private static getMouseEvent;
|
|
67
|
+
static get allianceChangedEvent(): Readonly<Record<PlayerAllianceType, Event<[Player]>>>;
|
|
53
68
|
static get onLeave(): Event<[Player]>;
|
|
54
69
|
static get onMouseDown(): Event<[Player, jmousebuttontype]>;
|
|
55
70
|
static get onMouseUp(): Event<[Player, jmousebuttontype]>;
|
package/core/types/player.lua
CHANGED
|
@@ -23,14 +23,32 @@ local ____math = require("math")
|
|
|
23
23
|
local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
|
|
24
24
|
local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
|
|
25
25
|
local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
|
|
26
|
+
local ____lazy = require("utility.lazy")
|
|
27
|
+
local lazyRecord = ____lazy.lazyRecord
|
|
28
|
+
local getPlayerAlliance = GetPlayerAlliance
|
|
26
29
|
local getPlayerColor = GetPlayerColor
|
|
27
30
|
local getPlayerName = GetPlayerName
|
|
28
31
|
local getPlayerTechCount = GetPlayerTechCount
|
|
29
32
|
local getPlayerTechMaxAllowed = GetPlayerTechMaxAllowed
|
|
33
|
+
local getTriggerPlayer = GetTriggerPlayer
|
|
34
|
+
local setPlayerAlliance = SetPlayerAlliance
|
|
30
35
|
local setPlayerTechMaxAllowed = SetPlayerTechMaxAllowed
|
|
31
36
|
local setPlayerTechResearched = SetPlayerTechResearched
|
|
32
37
|
local setPlayerAbilityAvailable = SetPlayerAbilityAvailable
|
|
38
|
+
local triggerRegisterPlayerAllianceChange = TriggerRegisterPlayerAllianceChange
|
|
33
39
|
local playerNative = _G.Player
|
|
40
|
+
local nativeByPlayerAllianceType = {
|
|
41
|
+
[0] = ALLIANCE_PASSIVE,
|
|
42
|
+
[1] = ALLIANCE_RESCUABLE,
|
|
43
|
+
[2] = ALLIANCE_HELP_REQUEST,
|
|
44
|
+
[3] = ALLIANCE_HELP_RESPONSE,
|
|
45
|
+
[4] = ALLIANCE_SHARED_XP,
|
|
46
|
+
[5] = ALLIANCE_SHARED_SPELLS,
|
|
47
|
+
[6] = ALLIANCE_SHARED_VISION,
|
|
48
|
+
[7] = ALLIANCE_SHARED_VISION_FORCED,
|
|
49
|
+
[8] = ALLIANCE_SHARED_CONTROL,
|
|
50
|
+
[9] = ALLIANCE_SHARED_ADVANCED_CONTROL
|
|
51
|
+
}
|
|
34
52
|
____exports.Player = __TS__Class()
|
|
35
53
|
local Player = ____exports.Player
|
|
36
54
|
Player.name = "Player"
|
|
@@ -85,6 +103,12 @@ end
|
|
|
85
103
|
function Player.prototype.isEnemyOf(self, other)
|
|
86
104
|
return IsPlayerEnemy(self.handle, other.handle)
|
|
87
105
|
end
|
|
106
|
+
function Player.prototype.setAlliance(self, other, ____type, value)
|
|
107
|
+
setPlayerAlliance(self.handle, other.handle, nativeByPlayerAllianceType[____type], value)
|
|
108
|
+
end
|
|
109
|
+
function Player.prototype.getAlliance(self, other, ____type)
|
|
110
|
+
return getPlayerAlliance(self.handle, other.handle, nativeByPlayerAllianceType[____type])
|
|
111
|
+
end
|
|
88
112
|
function Player.prototype.setAbilityAvailable(self, abilityId, available)
|
|
89
113
|
setPlayerAbilityAvailable(self.handle, abilityId, available)
|
|
90
114
|
end
|
|
@@ -124,14 +148,11 @@ function Player.getMouseEvent(self, event, collector)
|
|
|
124
148
|
self.events[eventId] = __TS__New(
|
|
125
149
|
TriggerEvent,
|
|
126
150
|
function(trigger)
|
|
127
|
-
Timer:
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
for ____, player in ipairs(____exports.Player.all) do
|
|
131
|
-
TriggerRegisterPlayerEvent(trigger, player.handle, event)
|
|
132
|
-
end
|
|
151
|
+
Timer:run(function()
|
|
152
|
+
for ____, player in ipairs(____exports.Player.all) do
|
|
153
|
+
TriggerRegisterPlayerEvent(trigger, player.handle, event)
|
|
133
154
|
end
|
|
134
|
-
)
|
|
155
|
+
end)
|
|
135
156
|
end,
|
|
136
157
|
collector or (function() return {} end)
|
|
137
158
|
)
|
|
@@ -180,7 +201,7 @@ function Player.getKeyEvent(self, isDown)
|
|
|
180
201
|
TriggerAddCondition(
|
|
181
202
|
trigger,
|
|
182
203
|
Condition(function()
|
|
183
|
-
local player = ____exports.Player:of(
|
|
204
|
+
local player = ____exports.Player:of(getTriggerPlayer())
|
|
184
205
|
local key = BlzGetTriggerPlayerKey()
|
|
185
206
|
local metaKey = BlzGetTriggerPlayerMetaKey()
|
|
186
207
|
Event.invoke(event, player, key, metaKey)
|
|
@@ -369,13 +390,32 @@ __TS__SetDescriptor(
|
|
|
369
390
|
end},
|
|
370
391
|
true
|
|
371
392
|
)
|
|
393
|
+
__TS__ObjectDefineProperty(
|
|
394
|
+
Player,
|
|
395
|
+
"allianceChangedEvent",
|
|
396
|
+
{get = function(self)
|
|
397
|
+
local event = lazyRecord(function(____type)
|
|
398
|
+
return __TS__New(
|
|
399
|
+
TriggerEvent,
|
|
400
|
+
function(trigger)
|
|
401
|
+
for ____, player in ipairs(____exports.Player.all) do
|
|
402
|
+
triggerRegisterPlayerAllianceChange(trigger, player.handle, nativeByPlayerAllianceType[____type])
|
|
403
|
+
end
|
|
404
|
+
end,
|
|
405
|
+
function() return ____exports.Player:of(getTriggerPlayer()) end
|
|
406
|
+
)
|
|
407
|
+
end)
|
|
408
|
+
rawset(self, "allianceChangedEvent", event)
|
|
409
|
+
return event
|
|
410
|
+
end}
|
|
411
|
+
)
|
|
372
412
|
__TS__ObjectDefineProperty(
|
|
373
413
|
Player,
|
|
374
414
|
"onLeave",
|
|
375
415
|
{get = function(self)
|
|
376
416
|
return ____exports.Player:getEvent(
|
|
377
417
|
EVENT_PLAYER_LEAVE,
|
|
378
|
-
function() return ____exports.Player:of(
|
|
418
|
+
function() return ____exports.Player:of(getTriggerPlayer()) end
|
|
379
419
|
)
|
|
380
420
|
end}
|
|
381
421
|
)
|
|
@@ -385,7 +425,7 @@ __TS__ObjectDefineProperty(
|
|
|
385
425
|
{get = function(self)
|
|
386
426
|
return ____exports.Player:getMouseEvent(
|
|
387
427
|
EVENT_PLAYER_MOUSE_DOWN,
|
|
388
|
-
function() return ____exports.Player:of(
|
|
428
|
+
function() return ____exports.Player:of(getTriggerPlayer()), BlzGetTriggerPlayerMouseButton() end
|
|
389
429
|
)
|
|
390
430
|
end}
|
|
391
431
|
)
|
|
@@ -395,7 +435,7 @@ __TS__ObjectDefineProperty(
|
|
|
395
435
|
{get = function(self)
|
|
396
436
|
return ____exports.Player:getMouseEvent(
|
|
397
437
|
EVENT_PLAYER_MOUSE_UP,
|
|
398
|
-
function() return ____exports.Player:of(
|
|
438
|
+
function() return ____exports.Player:of(getTriggerPlayer()), BlzGetTriggerPlayerMouseButton() end
|
|
399
439
|
)
|
|
400
440
|
end}
|
|
401
441
|
)
|
|
@@ -405,7 +445,7 @@ __TS__ObjectDefineProperty(
|
|
|
405
445
|
{get = function(self)
|
|
406
446
|
return ____exports.Player:getMouseEvent(
|
|
407
447
|
EVENT_PLAYER_MOUSE_MOVE,
|
|
408
|
-
function() return ____exports.Player:of(
|
|
448
|
+
function() return ____exports.Player:of(getTriggerPlayer()), vec2(
|
|
409
449
|
BlzGetTriggerPlayerMouseX(),
|
|
410
450
|
BlzGetTriggerPlayerMouseY()
|
|
411
451
|
) end
|
|
@@ -441,7 +481,7 @@ __TS__ObjectDefineProperty(
|
|
|
441
481
|
TriggerRegisterPlayerChatEvent(trigger, player.handle, "", false)
|
|
442
482
|
end
|
|
443
483
|
end,
|
|
444
|
-
function() return ____exports.Player:of(
|
|
484
|
+
function() return ____exports.Player:of(getTriggerPlayer()), GetEventPlayerChatString() end
|
|
445
485
|
)
|
|
446
486
|
rawset(self, "onChat", event)
|
|
447
487
|
return event
|
|
@@ -13,6 +13,8 @@ local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates"
|
|
|
13
13
|
local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
|
|
14
14
|
local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
|
|
15
15
|
local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
|
|
16
|
+
local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
|
|
17
|
+
local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
|
|
16
18
|
local getHandleId = GetHandleId
|
|
17
19
|
local setCameraField = SetCameraField
|
|
18
20
|
local getCameraField = GetCameraField
|
|
@@ -26,6 +28,7 @@ local resetToGameCamera = ResetToGameCamera
|
|
|
26
28
|
local cos = math.cos
|
|
27
29
|
local deg = math.deg
|
|
28
30
|
local sin = math.sin
|
|
31
|
+
local sqrt = math.sqrt
|
|
29
32
|
local memoized = {}
|
|
30
33
|
____exports.PlayerCamera = __TS__Class()
|
|
31
34
|
local PlayerCamera = ____exports.PlayerCamera
|
|
@@ -233,4 +236,45 @@ ____exports.worldCoordinatesToFrame = function(x, y, z)
|
|
|
233
236
|
local frameY = 0.42625 - yCenterScreenShift + (cameraAngleOfAttackSinRotationCos * dx + cameraAngleOfAttackSinRotationSin * dy - cameraAngleOfAttackCos * dz) / xPrime
|
|
234
237
|
return frameX, frameY, xPrime < 0 and frameX >= frameMinX and frameX <= frameMaxX and frameY >= FRAME_MIN_Y and frameY <= FRAME_MAX_Y
|
|
235
238
|
end
|
|
239
|
+
---
|
|
240
|
+
-- @internal For use by internal systems only.
|
|
241
|
+
____exports.frameCoordinatesToWorld = function(x, y)
|
|
242
|
+
if not isCameraViewPrecalculated then
|
|
243
|
+
precalculateCameraView()
|
|
244
|
+
end
|
|
245
|
+
local a = (x - 0.4) * scaleFactor
|
|
246
|
+
local b = (0.42625 - yCenterScreenShift - y) * scaleFactor
|
|
247
|
+
local nx = 1 / sqrt(1 + a * a + b * b)
|
|
248
|
+
local ny = sqrt(1 - (1 + b * b) * nx * nx)
|
|
249
|
+
local nz = sqrt(1 - nx * nx - ny * ny)
|
|
250
|
+
if a > 0 then
|
|
251
|
+
ny = -ny
|
|
252
|
+
end
|
|
253
|
+
if b < 0 then
|
|
254
|
+
nz = -nz
|
|
255
|
+
end
|
|
256
|
+
local nxPrime = cameraAngleOfAttackCosRotationCos * nx - cameraRotationSin * ny + cameraAngleOfAttackSinRotationCos * nz
|
|
257
|
+
local nyPrime = cameraAngleOfAttackCosRotationSin * nx + cameraRotationCos * ny + cameraAngleOfAttackSinRotationSin * nz
|
|
258
|
+
local nzPrime = -cameraAngleOfAttackSin * nx + cameraAngleOfAttackCos * nz
|
|
259
|
+
local zGuess = getTerrainZ(cameraEyeX, cameraEyeY)
|
|
260
|
+
local xGuess = cameraEyeX + nxPrime * (cameraEyeZ - zGuess) / nzPrime
|
|
261
|
+
local yGuess = cameraEyeY + nyPrime * (cameraEyeZ - zGuess) / nzPrime
|
|
262
|
+
local zWorld = getTerrainZ(xGuess, yGuess)
|
|
263
|
+
local deltaZ = zWorld - zGuess
|
|
264
|
+
zGuess = zWorld
|
|
265
|
+
local zWorldOld = zWorld
|
|
266
|
+
local deltaZOld = deltaZ
|
|
267
|
+
local i = 0
|
|
268
|
+
while (deltaZ > 1 or deltaZ < -1) and i < 50 do
|
|
269
|
+
xGuess = cameraEyeX + nxPrime * (cameraEyeZ - zGuess) / nzPrime
|
|
270
|
+
yGuess = cameraEyeY + nyPrime * (cameraEyeZ - zGuess) / nzPrime
|
|
271
|
+
zWorld = getTerrainZ(xGuess, yGuess)
|
|
272
|
+
deltaZ = zWorld - zGuess
|
|
273
|
+
zGuess = (deltaZOld * zWorld - deltaZ * zWorldOld) / (deltaZOld - deltaZ)
|
|
274
|
+
zWorldOld = zWorld
|
|
275
|
+
deltaZOld = deltaZ
|
|
276
|
+
i = i + 1
|
|
277
|
+
end
|
|
278
|
+
return xGuess, yGuess, zWorld, i < 50
|
|
279
|
+
end
|
|
236
280
|
return ____exports
|
package/core/types/tileCell.d.ts
CHANGED
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
|
-
|
|
2
|
+
import { AttributesHolder } from "../../attributes";
|
|
3
|
+
export declare class TileCell extends AttributesHolder implements Readonly<Vec2> {
|
|
3
4
|
private readonly id;
|
|
4
5
|
readonly x: number;
|
|
5
6
|
readonly y: number;
|
|
6
7
|
readonly z: undefined;
|
|
7
8
|
protected constructor(id: number, x: number, y: number, z: undefined);
|
|
9
|
+
get up(): TileCell;
|
|
10
|
+
get down(): TileCell;
|
|
11
|
+
get left(): TileCell;
|
|
12
|
+
get right(): TileCell;
|
|
13
|
+
get terrainTypeId(): number;
|
|
14
|
+
set terrainTypeId(terrainTypeId: number);
|
|
15
|
+
get terrainVariance(): number;
|
|
16
|
+
set terrainVariance(terrainVariance: number);
|
|
17
|
+
randomizeTerrainVariance(): void;
|
|
8
18
|
isInRangeOf(x: number, y: number, range: number): boolean;
|
|
9
19
|
isInRangeOf(tileCell: TileCell, range: number): boolean;
|
|
10
20
|
static getInRect(minX: number, minY: number, maxX: number, maxY: number): TileCell[];
|
package/core/types/tileCell.lua
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
local ____lualib = require("lualib_bundle")
|
|
2
2
|
local __TS__Class = ____lualib.__TS__Class
|
|
3
|
+
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
3
4
|
local __TS__New = ____lualib.__TS__New
|
|
5
|
+
local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
|
|
4
6
|
local ____exports = {}
|
|
7
|
+
local ____attributes = require("attributes")
|
|
8
|
+
local AttributesHolder = ____attributes.AttributesHolder
|
|
9
|
+
local getTerrainType = GetTerrainType
|
|
10
|
+
local setTerrainType = SetTerrainType
|
|
11
|
+
local getTerrainVariance = GetTerrainVariance
|
|
5
12
|
local abs = math.abs
|
|
6
13
|
local ____type = math.type
|
|
7
14
|
local ult = math.ult
|
|
@@ -9,13 +16,27 @@ local tileCellById = {}
|
|
|
9
16
|
____exports.TileCell = __TS__Class()
|
|
10
17
|
local TileCell = ____exports.TileCell
|
|
11
18
|
TileCell.name = "TileCell"
|
|
19
|
+
__TS__ClassExtends(TileCell, AttributesHolder)
|
|
12
20
|
function TileCell.prototype.____constructor(self, id, x, y, z)
|
|
21
|
+
AttributesHolder.prototype.____constructor(self)
|
|
13
22
|
self.id = id
|
|
14
23
|
self.x = x
|
|
15
24
|
self.y = y
|
|
16
25
|
self.z = z
|
|
17
26
|
tileCellById[id] = self
|
|
18
27
|
end
|
|
28
|
+
function TileCell.prototype.randomizeTerrainVariance(self)
|
|
29
|
+
local x = self.x
|
|
30
|
+
local y = self.y
|
|
31
|
+
setTerrainType(
|
|
32
|
+
x,
|
|
33
|
+
y,
|
|
34
|
+
getTerrainType(x, y),
|
|
35
|
+
-1,
|
|
36
|
+
1,
|
|
37
|
+
1
|
|
38
|
+
)
|
|
39
|
+
end
|
|
19
40
|
function TileCell.prototype.isInRangeOf(self, x, y, range)
|
|
20
41
|
if range == nil then
|
|
21
42
|
range = y
|
|
@@ -97,4 +118,80 @@ function TileCell.of(x, y)
|
|
|
97
118
|
nil
|
|
98
119
|
)
|
|
99
120
|
end
|
|
121
|
+
__TS__SetDescriptor(
|
|
122
|
+
TileCell.prototype,
|
|
123
|
+
"up",
|
|
124
|
+
{get = function(self)
|
|
125
|
+
return ____exports.TileCell.of(self.x, self.y + 128)
|
|
126
|
+
end},
|
|
127
|
+
true
|
|
128
|
+
)
|
|
129
|
+
__TS__SetDescriptor(
|
|
130
|
+
TileCell.prototype,
|
|
131
|
+
"down",
|
|
132
|
+
{get = function(self)
|
|
133
|
+
return ____exports.TileCell.of(self.x, self.y - 128)
|
|
134
|
+
end},
|
|
135
|
+
true
|
|
136
|
+
)
|
|
137
|
+
__TS__SetDescriptor(
|
|
138
|
+
TileCell.prototype,
|
|
139
|
+
"left",
|
|
140
|
+
{get = function(self)
|
|
141
|
+
return ____exports.TileCell.of(self.x - 128, self.y)
|
|
142
|
+
end},
|
|
143
|
+
true
|
|
144
|
+
)
|
|
145
|
+
__TS__SetDescriptor(
|
|
146
|
+
TileCell.prototype,
|
|
147
|
+
"right",
|
|
148
|
+
{get = function(self)
|
|
149
|
+
return ____exports.TileCell.of(self.x + 128, self.y)
|
|
150
|
+
end},
|
|
151
|
+
true
|
|
152
|
+
)
|
|
153
|
+
__TS__SetDescriptor(
|
|
154
|
+
TileCell.prototype,
|
|
155
|
+
"terrainTypeId",
|
|
156
|
+
{
|
|
157
|
+
get = function(self)
|
|
158
|
+
return getTerrainType(self.x, self.y)
|
|
159
|
+
end,
|
|
160
|
+
set = function(self, terrainTypeId)
|
|
161
|
+
local x = self.x
|
|
162
|
+
local y = self.y
|
|
163
|
+
setTerrainType(
|
|
164
|
+
x,
|
|
165
|
+
y,
|
|
166
|
+
terrainTypeId,
|
|
167
|
+
getTerrainVariance(x, y),
|
|
168
|
+
1,
|
|
169
|
+
1
|
|
170
|
+
)
|
|
171
|
+
end
|
|
172
|
+
},
|
|
173
|
+
true
|
|
174
|
+
)
|
|
175
|
+
__TS__SetDescriptor(
|
|
176
|
+
TileCell.prototype,
|
|
177
|
+
"terrainVariance",
|
|
178
|
+
{
|
|
179
|
+
get = function(self)
|
|
180
|
+
return getTerrainVariance(self.x, self.y)
|
|
181
|
+
end,
|
|
182
|
+
set = function(self, terrainVariance)
|
|
183
|
+
local x = self.x
|
|
184
|
+
local y = self.y
|
|
185
|
+
setTerrainType(
|
|
186
|
+
x,
|
|
187
|
+
y,
|
|
188
|
+
getTerrainType(x, y),
|
|
189
|
+
terrainVariance,
|
|
190
|
+
1,
|
|
191
|
+
1
|
|
192
|
+
)
|
|
193
|
+
end
|
|
194
|
+
},
|
|
195
|
+
true
|
|
196
|
+
)
|
|
100
197
|
return ____exports
|
package/core/types/timer.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
2
|
import { Event } from "../../event";
|
|
3
3
|
import { AbstractDestroyable, Destructor } from "../../destroyable";
|
|
4
|
+
import { CallbackId } from "../../utility/callback-array";
|
|
4
5
|
declare const enum TimerPropertyKey {
|
|
5
6
|
HANDLE = 0,
|
|
6
7
|
DESTROY_ON_EXPIRATION = 1,
|
|
@@ -22,8 +23,8 @@ export declare class Timer extends AbstractDestroyable {
|
|
|
22
23
|
pause(): void;
|
|
23
24
|
resume(): void;
|
|
24
25
|
static create(): Timer;
|
|
25
|
-
static run<T, K extends KeysOfType<T, (this: T, ...args: any) => any>>(object: T, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never):
|
|
26
|
-
static run<Args extends any[]>(callback: (this: void, ...args: Args) => void, ...args: Args):
|
|
26
|
+
static run<T, K extends KeysOfType<T, (this: T, ...args: any) => any>>(object: T, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): CallbackId;
|
|
27
|
+
static run<Args extends any[]>(callback: (this: void, ...args: Args) => void, ...args: Args): CallbackId;
|
|
27
28
|
static simple<Args extends any[]>(timeout: number, callback: (...args: Args) => void, ...args: Args): Timer;
|
|
28
29
|
static periodic<Args extends any[]>(period: number, callback: (this: void, timer: Timer, ...args: Args) => void, ...args: Args): Timer;
|
|
29
30
|
static counted(period: number, count: number, callback: (this: void, timer: Timer) => void): Timer;
|
package/core/types/timer.lua
CHANGED
|
@@ -15,6 +15,7 @@ local AbstractDestroyable = ____destroyable.AbstractDestroyable
|
|
|
15
15
|
local ____callback_2Darray = require("utility.callback-array")
|
|
16
16
|
local addCallback = ____callback_2Darray.addCallback
|
|
17
17
|
local callbackArray = ____callback_2Darray.callbackArray
|
|
18
|
+
local consumeCallback = ____callback_2Darray.consumeCallback
|
|
18
19
|
local consumeCallbacks = ____callback_2Darray.consumeCallbacks
|
|
19
20
|
local createTimer = CreateTimer
|
|
20
21
|
local timerStart = TimerStart
|
|
@@ -55,6 +56,11 @@ local function timerSafeCall()
|
|
|
55
56
|
end
|
|
56
57
|
local zeroTimerScheduled = false
|
|
57
58
|
local zeroTimerCallbacks = callbackArray()
|
|
59
|
+
---
|
|
60
|
+
-- @internal For use by internal systems only.
|
|
61
|
+
____exports.consumeZeroTimerCallback = function(id)
|
|
62
|
+
consumeCallback(zeroTimerCallbacks, id)
|
|
63
|
+
end
|
|
58
64
|
local function invokeZeroTimerCallbacks()
|
|
59
65
|
zeroTimerScheduled = false
|
|
60
66
|
consumeCallbacks(zeroTimerCallbacks)
|
|
@@ -98,9 +104,9 @@ function Timer.run(self, objectOrCallback, keyOrFirstArg, ...)
|
|
|
98
104
|
____exports.Timer:simple(0, invokeZeroTimerCallbacks)
|
|
99
105
|
end
|
|
100
106
|
if ____type(objectOrCallback) == "function" then
|
|
101
|
-
addCallback(zeroTimerCallbacks, objectOrCallback, keyOrFirstArg, ...)
|
|
107
|
+
return addCallback(zeroTimerCallbacks, objectOrCallback, keyOrFirstArg, ...)
|
|
102
108
|
else
|
|
103
|
-
addCallback(zeroTimerCallbacks, objectOrCallback[keyOrFirstArg], objectOrCallback, ...)
|
|
109
|
+
return addCallback(zeroTimerCallbacks, objectOrCallback[keyOrFirstArg], objectOrCallback, ...)
|
|
104
110
|
end
|
|
105
111
|
end
|
|
106
112
|
function Timer.simple(self, timeout, callback, ...)
|
package/decl/native.d.ts
CHANGED
|
@@ -5259,8 +5259,8 @@ declare function BlzRemoveAbilityStringLevelArrayField(
|
|
|
5259
5259
|
level: number,
|
|
5260
5260
|
value: string,
|
|
5261
5261
|
): boolean
|
|
5262
|
-
declare function BlzGetItemAbilityByIndex(whichItem: jitem, index: number): jability |
|
|
5263
|
-
declare function BlzGetItemAbility(whichItem: jitem, abilCode: number): jability |
|
|
5262
|
+
declare function BlzGetItemAbilityByIndex(whichItem: jitem, index: number): jability | undefined
|
|
5263
|
+
declare function BlzGetItemAbility(whichItem: jitem, abilCode: number): jability | undefined
|
|
5264
5264
|
declare function BlzItemAddAbility(whichItem: jitem, abilCode: number): boolean
|
|
5265
5265
|
declare function BlzGetItemBooleanField(whichItem: jitem, whichField: jitembooleanfield): boolean
|
|
5266
5266
|
declare function BlzGetItemIntegerField(whichItem: jitem, whichField: jitemintegerfield): number
|
package/engine/behavior.d.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
2
|
import { AbstractDestroyable, Destructor } from "../destroyable";
|
|
3
3
|
import { Event } from "../event";
|
|
4
|
+
export declare const enum BehaviorPriority {
|
|
5
|
+
HIGH = 0,
|
|
6
|
+
MEDIUM = 1,
|
|
7
|
+
LOW = 2
|
|
8
|
+
}
|
|
4
9
|
export type BehaviorConstructor<T extends Behavior<AnyNotNil>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
|
|
5
10
|
declare const enum BehaviorPropertyKey {
|
|
6
11
|
PREVIOUS_BEHAVIOR = 0,
|
|
@@ -9,12 +14,14 @@ declare const enum BehaviorPropertyKey {
|
|
|
9
14
|
}
|
|
10
15
|
export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
|
|
11
16
|
protected readonly object: T;
|
|
17
|
+
readonly priority: BehaviorPriority;
|
|
12
18
|
private [BehaviorPropertyKey.PREVIOUS_BEHAVIOR]?;
|
|
13
19
|
private [BehaviorPropertyKey.NEXT_BEHAVIOR]?;
|
|
14
20
|
private [BehaviorPropertyKey.TIMER]?;
|
|
15
|
-
protected constructor(object: T);
|
|
21
|
+
protected constructor(object: T, priority?: BehaviorPriority);
|
|
16
22
|
protected onDestroy(): Destructor;
|
|
17
23
|
protected registerEvent<K extends string, Args extends any[]>(this: Behavior<any, PeriodicActionParameters> & Record<K, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, listener: K): void;
|
|
24
|
+
protected deregisterEvent(event: Event<any>): boolean;
|
|
18
25
|
protected onPeriod(...parameters: PeriodicActionParameters): void;
|
|
19
26
|
protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;
|
|
20
27
|
protected stopPeriodicAction(): void;
|