warscript 0.0.1-dev.eda504c → 0.0.1-dev.ee6e396
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/core/types/player.d.ts +16 -0
- package/core/types/player.lua +57 -14
- package/core/types/tileCell.d.ts +2 -1
- package/core/types/tileCell.lua +5 -0
- package/destroyable.d.ts +1 -0
- package/destroyable.lua +9 -0
- package/engine/behavior.d.ts +10 -2
- package/engine/behavior.lua +157 -76
- 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 +6 -1
- package/engine/behaviour/ability.lua +31 -1
- package/engine/behaviour/unit/stun-immunity.d.ts +7 -5
- package/engine/behaviour/unit/stun-immunity.lua +6 -5
- package/engine/behaviour/unit.d.ts +7 -3
- package/engine/behaviour/unit.lua +101 -24
- package/engine/buff.d.ts +19 -4
- package/engine/buff.lua +122 -41
- package/engine/internal/mechanics/cast-ability.lua +6 -3
- 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/attributes.d.ts +17 -0
- package/engine/internal/unit/attributes.lua +46 -0
- 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/interrupts.d.ts +12 -0
- package/engine/internal/unit/interrupts.lua +28 -0
- package/engine/internal/unit/main-selected.lua +12 -27
- package/engine/internal/unit/range-event.d.ts +12 -0
- package/engine/internal/unit/range-event.lua +90 -0
- package/engine/internal/unit/scale.d.ts +7 -0
- package/engine/internal/unit/scale.lua +20 -0
- package/engine/internal/unit-missile-launch.lua +16 -6
- package/engine/internal/unit.d.ts +13 -19
- package/engine/internal/unit.lua +140 -173
- 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/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/unit.d.ts +20 -5
- package/engine/object-field/unit.lua +61 -0
- package/engine/object-field.d.ts +9 -1
- package/engine/object-field.lua +265 -122
- package/engine/standard/fields/ability.d.ts +2 -2
- package/engine/standard/fields/ability.lua +2 -2
- package/engine/standard/fields/unit.d.ts +11 -3
- package/engine/standard/fields/unit.lua +15 -2
- package/engine/synchronization.d.ts +11 -0
- package/engine/synchronization.lua +77 -0
- package/engine/text-tag.lua +2 -1
- package/engine/unit.d.ts +5 -0
- package/engine/unit.lua +5 -0
- package/net/socket.lua +1 -1
- package/objutil/buff.lua +9 -7
- package/package.json +2 -2
- package/patch-lua.lua +15 -0
- package/utility/linked-map.d.ts +34 -0
- package/utility/linked-map.lua +101 -0
- package/utility/linked-set.d.ts +3 -1
- package/utility/linked-set.lua +38 -0
- package/utility/records.lua +20 -1
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
|
|
@@ -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]
|
|
@@ -123,6 +124,7 @@ function ObjectField.prototype.setValue(self, entry, value)
|
|
|
123
124
|
defaultValueByObjectDataEntryId[entry.id] = value
|
|
124
125
|
return true
|
|
125
126
|
end
|
|
127
|
+
local previousOriginalValue
|
|
126
128
|
local modifiersByInstance = self.modifiersByInstance
|
|
127
129
|
if modifiersByInstance ~= nil then
|
|
128
130
|
local modifiers = modifiersByInstance[entry]
|
|
@@ -132,11 +134,40 @@ function ObjectField.prototype.setValue(self, entry, value)
|
|
|
132
134
|
originalValueByInstance = mutableWeakLuaMap()
|
|
133
135
|
self.originalValueByInstance = originalValueByInstance
|
|
134
136
|
end
|
|
137
|
+
previousOriginalValue = originalValueByInstance[entry]
|
|
138
|
+
if value == previousOriginalValue then
|
|
139
|
+
return true
|
|
140
|
+
end
|
|
135
141
|
originalValueByInstance[entry] = value
|
|
136
|
-
value = self:calculateActualValue(entry)
|
|
142
|
+
value = (self:calculateActualValue(entry))
|
|
143
|
+
end
|
|
144
|
+
end
|
|
145
|
+
local previousValue = self:setActualValue(entry, value)
|
|
146
|
+
if previousValue == nil then
|
|
147
|
+
return false
|
|
148
|
+
end
|
|
149
|
+
if previousOriginalValue ~= nil or value ~= previousValue then
|
|
150
|
+
local ____self_invokeValueChangeEvent_2 = self.invokeValueChangeEvent
|
|
151
|
+
local ____entry_1 = entry
|
|
152
|
+
local ____previousOriginalValue_0 = previousOriginalValue
|
|
153
|
+
if ____previousOriginalValue_0 == nil then
|
|
154
|
+
____previousOriginalValue_0 = previousValue
|
|
137
155
|
end
|
|
156
|
+
____self_invokeValueChangeEvent_2(
|
|
157
|
+
self,
|
|
158
|
+
____entry_1,
|
|
159
|
+
self,
|
|
160
|
+
____previousOriginalValue_0,
|
|
161
|
+
value
|
|
162
|
+
)
|
|
163
|
+
end
|
|
164
|
+
return true
|
|
165
|
+
end
|
|
166
|
+
function ObjectField.prototype.updateActualValue(self, instance)
|
|
167
|
+
local actualValue, hasModifiers = self:calculateActualValue(instance)
|
|
168
|
+
if hasModifiers then
|
|
169
|
+
self:setActualValue(instance, actualValue)
|
|
138
170
|
end
|
|
139
|
-
return self:setActualValue(entry, value)
|
|
140
171
|
end
|
|
141
172
|
function ObjectField.prototype.applyModifier(self, instance, modifier)
|
|
142
173
|
local modifiersByInstance = self.modifiersByInstance
|
|
@@ -150,11 +181,14 @@ function ObjectField.prototype.applyModifier(self, instance, modifier)
|
|
|
150
181
|
originalValueByInstance = mutableWeakLuaMap()
|
|
151
182
|
self.originalValueByInstance = originalValueByInstance
|
|
152
183
|
end
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
184
|
+
local ____originalValueByInstance_4 = originalValueByInstance
|
|
185
|
+
local ____instance_5 = instance
|
|
186
|
+
local ____originalValueByInstance_instance_3 = originalValueByInstance[instance]
|
|
187
|
+
if ____originalValueByInstance_instance_3 == nil then
|
|
188
|
+
____originalValueByInstance_instance_3 = self:getActualValue(instance)
|
|
189
|
+
end
|
|
190
|
+
____originalValueByInstance_4[____instance_5] = ____originalValueByInstance_instance_3
|
|
191
|
+
self:setActualValue(instance, (self:calculateActualValue(instance)))
|
|
158
192
|
end
|
|
159
193
|
end
|
|
160
194
|
function ObjectField.prototype.removeModifier(self, instance, modifier)
|
|
@@ -162,10 +196,7 @@ function ObjectField.prototype.removeModifier(self, instance, modifier)
|
|
|
162
196
|
if modifiersByInstance ~= nil then
|
|
163
197
|
local modifiers = modifiersByInstance[instance]
|
|
164
198
|
if modifiers ~= nil and modifiers:remove(modifier) then
|
|
165
|
-
self:setActualValue(
|
|
166
|
-
instance,
|
|
167
|
-
self:calculateActualValue(instance)
|
|
168
|
-
)
|
|
199
|
+
self:setActualValue(instance, (self:calculateActualValue(instance)))
|
|
169
200
|
return true
|
|
170
201
|
end
|
|
171
202
|
end
|
|
@@ -196,22 +227,22 @@ function ObjectField.prototype.getActualValue(self, instance)
|
|
|
196
227
|
if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
|
|
197
228
|
local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
|
|
198
229
|
if defaultValue ~= nil or self.isGlobal then
|
|
199
|
-
local
|
|
200
|
-
if
|
|
201
|
-
|
|
230
|
+
local ____self_valueByInstance_instance_6 = self.valueByInstance[instance]
|
|
231
|
+
if ____self_valueByInstance_instance_6 == nil then
|
|
232
|
+
____self_valueByInstance_instance_6 = defaultValue
|
|
202
233
|
end
|
|
203
|
-
local
|
|
204
|
-
if
|
|
205
|
-
|
|
234
|
+
local ____self_valueByInstance_instance_6_7 = ____self_valueByInstance_instance_6
|
|
235
|
+
if ____self_valueByInstance_instance_6_7 == nil then
|
|
236
|
+
____self_valueByInstance_instance_6_7 = self.defaultValue
|
|
206
237
|
end
|
|
207
|
-
return
|
|
238
|
+
return ____self_valueByInstance_instance_6_7
|
|
208
239
|
end
|
|
209
240
|
end
|
|
210
|
-
local
|
|
211
|
-
if
|
|
212
|
-
|
|
241
|
+
local ____temp_8 = self:getNativeFieldValue(instance)
|
|
242
|
+
if ____temp_8 == nil then
|
|
243
|
+
____temp_8 = self.defaultValue
|
|
213
244
|
end
|
|
214
|
-
return
|
|
245
|
+
return ____temp_8
|
|
215
246
|
end
|
|
216
247
|
function ObjectField.prototype.setActualValue(self, instance, value)
|
|
217
248
|
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
@@ -219,49 +250,44 @@ function ObjectField.prototype.setActualValue(self, instance, value)
|
|
|
219
250
|
if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
|
|
220
251
|
local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
|
|
221
252
|
if defaultValue ~= nil or self.isGlobal then
|
|
222
|
-
local
|
|
223
|
-
if
|
|
224
|
-
|
|
225
|
-
end
|
|
226
|
-
local ____self_valueByInstance_instance_3_4 = ____self_valueByInstance_instance_3
|
|
227
|
-
if ____self_valueByInstance_instance_3_4 == nil then
|
|
228
|
-
____self_valueByInstance_instance_3_4 = self.defaultValue
|
|
253
|
+
local ____self_valueByInstance_instance_9 = self.valueByInstance[instance]
|
|
254
|
+
if ____self_valueByInstance_instance_9 == nil then
|
|
255
|
+
____self_valueByInstance_instance_9 = defaultValue
|
|
229
256
|
end
|
|
230
|
-
local
|
|
231
|
-
if
|
|
232
|
-
|
|
233
|
-
self:invokeValueChangeEvent(instance, self, previousValue, value)
|
|
257
|
+
local ____self_valueByInstance_instance_9_10 = ____self_valueByInstance_instance_9
|
|
258
|
+
if ____self_valueByInstance_instance_9_10 == nil then
|
|
259
|
+
____self_valueByInstance_instance_9_10 = self.defaultValue
|
|
234
260
|
end
|
|
235
|
-
|
|
261
|
+
local previousValue = ____self_valueByInstance_instance_9_10
|
|
262
|
+
self.valueByInstance[instance] = value
|
|
263
|
+
return previousValue
|
|
236
264
|
end
|
|
237
265
|
end
|
|
238
266
|
if not self:hasNativeFieldValue(objectDataEntryId) then
|
|
239
|
-
return
|
|
267
|
+
return nil
|
|
240
268
|
end
|
|
241
269
|
local previousValue = self:getNativeFieldValue(instance)
|
|
242
|
-
if value ~= previousValue then
|
|
243
|
-
|
|
244
|
-
return false
|
|
245
|
-
end
|
|
246
|
-
self:invokeValueChangeEvent(instance, self, previousValue, value)
|
|
270
|
+
if value ~= previousValue and not self:setNativeFieldValue(instance, value) then
|
|
271
|
+
return nil
|
|
247
272
|
end
|
|
248
|
-
return
|
|
273
|
+
return previousValue
|
|
249
274
|
end
|
|
250
275
|
function ObjectField.prototype.calculateActualValue(self, instance)
|
|
251
|
-
local
|
|
252
|
-
local originalValue =
|
|
253
|
-
local
|
|
254
|
-
local modifiers =
|
|
276
|
+
local ____opt_11 = self.originalValueByInstance
|
|
277
|
+
local originalValue = ____opt_11 and ____opt_11[instance]
|
|
278
|
+
local ____opt_13 = self.modifiersByInstance
|
|
279
|
+
local modifiers = ____opt_13 and ____opt_13[instance]
|
|
255
280
|
if originalValue ~= nil then
|
|
256
281
|
local value = originalValue
|
|
257
282
|
if modifiers ~= nil then
|
|
258
283
|
for modifier in pairs(modifiers) do
|
|
259
284
|
value = modifier(instance, value, originalValue)
|
|
260
285
|
end
|
|
286
|
+
return value, true
|
|
261
287
|
end
|
|
262
|
-
return value
|
|
288
|
+
return value, false
|
|
263
289
|
end
|
|
264
|
-
return self.defaultValue
|
|
290
|
+
return self.defaultValue, false
|
|
265
291
|
end
|
|
266
292
|
function ObjectField.prototype.invokeValueChangeEvent(self, ...)
|
|
267
293
|
self:invokeValueChangeEventRecursive(
|
|
@@ -316,17 +342,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
|
|
|
316
342
|
if defaultValueByObjectDataEntryId ~= nil then
|
|
317
343
|
local value = defaultValueByObjectDataEntryId[entry.id]
|
|
318
344
|
if value ~= nil then
|
|
319
|
-
local
|
|
345
|
+
local ____temp_16
|
|
320
346
|
if index == nil then
|
|
321
|
-
|
|
347
|
+
____temp_16 = value
|
|
322
348
|
else
|
|
323
|
-
local
|
|
324
|
-
if
|
|
325
|
-
|
|
349
|
+
local ____value_index_15 = value[index + 1]
|
|
350
|
+
if ____value_index_15 == nil then
|
|
351
|
+
____value_index_15 = self.defaultValue
|
|
326
352
|
end
|
|
327
|
-
|
|
353
|
+
____temp_16 = ____value_index_15
|
|
328
354
|
end
|
|
329
|
-
return
|
|
355
|
+
return ____temp_16
|
|
330
356
|
end
|
|
331
357
|
end
|
|
332
358
|
return index == nil and ({}) or self.defaultValue
|
|
@@ -336,17 +362,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
|
|
|
336
362
|
local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
|
|
337
363
|
if defaultValue ~= nil or self.isGlobal then
|
|
338
364
|
local value = self.valueByInstance[entry] or defaultValue or emptyArray()
|
|
339
|
-
local
|
|
365
|
+
local ____temp_18
|
|
340
366
|
if index == nil then
|
|
341
|
-
|
|
367
|
+
____temp_18 = value
|
|
342
368
|
else
|
|
343
|
-
local
|
|
344
|
-
if
|
|
345
|
-
|
|
369
|
+
local ____value_index_17 = value[index + 1]
|
|
370
|
+
if ____value_index_17 == nil then
|
|
371
|
+
____value_index_17 = self.defaultValue
|
|
346
372
|
end
|
|
347
|
-
|
|
373
|
+
____temp_18 = ____value_index_17
|
|
348
374
|
end
|
|
349
|
-
return
|
|
375
|
+
return ____temp_18
|
|
350
376
|
end
|
|
351
377
|
end
|
|
352
378
|
if index ~= nil then
|
|
@@ -391,36 +417,22 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
|
|
|
391
417
|
if defaultValueByObjectDataEntryId ~= nil then
|
|
392
418
|
local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
|
|
393
419
|
if valueByLevel ~= nil then
|
|
394
|
-
local
|
|
395
|
-
if
|
|
396
|
-
|
|
420
|
+
local ____valueByLevel_index_19 = valueByLevel[level + 1]
|
|
421
|
+
if ____valueByLevel_index_19 == nil then
|
|
422
|
+
____valueByLevel_index_19 = self.defaultValue
|
|
397
423
|
end
|
|
398
|
-
return
|
|
424
|
+
return ____valueByLevel_index_19
|
|
399
425
|
end
|
|
400
426
|
end
|
|
401
427
|
return self.defaultValue
|
|
402
428
|
end
|
|
403
|
-
local
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
local ____temp_16 = ____opt_14 and ____opt_14[level + 1]
|
|
409
|
-
if ____temp_16 == nil then
|
|
410
|
-
____temp_16 = (defaultValueByLevel or emptyArray())[level + 1]
|
|
411
|
-
end
|
|
412
|
-
local ____temp_16_17 = ____temp_16
|
|
413
|
-
if ____temp_16_17 == nil then
|
|
414
|
-
____temp_16_17 = self.defaultValue
|
|
415
|
-
end
|
|
416
|
-
return ____temp_16_17
|
|
417
|
-
end
|
|
418
|
-
end
|
|
419
|
-
local ____temp_18 = self:getNativeFieldValue(entry, level)
|
|
420
|
-
if ____temp_18 == nil then
|
|
421
|
-
____temp_18 = self.defaultValue
|
|
429
|
+
local ____opt_22 = self.originalValueByLevelByInstance
|
|
430
|
+
local ____opt_20 = ____opt_22 and ____opt_22[entry]
|
|
431
|
+
local originalValue = ____opt_20 and ____opt_20[level]
|
|
432
|
+
if originalValue ~= nil then
|
|
433
|
+
return originalValue
|
|
422
434
|
end
|
|
423
|
-
return
|
|
435
|
+
return self:getActualValue(entry, level)
|
|
424
436
|
end
|
|
425
437
|
function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
|
|
426
438
|
if value == nil then
|
|
@@ -460,56 +472,114 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
|
|
|
460
472
|
valueByLevel[level + 1] = value
|
|
461
473
|
return true
|
|
462
474
|
end
|
|
463
|
-
local
|
|
464
|
-
local
|
|
465
|
-
if
|
|
466
|
-
local
|
|
467
|
-
if
|
|
468
|
-
local
|
|
469
|
-
if
|
|
470
|
-
|
|
471
|
-
self.
|
|
472
|
-
end
|
|
473
|
-
local ____valueByLevel_index_19 = valueByLevel[level + 1]
|
|
474
|
-
if ____valueByLevel_index_19 == nil then
|
|
475
|
-
____valueByLevel_index_19 = (defaultValueByLevel or emptyArray())[level + 1]
|
|
476
|
-
end
|
|
477
|
-
local ____valueByLevel_index_19_20 = ____valueByLevel_index_19
|
|
478
|
-
if ____valueByLevel_index_19_20 == nil then
|
|
479
|
-
____valueByLevel_index_19_20 = self.defaultValue
|
|
475
|
+
local previousOriginalValue
|
|
476
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
477
|
+
if modifiersByInstance ~= nil then
|
|
478
|
+
local modifiers = modifiersByInstance[entry]
|
|
479
|
+
if modifiers ~= nil and modifiers.size ~= 0 then
|
|
480
|
+
local originalValueByLevelByInstance = self.originalValueByLevelByInstance
|
|
481
|
+
if originalValueByLevelByInstance == nil then
|
|
482
|
+
originalValueByLevelByInstance = mutableWeakLuaMap()
|
|
483
|
+
self.originalValueByLevelByInstance = originalValueByLevelByInstance
|
|
480
484
|
end
|
|
481
|
-
local
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
entry,
|
|
486
|
-
self,
|
|
487
|
-
level,
|
|
488
|
-
previousValue,
|
|
489
|
-
value
|
|
490
|
-
)
|
|
485
|
+
local originalValueByLevel = getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)
|
|
486
|
+
previousOriginalValue = originalValueByLevel[level]
|
|
487
|
+
if value == previousOriginalValue then
|
|
488
|
+
return true
|
|
491
489
|
end
|
|
492
|
-
|
|
490
|
+
originalValueByLevel[level] = value
|
|
491
|
+
value = self:calculateActualValue(entry, level)
|
|
493
492
|
end
|
|
494
493
|
end
|
|
495
|
-
|
|
494
|
+
local previousValue = self:setActualValue(entry, level, value)
|
|
495
|
+
if previousValue == nil then
|
|
496
496
|
return false
|
|
497
497
|
end
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
498
|
+
if previousOriginalValue ~= nil or value ~= previousValue then
|
|
499
|
+
local ____self_invokeValueChangeEvent_26 = self.invokeValueChangeEvent
|
|
500
|
+
local ____entry_25 = entry
|
|
501
|
+
local ____previousOriginalValue_24 = previousOriginalValue
|
|
502
|
+
if ____previousOriginalValue_24 == nil then
|
|
503
|
+
____previousOriginalValue_24 = previousValue
|
|
502
504
|
end
|
|
503
|
-
|
|
504
|
-
|
|
505
|
+
____self_invokeValueChangeEvent_26(
|
|
506
|
+
self,
|
|
507
|
+
____entry_25,
|
|
505
508
|
self,
|
|
506
509
|
level,
|
|
507
|
-
|
|
510
|
+
____previousOriginalValue_24,
|
|
508
511
|
value
|
|
509
512
|
)
|
|
510
513
|
end
|
|
511
514
|
return true
|
|
512
515
|
end
|
|
516
|
+
function ObjectLevelField.prototype.updateActualValue(self, instance, level)
|
|
517
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
518
|
+
if modifiersByInstance == nil then
|
|
519
|
+
return
|
|
520
|
+
end
|
|
521
|
+
local modifiers = modifiersByInstance[instance]
|
|
522
|
+
if modifiers == nil or modifiers.size == 0 then
|
|
523
|
+
return
|
|
524
|
+
end
|
|
525
|
+
if level == nil then
|
|
526
|
+
for i = 0, self:getLevelCount(instance) - 1 do
|
|
527
|
+
self:updateActualValue(instance, i)
|
|
528
|
+
end
|
|
529
|
+
return
|
|
530
|
+
end
|
|
531
|
+
self:setActualValue(
|
|
532
|
+
instance,
|
|
533
|
+
level,
|
|
534
|
+
self:calculateActualValue(instance, level)
|
|
535
|
+
)
|
|
536
|
+
end
|
|
537
|
+
function ObjectLevelField.prototype.applyModifier(self, instance, modifier)
|
|
538
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
539
|
+
if modifiersByInstance == nil then
|
|
540
|
+
modifiersByInstance = mutableWeakLuaMap()
|
|
541
|
+
self.modifiersByInstance = modifiersByInstance
|
|
542
|
+
end
|
|
543
|
+
if getOrPut(modifiersByInstance, instance, mutableLinkedSet):add(modifier) then
|
|
544
|
+
local originalValueByLevelByInstance = self.originalValueByLevelByInstance
|
|
545
|
+
if originalValueByLevelByInstance == nil then
|
|
546
|
+
originalValueByLevelByInstance = mutableWeakLuaMap()
|
|
547
|
+
self.originalValueByLevelByInstance = originalValueByLevelByInstance
|
|
548
|
+
end
|
|
549
|
+
local originalValueByLevel = getOrPut(originalValueByLevelByInstance, instance, mutableLuaMap)
|
|
550
|
+
local levelCount = self:getLevelCount(instance)
|
|
551
|
+
for level = 0, levelCount - 1 do
|
|
552
|
+
local ____originalValueByLevel_level_27 = originalValueByLevel[level]
|
|
553
|
+
if ____originalValueByLevel_level_27 == nil then
|
|
554
|
+
____originalValueByLevel_level_27 = self:getActualValue(instance, level)
|
|
555
|
+
end
|
|
556
|
+
originalValueByLevel[level] = ____originalValueByLevel_level_27
|
|
557
|
+
self:setActualValue(
|
|
558
|
+
instance,
|
|
559
|
+
level,
|
|
560
|
+
self:calculateActualValue(instance, level)
|
|
561
|
+
)
|
|
562
|
+
end
|
|
563
|
+
end
|
|
564
|
+
end
|
|
565
|
+
function ObjectLevelField.prototype.removeModifier(self, instance, modifier)
|
|
566
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
567
|
+
if modifiersByInstance ~= nil then
|
|
568
|
+
local modifiers = modifiersByInstance[instance]
|
|
569
|
+
if modifiers ~= nil and modifiers:remove(modifier) then
|
|
570
|
+
local levelCount = self:getLevelCount(instance)
|
|
571
|
+
for level = 0, levelCount - 1 do
|
|
572
|
+
self:setActualValue(
|
|
573
|
+
instance,
|
|
574
|
+
level,
|
|
575
|
+
self:calculateActualValue(instance, level)
|
|
576
|
+
)
|
|
577
|
+
end
|
|
578
|
+
return true
|
|
579
|
+
end
|
|
580
|
+
end
|
|
581
|
+
return false
|
|
582
|
+
end
|
|
513
583
|
function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value)
|
|
514
584
|
if value ~= nil then
|
|
515
585
|
if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
|
|
@@ -525,6 +595,79 @@ function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value
|
|
|
525
595
|
end
|
|
526
596
|
return self:setValue(entry, levelOrValue)
|
|
527
597
|
end
|
|
598
|
+
function ObjectLevelField.prototype.getActualValue(self, instance, level)
|
|
599
|
+
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
600
|
+
if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
|
|
601
|
+
local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
|
|
602
|
+
if defaultValueByLevel ~= nil or self.isGlobal then
|
|
603
|
+
local ____opt_28 = self.valueByInstance[instance]
|
|
604
|
+
local ____temp_30 = ____opt_28 and ____opt_28[level + 1]
|
|
605
|
+
if ____temp_30 == nil then
|
|
606
|
+
____temp_30 = (defaultValueByLevel or emptyArray())[level + 1]
|
|
607
|
+
end
|
|
608
|
+
local ____temp_30_31 = ____temp_30
|
|
609
|
+
if ____temp_30_31 == nil then
|
|
610
|
+
____temp_30_31 = self.defaultValue
|
|
611
|
+
end
|
|
612
|
+
return ____temp_30_31
|
|
613
|
+
end
|
|
614
|
+
end
|
|
615
|
+
local ____temp_32 = self:getNativeFieldValue(instance, level)
|
|
616
|
+
if ____temp_32 == nil then
|
|
617
|
+
____temp_32 = self.defaultValue
|
|
618
|
+
end
|
|
619
|
+
return ____temp_32
|
|
620
|
+
end
|
|
621
|
+
function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
|
|
622
|
+
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
623
|
+
local objectDataEntryId = self:getObjectDataEntryId(instance)
|
|
624
|
+
if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
|
|
625
|
+
local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
|
|
626
|
+
if defaultValueByLevel ~= nil or self.isGlobal then
|
|
627
|
+
local valueByLevel = self.valueByInstance[instance]
|
|
628
|
+
if valueByLevel == nil then
|
|
629
|
+
valueByLevel = {}
|
|
630
|
+
self.valueByInstance[instance] = valueByLevel
|
|
631
|
+
end
|
|
632
|
+
local ____valueByLevel_index_33 = valueByLevel[level + 1]
|
|
633
|
+
if ____valueByLevel_index_33 == nil then
|
|
634
|
+
____valueByLevel_index_33 = (defaultValueByLevel or emptyArray())[level + 1]
|
|
635
|
+
end
|
|
636
|
+
local ____valueByLevel_index_33_34 = ____valueByLevel_index_33
|
|
637
|
+
if ____valueByLevel_index_33_34 == nil then
|
|
638
|
+
____valueByLevel_index_33_34 = self.defaultValue
|
|
639
|
+
end
|
|
640
|
+
local previousValue = ____valueByLevel_index_33_34
|
|
641
|
+
valueByLevel[level + 1] = value
|
|
642
|
+
return previousValue
|
|
643
|
+
end
|
|
644
|
+
end
|
|
645
|
+
if not self:hasNativeFieldValue(objectDataEntryId) then
|
|
646
|
+
return nil
|
|
647
|
+
end
|
|
648
|
+
local previousValue = self:getNativeFieldValue(instance, level)
|
|
649
|
+
if value ~= previousValue and not self:setNativeFieldValue(instance, level, value) then
|
|
650
|
+
return nil
|
|
651
|
+
end
|
|
652
|
+
return previousValue
|
|
653
|
+
end
|
|
654
|
+
function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
|
|
655
|
+
local ____opt_37 = self.originalValueByLevelByInstance
|
|
656
|
+
local ____opt_35 = ____opt_37 and ____opt_37[instance]
|
|
657
|
+
local originalValue = ____opt_35 and ____opt_35[level]
|
|
658
|
+
local ____opt_39 = self.modifiersByInstance
|
|
659
|
+
local modifiers = ____opt_39 and ____opt_39[instance]
|
|
660
|
+
if originalValue ~= nil then
|
|
661
|
+
local value = originalValue
|
|
662
|
+
if modifiers ~= nil then
|
|
663
|
+
for modifier in pairs(modifiers) do
|
|
664
|
+
value = modifier(instance, level, value, originalValue)
|
|
665
|
+
end
|
|
666
|
+
end
|
|
667
|
+
return value
|
|
668
|
+
end
|
|
669
|
+
return self.defaultValue
|
|
670
|
+
end
|
|
528
671
|
function ObjectLevelField.prototype.invokeValueChangeEvent(self, ...)
|
|
529
672
|
self:invokeValueChangeEventRecursive(
|
|
530
673
|
getClass(self),
|
|
@@ -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,12 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
|
-
import { UnitClassificationsField, UnitPropulsionWindowField } from "../../object-field/unit";
|
|
3
|
-
export declare const
|
|
4
|
-
export declare const
|
|
2
|
+
import { UnitClassificationsField, UnitFloatField, UnitFlyHeightField, UnitHealthRegenerationTypeField, UnitIntegerField, UnitPropulsionWindowField, UnitScalingValueField } from "../../object-field/unit";
|
|
3
|
+
export declare const PROPULSION_WINDOW_UNIT_FIELD: UnitPropulsionWindowField & symbol;
|
|
4
|
+
export declare const CLASSIFICATIONS_UNIT_FIELD: UnitClassificationsField & symbol;
|
|
5
|
+
export declare const FLY_HEIGHT_UNIT_FIELD: UnitFlyHeightField & symbol;
|
|
6
|
+
export declare const SCALING_VALUE_UNIT_FIELD: UnitScalingValueField & symbol;
|
|
7
|
+
export declare const HEALTH_REGENERATION_RATE_UNIT_FIELD: UnitFloatField & symbol;
|
|
8
|
+
export declare const MANA_REGENERATION_RATE_UNIT_FIELD: UnitFloatField & symbol;
|
|
9
|
+
export declare const HEALTH_REGENERATION_TYPE_UNIT_FIELD: UnitHealthRegenerationTypeField & symbol;
|
|
10
|
+
export declare const STRENGTH_UNIT_FIELD: UnitIntegerField<number> & symbol;
|
|
11
|
+
export declare const AGILITY_UNIT_FIELD: UnitIntegerField<number> & symbol;
|
|
12
|
+
export declare const INTELLIGENCE_UNIT_FIELD: UnitIntegerField<number> & symbol;
|
|
@@ -1,7 +1,20 @@
|
|
|
1
1
|
local ____exports = {}
|
|
2
2
|
local ____unit = require("engine.object-field.unit")
|
|
3
3
|
local UnitClassificationsField = ____unit.UnitClassificationsField
|
|
4
|
+
local UnitFloatField = ____unit.UnitFloatField
|
|
5
|
+
local UnitFlyHeightField = ____unit.UnitFlyHeightField
|
|
6
|
+
local UnitHealthRegenerationTypeField = ____unit.UnitHealthRegenerationTypeField
|
|
7
|
+
local UnitIntegerField = ____unit.UnitIntegerField
|
|
4
8
|
local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
|
|
5
|
-
|
|
6
|
-
____exports.
|
|
9
|
+
local UnitScalingValueField = ____unit.UnitScalingValueField
|
|
10
|
+
____exports.PROPULSION_WINDOW_UNIT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
|
|
11
|
+
____exports.CLASSIFICATIONS_UNIT_FIELD = UnitClassificationsField:create(fourCC("utyp"))
|
|
12
|
+
____exports.FLY_HEIGHT_UNIT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
|
|
13
|
+
____exports.SCALING_VALUE_UNIT_FIELD = UnitScalingValueField:create(fourCC("usca"))
|
|
14
|
+
____exports.HEALTH_REGENERATION_RATE_UNIT_FIELD = UnitFloatField:create(fourCC("uhpr"))
|
|
15
|
+
____exports.MANA_REGENERATION_RATE_UNIT_FIELD = UnitFloatField:create(fourCC("umpr"))
|
|
16
|
+
____exports.HEALTH_REGENERATION_TYPE_UNIT_FIELD = UnitHealthRegenerationTypeField:create(fourCC("uhrt"))
|
|
17
|
+
____exports.STRENGTH_UNIT_FIELD = UnitIntegerField:create(fourCC("ustc"))
|
|
18
|
+
____exports.AGILITY_UNIT_FIELD = UnitIntegerField:create(fourCC("uagc"))
|
|
19
|
+
____exports.INTELLIGENCE_UNIT_FIELD = UnitIntegerField:create(fourCC("uinc"))
|
|
7
20
|
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
|
+
}
|