warscript 0.0.1-dev.ee2345e → 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/attributes.d.ts +6 -1
- package/attributes.lua +17 -1
- package/binaryreader.d.ts +1 -0
- package/binaryreader.lua +3 -0
- package/config.d.ts +5 -0
- package/config.lua +10 -0
- package/core/types/effect.d.ts +14 -6
- package/core/types/effect.lua +131 -35
- package/core/types/frame.d.ts +8 -1
- package/core/types/frame.lua +117 -22
- package/core/types/group.d.ts +0 -1
- package/core/types/image.d.ts +0 -1
- package/core/types/missile.d.ts +2 -2
- package/core/types/missile.lua +8 -2
- 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/sound.d.ts +17 -24
- package/core/types/sound.lua +99 -24
- package/core/types/tileCell.d.ts +11 -1
- package/core/types/tileCell.lua +97 -0
- package/core/types/timer.d.ts +9 -8
- package/core/types/timer.lua +45 -23
- package/core/types/unit.lua +8 -0
- package/core/util.d.ts +1 -1
- package/core/util.lua +18 -1
- package/decl/index.d.ts +1 -0
- package/decl/native.d.ts +846 -790
- package/destroyable.d.ts +1 -0
- package/destroyable.lua +9 -0
- package/engine/ability.d.ts +1 -1
- package/engine/behavior.d.ts +24 -11
- package/engine/behavior.lua +233 -73
- package/engine/behaviour/ability/always-enabled.d.ts +7 -0
- package/engine/behaviour/ability/always-enabled.lua +31 -0
- package/engine/behaviour/ability/apply-buff.d.ts +8 -5
- package/engine/behaviour/ability/apply-buff.lua +36 -4
- package/engine/behaviour/ability/apply-unit-behavior.d.ts +6 -1
- package/engine/behaviour/ability/apply-unit-behavior.lua +1 -0
- package/engine/behaviour/ability/damage.d.ts +39 -11
- package/engine/behaviour/ability/damage.lua +83 -37
- package/engine/behaviour/ability/emulate-impact.d.ts +6 -0
- package/engine/behaviour/ability/emulate-impact.lua +43 -0
- package/engine/behaviour/ability/heal.d.ts +33 -6
- package/engine/behaviour/ability/heal.lua +89 -10
- package/engine/behaviour/ability/instant-impact.d.ts +2 -2
- package/engine/behaviour/ability/instant-impact.lua +4 -15
- package/engine/behaviour/ability/on-command-impact.d.ts +8 -0
- package/engine/behaviour/ability/on-command-impact.lua +25 -0
- package/engine/behaviour/ability/remove-buffs.d.ts +25 -0
- package/engine/behaviour/ability/remove-buffs.lua +49 -0
- package/engine/behaviour/ability/restore-mana.d.ts +15 -0
- package/engine/behaviour/ability/restore-mana.lua +29 -0
- package/engine/behaviour/ability.d.ts +33 -5
- package/engine/behaviour/ability.lua +183 -27
- package/engine/behaviour/unit/stun-immunity.d.ts +12 -7
- package/engine/behaviour/unit/stun-immunity.lua +57 -31
- package/engine/behaviour/unit.d.ts +48 -4
- package/engine/behaviour/unit.lua +292 -2
- package/engine/buff.d.ts +121 -46
- package/engine/buff.lua +567 -248
- package/engine/game-map.d.ts +7 -0
- package/engine/game-map.lua +32 -0
- package/engine/internal/ability.d.ts +23 -14
- package/engine/internal/ability.lua +129 -85
- package/engine/internal/item/ability.lua +162 -4
- package/engine/internal/item+owner.lua +12 -6
- package/engine/internal/item.d.ts +20 -19
- package/engine/internal/item.lua +191 -74
- package/engine/internal/mechanics/ability-duration.lua +1 -1
- package/engine/internal/mechanics/cast-ability.lua +6 -3
- package/engine/internal/misc/ability-disable-counter.d.ts +2 -0
- package/engine/internal/misc/ability-disable-counter.lua +13 -0
- package/engine/internal/misc/damage-metadata-by-target.d.ts +2 -0
- package/engine/internal/misc/damage-metadata-by-target.lua +5 -0
- 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/object-data/auto-attack-speed-increase.d.ts +1 -1
- package/engine/internal/object-data/auto-attack-speed-increase.lua +2 -0
- package/engine/internal/object-data/evasion-probability.d.ts +2 -0
- package/engine/internal/object-data/evasion-probability.lua +16 -0
- package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts +2 -0
- package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua +16 -0
- package/engine/internal/unit/ability.d.ts +45 -1
- package/engine/internal/unit/ability.lua +128 -17
- package/engine/internal/unit/add-item-to-slot-init.d.ts +2 -0
- package/engine/internal/unit/add-item-to-slot-init.lua +23 -0
- package/engine/internal/unit/add-item-to-slot.d.ts +2 -0
- package/engine/internal/unit/add-item-to-slot.lua +52 -0
- package/engine/internal/unit/allowed-targets.d.ts +1 -1
- package/engine/internal/unit/allowed-targets.lua +9 -1
- package/engine/internal/unit/attributes.d.ts +17 -0
- package/engine/internal/unit/attributes.lua +46 -0
- package/engine/internal/unit/bonus.d.ts +13 -8
- package/engine/internal/unit/bonus.lua +33 -1
- package/engine/internal/unit/fly-height.d.ts +7 -0
- package/engine/internal/unit/fly-height.lua +20 -0
- package/engine/internal/unit/ignore-events-items.d.ts +2 -0
- package/engine/internal/unit/ignore-events-items.lua +5 -0
- package/engine/internal/unit/interrupts.d.ts +12 -0
- package/engine/internal/unit/interrupts.lua +28 -0
- package/engine/internal/unit/item.d.ts +24 -0
- package/engine/internal/unit/item.lua +78 -0
- package/engine/internal/unit/main-selected.d.ts +13 -0
- package/engine/internal/unit/main-selected.lua +36 -0
- package/engine/internal/unit/order.d.ts +20 -0
- package/engine/internal/unit/order.lua +136 -0
- 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+ability.lua +12 -3
- package/engine/internal/unit+damage.d.ts +2 -11
- package/engine/internal/unit+damage.lua +10 -14
- package/engine/internal/unit+spellSteal.lua +1 -2
- package/engine/internal/unit+transport.lua +4 -10
- package/engine/internal/unit-missile-launch.lua +70 -13
- package/engine/internal/unit.d.ts +97 -36
- package/engine/internal/unit.lua +701 -336
- package/engine/internal/utility.lua +12 -0
- package/engine/lightning.d.ts +12 -5
- package/engine/lightning.lua +48 -14
- package/engine/local-client.d.ts +9 -2
- package/engine/local-client.lua +112 -0
- package/engine/object-data/auxiliary/animation-name.d.ts +1 -0
- package/engine/object-data/auxiliary/animation-name.lua +16 -0
- package/engine/object-data/auxiliary/armor-type.d.ts +11 -0
- package/engine/object-data/auxiliary/armor-type.lua +46 -0
- package/engine/object-data/auxiliary/attachment-preset.d.ts +7 -3
- package/engine/object-data/auxiliary/attachment-preset.lua +4 -3
- package/engine/object-data/auxiliary/attack-type.d.ts +7 -8
- package/engine/object-data/auxiliary/attack-type.lua +42 -0
- package/engine/object-data/auxiliary/combat-classification.d.ts +0 -2
- 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/auxiliary/movement-type.d.ts +7 -7
- package/engine/object-data/auxiliary/movement-type.lua +22 -0
- package/engine/object-data/auxiliary/sound-eax.d.ts +10 -0
- package/engine/object-data/auxiliary/sound-eax.lua +2 -0
- package/engine/object-data/auxiliary/sound-preset-name.d.ts +5 -1
- package/engine/object-data/auxiliary/tech-tree-dependency.d.ts +1 -1
- package/engine/object-data/auxiliary/unit-attribute.d.ts +6 -0
- package/engine/object-data/auxiliary/unit-attribute.lua +9 -0
- package/engine/object-data/entry/ability-type/berserk.d.ts +2 -0
- package/engine/object-data/entry/ability-type/berserk.lua +13 -0
- package/engine/object-data/entry/ability-type/blank-configurable.d.ts +0 -1
- package/engine/object-data/entry/ability-type/blank-configurable.lua +12 -1
- package/engine/object-data/entry/ability-type/blank-passive.d.ts +0 -1
- package/engine/object-data/entry/ability-type/carrion-swarm.d.ts +14 -0
- package/engine/object-data/entry/ability-type/carrion-swarm.lua +65 -0
- package/engine/object-data/entry/ability-type/channel.d.ts +0 -1
- package/engine/object-data/entry/ability-type/disease-cloud.lua +2 -2
- package/engine/object-data/entry/ability-type/engineering-upgrade.lua +2 -2
- package/engine/object-data/entry/ability-type/ensnare.d.ts +12 -0
- package/engine/object-data/entry/ability-type/ensnare.lua +52 -0
- package/engine/object-data/entry/ability-type/feral-spirit.lua +2 -2
- package/engine/object-data/entry/ability-type/mana-regeneration.d.ts +8 -0
- package/engine/object-data/entry/ability-type/mana-regeneration.lua +26 -0
- package/engine/object-data/entry/ability-type/mine.d.ts +10 -0
- package/engine/object-data/entry/ability-type/mine.lua +39 -0
- package/engine/object-data/entry/ability-type/permanent-invisibility.d.ts +8 -0
- package/engine/object-data/entry/ability-type/permanent-invisibility.lua +26 -0
- package/engine/object-data/entry/ability-type/phase-shift.d.ts +10 -0
- package/engine/object-data/entry/ability-type/phase-shift.lua +39 -0
- package/engine/object-data/entry/ability-type/phoenix-morph.lua +4 -4
- package/engine/object-data/entry/ability-type/raise-dead.d.ts +17 -0
- package/engine/object-data/entry/ability-type/raise-dead.lua +78 -0
- package/engine/object-data/entry/ability-type/shock-wave.d.ts +4 -0
- package/engine/object-data/entry/ability-type/shock-wave.lua +26 -0
- package/engine/object-data/entry/ability-type/slow-poison.d.ts +10 -0
- package/engine/object-data/entry/ability-type/slow-poison.lua +58 -0
- package/engine/object-data/entry/ability-type/spirit-touch.d.ts +2 -2
- package/engine/object-data/entry/ability-type/spirit-touch.lua +6 -6
- package/engine/object-data/entry/ability-type/summon-quilbeast.lua +2 -2
- package/engine/object-data/entry/ability-type/summon-water-elemental.lua +2 -2
- package/engine/object-data/entry/ability-type/web.d.ts +12 -0
- package/engine/object-data/entry/ability-type/web.lua +52 -0
- package/engine/object-data/entry/ability-type.d.ts +19 -18
- package/engine/object-data/entry/ability-type.lua +93 -36
- package/engine/object-data/entry/buff-type/applicable.d.ts +0 -1
- package/engine/object-data/entry/buff-type/applicable.lua +18 -37
- package/engine/object-data/entry/buff-type/blank.d.ts +0 -1
- package/engine/object-data/entry/buff-type.d.ts +6 -13
- package/engine/object-data/entry/buff-type.lua +13 -29
- package/engine/object-data/entry/destructible-type.d.ts +28 -3
- package/engine/object-data/entry/destructible-type.lua +155 -0
- package/engine/object-data/entry/item-type/blank.d.ts +0 -1
- package/engine/object-data/entry/item-type.d.ts +15 -2
- package/engine/object-data/entry/item-type.lua +93 -2
- package/engine/object-data/entry/lightning-type.d.ts +1 -2
- package/engine/object-data/entry/sound-preset.d.ts +33 -0
- package/engine/object-data/entry/sound-preset.lua +140 -0
- package/engine/object-data/entry/unit-type.d.ts +62 -7
- package/engine/object-data/entry/unit-type.lua +524 -75
- package/engine/object-data/entry/upgrade/blank.d.ts +0 -1
- package/engine/object-data/entry/upgrade.d.ts +1 -2
- package/engine/object-data/entry/upgrade.lua +4 -4
- package/engine/object-data/entry.d.ts +18 -17
- package/engine/object-data/entry.lua +60 -32
- package/engine/object-data/utility/object-data-entry-id-generator.lua +7 -0
- package/engine/object-field/ability.d.ts +28 -5
- package/engine/object-field/ability.lua +59 -5
- package/engine/object-field/unit.d.ts +72 -3
- package/engine/object-field/unit.lua +268 -7
- package/engine/object-field.d.ts +25 -7
- package/engine/object-field.lua +359 -116
- package/engine/random.d.ts +10 -0
- package/engine/random.lua +22 -0
- package/engine/standard/entries/buff-type.d.ts +3 -0
- package/engine/standard/entries/buff-type.lua +3 -0
- package/engine/standard/entries/sound-preset.d.ts +10 -0
- package/engine/standard/entries/sound-preset.lua +10 -0
- package/engine/standard/entries/unit-type.d.ts +39 -1
- package/engine/standard/entries/unit-type.lua +39 -1
- package/engine/standard/fields/ability.d.ts +5 -3
- package/engine/standard/fields/ability.lua +5 -3
- package/engine/standard/fields/unit.d.ts +12 -0
- package/engine/standard/fields/unit.lua +20 -0
- package/engine/synchronization.d.ts +11 -0
- package/engine/synchronization.lua +77 -0
- package/engine/text-tag.d.ts +36 -2
- package/engine/text-tag.lua +250 -10
- package/engine/unit.d.ts +9 -0
- package/engine/unit.lua +18 -2
- package/event.d.ts +2 -3
- package/event.lua +9 -5
- package/index.d.ts +1 -0
- package/index.lua +1 -0
- package/lualib_bundle.lua +146 -42
- package/math/vec2.d.ts +2 -9
- package/math.d.ts +0 -2
- package/net/socket.d.ts +7 -1
- package/net/socket.lua +45 -4
- package/network.d.ts +1 -0
- package/network.lua +3 -2
- package/objutil/ability.d.ts +0 -1
- package/objutil/buff.d.ts +0 -1
- package/objutil/buff.lua +12 -11
- package/objutil/object.d.ts +0 -1
- package/objutil/unit.d.ts +0 -1
- package/objutil/unit.lua +8 -0
- package/package.json +13 -14
- package/patch-lua.d.ts +0 -0
- package/patch-lua.lua +25 -0
- package/patch-lualib.lua +1 -1
- package/property.d.ts +55 -0
- package/property.lua +374 -0
- package/string.d.ts +30 -0
- package/string.lua +14 -0
- package/util/stream.d.ts +0 -1
- package/utility/arrays.d.ts +13 -5
- package/utility/arrays.lua +45 -3
- package/utility/bit-set.d.ts +0 -2
- package/utility/callback-array.d.ts +17 -0
- package/utility/callback-array.lua +61 -0
- package/utility/functions.d.ts +8 -0
- package/utility/functions.lua +13 -0
- package/utility/lazy.d.ts +2 -0
- package/utility/lazy.lua +14 -0
- package/utility/linked-map.d.ts +34 -0
- package/utility/linked-map.lua +101 -0
- package/utility/linked-set.d.ts +15 -4
- package/utility/linked-set.lua +48 -3
- package/utility/lua-maps.d.ts +16 -4
- package/utility/lua-maps.lua +53 -2
- package/utility/lua-sets.d.ts +3 -2
- package/utility/lua-sets.lua +7 -0
- package/utility/records.lua +20 -1
- package/utility/reflection.lua +11 -7
- package/utility/types.d.ts +4 -0
- package/core/mapbounds.d.ts +0 -8
- package/core/mapbounds.lua +0 -12
- package/core/types/order.d.ts +0 -25
- package/core/types/order.lua +0 -55
package/objutil/buff.lua
CHANGED
|
@@ -20,7 +20,6 @@ local AbilityDefinitionInnerFire = ____ability.AbilityDefinitionInnerFire
|
|
|
20
20
|
local AbilityDefinitionSearingArrows = ____ability.AbilityDefinitionSearingArrows
|
|
21
21
|
local AbilityDefinitionSlowPoison = ____ability.AbilityDefinitionSlowPoison
|
|
22
22
|
local ____unit = require("core.types.unit")
|
|
23
|
-
local AttackType = ____unit.AttackType
|
|
24
23
|
local DamageType = ____unit.DamageType
|
|
25
24
|
local Unit = ____unit.Unit
|
|
26
25
|
local ____dummy = require("core.dummy")
|
|
@@ -30,6 +29,8 @@ local ____timer = require("core.types.timer")
|
|
|
30
29
|
local Timer = ____timer.Timer
|
|
31
30
|
local ____exception = require("exception")
|
|
32
31
|
local IllegalStateException = ____exception.IllegalStateException
|
|
32
|
+
local ____linked_2Dmap = require("utility.linked-map")
|
|
33
|
+
local LinkedMap = ____linked_2Dmap.LinkedMap
|
|
33
34
|
local ____assert = _G.assert
|
|
34
35
|
local ____pairs = _G.pairs
|
|
35
36
|
____exports.BuffDefinition = __TS__Class()
|
|
@@ -462,7 +463,7 @@ local buffs = setmetatable(
|
|
|
462
463
|
{
|
|
463
464
|
__mode = "k",
|
|
464
465
|
__index = function(self, unit)
|
|
465
|
-
local ____table =
|
|
466
|
+
local ____table = __TS__New(LinkedMap)
|
|
466
467
|
self[unit] = ____table
|
|
467
468
|
return ____table
|
|
468
469
|
end
|
|
@@ -495,7 +496,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
|
|
|
495
496
|
end
|
|
496
497
|
local constructor = self.constructor
|
|
497
498
|
local instances = buffs[unit]
|
|
498
|
-
local instance = instances
|
|
499
|
+
local instance = instances:get(constructor)
|
|
499
500
|
if instance then
|
|
500
501
|
instance:destroy()
|
|
501
502
|
if not instance.destroyed then
|
|
@@ -508,7 +509,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
|
|
|
508
509
|
)
|
|
509
510
|
end
|
|
510
511
|
end
|
|
511
|
-
instances
|
|
512
|
+
instances:put(constructor, self)
|
|
512
513
|
if preset then
|
|
513
514
|
local unitHandle = unit.handle
|
|
514
515
|
local slowPoisonMethod = not preset.positive and not preset.magic
|
|
@@ -587,13 +588,13 @@ function Buff.apply(self, ...)
|
|
|
587
588
|
end
|
|
588
589
|
end
|
|
589
590
|
function Buff.getInstance(self, unit)
|
|
590
|
-
return buffs[unit]
|
|
591
|
+
return buffs[unit]:get(self)
|
|
591
592
|
end
|
|
592
593
|
function Buff.isApplied(self, unit)
|
|
593
|
-
return buffs[unit]
|
|
594
|
+
return buffs[unit]:get(self) ~= nil
|
|
594
595
|
end
|
|
595
596
|
function Buff.ifApplied(self, unit, action)
|
|
596
|
-
local instance = buffs[unit]
|
|
597
|
+
local instance = buffs[unit]:get(self)
|
|
597
598
|
if instance then
|
|
598
599
|
____assert(__TS__InstanceOf(instance, self))
|
|
599
600
|
action(instance)
|
|
@@ -616,7 +617,7 @@ function Buff.prototype.destroy(self)
|
|
|
616
617
|
if self.preset then
|
|
617
618
|
self.unit:removeAbility(self.preset.buffId)
|
|
618
619
|
end
|
|
619
|
-
buffs[self.unit]
|
|
620
|
+
buffs[self.unit]:remove(self.constructor)
|
|
620
621
|
self.destroyed = true
|
|
621
622
|
end
|
|
622
623
|
function Buff.prototype.onDispel(self, source)
|
|
@@ -756,14 +757,14 @@ for ____, pointDispelAbilityId in ipairs(pointDispelAbilityIds) do
|
|
|
756
757
|
end)
|
|
757
758
|
end
|
|
758
759
|
Unit.onDamaging:addListener(function(source, target, event)
|
|
759
|
-
if event.amount == 0 and event.attackType ==
|
|
760
|
+
if event.amount == 0 and event.attackType == 0 and event.damageType == DamageType.NORMAL and not event.isAttack then
|
|
760
761
|
Timer:run(function()
|
|
761
762
|
checkBuffs(target, true, source)
|
|
762
763
|
end)
|
|
763
764
|
end
|
|
764
765
|
end)
|
|
765
|
-
Unit.
|
|
766
|
-
if item.
|
|
766
|
+
Unit.itemPickedUpEvent:addListener(function(unit, item)
|
|
767
|
+
if item.isPowerUp and item:hasAbility(fourCC("APdi")) then
|
|
767
768
|
end
|
|
768
769
|
end)
|
|
769
770
|
return ____exports
|
package/objutil/object.d.ts
CHANGED
package/objutil/unit.d.ts
CHANGED
package/objutil/unit.lua
CHANGED
|
@@ -11,6 +11,8 @@ local ____exports = {}
|
|
|
11
11
|
local ____object = require("objutil.object")
|
|
12
12
|
local ObjectDefinition = ____object.ObjectDefinition
|
|
13
13
|
local idgen = require("objutil.idgen")
|
|
14
|
+
local ____config = require("config")
|
|
15
|
+
local WarscriptConfig = ____config.WarscriptConfig
|
|
14
16
|
local attackTypes = setmetatable(
|
|
15
17
|
{
|
|
16
18
|
normal = "normal",
|
|
@@ -593,6 +595,9 @@ __TS__SetDescriptor(
|
|
|
593
595
|
end,
|
|
594
596
|
set = function(self, v)
|
|
595
597
|
self:setStringField("umdl", v)
|
|
598
|
+
if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
|
|
599
|
+
self:setStringField("upor", "")
|
|
600
|
+
end
|
|
596
601
|
end
|
|
597
602
|
},
|
|
598
603
|
true
|
|
@@ -606,6 +611,9 @@ __TS__SetDescriptor(
|
|
|
606
611
|
end,
|
|
607
612
|
set = function(self, v)
|
|
608
613
|
self.object:setField("umdl:hd", v)
|
|
614
|
+
if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
|
|
615
|
+
self.object:setField("upor:hd", "")
|
|
616
|
+
end
|
|
609
617
|
end
|
|
610
618
|
},
|
|
611
619
|
true
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json.schemastore.org/package",
|
|
3
3
|
"name": "warscript",
|
|
4
|
-
"version": "0.0.1-dev.
|
|
4
|
+
"version": "0.0.1-dev.ee6e396",
|
|
5
5
|
"description": "A typescript library for Warcraft III using Warpack.",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"warcraft",
|
|
@@ -22,23 +22,22 @@
|
|
|
22
22
|
},
|
|
23
23
|
"peerDependencies": {
|
|
24
24
|
"@warscript/language-extensions": "^0.0.1",
|
|
25
|
-
"@warscript/tstl-plugin": "^0.0.
|
|
26
|
-
"typescript-to-lua": "^1.24.1",
|
|
25
|
+
"@warscript/tstl-plugin": "^0.0.4",
|
|
27
26
|
"lua-types": "^2.13.1",
|
|
28
|
-
"warpack": "0.0.1-dev.
|
|
27
|
+
"warpack": "0.0.1-dev.e490aaf"
|
|
29
28
|
},
|
|
30
29
|
"devDependencies": {
|
|
31
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
32
|
-
"@typescript-eslint/parser": "^
|
|
33
|
-
"async": "^3.2.
|
|
30
|
+
"@typescript-eslint/eslint-plugin": "^8.13.0",
|
|
31
|
+
"@typescript-eslint/parser": "^8.13.0",
|
|
32
|
+
"async": "^3.2.6",
|
|
34
33
|
"copyfiles": "^2.4.1",
|
|
35
|
-
"eslint": "^
|
|
36
|
-
"eslint-config-prettier": "^
|
|
37
|
-
"eslint-plugin-prettier": "^
|
|
38
|
-
"prettier": "^
|
|
39
|
-
"rimraf": "^
|
|
40
|
-
"ts-node": "^10.9.
|
|
41
|
-
"tsc-watch": "^
|
|
34
|
+
"eslint": "^9.14.0",
|
|
35
|
+
"eslint-config-prettier": "^9.1.0",
|
|
36
|
+
"eslint-plugin-prettier": "^5.2.1",
|
|
37
|
+
"prettier": "^3.3.3",
|
|
38
|
+
"rimraf": "^6.0.1",
|
|
39
|
+
"ts-node": "^10.9.2",
|
|
40
|
+
"tsc-watch": "^6.2.0"
|
|
42
41
|
},
|
|
43
42
|
"publishConfig": {
|
|
44
43
|
"access": "public",
|
package/patch-lua.d.ts
ADDED
|
File without changes
|
package/patch-lua.lua
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
local error = _G.error
|
|
2
|
+
local getmetatable = _G.getmetatable
|
|
3
|
+
local ipairs = _G.ipairs
|
|
4
|
+
local select = _G.select
|
|
5
|
+
local tostring = _G.tostring
|
|
6
|
+
local tableconcat = table.concat
|
|
7
|
+
|
|
8
|
+
_G.ipairs = function(t)
|
|
9
|
+
local metatable = getmetatable(t)
|
|
10
|
+
if metatable and metatable.__ipairs then
|
|
11
|
+
return metatable.__ipairs(t)
|
|
12
|
+
end
|
|
13
|
+
return ipairs(t)
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
_G.assert = function(v, ...)
|
|
17
|
+
if not v then
|
|
18
|
+
local args = {}
|
|
19
|
+
for i = 1, select("#", ...) do
|
|
20
|
+
args[i] = tostring(select(i, ...))
|
|
21
|
+
end
|
|
22
|
+
error(tableconcat(args, " "))
|
|
23
|
+
end
|
|
24
|
+
return v, ...
|
|
25
|
+
end
|
package/patch-lualib.lua
CHANGED
|
@@ -3,7 +3,7 @@ local lualib = _G.require("lualib_bundle")
|
|
|
3
3
|
local next = _G.next
|
|
4
4
|
local ____type = _G.type
|
|
5
5
|
lualib.__TS__ArrayIsArray = function(value)
|
|
6
|
-
return ____type(value) == "table" and (value[1] ~= nil or (
|
|
6
|
+
return ____type(value) == "table" and (value[1] ~= nil or (next(value)) == nil) and value.constructor == nil
|
|
7
7
|
end
|
|
8
8
|
local __TS__SetDescriptor = lualib.__TS__SetDescriptor
|
|
9
9
|
lualib.__TS__ObjectDefineProperty = function(target, key, desc)
|
package/property.d.ts
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/** @noSelfInFile */
|
|
2
|
+
import { Player } from "./core/types/player";
|
|
3
|
+
import { Event } from "./event";
|
|
4
|
+
export declare class PersistentPropertiesConfig {
|
|
5
|
+
static defaultFileName: string;
|
|
6
|
+
}
|
|
7
|
+
declare const enum PropertyPropertyKey {
|
|
8
|
+
DEFAULT_VALUE = 0,
|
|
9
|
+
VALUE = 1,
|
|
10
|
+
IS_CHANGED = 2
|
|
11
|
+
}
|
|
12
|
+
export declare class Property<T> {
|
|
13
|
+
readonly valueChangeEvent: Event<[newValue: T, oldValue: T]>;
|
|
14
|
+
private [PropertyPropertyKey.DEFAULT_VALUE];
|
|
15
|
+
private [PropertyPropertyKey.VALUE];
|
|
16
|
+
private [PropertyPropertyKey.IS_CHANGED]?;
|
|
17
|
+
constructor(defaultValue: T);
|
|
18
|
+
get defaultValue(): T;
|
|
19
|
+
set defaultValue(defaultValue: T);
|
|
20
|
+
get value(): T;
|
|
21
|
+
set value(value: T);
|
|
22
|
+
get isChanged(): boolean;
|
|
23
|
+
reset(): boolean;
|
|
24
|
+
set(value: T): boolean;
|
|
25
|
+
get(): T;
|
|
26
|
+
}
|
|
27
|
+
declare const enum PlayerPropertyPropertyKey {
|
|
28
|
+
DEFAULT_VALUE = 0,
|
|
29
|
+
VALUE_BY_PLAYER = 1,
|
|
30
|
+
IS_CHANGED_BY_PLAYER = 2
|
|
31
|
+
}
|
|
32
|
+
export declare class PlayerProperty<T> {
|
|
33
|
+
readonly valueChangeEvent: Event<[player: Player, newValue: T, oldValue: T]>;
|
|
34
|
+
private readonly [PlayerPropertyPropertyKey.DEFAULT_VALUE];
|
|
35
|
+
private readonly [PlayerPropertyPropertyKey.VALUE_BY_PLAYER];
|
|
36
|
+
private readonly [PlayerPropertyPropertyKey.IS_CHANGED_BY_PLAYER];
|
|
37
|
+
constructor(defaultValue: T);
|
|
38
|
+
isChanged(player: Player): boolean;
|
|
39
|
+
reset(player: Player): boolean;
|
|
40
|
+
set(player: Player, value: T): boolean;
|
|
41
|
+
get(player: Player): T;
|
|
42
|
+
}
|
|
43
|
+
export declare class PersistentProperty<T extends undefined | boolean | number | string> extends Property<T> {
|
|
44
|
+
readonly id: number;
|
|
45
|
+
constructor(id: number, defaultValue: T, valueChangeEventListener?: (newValue: T, oldValue: T) => void);
|
|
46
|
+
reset(): boolean;
|
|
47
|
+
set(value: T): boolean;
|
|
48
|
+
}
|
|
49
|
+
export declare class PersistentPlayerProperty<T extends string | number | boolean> extends PlayerProperty<T> {
|
|
50
|
+
readonly id: number;
|
|
51
|
+
constructor(id: number, initialValue: T, valueChangeEventListener?: (player: Player, newValue: T, oldValue: T) => void);
|
|
52
|
+
reset(player: Player): boolean;
|
|
53
|
+
set(player: Player, value: T): boolean;
|
|
54
|
+
}
|
|
55
|
+
export {};
|
package/property.lua
ADDED
|
@@ -0,0 +1,374 @@
|
|
|
1
|
+
local ____lualib = require("lualib_bundle")
|
|
2
|
+
local __TS__Class = ____lualib.__TS__Class
|
|
3
|
+
local __TS__New = ____lualib.__TS__New
|
|
4
|
+
local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
|
|
5
|
+
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
6
|
+
local ____exports = {}
|
|
7
|
+
local savePropertyValues
|
|
8
|
+
local ____binaryreader = require("binaryreader")
|
|
9
|
+
local BinaryReader = ____binaryreader.BinaryReader
|
|
10
|
+
local ____binarywriter = require("binarywriter")
|
|
11
|
+
local BinaryWriter = ____binarywriter.BinaryWriter
|
|
12
|
+
local ____player = require("core.types.player")
|
|
13
|
+
local Player = ____player.Player
|
|
14
|
+
local ____timer = require("core.types.timer")
|
|
15
|
+
local Timer = ____timer.Timer
|
|
16
|
+
local ____event = require("event")
|
|
17
|
+
local Event = ____event.Event
|
|
18
|
+
local file = require("file")
|
|
19
|
+
local ____network = require("network")
|
|
20
|
+
local synchronize = ____network.synchronize
|
|
21
|
+
local base64 = require("utility.base64")
|
|
22
|
+
local lzw = require("utility.lzw")
|
|
23
|
+
local ____preconditions = require("utility.preconditions")
|
|
24
|
+
local ____require = ____preconditions.require
|
|
25
|
+
local invoke = Event.invoke
|
|
26
|
+
____exports.PersistentPropertiesConfig = __TS__Class()
|
|
27
|
+
local PersistentPropertiesConfig = ____exports.PersistentPropertiesConfig
|
|
28
|
+
PersistentPropertiesConfig.name = "PersistentPropertiesConfig"
|
|
29
|
+
function PersistentPropertiesConfig.prototype.____constructor(self)
|
|
30
|
+
end
|
|
31
|
+
PersistentPropertiesConfig.defaultFileName = ""
|
|
32
|
+
____exports.Property = __TS__Class()
|
|
33
|
+
local Property = ____exports.Property
|
|
34
|
+
Property.name = "Property"
|
|
35
|
+
function Property.prototype.____constructor(self, defaultValue)
|
|
36
|
+
self.valueChangeEvent = __TS__New(Event)
|
|
37
|
+
self[0] = defaultValue
|
|
38
|
+
self[1] = defaultValue
|
|
39
|
+
end
|
|
40
|
+
function Property.prototype.reset(self)
|
|
41
|
+
if self[2] then
|
|
42
|
+
self[2] = nil
|
|
43
|
+
local defaultValue = self[0]
|
|
44
|
+
local oldValue = self[1]
|
|
45
|
+
if defaultValue ~= oldValue then
|
|
46
|
+
self[1] = defaultValue
|
|
47
|
+
invoke(self.valueChangeEvent, defaultValue, oldValue)
|
|
48
|
+
end
|
|
49
|
+
return true
|
|
50
|
+
end
|
|
51
|
+
return false
|
|
52
|
+
end
|
|
53
|
+
function Property.prototype.set(self, value)
|
|
54
|
+
self[2] = true
|
|
55
|
+
local oldValue = self[1]
|
|
56
|
+
self[1] = value
|
|
57
|
+
if value ~= oldValue then
|
|
58
|
+
invoke(self.valueChangeEvent, value, oldValue)
|
|
59
|
+
return true
|
|
60
|
+
end
|
|
61
|
+
return false
|
|
62
|
+
end
|
|
63
|
+
function Property.prototype.get(self)
|
|
64
|
+
return self[1]
|
|
65
|
+
end
|
|
66
|
+
__TS__SetDescriptor(
|
|
67
|
+
Property.prototype,
|
|
68
|
+
"defaultValue",
|
|
69
|
+
{
|
|
70
|
+
get = function(self)
|
|
71
|
+
return self[0]
|
|
72
|
+
end,
|
|
73
|
+
set = function(self, defaultValue)
|
|
74
|
+
local oldDefaultValue = self[0]
|
|
75
|
+
if defaultValue ~= oldDefaultValue then
|
|
76
|
+
self[0] = defaultValue
|
|
77
|
+
if not self[2] then
|
|
78
|
+
self[1] = defaultValue
|
|
79
|
+
invoke(self.valueChangeEvent, defaultValue, oldDefaultValue)
|
|
80
|
+
end
|
|
81
|
+
end
|
|
82
|
+
end
|
|
83
|
+
},
|
|
84
|
+
true
|
|
85
|
+
)
|
|
86
|
+
__TS__SetDescriptor(
|
|
87
|
+
Property.prototype,
|
|
88
|
+
"value",
|
|
89
|
+
{
|
|
90
|
+
get = function(self)
|
|
91
|
+
return self:get()
|
|
92
|
+
end,
|
|
93
|
+
set = function(self, value)
|
|
94
|
+
self:set(value)
|
|
95
|
+
end
|
|
96
|
+
},
|
|
97
|
+
true
|
|
98
|
+
)
|
|
99
|
+
__TS__SetDescriptor(
|
|
100
|
+
Property.prototype,
|
|
101
|
+
"isChanged",
|
|
102
|
+
{get = function(self)
|
|
103
|
+
return self[2] == true
|
|
104
|
+
end},
|
|
105
|
+
true
|
|
106
|
+
)
|
|
107
|
+
____exports.PlayerProperty = __TS__Class()
|
|
108
|
+
local PlayerProperty = ____exports.PlayerProperty
|
|
109
|
+
PlayerProperty.name = "PlayerProperty"
|
|
110
|
+
function PlayerProperty.prototype.____constructor(self, defaultValue)
|
|
111
|
+
self.valueChangeEvent = __TS__New(Event)
|
|
112
|
+
self[0] = defaultValue
|
|
113
|
+
self[1] = {}
|
|
114
|
+
self[2] = {}
|
|
115
|
+
end
|
|
116
|
+
function PlayerProperty.prototype.isChanged(self, player)
|
|
117
|
+
return self[2][player] ~= nil
|
|
118
|
+
end
|
|
119
|
+
function PlayerProperty.prototype.reset(self, player)
|
|
120
|
+
if self[2][player] ~= nil then
|
|
121
|
+
self[2][player] = nil
|
|
122
|
+
local initialValue = self[0]
|
|
123
|
+
local oldValue = self[1][player]
|
|
124
|
+
self[1][player] = nil
|
|
125
|
+
if initialValue ~= oldValue then
|
|
126
|
+
invoke(self.valueChangeEvent, player, initialValue, oldValue)
|
|
127
|
+
end
|
|
128
|
+
return true
|
|
129
|
+
end
|
|
130
|
+
return false
|
|
131
|
+
end
|
|
132
|
+
function PlayerProperty.prototype.set(self, player, value)
|
|
133
|
+
self[2][player] = true
|
|
134
|
+
local oldValue = self[1][player]
|
|
135
|
+
self[1][player] = value
|
|
136
|
+
if value ~= oldValue then
|
|
137
|
+
invoke(self.valueChangeEvent, player, value, oldValue)
|
|
138
|
+
return true
|
|
139
|
+
end
|
|
140
|
+
return false
|
|
141
|
+
end
|
|
142
|
+
function PlayerProperty.prototype.get(self, player)
|
|
143
|
+
local ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0
|
|
144
|
+
if self[2][player] ~= nil then
|
|
145
|
+
____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0 = self[1][player]
|
|
146
|
+
else
|
|
147
|
+
____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0 = self[0]
|
|
148
|
+
end
|
|
149
|
+
return ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0
|
|
150
|
+
end
|
|
151
|
+
local NULL_VALUE = {}
|
|
152
|
+
local loadedValueById
|
|
153
|
+
local loadedValueByIdByPlayer = {}
|
|
154
|
+
local localValueById = {}
|
|
155
|
+
local persistentPropertyById = {}
|
|
156
|
+
local persistentPlayerPropertyById = {}
|
|
157
|
+
____exports.PersistentProperty = __TS__Class()
|
|
158
|
+
local PersistentProperty = ____exports.PersistentProperty
|
|
159
|
+
PersistentProperty.name = "PersistentProperty"
|
|
160
|
+
__TS__ClassExtends(PersistentProperty, ____exports.Property)
|
|
161
|
+
function PersistentProperty.prototype.____constructor(self, id, defaultValue, valueChangeEventListener)
|
|
162
|
+
PersistentProperty.____super.prototype.____constructor(self, defaultValue)
|
|
163
|
+
self.id = id
|
|
164
|
+
____require(not (persistentPropertyById[id] ~= nil) and not (persistentPlayerPropertyById[id] ~= nil))
|
|
165
|
+
persistentPropertyById[id] = self
|
|
166
|
+
if valueChangeEventListener ~= nil then
|
|
167
|
+
self.valueChangeEvent:addListener(valueChangeEventListener)
|
|
168
|
+
end
|
|
169
|
+
local value = loadedValueById and loadedValueById[id]
|
|
170
|
+
if value ~= nil then
|
|
171
|
+
local ____self_set_4 = self.set
|
|
172
|
+
local ____temp_3
|
|
173
|
+
if value == NULL_VALUE then
|
|
174
|
+
____temp_3 = nil
|
|
175
|
+
else
|
|
176
|
+
____temp_3 = value
|
|
177
|
+
end
|
|
178
|
+
____self_set_4(self, ____temp_3)
|
|
179
|
+
end
|
|
180
|
+
end
|
|
181
|
+
function PersistentProperty.prototype.reset(self)
|
|
182
|
+
if PersistentProperty.____super.prototype.reset(self) then
|
|
183
|
+
localValueById[self.id] = nil
|
|
184
|
+
savePropertyValues()
|
|
185
|
+
return true
|
|
186
|
+
end
|
|
187
|
+
return false
|
|
188
|
+
end
|
|
189
|
+
function PersistentProperty.prototype.set(self, value)
|
|
190
|
+
if PersistentProperty.____super.prototype.set(self, value) then
|
|
191
|
+
localValueById[self.id] = value == nil and NULL_VALUE or value
|
|
192
|
+
savePropertyValues()
|
|
193
|
+
return true
|
|
194
|
+
end
|
|
195
|
+
return false
|
|
196
|
+
end
|
|
197
|
+
____exports.PersistentPlayerProperty = __TS__Class()
|
|
198
|
+
local PersistentPlayerProperty = ____exports.PersistentPlayerProperty
|
|
199
|
+
PersistentPlayerProperty.name = "PersistentPlayerProperty"
|
|
200
|
+
__TS__ClassExtends(PersistentPlayerProperty, ____exports.PlayerProperty)
|
|
201
|
+
function PersistentPlayerProperty.prototype.____constructor(self, id, initialValue, valueChangeEventListener)
|
|
202
|
+
PersistentPlayerProperty.____super.prototype.____constructor(self, initialValue)
|
|
203
|
+
self.id = id
|
|
204
|
+
____require(not (persistentPropertyById[id] ~= nil) and not (persistentPlayerPropertyById[id] ~= nil))
|
|
205
|
+
persistentPlayerPropertyById[id] = self
|
|
206
|
+
if valueChangeEventListener ~= nil then
|
|
207
|
+
self.valueChangeEvent:addListener(valueChangeEventListener)
|
|
208
|
+
end
|
|
209
|
+
for ____, player in ipairs(Player.all) do
|
|
210
|
+
local ____opt_5 = loadedValueByIdByPlayer and loadedValueByIdByPlayer[player]
|
|
211
|
+
local value = ____opt_5 and ____opt_5[id]
|
|
212
|
+
if value ~= nil then
|
|
213
|
+
local ____self_set_10 = self.set
|
|
214
|
+
local ____temp_9
|
|
215
|
+
if value == NULL_VALUE then
|
|
216
|
+
____temp_9 = nil
|
|
217
|
+
else
|
|
218
|
+
____temp_9 = value
|
|
219
|
+
end
|
|
220
|
+
____self_set_10(self, player, ____temp_9)
|
|
221
|
+
end
|
|
222
|
+
end
|
|
223
|
+
end
|
|
224
|
+
function PersistentPlayerProperty.prototype.reset(self, player)
|
|
225
|
+
if PersistentPlayerProperty.____super.prototype.reset(self, player) then
|
|
226
|
+
if player.isLocal then
|
|
227
|
+
localValueById[self.id] = nil
|
|
228
|
+
end
|
|
229
|
+
savePropertyValues(player)
|
|
230
|
+
return true
|
|
231
|
+
end
|
|
232
|
+
return false
|
|
233
|
+
end
|
|
234
|
+
function PersistentPlayerProperty.prototype.set(self, player, value)
|
|
235
|
+
if PersistentPlayerProperty.____super.prototype.set(self, player, value) then
|
|
236
|
+
if player.isLocal then
|
|
237
|
+
localValueById[self.id] = value
|
|
238
|
+
end
|
|
239
|
+
savePropertyValues(player)
|
|
240
|
+
return true
|
|
241
|
+
end
|
|
242
|
+
return false
|
|
243
|
+
end
|
|
244
|
+
savePropertyValues = function(player)
|
|
245
|
+
if player ~= nil and not player.isLocal or loadedValueById == nil or loadedValueByIdByPlayer[Player["local"]] == nil then
|
|
246
|
+
return
|
|
247
|
+
end
|
|
248
|
+
local writer = __TS__New(BinaryWriter)
|
|
249
|
+
writer:writeUInt32(0)
|
|
250
|
+
local size = 0
|
|
251
|
+
for ____ in pairs(localValueById) do
|
|
252
|
+
size = size + 1
|
|
253
|
+
end
|
|
254
|
+
writer:writeUInt32(size)
|
|
255
|
+
for id, value in pairs(localValueById) do
|
|
256
|
+
writer:writeInt32(id)
|
|
257
|
+
if value == NULL_VALUE then
|
|
258
|
+
writer:writeUInt8(0)
|
|
259
|
+
elseif value == false then
|
|
260
|
+
writer:writeUInt8(1)
|
|
261
|
+
elseif value == true then
|
|
262
|
+
writer:writeUInt8(2)
|
|
263
|
+
elseif type(value) == "number" then
|
|
264
|
+
if math.type(value) == "integer" then
|
|
265
|
+
writer:writeUInt8(3)
|
|
266
|
+
writer:writeInt32(value)
|
|
267
|
+
else
|
|
268
|
+
writer:writeUInt8(4)
|
|
269
|
+
writer:writeFloat(value)
|
|
270
|
+
end
|
|
271
|
+
else
|
|
272
|
+
writer:writeUInt8(5)
|
|
273
|
+
writer:writeUInt32(#value)
|
|
274
|
+
writer:writeBytes(value)
|
|
275
|
+
end
|
|
276
|
+
end
|
|
277
|
+
file.write(
|
|
278
|
+
____exports.PersistentPropertiesConfig.defaultFileName,
|
|
279
|
+
base64.encode(lzw.compress(tostring(writer)))
|
|
280
|
+
)
|
|
281
|
+
end
|
|
282
|
+
local function loadPropertyValues(fileData, player)
|
|
283
|
+
do
|
|
284
|
+
local function ____catch(_)
|
|
285
|
+
return true, {}
|
|
286
|
+
end
|
|
287
|
+
local ____try, ____hasReturned, ____returnValue = pcall(function()
|
|
288
|
+
local valueById = {}
|
|
289
|
+
local reader = __TS__New(
|
|
290
|
+
BinaryReader,
|
|
291
|
+
lzw.decompress(base64.decode(fileData))
|
|
292
|
+
)
|
|
293
|
+
reader:readUInt32()
|
|
294
|
+
local size = reader:readUInt32()
|
|
295
|
+
for _ = 1, size do
|
|
296
|
+
local id = reader:readInt32()
|
|
297
|
+
local dataType = reader:readUInt8()
|
|
298
|
+
if dataType == 0 then
|
|
299
|
+
valueById[id] = NULL_VALUE
|
|
300
|
+
elseif dataType == 1 then
|
|
301
|
+
valueById[id] = false
|
|
302
|
+
elseif dataType == 2 then
|
|
303
|
+
valueById[id] = true
|
|
304
|
+
elseif dataType == 3 then
|
|
305
|
+
valueById[id] = reader:readInt32()
|
|
306
|
+
elseif dataType == 4 then
|
|
307
|
+
valueById[id] = reader:readFloat()
|
|
308
|
+
elseif dataType == 5 then
|
|
309
|
+
valueById[id] = reader:readBytes(reader:readUInt32())
|
|
310
|
+
end
|
|
311
|
+
end
|
|
312
|
+
for id, value in pairs(valueById) do
|
|
313
|
+
local persistentProperty = persistentPropertyById[id]
|
|
314
|
+
if persistentProperty ~= nil then
|
|
315
|
+
if not persistentProperty.isChanged then
|
|
316
|
+
local ____persistentProperty_set_12 = persistentProperty.set
|
|
317
|
+
local ____temp_11
|
|
318
|
+
if value == NULL_VALUE then
|
|
319
|
+
____temp_11 = nil
|
|
320
|
+
else
|
|
321
|
+
____temp_11 = value
|
|
322
|
+
end
|
|
323
|
+
____persistentProperty_set_12(persistentProperty, ____temp_11)
|
|
324
|
+
end
|
|
325
|
+
elseif player ~= nil then
|
|
326
|
+
local persistentPlayerProperty = persistentPlayerPropertyById[id]
|
|
327
|
+
if persistentPlayerProperty ~= nil then
|
|
328
|
+
if not persistentPlayerProperty:isChanged(player) then
|
|
329
|
+
local ____persistentPlayerProperty_set_15 = persistentPlayerProperty.set
|
|
330
|
+
local ____player_14 = player
|
|
331
|
+
local ____temp_13
|
|
332
|
+
if value == NULL_VALUE then
|
|
333
|
+
____temp_13 = nil
|
|
334
|
+
else
|
|
335
|
+
____temp_13 = value
|
|
336
|
+
end
|
|
337
|
+
____persistentPlayerProperty_set_15(persistentPlayerProperty, ____player_14, ____temp_13)
|
|
338
|
+
end
|
|
339
|
+
elseif player.isLocal then
|
|
340
|
+
localValueById[id] = value
|
|
341
|
+
end
|
|
342
|
+
else
|
|
343
|
+
localValueById[id] = value
|
|
344
|
+
end
|
|
345
|
+
end
|
|
346
|
+
return true, valueById
|
|
347
|
+
end)
|
|
348
|
+
if not ____try then
|
|
349
|
+
____hasReturned, ____returnValue = ____catch(____hasReturned)
|
|
350
|
+
end
|
|
351
|
+
if ____hasReturned then
|
|
352
|
+
return ____returnValue
|
|
353
|
+
end
|
|
354
|
+
end
|
|
355
|
+
end
|
|
356
|
+
Timer:run(function()
|
|
357
|
+
local data = file.read(____exports.PersistentPropertiesConfig.defaultFileName) or ""
|
|
358
|
+
loadedValueById = loadPropertyValues(data)
|
|
359
|
+
for ____, player in ipairs(Player.all) do
|
|
360
|
+
local ____self_16 = synchronize(player, data)
|
|
361
|
+
____self_16["then"](
|
|
362
|
+
____self_16,
|
|
363
|
+
function(____, synchronizedData)
|
|
364
|
+
loadedValueByIdByPlayer[player] = loadPropertyValues(synchronizedData, player)
|
|
365
|
+
savePropertyValues(player)
|
|
366
|
+
end,
|
|
367
|
+
function()
|
|
368
|
+
loadedValueByIdByPlayer[player] = {}
|
|
369
|
+
savePropertyValues(player)
|
|
370
|
+
end
|
|
371
|
+
)
|
|
372
|
+
end
|
|
373
|
+
end)
|
|
374
|
+
return ____exports
|
package/string.d.ts
CHANGED
|
@@ -59,6 +59,22 @@ declare global {
|
|
|
59
59
|
function toNumber(string: string): number;
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
+
declare global {
|
|
63
|
+
namespace string {
|
|
64
|
+
/**
|
|
65
|
+
* Returns the index within the string of the first occurrence of the specified substring, starting from the specified `startIndex`,
|
|
66
|
+
* or -1 if the string does not contain such substring.
|
|
67
|
+
*/
|
|
68
|
+
function indexOf(string: string, substring: string, startIndex?: number): number;
|
|
69
|
+
}
|
|
70
|
+
interface String {
|
|
71
|
+
/**
|
|
72
|
+
* Returns the index within this string of the first occurrence of the specified substring, starting from the specified `startIndex`,
|
|
73
|
+
* or -1 if the string does not contain such substring.
|
|
74
|
+
*/
|
|
75
|
+
indexOf(substring: string, startIndex?: number): number;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
62
78
|
declare global {
|
|
63
79
|
interface String {
|
|
64
80
|
/**
|
|
@@ -103,4 +119,18 @@ declare global {
|
|
|
103
119
|
function isNotBlank(string: string): boolean;
|
|
104
120
|
}
|
|
105
121
|
}
|
|
122
|
+
declare global {
|
|
123
|
+
namespace string {
|
|
124
|
+
/**
|
|
125
|
+
* Returns the number of characters matching the given predicate.
|
|
126
|
+
*/
|
|
127
|
+
function count(string: string, predicate: (char: string) => boolean): number;
|
|
128
|
+
}
|
|
129
|
+
interface String {
|
|
130
|
+
/**
|
|
131
|
+
* Returns the number of characters matching the given predicate.
|
|
132
|
+
*/
|
|
133
|
+
count(predicate: (char: string) => boolean): number;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
106
136
|
export {};
|