warscript 0.0.1-dev.e561d29 → 0.0.1-dev.e698bed
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 +24 -21
- package/core/types/player.d.ts +16 -0
- package/core/types/player.lua +60 -15
- package/core/types/playerCamera.d.ts +2 -0
- package/core/types/playerCamera.lua +123 -5
- 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/engine/behavior.d.ts +10 -1
- package/engine/behavior.lua +141 -65
- package/engine/behaviour/ability/apply-buff.lua +12 -4
- package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
- package/engine/behaviour/ability/remove-buffs.lua +21 -0
- package/engine/behaviour/ability/restore-mana.d.ts +1 -1
- package/engine/behaviour/ability/restore-mana.lua +6 -6
- 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 +10 -4
- package/engine/buff.lua +119 -84
- package/engine/internal/ability.d.ts +3 -1
- package/engine/internal/ability.lua +26 -9
- package/engine/internal/item+owner.lua +12 -6
- package/engine/internal/item.d.ts +13 -15
- package/engine/internal/item.lua +63 -49
- package/engine/internal/misc/frame-coordinates.d.ts +2 -0
- package/engine/internal/misc/frame-coordinates.lua +21 -0
- package/engine/internal/misc/get-terrain-z.d.ts +2 -0
- package/engine/internal/misc/get-terrain-z.lua +11 -0
- package/engine/internal/misc/player-local-handle.d.ts +2 -0
- package/engine/internal/misc/player-local-handle.lua +5 -0
- 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+ability.lua +10 -1
- package/engine/internal/unit-missile-launch.lua +44 -20
- package/engine/internal/unit.d.ts +16 -13
- package/engine/internal/unit.lua +102 -81
- 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-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 +13 -1
- package/engine/object-field/unit.lua +57 -0
- package/engine/object-field.d.ts +9 -3
- package/engine/object-field.lua +204 -115
- 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 +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.d.ts +1 -1
- package/engine/text-tag.lua +92 -17
- 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/functions.d.ts +2 -0
- package/utility/functions.lua +7 -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/lua-sets.d.ts +1 -0
- package/utility/lua-sets.lua +4 -0
- package/utility/types.d.ts +3 -0
package/engine/object-field.lua
CHANGED
|
@@ -25,6 +25,7 @@ local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
|
|
|
25
25
|
local ____lua_2Dmaps = require("utility.lua-maps")
|
|
26
26
|
local emptyLuaMap = ____lua_2Dmaps.emptyLuaMap
|
|
27
27
|
local getOrPut = ____lua_2Dmaps.getOrPut
|
|
28
|
+
local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
|
|
28
29
|
local mutableWeakLuaMap = ____lua_2Dmaps.mutableWeakLuaMap
|
|
29
30
|
local ____arrays = require("utility.arrays")
|
|
30
31
|
local emptyArray = ____arrays.emptyArray
|
|
@@ -58,9 +59,9 @@ end
|
|
|
58
59
|
function ObjectFieldBase.prototype.supports(self, instance)
|
|
59
60
|
return __TS__InstanceOf(instance, self.instanceClass)
|
|
60
61
|
end
|
|
61
|
-
function ObjectFieldBase.prototype.hasValue(self,
|
|
62
|
+
function ObjectFieldBase.prototype.hasValue(self, objectDataEntryId)
|
|
62
63
|
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
63
|
-
return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[
|
|
64
|
+
return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[objectDataEntryId] ~= nil or self:hasNativeFieldValue(objectDataEntryId)
|
|
64
65
|
end
|
|
65
66
|
function ObjectFieldBase.create(self, id, isGlobal)
|
|
66
67
|
return __TS__New(
|
|
@@ -99,7 +100,7 @@ function ObjectField.prototype.getValue(self, entry, includeModifiers)
|
|
|
99
100
|
end
|
|
100
101
|
return self.defaultValue
|
|
101
102
|
end
|
|
102
|
-
if includeModifiers
|
|
103
|
+
if not includeModifiers then
|
|
103
104
|
local originalValueByInstance = self.originalValueByInstance
|
|
104
105
|
if originalValueByInstance ~= nil then
|
|
105
106
|
local originalValue = originalValueByInstance[entry]
|
|
@@ -150,7 +151,13 @@ function ObjectField.prototype.applyModifier(self, instance, modifier)
|
|
|
150
151
|
originalValueByInstance = mutableWeakLuaMap()
|
|
151
152
|
self.originalValueByInstance = originalValueByInstance
|
|
152
153
|
end
|
|
153
|
-
|
|
154
|
+
local ____originalValueByInstance_1 = originalValueByInstance
|
|
155
|
+
local ____instance_2 = instance
|
|
156
|
+
local ____originalValueByInstance_instance_0 = originalValueByInstance[instance]
|
|
157
|
+
if ____originalValueByInstance_instance_0 == nil then
|
|
158
|
+
____originalValueByInstance_instance_0 = self:getActualValue(instance)
|
|
159
|
+
end
|
|
160
|
+
____originalValueByInstance_1[____instance_2] = ____originalValueByInstance_instance_0
|
|
154
161
|
self:setActualValue(
|
|
155
162
|
instance,
|
|
156
163
|
self:calculateActualValue(instance)
|
|
@@ -196,61 +203,58 @@ function ObjectField.prototype.getActualValue(self, instance)
|
|
|
196
203
|
if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
|
|
197
204
|
local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
|
|
198
205
|
if defaultValue ~= nil or self.isGlobal then
|
|
199
|
-
local
|
|
200
|
-
if
|
|
201
|
-
|
|
206
|
+
local ____self_valueByInstance_instance_3 = self.valueByInstance[instance]
|
|
207
|
+
if ____self_valueByInstance_instance_3 == nil then
|
|
208
|
+
____self_valueByInstance_instance_3 = defaultValue
|
|
202
209
|
end
|
|
203
|
-
local
|
|
204
|
-
if
|
|
205
|
-
|
|
210
|
+
local ____self_valueByInstance_instance_3_4 = ____self_valueByInstance_instance_3
|
|
211
|
+
if ____self_valueByInstance_instance_3_4 == nil then
|
|
212
|
+
____self_valueByInstance_instance_3_4 = self.defaultValue
|
|
206
213
|
end
|
|
207
|
-
return
|
|
214
|
+
return ____self_valueByInstance_instance_3_4
|
|
208
215
|
end
|
|
209
216
|
end
|
|
210
|
-
local
|
|
211
|
-
if
|
|
212
|
-
|
|
217
|
+
local ____temp_5 = self:getNativeFieldValue(instance)
|
|
218
|
+
if ____temp_5 == nil then
|
|
219
|
+
____temp_5 = self.defaultValue
|
|
213
220
|
end
|
|
214
|
-
return
|
|
221
|
+
return ____temp_5
|
|
215
222
|
end
|
|
216
223
|
function ObjectField.prototype.setActualValue(self, instance, value)
|
|
217
224
|
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
225
|
+
local objectDataEntryId = self:getObjectDataEntryId(instance)
|
|
218
226
|
if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
|
|
219
|
-
local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[
|
|
227
|
+
local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
|
|
220
228
|
if defaultValue ~= nil or self.isGlobal then
|
|
221
|
-
local
|
|
222
|
-
if
|
|
223
|
-
|
|
224
|
-
end
|
|
225
|
-
local ____self_valueByInstance_instance_3_4 = ____self_valueByInstance_instance_3
|
|
226
|
-
if ____self_valueByInstance_instance_3_4 == nil then
|
|
227
|
-
____self_valueByInstance_instance_3_4 = self.defaultValue
|
|
229
|
+
local ____self_valueByInstance_instance_6 = self.valueByInstance[instance]
|
|
230
|
+
if ____self_valueByInstance_instance_6 == nil then
|
|
231
|
+
____self_valueByInstance_instance_6 = defaultValue
|
|
228
232
|
end
|
|
229
|
-
local
|
|
230
|
-
if
|
|
231
|
-
|
|
232
|
-
self:invokeValueChangeEvent(instance, self, previousValue, value)
|
|
233
|
+
local ____self_valueByInstance_instance_6_7 = ____self_valueByInstance_instance_6
|
|
234
|
+
if ____self_valueByInstance_instance_6_7 == nil then
|
|
235
|
+
____self_valueByInstance_instance_6_7 = self.defaultValue
|
|
233
236
|
end
|
|
237
|
+
local previousValue = ____self_valueByInstance_instance_6_7
|
|
238
|
+
self.valueByInstance[instance] = value
|
|
239
|
+
self:invokeValueChangeEvent(instance, self, previousValue, value)
|
|
234
240
|
return true
|
|
235
241
|
end
|
|
236
242
|
end
|
|
237
|
-
if not self:hasNativeFieldValue(
|
|
243
|
+
if not self:hasNativeFieldValue(objectDataEntryId) then
|
|
238
244
|
return false
|
|
239
245
|
end
|
|
240
246
|
local previousValue = self:getNativeFieldValue(instance)
|
|
241
|
-
if value ~= previousValue then
|
|
242
|
-
|
|
243
|
-
return false
|
|
244
|
-
end
|
|
245
|
-
self:invokeValueChangeEvent(instance, self, previousValue, value)
|
|
247
|
+
if value ~= previousValue and not self:setNativeFieldValue(instance, value) then
|
|
248
|
+
return false
|
|
246
249
|
end
|
|
250
|
+
self:invokeValueChangeEvent(instance, self, previousValue, value)
|
|
247
251
|
return true
|
|
248
252
|
end
|
|
249
253
|
function ObjectField.prototype.calculateActualValue(self, instance)
|
|
250
|
-
local
|
|
251
|
-
local originalValue =
|
|
252
|
-
local
|
|
253
|
-
local modifiers =
|
|
254
|
+
local ____opt_8 = self.originalValueByInstance
|
|
255
|
+
local originalValue = ____opt_8 and ____opt_8[instance]
|
|
256
|
+
local ____opt_10 = self.modifiersByInstance
|
|
257
|
+
local modifiers = ____opt_10 and ____opt_10[instance]
|
|
254
258
|
if originalValue ~= nil then
|
|
255
259
|
local value = originalValue
|
|
256
260
|
if modifiers ~= nil then
|
|
@@ -315,17 +319,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
|
|
|
315
319
|
if defaultValueByObjectDataEntryId ~= nil then
|
|
316
320
|
local value = defaultValueByObjectDataEntryId[entry.id]
|
|
317
321
|
if value ~= nil then
|
|
318
|
-
local
|
|
322
|
+
local ____temp_13
|
|
319
323
|
if index == nil then
|
|
320
|
-
|
|
324
|
+
____temp_13 = value
|
|
321
325
|
else
|
|
322
|
-
local
|
|
323
|
-
if
|
|
324
|
-
|
|
326
|
+
local ____value_index_12 = value[index + 1]
|
|
327
|
+
if ____value_index_12 == nil then
|
|
328
|
+
____value_index_12 = self.defaultValue
|
|
325
329
|
end
|
|
326
|
-
|
|
330
|
+
____temp_13 = ____value_index_12
|
|
327
331
|
end
|
|
328
|
-
return
|
|
332
|
+
return ____temp_13
|
|
329
333
|
end
|
|
330
334
|
end
|
|
331
335
|
return index == nil and ({}) or self.defaultValue
|
|
@@ -335,17 +339,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
|
|
|
335
339
|
local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
|
|
336
340
|
if defaultValue ~= nil or self.isGlobal then
|
|
337
341
|
local value = self.valueByInstance[entry] or defaultValue or emptyArray()
|
|
338
|
-
local
|
|
342
|
+
local ____temp_15
|
|
339
343
|
if index == nil then
|
|
340
|
-
|
|
344
|
+
____temp_15 = value
|
|
341
345
|
else
|
|
342
|
-
local
|
|
343
|
-
if
|
|
344
|
-
|
|
346
|
+
local ____value_index_14 = value[index + 1]
|
|
347
|
+
if ____value_index_14 == nil then
|
|
348
|
+
____value_index_14 = self.defaultValue
|
|
345
349
|
end
|
|
346
|
-
|
|
350
|
+
____temp_15 = ____value_index_14
|
|
347
351
|
end
|
|
348
|
-
return
|
|
352
|
+
return ____temp_15
|
|
349
353
|
end
|
|
350
354
|
end
|
|
351
355
|
if index ~= nil then
|
|
@@ -390,36 +394,22 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
|
|
|
390
394
|
if defaultValueByObjectDataEntryId ~= nil then
|
|
391
395
|
local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
|
|
392
396
|
if valueByLevel ~= nil then
|
|
393
|
-
local
|
|
394
|
-
if
|
|
395
|
-
|
|
397
|
+
local ____valueByLevel_index_16 = valueByLevel[level + 1]
|
|
398
|
+
if ____valueByLevel_index_16 == nil then
|
|
399
|
+
____valueByLevel_index_16 = self.defaultValue
|
|
396
400
|
end
|
|
397
|
-
return
|
|
401
|
+
return ____valueByLevel_index_16
|
|
398
402
|
end
|
|
399
403
|
end
|
|
400
404
|
return self.defaultValue
|
|
401
405
|
end
|
|
402
|
-
local
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
local ____temp_16 = ____opt_14 and ____opt_14[level + 1]
|
|
408
|
-
if ____temp_16 == nil then
|
|
409
|
-
____temp_16 = (defaultValueByLevel or emptyArray())[level + 1]
|
|
410
|
-
end
|
|
411
|
-
local ____temp_16_17 = ____temp_16
|
|
412
|
-
if ____temp_16_17 == nil then
|
|
413
|
-
____temp_16_17 = self.defaultValue
|
|
414
|
-
end
|
|
415
|
-
return ____temp_16_17
|
|
416
|
-
end
|
|
417
|
-
end
|
|
418
|
-
local ____temp_18 = self:getNativeFieldValue(entry, level)
|
|
419
|
-
if ____temp_18 == nil then
|
|
420
|
-
____temp_18 = self.defaultValue
|
|
406
|
+
local ____opt_19 = self.originalValueByLevelByInstance
|
|
407
|
+
local ____opt_17 = ____opt_19 and ____opt_19[entry]
|
|
408
|
+
local originalValue = ____opt_17 and ____opt_17[level]
|
|
409
|
+
if originalValue ~= nil then
|
|
410
|
+
return originalValue
|
|
421
411
|
end
|
|
422
|
-
return
|
|
412
|
+
return self:getActualValue(entry, level)
|
|
423
413
|
end
|
|
424
414
|
function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
|
|
425
415
|
if value == nil then
|
|
@@ -459,54 +449,66 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
|
|
|
459
449
|
valueByLevel[level + 1] = value
|
|
460
450
|
return true
|
|
461
451
|
end
|
|
462
|
-
local
|
|
463
|
-
if
|
|
464
|
-
local
|
|
465
|
-
if
|
|
466
|
-
local
|
|
467
|
-
if
|
|
468
|
-
|
|
469
|
-
self.
|
|
470
|
-
end
|
|
471
|
-
local ____valueByLevel_index_19 = valueByLevel[level + 1]
|
|
472
|
-
if ____valueByLevel_index_19 == nil then
|
|
473
|
-
____valueByLevel_index_19 = (defaultValueByLevel or emptyArray())[level + 1]
|
|
452
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
453
|
+
if modifiersByInstance ~= nil then
|
|
454
|
+
local modifiers = modifiersByInstance[entry]
|
|
455
|
+
if modifiers ~= nil and modifiers.size ~= 0 then
|
|
456
|
+
local originalValueByLevelByInstance = self.originalValueByLevelByInstance
|
|
457
|
+
if originalValueByLevelByInstance == nil then
|
|
458
|
+
originalValueByLevelByInstance = mutableWeakLuaMap()
|
|
459
|
+
self.originalValueByLevelByInstance = originalValueByLevelByInstance
|
|
474
460
|
end
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
461
|
+
getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)[level] = value
|
|
462
|
+
value = self:calculateActualValue(entry, level)
|
|
463
|
+
end
|
|
464
|
+
end
|
|
465
|
+
return self:setActualValue(entry, level, value)
|
|
466
|
+
end
|
|
467
|
+
function ObjectLevelField.prototype.applyModifier(self, instance, modifier)
|
|
468
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
469
|
+
if modifiersByInstance == nil then
|
|
470
|
+
modifiersByInstance = mutableWeakLuaMap()
|
|
471
|
+
self.modifiersByInstance = modifiersByInstance
|
|
472
|
+
end
|
|
473
|
+
if getOrPut(modifiersByInstance, instance, mutableLinkedSet):add(modifier) then
|
|
474
|
+
local originalValueByLevelByInstance = self.originalValueByLevelByInstance
|
|
475
|
+
if originalValueByLevelByInstance == nil then
|
|
476
|
+
originalValueByLevelByInstance = mutableWeakLuaMap()
|
|
477
|
+
self.originalValueByLevelByInstance = originalValueByLevelByInstance
|
|
478
|
+
end
|
|
479
|
+
local originalValueByLevel = getOrPut(originalValueByLevelByInstance, instance, mutableLuaMap)
|
|
480
|
+
local levelCount = self:getLevelCount(instance)
|
|
481
|
+
for level = 0, levelCount - 1 do
|
|
482
|
+
local ____originalValueByLevel_level_21 = originalValueByLevel[level]
|
|
483
|
+
if ____originalValueByLevel_level_21 == nil then
|
|
484
|
+
____originalValueByLevel_level_21 = self:getActualValue(instance, level)
|
|
478
485
|
end
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
486
|
+
originalValueByLevel[level] = ____originalValueByLevel_level_21
|
|
487
|
+
self:setActualValue(
|
|
488
|
+
instance,
|
|
489
|
+
level,
|
|
490
|
+
self:calculateActualValue(instance, level)
|
|
491
|
+
)
|
|
492
|
+
end
|
|
493
|
+
end
|
|
494
|
+
end
|
|
495
|
+
function ObjectLevelField.prototype.removeModifier(self, instance, modifier)
|
|
496
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
497
|
+
if modifiersByInstance ~= nil then
|
|
498
|
+
local modifiers = modifiersByInstance[instance]
|
|
499
|
+
if modifiers ~= nil and modifiers:remove(modifier) then
|
|
500
|
+
local levelCount = self:getLevelCount(instance)
|
|
501
|
+
for level = 0, levelCount - 1 do
|
|
502
|
+
self:setActualValue(
|
|
503
|
+
instance,
|
|
485
504
|
level,
|
|
486
|
-
|
|
487
|
-
value
|
|
505
|
+
self:calculateActualValue(instance, level)
|
|
488
506
|
)
|
|
489
507
|
end
|
|
490
508
|
return true
|
|
491
509
|
end
|
|
492
510
|
end
|
|
493
|
-
|
|
494
|
-
return false
|
|
495
|
-
end
|
|
496
|
-
local previousValue = self:getNativeFieldValue(entry, level)
|
|
497
|
-
if value ~= previousValue then
|
|
498
|
-
if not self:setNativeFieldValue(entry, level, value) then
|
|
499
|
-
return false
|
|
500
|
-
end
|
|
501
|
-
self:invokeValueChangeEvent(
|
|
502
|
-
entry,
|
|
503
|
-
self,
|
|
504
|
-
level,
|
|
505
|
-
previousValue,
|
|
506
|
-
value
|
|
507
|
-
)
|
|
508
|
-
end
|
|
509
|
-
return true
|
|
511
|
+
return false
|
|
510
512
|
end
|
|
511
513
|
function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value)
|
|
512
514
|
if value ~= nil then
|
|
@@ -523,6 +525,93 @@ function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value
|
|
|
523
525
|
end
|
|
524
526
|
return self:setValue(entry, levelOrValue)
|
|
525
527
|
end
|
|
528
|
+
function ObjectLevelField.prototype.getActualValue(self, instance, level)
|
|
529
|
+
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
530
|
+
if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
|
|
531
|
+
local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
|
|
532
|
+
if defaultValueByLevel ~= nil or self.isGlobal then
|
|
533
|
+
local ____opt_22 = self.valueByInstance[instance]
|
|
534
|
+
local ____temp_24 = ____opt_22 and ____opt_22[level + 1]
|
|
535
|
+
if ____temp_24 == nil then
|
|
536
|
+
____temp_24 = (defaultValueByLevel or emptyArray())[level + 1]
|
|
537
|
+
end
|
|
538
|
+
local ____temp_24_25 = ____temp_24
|
|
539
|
+
if ____temp_24_25 == nil then
|
|
540
|
+
____temp_24_25 = self.defaultValue
|
|
541
|
+
end
|
|
542
|
+
return ____temp_24_25
|
|
543
|
+
end
|
|
544
|
+
end
|
|
545
|
+
local ____temp_26 = self:getNativeFieldValue(instance, level)
|
|
546
|
+
if ____temp_26 == nil then
|
|
547
|
+
____temp_26 = self.defaultValue
|
|
548
|
+
end
|
|
549
|
+
return ____temp_26
|
|
550
|
+
end
|
|
551
|
+
function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
|
|
552
|
+
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
553
|
+
local objectDataEntryId = self:getObjectDataEntryId(instance)
|
|
554
|
+
if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
|
|
555
|
+
local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
|
|
556
|
+
if defaultValueByLevel ~= nil or self.isGlobal then
|
|
557
|
+
local valueByLevel = self.valueByInstance[instance]
|
|
558
|
+
if valueByLevel == nil then
|
|
559
|
+
valueByLevel = {}
|
|
560
|
+
self.valueByInstance[instance] = valueByLevel
|
|
561
|
+
end
|
|
562
|
+
local ____valueByLevel_index_27 = valueByLevel[level + 1]
|
|
563
|
+
if ____valueByLevel_index_27 == nil then
|
|
564
|
+
____valueByLevel_index_27 = (defaultValueByLevel or emptyArray())[level + 1]
|
|
565
|
+
end
|
|
566
|
+
local ____valueByLevel_index_27_28 = ____valueByLevel_index_27
|
|
567
|
+
if ____valueByLevel_index_27_28 == nil then
|
|
568
|
+
____valueByLevel_index_27_28 = self.defaultValue
|
|
569
|
+
end
|
|
570
|
+
local previousValue = ____valueByLevel_index_27_28
|
|
571
|
+
valueByLevel[level + 1] = value
|
|
572
|
+
self:invokeValueChangeEvent(
|
|
573
|
+
instance,
|
|
574
|
+
self,
|
|
575
|
+
level,
|
|
576
|
+
previousValue,
|
|
577
|
+
value
|
|
578
|
+
)
|
|
579
|
+
return true
|
|
580
|
+
end
|
|
581
|
+
end
|
|
582
|
+
if not self:hasNativeFieldValue(objectDataEntryId) then
|
|
583
|
+
return false
|
|
584
|
+
end
|
|
585
|
+
local previousValue = self:getNativeFieldValue(instance, level)
|
|
586
|
+
if value ~= previousValue and not self:setNativeFieldValue(instance, level, value) then
|
|
587
|
+
return false
|
|
588
|
+
end
|
|
589
|
+
self:invokeValueChangeEvent(
|
|
590
|
+
instance,
|
|
591
|
+
self,
|
|
592
|
+
level,
|
|
593
|
+
previousValue,
|
|
594
|
+
value
|
|
595
|
+
)
|
|
596
|
+
return true
|
|
597
|
+
end
|
|
598
|
+
function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
|
|
599
|
+
local ____opt_31 = self.originalValueByLevelByInstance
|
|
600
|
+
local ____opt_29 = ____opt_31 and ____opt_31[instance]
|
|
601
|
+
local originalValue = ____opt_29 and ____opt_29[level]
|
|
602
|
+
local ____opt_33 = self.modifiersByInstance
|
|
603
|
+
local modifiers = ____opt_33 and ____opt_33[instance]
|
|
604
|
+
if originalValue ~= nil then
|
|
605
|
+
local value = originalValue
|
|
606
|
+
if modifiers ~= nil then
|
|
607
|
+
for modifier in pairs(modifiers) do
|
|
608
|
+
value = modifier(instance, level, value, originalValue)
|
|
609
|
+
end
|
|
610
|
+
end
|
|
611
|
+
return value
|
|
612
|
+
end
|
|
613
|
+
return self.defaultValue
|
|
614
|
+
end
|
|
526
615
|
function ObjectLevelField.prototype.invokeValueChangeEvent(self, ...)
|
|
527
616
|
self:invokeValueChangeEventRecursive(
|
|
528
617
|
getClass(self),
|
package/engine/random.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
|
+
import { ReadonlyNonEmptyArray } from "../utility/types";
|
|
2
3
|
export declare const randomAngle: () => number;
|
|
3
4
|
export declare const randomInteger: {
|
|
4
5
|
(upperBound?: number): number;
|
|
@@ -9,3 +10,11 @@ export declare const randomFloat: {
|
|
|
9
10
|
(lowerBound: number, upperBound: number): number;
|
|
10
11
|
};
|
|
11
12
|
export declare const randomXY: (centerX: number, centerY: number, range: number) => LuaMultiReturn<[x: number, y: number]>;
|
|
13
|
+
export declare const randomElement: {
|
|
14
|
+
<T>(array: ReadonlyNonEmptyArray<T>): T;
|
|
15
|
+
<T>(array: ReadonlyArray<T>): T | undefined;
|
|
16
|
+
};
|
|
17
|
+
export declare const random: {
|
|
18
|
+
<T>(element: T, ...elements: T[]): T;
|
|
19
|
+
<T>(...elements: T[]): T | undefined;
|
|
20
|
+
};
|
package/engine/random.lua
CHANGED
|
@@ -4,6 +4,7 @@ local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
|
|
|
4
4
|
local PI = ____math.PI
|
|
5
5
|
local getRandomInt = GetRandomInt
|
|
6
6
|
local getRandomReal = GetRandomReal
|
|
7
|
+
local select = _G.select
|
|
7
8
|
local cos = math.cos
|
|
8
9
|
local sin = math.sin
|
|
9
10
|
local sqrt = math.sqrt
|
|
@@ -15,4 +16,16 @@ ____exports.randomXY = function(centerX, centerY, range)
|
|
|
15
16
|
local t = getRandomReal(0, 1) * 2 * PI
|
|
16
17
|
return centerX + r * cos(t), centerY + r * sin(t)
|
|
17
18
|
end
|
|
19
|
+
____exports.randomElement = function(array)
|
|
20
|
+
return array[getRandomInt(1, #array)]
|
|
21
|
+
end
|
|
22
|
+
____exports.random = function(...)
|
|
23
|
+
return (select(
|
|
24
|
+
getRandomInt(
|
|
25
|
+
1,
|
|
26
|
+
select("#", ...)
|
|
27
|
+
),
|
|
28
|
+
...
|
|
29
|
+
))
|
|
30
|
+
end
|
|
18
31
|
return ____exports
|
|
@@ -376,8 +376,8 @@ export declare const INVISIBILITY_TRANSITION_TIME_ABILITY_FLOAT_LEVEL_FIELD: Abi
|
|
|
376
376
|
export declare const ACTIVATION_RADIUS_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
|
|
377
377
|
export declare const AMOUNT_REGENERATED_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
|
|
378
378
|
export declare const DAMAGE_PER_SECOND_POI1_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
|
|
379
|
-
export declare const
|
|
380
|
-
export declare const
|
|
379
|
+
export declare const MOVEMENT_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
|
|
380
|
+
export declare const ATTACK_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
|
|
381
381
|
export declare const EXTRA_DAMAGE_POA1_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
|
|
382
382
|
export declare const DAMAGE_PER_SECOND_POA2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
|
|
383
383
|
export declare const ATTACK_SPEED_FACTOR_POA3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
|
|
@@ -387,8 +387,8 @@ ____exports.INVISIBILITY_TRANSITION_TIME_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloa
|
|
|
387
387
|
____exports.ACTIVATION_RADIUS_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Neu1"))
|
|
388
388
|
____exports.AMOUNT_REGENERATED_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Arm1"))
|
|
389
389
|
____exports.DAMAGE_PER_SECOND_POI1_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi1"))
|
|
390
|
-
____exports.
|
|
391
|
-
____exports.
|
|
390
|
+
____exports.MOVEMENT_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi2"))
|
|
391
|
+
____exports.ATTACK_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi3"))
|
|
392
392
|
____exports.EXTRA_DAMAGE_POA1_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa1"))
|
|
393
393
|
____exports.DAMAGE_PER_SECOND_POA2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa2"))
|
|
394
394
|
____exports.ATTACK_SPEED_FACTOR_POA3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa3"))
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
|
-
import { UnitClassificationsField, UnitPropulsionWindowField } from "../../object-field/unit";
|
|
2
|
+
import { UnitClassificationsField, UnitFlyHeightField, UnitPropulsionWindowField, UnitScalingValueField } from "../../object-field/unit";
|
|
3
3
|
export declare const PROPULSION_WINDOW_UNIT_FLOAT_FIELD: UnitPropulsionWindowField & symbol;
|
|
4
4
|
export declare const UNIT_CLASSIFICATIONS_FIELD: UnitClassificationsField & symbol;
|
|
5
|
+
export declare const FLY_HEIGHT_UNIT_FLOAT_FIELD: UnitFlyHeightField & symbol;
|
|
6
|
+
export declare const SCALING_VALUE_UNIT_FLOAT_FIELD: UnitScalingValueField & symbol;
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
local ____exports = {}
|
|
2
2
|
local ____unit = require("engine.object-field.unit")
|
|
3
3
|
local UnitClassificationsField = ____unit.UnitClassificationsField
|
|
4
|
+
local UnitFlyHeightField = ____unit.UnitFlyHeightField
|
|
4
5
|
local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
|
|
6
|
+
local UnitScalingValueField = ____unit.UnitScalingValueField
|
|
5
7
|
____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
|
|
6
8
|
____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
|
|
9
|
+
____exports.FLY_HEIGHT_UNIT_FLOAT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
|
|
10
|
+
____exports.SCALING_VALUE_UNIT_FLOAT_FIELD = UnitScalingValueField:create(fourCC("usca"))
|
|
7
11
|
return ____exports
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** @noSelfInFile */
|
|
2
|
+
import { Player } from "../core/types/player";
|
|
3
|
+
import { Event } from "../event";
|
|
4
|
+
export declare const synchronizer: <T, K extends number>(getSyncId: (object: T) => K, getObject: (syncId: K) => T | undefined) => ((player: Player, object: T | undefined) => Promise<T | undefined>);
|
|
5
|
+
export declare class ObjectBus<T, K extends number> {
|
|
6
|
+
private readonly getSyncId;
|
|
7
|
+
readonly event: Event<[Player, T | undefined]>;
|
|
8
|
+
private readonly syncSlider;
|
|
9
|
+
constructor(getSyncId: (object: T) => K, getObject: (syncId: K) => T | undefined);
|
|
10
|
+
send(object: T | undefined): void;
|
|
11
|
+
}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
local ____lualib = require("lualib_bundle")
|
|
2
|
+
local __TS__New = ____lualib.__TS__New
|
|
3
|
+
local __TS__Promise = ____lualib.__TS__Promise
|
|
4
|
+
local __TS__Class = ____lualib.__TS__Class
|
|
5
|
+
local ____exports = {}
|
|
6
|
+
local ____player = require("core.types.player")
|
|
7
|
+
local Player = ____player.Player
|
|
8
|
+
local ____math = require("math")
|
|
9
|
+
local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
|
|
10
|
+
local MINIMUM_INTEGER = ____math.MINIMUM_INTEGER
|
|
11
|
+
local ____linked_2Dset = require("utility.linked-set")
|
|
12
|
+
local LinkedSet = ____linked_2Dset.LinkedSet
|
|
13
|
+
local ____event = require("event")
|
|
14
|
+
local Event = ____event.Event
|
|
15
|
+
local eventInvoke = Event.invoke
|
|
16
|
+
local createFrameByType = BlzCreateFrameByType
|
|
17
|
+
local createTrigger = CreateTrigger
|
|
18
|
+
local getOriginFrame = BlzGetOriginFrame
|
|
19
|
+
local getTriggerFrameValue = BlzGetTriggerFrameValue
|
|
20
|
+
local getTriggerPlayer = GetTriggerPlayer
|
|
21
|
+
local frameSetMinMaxValue = BlzFrameSetMinMaxValue
|
|
22
|
+
local frameSetValue = BlzFrameSetValue
|
|
23
|
+
local triggerAddAction = TriggerAddAction
|
|
24
|
+
local triggerRegisterFrameEvent = BlzTriggerRegisterFrameEvent
|
|
25
|
+
____exports.synchronizer = function(getSyncId, getObject)
|
|
26
|
+
local queue = __TS__New(LinkedSet)
|
|
27
|
+
local socket = __TS__New(____exports.ObjectBus, getSyncId, getObject)
|
|
28
|
+
socket.event:addListener(function(_, object)
|
|
29
|
+
local ____opt_0 = queue:pop()
|
|
30
|
+
if ____opt_0 ~= nil then
|
|
31
|
+
____opt_0(object)
|
|
32
|
+
end
|
|
33
|
+
end)
|
|
34
|
+
local function executor(____, resolve)
|
|
35
|
+
queue:add(resolve)
|
|
36
|
+
end
|
|
37
|
+
return function(player, object)
|
|
38
|
+
if player.isLocal then
|
|
39
|
+
socket:send(object)
|
|
40
|
+
end
|
|
41
|
+
return __TS__New(__TS__Promise, executor)
|
|
42
|
+
end
|
|
43
|
+
end
|
|
44
|
+
____exports.ObjectBus = __TS__Class()
|
|
45
|
+
local ObjectBus = ____exports.ObjectBus
|
|
46
|
+
ObjectBus.name = "ObjectBus"
|
|
47
|
+
function ObjectBus.prototype.____constructor(self, getSyncId, getObject)
|
|
48
|
+
self.getSyncId = getSyncId
|
|
49
|
+
local syncSlider = createFrameByType(
|
|
50
|
+
"SLIDER",
|
|
51
|
+
"Synchronizer",
|
|
52
|
+
getOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0),
|
|
53
|
+
"",
|
|
54
|
+
0
|
|
55
|
+
)
|
|
56
|
+
frameSetMinMaxValue(syncSlider, MINIMUM_INTEGER, MAXIMUM_INTEGER)
|
|
57
|
+
self.syncSlider = syncSlider
|
|
58
|
+
local event = __TS__New(Event)
|
|
59
|
+
local trigger = createTrigger()
|
|
60
|
+
triggerRegisterFrameEvent(trigger, syncSlider, FRAMEEVENT_SLIDER_VALUE_CHANGED)
|
|
61
|
+
triggerAddAction(
|
|
62
|
+
trigger,
|
|
63
|
+
function()
|
|
64
|
+
eventInvoke(
|
|
65
|
+
event,
|
|
66
|
+
Player:of(getTriggerPlayer()),
|
|
67
|
+
getObject(getTriggerFrameValue())
|
|
68
|
+
)
|
|
69
|
+
end
|
|
70
|
+
)
|
|
71
|
+
self.event = event
|
|
72
|
+
end
|
|
73
|
+
function ObjectBus.prototype.send(self, object)
|
|
74
|
+
local syncId = object ~= nil and self.getSyncId(object) or 0
|
|
75
|
+
frameSetValue(self.syncSlider, syncId)
|
|
76
|
+
end
|
|
77
|
+
return ____exports
|
package/engine/text-tag.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ declare const enum TextTagPropertyKey {
|
|
|
23
23
|
Y = 107
|
|
24
24
|
}
|
|
25
25
|
export declare class TextTag extends AbstractDestroyable {
|
|
26
|
-
private
|
|
26
|
+
private [TextTagPropertyKey.HANDLE]?;
|
|
27
27
|
private [TextTagPropertyKey.CONFIGURATION]?;
|
|
28
28
|
private [TextTagPropertyKey.TEXT]?;
|
|
29
29
|
private [TextTagPropertyKey.FONT_SIZE]?;
|