warscript 0.0.1-dev.f024cc2 → 0.0.1-dev.f074376
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 +16 -0
- package/core/types/player.lua +57 -14
- 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 +22 -2
- package/decl/native.d.ts +2 -2
- package/destroyable.d.ts +1 -0
- package/destroyable.lua +9 -0
- package/engine/behavior.d.ts +12 -1
- package/engine/behavior.lua +199 -65
- package/engine/behaviour/ability/apply-buff.lua +4 -4
- package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
- package/engine/behaviour/ability/remove-buffs.lua +21 -0
- package/engine/behaviour/ability.d.ts +2 -1
- package/engine/behaviour/ability.lua +2 -1
- 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 +15 -5
- package/engine/behaviour/unit.lua +116 -22
- package/engine/buff.d.ts +15 -5
- package/engine/buff.lua +151 -94
- package/engine/internal/ability.d.ts +3 -1
- package/engine/internal/ability.lua +26 -9
- package/engine/internal/item.d.ts +13 -15
- package/engine/internal/item.lua +63 -49
- package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts +2 -0
- package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua +16 -0
- package/engine/internal/unit/ability.d.ts +14 -14
- package/engine/internal/unit/ability.lua +72 -45
- package/engine/internal/unit/bonus.d.ts +2 -0
- package/engine/internal/unit/bonus.lua +10 -0
- 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+ability.lua +9 -0
- package/engine/internal/unit-missile-launch.lua +44 -20
- package/engine/internal/unit.d.ts +15 -12
- package/engine/internal/unit.lua +93 -76
- package/engine/local-client.d.ts +2 -0
- package/engine/local-client.lua +30 -0
- package/engine/object-data/auxiliary/health-regeneration-type.d.ts +8 -0
- package/engine/object-data/auxiliary/health-regeneration-type.lua +2 -0
- package/engine/object-data/entry/ability-type/mana-regeneration.d.ts +8 -0
- package/engine/object-data/entry/ability-type/mana-regeneration.lua +26 -0
- package/engine/object-data/entry/ability-type.lua +4 -1
- package/engine/object-data/entry/destructible-type.d.ts +27 -1
- package/engine/object-data/entry/destructible-type.lua +155 -0
- package/engine/object-data/entry/unit-type.d.ts +4 -0
- package/engine/object-data/entry/unit-type.lua +76 -32
- package/engine/object-field/ability.d.ts +3 -3
- package/engine/object-field/ability.lua +7 -6
- package/engine/object-field/unit.d.ts +20 -5
- package/engine/object-field/unit.lua +61 -0
- package/engine/object-field.d.ts +9 -3
- package/engine/object-field.lua +237 -114
- package/engine/random.d.ts +9 -0
- package/engine/random.lua +13 -0
- package/engine/standard/fields/ability.d.ts +2 -2
- package/engine/standard/fields/ability.lua +2 -2
- package/engine/standard/fields/unit.d.ts +4 -1
- package/engine/standard/fields/unit.lua +6 -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 +17 -0
- package/utility/callback-array.lua +61 -0
- 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
|
@@ -17,63 +17,127 @@ local getOrPut = ____lua_2Dmaps.getOrPut
|
|
|
17
17
|
local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
|
|
18
18
|
local ____lua_2Dsets = require("utility.lua-sets")
|
|
19
19
|
local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
|
|
20
|
-
local
|
|
21
|
-
local
|
|
22
|
-
local
|
|
23
|
-
local
|
|
20
|
+
local ____bonus = require("engine.internal.unit.bonus")
|
|
21
|
+
local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
|
|
22
|
+
local getUnitBonus = ____bonus.getUnitBonus
|
|
23
|
+
local removeUnitBonus = ____bonus.removeUnitBonus
|
|
24
|
+
local safeCall = warpack.safeCall
|
|
25
|
+
local createBehaviorFunctionsByUnitTypeId = {}
|
|
26
|
+
local behaviorsByOwningPlayerEvent = {}
|
|
27
|
+
local listenerByBehaviorByOwningPlayerEvent = {}
|
|
28
|
+
local owningPlayerEventsByBehavior = {}
|
|
29
|
+
local behaviorsByInRangeUnitEvent = {}
|
|
30
|
+
local rangeByBehaviorByInRangeUnitEvent = {}
|
|
31
|
+
local listenerByBehaviorByInRangeUnitEvent = {}
|
|
32
|
+
local inRangeUnitEventsByBehavior = {}
|
|
24
33
|
____exports.UnitBehavior = __TS__Class()
|
|
25
34
|
local UnitBehavior = ____exports.UnitBehavior
|
|
26
35
|
UnitBehavior.name = "UnitBehavior"
|
|
27
36
|
__TS__ClassExtends(UnitBehavior, Behavior)
|
|
28
|
-
function UnitBehavior.prototype.____constructor(self, unit)
|
|
29
|
-
Behavior.prototype.____constructor(self, unit)
|
|
37
|
+
function UnitBehavior.prototype.____constructor(self, unit, priority)
|
|
38
|
+
Behavior.prototype.____constructor(self, unit, priority)
|
|
30
39
|
end
|
|
31
40
|
function UnitBehavior.prototype.onDestroy(self)
|
|
32
|
-
local
|
|
33
|
-
if
|
|
34
|
-
for event in pairs(
|
|
35
|
-
local ____opt_0 =
|
|
41
|
+
local owningPlayerEvents = owningPlayerEventsByBehavior[self]
|
|
42
|
+
if owningPlayerEvents ~= nil then
|
|
43
|
+
for event in pairs(owningPlayerEvents) do
|
|
44
|
+
local ____opt_0 = behaviorsByOwningPlayerEvent[event]
|
|
36
45
|
if ____opt_0 ~= nil then
|
|
37
46
|
____opt_0:remove(self)
|
|
38
47
|
end
|
|
39
|
-
local ____opt_2 =
|
|
48
|
+
local ____opt_2 = listenerByBehaviorByOwningPlayerEvent[event]
|
|
40
49
|
if ____opt_2 ~= nil then
|
|
41
50
|
____opt_2[self] = nil
|
|
42
51
|
end
|
|
43
|
-
|
|
52
|
+
end
|
|
53
|
+
owningPlayerEventsByBehavior[self] = nil
|
|
54
|
+
end
|
|
55
|
+
local inRangeUnitEvents = inRangeUnitEventsByBehavior[self]
|
|
56
|
+
if inRangeUnitEvents ~= nil then
|
|
57
|
+
for event in pairs(inRangeUnitEvents) do
|
|
58
|
+
local ____opt_4 = behaviorsByInRangeUnitEvent[event]
|
|
44
59
|
if ____opt_4 ~= nil then
|
|
45
|
-
____opt_4
|
|
60
|
+
____opt_4:remove(self)
|
|
61
|
+
end
|
|
62
|
+
local ____opt_6 = rangeByBehaviorByInRangeUnitEvent[event]
|
|
63
|
+
if ____opt_6 ~= nil then
|
|
64
|
+
____opt_6[self] = nil
|
|
65
|
+
end
|
|
66
|
+
local ____opt_8 = listenerByBehaviorByInRangeUnitEvent[event]
|
|
67
|
+
if ____opt_8 ~= nil then
|
|
68
|
+
____opt_8[self] = nil
|
|
46
69
|
end
|
|
47
70
|
end
|
|
48
|
-
|
|
71
|
+
inRangeUnitEventsByBehavior[self] = nil
|
|
72
|
+
end
|
|
73
|
+
if self._bonusIdByBonusType ~= nil then
|
|
74
|
+
for bonusType, bonusId in pairs(self._bonusIdByBonusType) do
|
|
75
|
+
removeUnitBonus(self.object, bonusType, bonusId)
|
|
76
|
+
end
|
|
49
77
|
end
|
|
50
78
|
return Behavior.prototype.onDestroy(self)
|
|
51
79
|
end
|
|
80
|
+
function UnitBehavior.prototype.getUnitBonus(self, bonusType)
|
|
81
|
+
local ____opt_10 = self._bonusIdByBonusType
|
|
82
|
+
local bonusId = ____opt_10 and ____opt_10[bonusType]
|
|
83
|
+
return bonusId == nil and 0 or getUnitBonus(self.object, bonusType, bonusId)
|
|
84
|
+
end
|
|
85
|
+
function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
|
|
86
|
+
local bonusIdByBonusType = self._bonusIdByBonusType
|
|
87
|
+
if bonusIdByBonusType == nil then
|
|
88
|
+
bonusIdByBonusType = {}
|
|
89
|
+
self._bonusIdByBonusType = bonusIdByBonusType
|
|
90
|
+
end
|
|
91
|
+
bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self.object, bonusType, bonusIdByBonusType[bonusType], value)
|
|
92
|
+
end
|
|
93
|
+
function UnitBehavior.prototype.registerOwningPlayerEvent(self, event, extractPlayer, listener)
|
|
94
|
+
local listenerByBehavior = getOrPut(listenerByBehaviorByOwningPlayerEvent, event, mutableLuaMap)
|
|
95
|
+
listenerByBehavior[self] = listener
|
|
96
|
+
getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
|
|
97
|
+
local behaviors = behaviorsByOwningPlayerEvent[event]
|
|
98
|
+
if behaviors == nil then
|
|
99
|
+
event:addListener(function(...)
|
|
100
|
+
local behaviors = behaviorsByOwningPlayerEvent[event]
|
|
101
|
+
if behaviors ~= nil then
|
|
102
|
+
local player = extractPlayer(...)
|
|
103
|
+
if player ~= nil then
|
|
104
|
+
for behavior in pairs(behaviors) do
|
|
105
|
+
if behavior.unit.owner == player then
|
|
106
|
+
safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
|
|
107
|
+
end
|
|
108
|
+
end
|
|
109
|
+
end
|
|
110
|
+
end
|
|
111
|
+
end)
|
|
112
|
+
behaviors = __TS__New(LinkedSet)
|
|
113
|
+
behaviorsByOwningPlayerEvent[event] = behaviors
|
|
114
|
+
end
|
|
115
|
+
behaviors:add(self)
|
|
116
|
+
end
|
|
52
117
|
function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
|
|
53
|
-
local rangeByBehavior = getOrPut(
|
|
118
|
+
local rangeByBehavior = getOrPut(rangeByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
|
|
54
119
|
rangeByBehavior[self] = range
|
|
55
|
-
local listenerByBehavior = getOrPut(
|
|
120
|
+
local listenerByBehavior = getOrPut(listenerByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
|
|
56
121
|
listenerByBehavior[self] = listener
|
|
57
|
-
getOrPut(
|
|
58
|
-
local behaviors =
|
|
122
|
+
getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
|
|
123
|
+
local behaviors = behaviorsByInRangeUnitEvent[event]
|
|
59
124
|
if behaviors == nil then
|
|
60
125
|
event:addListener(function(...)
|
|
61
|
-
local behaviors =
|
|
126
|
+
local behaviors = behaviorsByInRangeUnitEvent[event]
|
|
62
127
|
if behaviors ~= nil then
|
|
63
128
|
local unit = extractUnit(...)
|
|
64
129
|
if unit ~= nil then
|
|
65
130
|
for behavior in pairs(behaviors) do
|
|
66
131
|
local range = rangeByBehavior[behavior]
|
|
67
132
|
if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
|
|
68
|
-
|
|
69
|
-
____self_6[listenerByBehavior[behavior]](____self_6, ...)
|
|
133
|
+
safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
|
|
70
134
|
end
|
|
71
135
|
end
|
|
72
136
|
end
|
|
73
137
|
end
|
|
74
138
|
end)
|
|
75
139
|
behaviors = __TS__New(LinkedSet)
|
|
76
|
-
|
|
140
|
+
behaviorsByInRangeUnitEvent[event] = behaviors
|
|
77
141
|
end
|
|
78
142
|
behaviors:add(self)
|
|
79
143
|
end
|
|
@@ -129,6 +193,8 @@ function UnitBehavior.prototype.onTargetingAbilityImpact(self, ability, source)
|
|
|
129
193
|
end
|
|
130
194
|
function UnitBehavior.prototype.onBuffGained(self, buff)
|
|
131
195
|
end
|
|
196
|
+
function UnitBehavior.prototype.onBuffLost(self, buff)
|
|
197
|
+
end
|
|
132
198
|
function UnitBehavior.prototype.onItemDropped(self, item)
|
|
133
199
|
end
|
|
134
200
|
function UnitBehavior.prototype.onItemPickedUp(self, item)
|
|
@@ -143,6 +209,23 @@ function UnitBehavior.prototype.onKill(self, target)
|
|
|
143
209
|
end
|
|
144
210
|
function UnitBehavior.prototype.onDeath(self, source)
|
|
145
211
|
end
|
|
212
|
+
function UnitBehavior.prototype.onOwnerChange(self, previousOwner)
|
|
213
|
+
end
|
|
214
|
+
function UnitBehavior.bindUnitType(self, unitTypeId, ...)
|
|
215
|
+
local args = {...}
|
|
216
|
+
local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unitTypeId]
|
|
217
|
+
if createBehaviorFunctions == nil then
|
|
218
|
+
createBehaviorFunctions = {}
|
|
219
|
+
createBehaviorFunctionsByUnitTypeId[unitTypeId] = createBehaviorFunctions
|
|
220
|
+
end
|
|
221
|
+
createBehaviorFunctions[#createBehaviorFunctions + 1] = function(unit)
|
|
222
|
+
return __TS__New(
|
|
223
|
+
self,
|
|
224
|
+
unit,
|
|
225
|
+
table.unpack(args)
|
|
226
|
+
)
|
|
227
|
+
end
|
|
228
|
+
end
|
|
146
229
|
__TS__SetDescriptor(
|
|
147
230
|
UnitBehavior.prototype,
|
|
148
231
|
"unit",
|
|
@@ -254,7 +337,18 @@ __TS__SetDescriptor(
|
|
|
254
337
|
Unit.itemChargesChangedEvent:addListener(function(unit, item)
|
|
255
338
|
____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
|
|
256
339
|
end)
|
|
340
|
+
Unit.onOwnerChange:addListener(function(unit, previousOwner)
|
|
341
|
+
____exports.UnitBehavior:forAll(unit, "onOwnerChange", previousOwner)
|
|
342
|
+
end)
|
|
257
343
|
end)(UnitBehavior)
|
|
344
|
+
Unit.onCreate:addListener(function(unit)
|
|
345
|
+
local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unit.typeId]
|
|
346
|
+
if createBehaviorFunctions ~= nil then
|
|
347
|
+
for ____, createBehavior in ipairs(createBehaviorFunctions) do
|
|
348
|
+
createBehavior(unit)
|
|
349
|
+
end
|
|
350
|
+
end
|
|
351
|
+
end)
|
|
258
352
|
Unit.destroyEvent:addListener(function(unit)
|
|
259
353
|
____exports.UnitBehavior:forAll(unit, "destroy")
|
|
260
354
|
end)
|
package/engine/buff.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ import { UnitBehavior } from "./behaviour/unit";
|
|
|
13
13
|
import type { Widget } from "../core/types/widget";
|
|
14
14
|
import { Destructor } from "../destroyable";
|
|
15
15
|
import { Event } from "../event";
|
|
16
|
+
import { AbilityBehavior } from "./behaviour/ability";
|
|
16
17
|
export type BuffConstructor<T extends Buff<any> = Buff<any>, Args extends any[] = any> = OmitConstructor<typeof Buff<any>> & (new (...args: Args) => T);
|
|
17
18
|
type EnumParameterValueType<T extends number> = T | AbilityEnumLevelField<T>;
|
|
18
19
|
type NumberParameterValueType = number | AbilityNumberField | AbilityNumberLevelField;
|
|
@@ -56,6 +57,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
|
|
|
56
57
|
armorIncreaseFactor?: NumberParameterValueType;
|
|
57
58
|
attackSpeedIncreaseFactor?: NumberParameterValueType;
|
|
58
59
|
movementSpeedIncreaseFactor?: NumberParameterValueType;
|
|
60
|
+
manaRegenerationRateIncreaseFactor?: NumberParameterValueType;
|
|
59
61
|
evasionProbability?: NumberParameterValueType;
|
|
60
62
|
missProbability?: NumberParameterValueType;
|
|
61
63
|
damageFactor?: NumberParameterValueType;
|
|
@@ -79,6 +81,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
|
|
|
79
81
|
healingOnExpiration?: NumberParameterValueType;
|
|
80
82
|
killsOnExpiration?: BooleanParameterValueType;
|
|
81
83
|
explodesOnExpiration?: BooleanParameterValueType;
|
|
84
|
+
abilityCooldownFactor?: NumberParameterValueType;
|
|
82
85
|
uniqueGroup?: BuffUniqueGroup;
|
|
83
86
|
} : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
|
|
84
87
|
declare const enum BuffPropertyKey {
|
|
@@ -124,7 +127,9 @@ declare const enum BuffPropertyKey {
|
|
|
124
127
|
PROVIDES_INVULNERABILITY = 139,
|
|
125
128
|
KILLS_ON_EXPIRATION = 140,
|
|
126
129
|
EXPLODES_ON_EXPIRATION = 141,
|
|
127
|
-
MISS_PROBABILITY = 142
|
|
130
|
+
MISS_PROBABILITY = 142,
|
|
131
|
+
ABILITY_COOLDOWN_FACTOR = 143,
|
|
132
|
+
ABILITY_COOLDOWN_MODIFIER = 144
|
|
128
133
|
}
|
|
129
134
|
export declare const enum BuffTypeIdSelectionPolicy {
|
|
130
135
|
LEAST_DURATION = 0
|
|
@@ -138,7 +143,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
|
|
|
138
143
|
polarity: BuffPolarityParameterType,
|
|
139
144
|
resistanceType: BuffResistanceTypeParameterType,
|
|
140
145
|
...abilityOrParameters: [
|
|
141
|
-
ability?: Ability,
|
|
146
|
+
ability?: Ability | AbilityBehavior,
|
|
142
147
|
parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
|
|
143
148
|
] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
|
|
144
149
|
];
|
|
@@ -187,6 +192,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
|
|
|
187
192
|
private [BuffPropertyKey.PROVIDES_INVULNERABILITY]?;
|
|
188
193
|
private [BuffPropertyKey.KILLS_ON_EXPIRATION]?;
|
|
189
194
|
private [BuffPropertyKey.EXPLODES_ON_EXPIRATION]?;
|
|
195
|
+
private [BuffPropertyKey.ABILITY_COOLDOWN_FACTOR]?;
|
|
196
|
+
private [BuffPropertyKey.ABILITY_COOLDOWN_MODIFIER]?;
|
|
190
197
|
protected static readonly defaultParameters: BuffParameters;
|
|
191
198
|
get source(): Unit;
|
|
192
199
|
readonly typeId: ApplicableBuffTypeId;
|
|
@@ -201,11 +208,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
|
|
|
201
208
|
private readonly _spellStealPriority?;
|
|
202
209
|
private readonly _learnLevelMinimum?;
|
|
203
210
|
private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
|
|
204
|
-
private _bonusIdByBonusType?;
|
|
205
211
|
private readonly _abilityTypeIds?;
|
|
206
212
|
private _behaviors?;
|
|
207
|
-
private getUnitBonus;
|
|
208
|
-
private addOrUpdateOrRemoveUnitBonus;
|
|
209
213
|
constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
|
|
210
214
|
get level(): number;
|
|
211
215
|
get remainingDamageOverDuration(): number;
|
|
@@ -262,9 +266,15 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
|
|
|
262
266
|
set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: number);
|
|
263
267
|
get evasionProbability(): number;
|
|
264
268
|
set evasionProbability(evasionProbability: number);
|
|
269
|
+
get manaRegenerationRateIncreaseFactor(): number;
|
|
270
|
+
set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: number);
|
|
265
271
|
get duration(): number;
|
|
266
272
|
get remainingDuration(): number;
|
|
267
273
|
set remainingDuration(remainingDuration: number);
|
|
274
|
+
get abilityCooldownFactor(): number;
|
|
275
|
+
set abilityCooldownFactor(abilityCooldownFactor: number);
|
|
276
|
+
onAbilityGained(ability: Ability): void;
|
|
277
|
+
onAbilityLost(ability: Ability): void;
|
|
268
278
|
flashEffect(...parameters: [
|
|
269
279
|
...widgetOrXY: [] | [Widget] | [x: number, x: number],
|
|
270
280
|
...parametersOrDuration: [] | [EffectParameters] | [number]
|