warscript 0.0.1-dev.eda504c → 0.0.1-dev.edf7fad

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (104) hide show
  1. package/core/types/frame.lua +47 -1
  2. package/core/types/player.d.ts +16 -0
  3. package/core/types/player.lua +57 -14
  4. package/core/types/sound.lua +1 -1
  5. package/core/types/tileCell.d.ts +2 -1
  6. package/core/types/tileCell.lua +5 -0
  7. package/destroyable.d.ts +1 -0
  8. package/destroyable.lua +9 -0
  9. package/engine/behavior.d.ts +10 -2
  10. package/engine/behavior.lua +157 -76
  11. package/engine/behaviour/ability/apply-buff.lua +4 -4
  12. package/engine/behaviour/ability/damage.d.ts +3 -0
  13. package/engine/behaviour/ability/damage.lua +8 -2
  14. package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
  15. package/engine/behaviour/ability/remove-buffs.lua +21 -0
  16. package/engine/behaviour/ability.d.ts +11 -6
  17. package/engine/behaviour/ability.lua +31 -1
  18. package/engine/behaviour/unit/stun-immunity.d.ts +7 -5
  19. package/engine/behaviour/unit/stun-immunity.lua +6 -5
  20. package/engine/behaviour/unit.d.ts +7 -3
  21. package/engine/behaviour/unit.lua +101 -24
  22. package/engine/buff.d.ts +65 -18
  23. package/engine/buff.lua +356 -152
  24. package/engine/internal/mechanics/cast-ability.lua +6 -3
  25. package/engine/internal/object-data/attribute-bonus.lua +2 -2
  26. package/engine/internal/object-data/health-bonus.d.ts +2 -0
  27. package/engine/internal/object-data/health-bonus.lua +16 -0
  28. package/engine/internal/object-data/mana-bonus.d.ts +2 -0
  29. package/engine/internal/object-data/mana-bonus.lua +16 -0
  30. package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts +2 -0
  31. package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua +16 -0
  32. package/engine/internal/unit/attributes.d.ts +17 -0
  33. package/engine/internal/unit/attributes.lua +46 -0
  34. package/engine/internal/unit/bonus.d.ts +6 -0
  35. package/engine/internal/unit/bonus.lua +33 -3
  36. package/engine/internal/unit/fly-height.d.ts +7 -0
  37. package/engine/internal/unit/fly-height.lua +20 -0
  38. package/engine/internal/unit/interrupts.d.ts +12 -0
  39. package/engine/internal/unit/interrupts.lua +28 -0
  40. package/engine/internal/unit/main-selected.lua +12 -27
  41. package/engine/internal/unit/range-event.d.ts +12 -0
  42. package/engine/internal/unit/range-event.lua +90 -0
  43. package/engine/internal/unit/scale.d.ts +7 -0
  44. package/engine/internal/unit/scale.lua +20 -0
  45. package/engine/internal/unit+bonus.lua +3 -3
  46. package/engine/internal/unit-missile-launch.lua +16 -6
  47. package/engine/internal/unit.d.ts +13 -19
  48. package/engine/internal/unit.lua +140 -173
  49. package/engine/local-client.d.ts +7 -0
  50. package/engine/local-client.lua +79 -1
  51. package/engine/object-data/auxiliary/health-regeneration-type.d.ts +8 -0
  52. package/engine/object-data/auxiliary/health-regeneration-type.lua +2 -0
  53. package/engine/object-data/auxiliary/unit-attribute.lua +1 -1
  54. package/engine/object-data/entry/ability-type/{armor-increase.d.ts → armor-bonus.d.ts} +3 -3
  55. package/engine/object-data/entry/ability-type/{armor-increase.lua → armor-bonus.lua} +9 -9
  56. package/engine/object-data/entry/ability-type/health-bonus.d.ts +8 -0
  57. package/engine/object-data/entry/ability-type/health-bonus.lua +26 -0
  58. package/engine/object-data/entry/ability-type/mana-bonus.d.ts +8 -0
  59. package/engine/object-data/entry/ability-type/mana-bonus.lua +26 -0
  60. package/engine/object-data/entry/ability-type/mana-regeneration.d.ts +8 -0
  61. package/engine/object-data/entry/ability-type/mana-regeneration.lua +26 -0
  62. package/engine/object-data/entry/ability-type/reincarnation.d.ts +8 -0
  63. package/engine/object-data/entry/ability-type/reincarnation.lua +26 -0
  64. package/engine/object-data/entry/ability-type.d.ts +2 -0
  65. package/engine/object-data/entry/ability-type.lua +84 -4
  66. package/engine/object-data/entry/buff-type/applicable.lua +113 -109
  67. package/engine/object-data/entry/destructible-type.d.ts +27 -1
  68. package/engine/object-data/entry/destructible-type.lua +155 -0
  69. package/engine/object-data/entry/unit-type.d.ts +4 -0
  70. package/engine/object-data/entry/unit-type.lua +76 -32
  71. package/engine/object-field/ability.lua +2 -2
  72. package/engine/object-field/unit.d.ts +20 -5
  73. package/engine/object-field/unit.lua +61 -0
  74. package/engine/object-field.d.ts +10 -2
  75. package/engine/object-field.lua +268 -123
  76. package/engine/random.d.ts +1 -0
  77. package/engine/random.lua +8 -0
  78. package/engine/standard/fields/ability.d.ts +2 -2
  79. package/engine/standard/fields/ability.lua +2 -2
  80. package/engine/standard/fields/unit.d.ts +11 -3
  81. package/engine/standard/fields/unit.lua +15 -2
  82. package/engine/synchronization.d.ts +11 -0
  83. package/engine/synchronization.lua +77 -0
  84. package/engine/text-tag.lua +2 -1
  85. package/engine/unit.d.ts +5 -0
  86. package/engine/unit.lua +5 -0
  87. package/lualib_bundle.lua +1 -1
  88. package/math.d.ts +2 -0
  89. package/math.lua +14 -0
  90. package/net/socket.lua +1 -1
  91. package/objutil/buff.lua +9 -7
  92. package/objutil/object.lua +1 -1
  93. package/operation.lua +1 -4
  94. package/package.json +5 -5
  95. package/patch-lua.lua +15 -0
  96. package/utility/linked-map.d.ts +34 -0
  97. package/utility/linked-map.lua +101 -0
  98. package/utility/linked-set.d.ts +3 -1
  99. package/utility/linked-set.lua +38 -0
  100. package/utility/records.lua +20 -1
  101. /package/engine/internal/object-data/{armor-increase.d.ts → armor-bonus.d.ts} +0 -0
  102. /package/engine/internal/object-data/{armor-increase.lua → armor-bonus.lua} +0 -0
  103. /package/engine/object-data/entry/ability-type/{attribute-increase.d.ts → attribute-bonus.d.ts} +0 -0
  104. /package/engine/object-data/entry/ability-type/{attribute-increase.lua → attribute-bonus.lua} +0 -0
@@ -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 == false then
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
- originalValueByInstance[instance] = self:getActualValue(instance)
154
- self:setActualValue(
155
- instance,
156
- self:calculateActualValue(instance)
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 ____self_valueByInstance_instance_0 = self.valueByInstance[instance]
200
- if ____self_valueByInstance_instance_0 == nil then
201
- ____self_valueByInstance_instance_0 = defaultValue
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 ____self_valueByInstance_instance_0_1 = ____self_valueByInstance_instance_0
204
- if ____self_valueByInstance_instance_0_1 == nil then
205
- ____self_valueByInstance_instance_0_1 = self.defaultValue
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 ____self_valueByInstance_instance_0_1
238
+ return ____self_valueByInstance_instance_6_7
208
239
  end
209
240
  end
210
- local ____temp_2 = self:getNativeFieldValue(instance)
211
- if ____temp_2 == nil then
212
- ____temp_2 = self.defaultValue
241
+ local ____temp_8 = self:getNativeFieldValue(instance)
242
+ if ____temp_8 == nil then
243
+ ____temp_8 = self.defaultValue
213
244
  end
214
- return ____temp_2
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 ____self_valueByInstance_instance_3 = self.valueByInstance[instance]
223
- if ____self_valueByInstance_instance_3 == nil then
224
- ____self_valueByInstance_instance_3 = defaultValue
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 previousValue = ____self_valueByInstance_instance_3_4
231
- if value ~= previousValue then
232
- self.valueByInstance[instance] = value
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
- return true
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 false
267
+ return nil
240
268
  end
241
269
  local previousValue = self:getNativeFieldValue(instance)
242
- if value ~= previousValue then
243
- if not self:setNativeFieldValue(instance, value) then
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 true
273
+ return previousValue
249
274
  end
250
275
  function ObjectField.prototype.calculateActualValue(self, instance)
251
- local ____opt_5 = self.originalValueByInstance
252
- local originalValue = ____opt_5 and ____opt_5[instance]
253
- local ____opt_7 = self.modifiersByInstance
254
- local modifiers = ____opt_7 and ____opt_7[instance]
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 ____temp_10
345
+ local ____temp_16
320
346
  if index == nil then
321
- ____temp_10 = value
347
+ ____temp_16 = value
322
348
  else
323
- local ____value_index_9 = value[index + 1]
324
- if ____value_index_9 == nil then
325
- ____value_index_9 = self.defaultValue
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
- ____temp_10 = ____value_index_9
353
+ ____temp_16 = ____value_index_15
328
354
  end
329
- return ____temp_10
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 ____temp_12
365
+ local ____temp_18
340
366
  if index == nil then
341
- ____temp_12 = value
367
+ ____temp_18 = value
342
368
  else
343
- local ____value_index_11 = value[index + 1]
344
- if ____value_index_11 == nil then
345
- ____value_index_11 = self.defaultValue
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
- ____temp_12 = ____value_index_11
373
+ ____temp_18 = ____value_index_17
348
374
  end
349
- return ____temp_12
375
+ return ____temp_18
350
376
  end
351
377
  end
352
378
  if index ~= nil then
@@ -377,12 +403,12 @@ ____exports.ObjectLevelField = __TS__Class()
377
403
  local ObjectLevelField = ____exports.ObjectLevelField
378
404
  ObjectLevelField.name = "ObjectLevelField"
379
405
  __TS__ClassExtends(ObjectLevelField, ObjectFieldBase)
380
- function ObjectLevelField.prototype.getValue(self, entry, level)
406
+ function ObjectLevelField.prototype.getValue(self, entry, level, includeModifiers)
381
407
  if level == nil then
382
408
  local result = {}
383
409
  local levelCount = self:getLevelCount(entry)
384
410
  for i = 0, levelCount - 1 do
385
- result[i + 1] = self:getValue(entry, i)
411
+ result[i + 1] = self:getValue(entry, i, includeModifiers)
386
412
  end
387
413
  return result
388
414
  end
@@ -391,36 +417,24 @@ 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 ____valueByLevel_index_13 = valueByLevel[level + 1]
395
- if ____valueByLevel_index_13 == nil then
396
- ____valueByLevel_index_13 = self.defaultValue
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 ____valueByLevel_index_13
424
+ return ____valueByLevel_index_19
399
425
  end
400
426
  end
401
427
  return self.defaultValue
402
428
  end
403
- local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
404
- if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
405
- local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
406
- if defaultValueByLevel ~= nil or self.isGlobal then
407
- local ____opt_14 = self.valueByInstance[entry]
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
429
+ if not includeModifiers then
430
+ local ____opt_22 = self.originalValueByLevelByInstance
431
+ local ____opt_20 = ____opt_22 and ____opt_22[entry]
432
+ local originalValue = ____opt_20 and ____opt_20[level]
433
+ if originalValue ~= nil then
434
+ return originalValue
417
435
  end
418
436
  end
419
- local ____temp_18 = self:getNativeFieldValue(entry, level)
420
- if ____temp_18 == nil then
421
- ____temp_18 = self.defaultValue
422
- end
423
- return ____temp_18
437
+ return self:getActualValue(entry, level)
424
438
  end
425
439
  function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
426
440
  if value == nil then
@@ -460,56 +474,114 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
460
474
  valueByLevel[level + 1] = value
461
475
  return true
462
476
  end
463
- local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
464
- local objectDataEntryId = self:getObjectDataEntryId(entry)
465
- if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
466
- local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
467
- if defaultValueByLevel ~= nil or self.isGlobal then
468
- local valueByLevel = self.valueByInstance[entry]
469
- if valueByLevel == nil then
470
- valueByLevel = {}
471
- self.valueByInstance[entry] = valueByLevel
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
477
+ local previousOriginalValue
478
+ local modifiersByInstance = self.modifiersByInstance
479
+ if modifiersByInstance ~= nil then
480
+ local modifiers = modifiersByInstance[entry]
481
+ if modifiers ~= nil and modifiers.size ~= 0 then
482
+ local originalValueByLevelByInstance = self.originalValueByLevelByInstance
483
+ if originalValueByLevelByInstance == nil then
484
+ originalValueByLevelByInstance = mutableWeakLuaMap()
485
+ self.originalValueByLevelByInstance = originalValueByLevelByInstance
480
486
  end
481
- local previousValue = ____valueByLevel_index_19_20
482
- if value ~= previousValue then
483
- valueByLevel[level + 1] = value
484
- self:invokeValueChangeEvent(
485
- entry,
486
- self,
487
- level,
488
- previousValue,
489
- value
490
- )
487
+ local originalValueByLevel = getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)
488
+ previousOriginalValue = originalValueByLevel[level]
489
+ if value == previousOriginalValue then
490
+ return true
491
491
  end
492
- return true
492
+ originalValueByLevel[level] = value
493
+ value = self:calculateActualValue(entry, level)
493
494
  end
494
495
  end
495
- if not self:hasNativeFieldValue(objectDataEntryId) then
496
+ local previousValue = self:setActualValue(entry, level, value)
497
+ if previousValue == nil then
496
498
  return false
497
499
  end
498
- local previousValue = self:getNativeFieldValue(entry, level)
499
- if value ~= previousValue then
500
- if not self:setNativeFieldValue(entry, level, value) then
501
- return false
500
+ if previousOriginalValue ~= nil or value ~= previousValue then
501
+ local ____self_invokeValueChangeEvent_26 = self.invokeValueChangeEvent
502
+ local ____entry_25 = entry
503
+ local ____previousOriginalValue_24 = previousOriginalValue
504
+ if ____previousOriginalValue_24 == nil then
505
+ ____previousOriginalValue_24 = previousValue
502
506
  end
503
- self:invokeValueChangeEvent(
504
- entry,
507
+ ____self_invokeValueChangeEvent_26(
508
+ self,
509
+ ____entry_25,
505
510
  self,
506
511
  level,
507
- previousValue,
512
+ ____previousOriginalValue_24,
508
513
  value
509
514
  )
510
515
  end
511
516
  return true
512
517
  end
518
+ function ObjectLevelField.prototype.updateActualValue(self, instance, level)
519
+ local modifiersByInstance = self.modifiersByInstance
520
+ if modifiersByInstance == nil then
521
+ return
522
+ end
523
+ local modifiers = modifiersByInstance[instance]
524
+ if modifiers == nil or modifiers.size == 0 then
525
+ return
526
+ end
527
+ if level == nil then
528
+ for i = 0, self:getLevelCount(instance) - 1 do
529
+ self:updateActualValue(instance, i)
530
+ end
531
+ return
532
+ end
533
+ self:setActualValue(
534
+ instance,
535
+ level,
536
+ self:calculateActualValue(instance, level)
537
+ )
538
+ end
539
+ function ObjectLevelField.prototype.applyModifier(self, instance, modifier)
540
+ local modifiersByInstance = self.modifiersByInstance
541
+ if modifiersByInstance == nil then
542
+ modifiersByInstance = mutableWeakLuaMap()
543
+ self.modifiersByInstance = modifiersByInstance
544
+ end
545
+ if getOrPut(modifiersByInstance, instance, mutableLinkedSet):add(modifier) then
546
+ local originalValueByLevelByInstance = self.originalValueByLevelByInstance
547
+ if originalValueByLevelByInstance == nil then
548
+ originalValueByLevelByInstance = mutableWeakLuaMap()
549
+ self.originalValueByLevelByInstance = originalValueByLevelByInstance
550
+ end
551
+ local originalValueByLevel = getOrPut(originalValueByLevelByInstance, instance, mutableLuaMap)
552
+ local levelCount = self:getLevelCount(instance)
553
+ for level = 0, levelCount - 1 do
554
+ local ____originalValueByLevel_level_27 = originalValueByLevel[level]
555
+ if ____originalValueByLevel_level_27 == nil then
556
+ ____originalValueByLevel_level_27 = self:getActualValue(instance, level)
557
+ end
558
+ originalValueByLevel[level] = ____originalValueByLevel_level_27
559
+ self:setActualValue(
560
+ instance,
561
+ level,
562
+ self:calculateActualValue(instance, level)
563
+ )
564
+ end
565
+ end
566
+ end
567
+ function ObjectLevelField.prototype.removeModifier(self, instance, modifier)
568
+ local modifiersByInstance = self.modifiersByInstance
569
+ if modifiersByInstance ~= nil then
570
+ local modifiers = modifiersByInstance[instance]
571
+ if modifiers ~= nil and modifiers:remove(modifier) then
572
+ local levelCount = self:getLevelCount(instance)
573
+ for level = 0, levelCount - 1 do
574
+ self:setActualValue(
575
+ instance,
576
+ level,
577
+ self:calculateActualValue(instance, level)
578
+ )
579
+ end
580
+ return true
581
+ end
582
+ end
583
+ return false
584
+ end
513
585
  function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value)
514
586
  if value ~= nil then
515
587
  if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
@@ -525,6 +597,79 @@ function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value
525
597
  end
526
598
  return self:setValue(entry, levelOrValue)
527
599
  end
600
+ function ObjectLevelField.prototype.getActualValue(self, instance, level)
601
+ local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
602
+ if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
603
+ local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
604
+ if defaultValueByLevel ~= nil or self.isGlobal then
605
+ local ____opt_28 = self.valueByInstance[instance]
606
+ local ____temp_30 = ____opt_28 and ____opt_28[level + 1]
607
+ if ____temp_30 == nil then
608
+ ____temp_30 = (defaultValueByLevel or emptyArray())[level + 1]
609
+ end
610
+ local ____temp_30_31 = ____temp_30
611
+ if ____temp_30_31 == nil then
612
+ ____temp_30_31 = self.defaultValue
613
+ end
614
+ return ____temp_30_31
615
+ end
616
+ end
617
+ local ____temp_32 = self:getNativeFieldValue(instance, level)
618
+ if ____temp_32 == nil then
619
+ ____temp_32 = self.defaultValue
620
+ end
621
+ return ____temp_32
622
+ end
623
+ function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
624
+ local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
625
+ local objectDataEntryId = self:getObjectDataEntryId(instance)
626
+ if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
627
+ local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
628
+ if defaultValueByLevel ~= nil or self.isGlobal then
629
+ local valueByLevel = self.valueByInstance[instance]
630
+ if valueByLevel == nil then
631
+ valueByLevel = {}
632
+ self.valueByInstance[instance] = valueByLevel
633
+ end
634
+ local ____valueByLevel_index_33 = valueByLevel[level + 1]
635
+ if ____valueByLevel_index_33 == nil then
636
+ ____valueByLevel_index_33 = (defaultValueByLevel or emptyArray())[level + 1]
637
+ end
638
+ local ____valueByLevel_index_33_34 = ____valueByLevel_index_33
639
+ if ____valueByLevel_index_33_34 == nil then
640
+ ____valueByLevel_index_33_34 = self.defaultValue
641
+ end
642
+ local previousValue = ____valueByLevel_index_33_34
643
+ valueByLevel[level + 1] = value
644
+ return previousValue
645
+ end
646
+ end
647
+ if not self:hasNativeFieldValue(objectDataEntryId) then
648
+ return nil
649
+ end
650
+ local previousValue = self:getNativeFieldValue(instance, level)
651
+ if value ~= previousValue and not self:setNativeFieldValue(instance, level, value) then
652
+ return nil
653
+ end
654
+ return previousValue
655
+ end
656
+ function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
657
+ local ____opt_37 = self.originalValueByLevelByInstance
658
+ local ____opt_35 = ____opt_37 and ____opt_37[instance]
659
+ local originalValue = ____opt_35 and ____opt_35[level]
660
+ local ____opt_39 = self.modifiersByInstance
661
+ local modifiers = ____opt_39 and ____opt_39[instance]
662
+ if originalValue ~= nil then
663
+ local value = originalValue
664
+ if modifiers ~= nil then
665
+ for modifier in pairs(modifiers) do
666
+ value = modifier(instance, level, value, originalValue)
667
+ end
668
+ end
669
+ return value
670
+ end
671
+ return self.defaultValue
672
+ end
528
673
  function ObjectLevelField.prototype.invokeValueChangeEvent(self, ...)
529
674
  self:invokeValueChangeEventRecursive(
530
675
  getClass(self),
@@ -18,3 +18,4 @@ export declare const random: {
18
18
  <T>(element: T, ...elements: T[]): T;
19
19
  <T>(...elements: T[]): T | undefined;
20
20
  };
21
+ export declare const shuffle: (array: unknown[]) => void;
package/engine/random.lua CHANGED
@@ -28,4 +28,12 @@ ____exports.random = function(...)
28
28
  ...
29
29
  ))
30
30
  end
31
+ ____exports.shuffle = function(array)
32
+ for i = #array - 1, 1 do
33
+ local j = getRandomInt(0, i)
34
+ local value = array[i + 1]
35
+ array[i + 1] = array[j + 1]
36
+ array[j + 1] = value
37
+ end
38
+ end
31
39
  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 ATTACK_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
380
- export declare const MOVEMENT_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
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.ATTACK_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi2"))
391
- ____exports.MOVEMENT_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi3"))
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 PROPULSION_WINDOW_UNIT_FLOAT_FIELD: UnitPropulsionWindowField & symbol;
4
- export declare const UNIT_CLASSIFICATIONS_FIELD: UnitClassificationsField & symbol;
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
- ____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
6
- ____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
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
+ }