diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/bigmap/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/bigmap/base.json index 76db3338..7d2cb523 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/bigmap/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/bigmap/base.json @@ -22,71 +22,91 @@ { "id": "67d135bc9e0d93daf71d555e", "pic": { - "path": "CONTENT/banners/banner_bigmap.png", - "rcid": "" + "file": "67e4046922d6081b78031dda.png", + "path": "banners/67e4046922d6081b78031dda.png", + "rcid": "", + "type": "banners" } }, { "id": "5464e0404bdc2d2a708b4567", "pic": { - "path": "CONTENT/banners/banner_usec.jpg", - "rcid": "" + "file": "67e404de22d6081b78031de2.jpg", + "path": "banners/67e404de22d6081b78031de2.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5464e0454bdc2d06708b4567", "pic": { - "path": "CONTENT/banners/banner_bear.jpg", - "rcid": "" + "file": "67e4045225a1aca9270117e7.jpg", + "path": "banners/67e4045225a1aca9270117e7.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5803a58524597710ca36fcb2", "pic": { - "path": "CONTENT/banners/banner_terragroup.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807bfe124597742a92e0a4c", "pic": { - "path": "CONTENT/banners/norvinskzone.jpg", - "rcid": "" + "file": "67e404ffbec96f5d8e097333.jpg", + "path": "banners/67e404ffbec96f5d8e097333.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807c3f124597746bf2db2ce", "pic": { - "path": "CONTENT/banners/banner_scav.jpg", - "rcid": "" + "file": "67e404c222d6081b78031ddf.jpg", + "path": "banners/67e404c222d6081b78031ddf.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807be8924597742c603fa19", "pic": { - "path": "CONTENT/banners/banner_tarkov.jpg", - "rcid": "" + "file": "67e4046dbec96f5d8e09732a.jpg", + "path": "banners/67e4046dbec96f5d8e09732a.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5805f617245977100b2c1f41", "pic": { - "path": "CONTENT/banners/tglabs.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0ad6af99768b777048f4e", "pic": { - "path": "CONTENT/banners/banner_emissary.jpg", - "rcid": "" + "file": "67e4047d22d6081b78031ddb.jpg", + "path": "banners/67e4047d22d6081b78031ddb.jpg", + "rcid": "", + "type": "banners" } } ], @@ -106,6 +126,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -152,6 +174,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -176,6 +200,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -200,6 +226,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -224,6 +252,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -247,6 +277,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -270,6 +302,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -293,6 +327,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -316,6 +352,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -360,6 +398,8 @@ "DependKarma": false, "DependKarmaPVE": false, "ForceSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, "SpawnMode": [ @@ -382,6 +422,8 @@ "BossZone": "ZoneFactoryCenter,ZoneScavBase", "Delay": 0, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -411,7 +453,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -458,7 +517,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -10024,7 +10098,7 @@ }, { "TemplateId": "675aaab74bca0b001d02f356", - "Value": 2 + "Value": 3 }, { "TemplateId": "676bf44c5539167c3603e869", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/factory4_day/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/factory4_day/base.json index 74af88d8..560c87ba 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/factory4_day/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/factory4_day/base.json @@ -8,71 +8,91 @@ { "id": "67d13656443d3073a3a92427", "pic": { - "path": "CONTENT/banners/banner_factory4.png", - "rcid": "" + "file": "67e40482bec96f5d8e09732b.png", + "path": "banners/67e40482bec96f5d8e09732b.png", + "rcid": "", + "type": "banners" } }, { "id": "5464e0404bdc2d2a708b4567", "pic": { - "path": "CONTENT/banners/banner_usec.jpg", - "rcid": "" + "file": "67e404de22d6081b78031de2.jpg", + "path": "banners/67e404de22d6081b78031de2.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5464e0454bdc2d06708b4567", "pic": { - "path": "CONTENT/banners/banner_bear.jpg", - "rcid": "" + "file": "67e4045225a1aca9270117e7.jpg", + "path": "banners/67e4045225a1aca9270117e7.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5803a58524597710ca36fcb2", "pic": { - "path": "CONTENT/banners/banner_terragroup.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807bfe124597742a92e0a4c", "pic": { - "path": "CONTENT/banners/norvinskzone.jpg", - "rcid": "" + "file": "67e404ffbec96f5d8e097333.jpg", + "path": "banners/67e404ffbec96f5d8e097333.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807c3f124597746bf2db2ce", "pic": { - "path": "CONTENT/banners/banner_scav.jpg", - "rcid": "" + "file": "67e404c222d6081b78031ddf.jpg", + "path": "banners/67e404c222d6081b78031ddf.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807be8924597742c603fa19", "pic": { - "path": "CONTENT/banners/banner_tarkov.jpg", - "rcid": "" + "file": "67e4046dbec96f5d8e09732a.jpg", + "path": "banners/67e4046dbec96f5d8e09732a.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5805f617245977100b2c1f41", "pic": { - "path": "CONTENT/banners/tglabs.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0ad6af99768b777048f4e", "pic": { - "path": "CONTENT/banners/banner_emissary.jpg", - "rcid": "" + "file": "67e4047d22d6081b78031ddb.jpg", + "path": "banners/67e4047d22d6081b78031ddb.jpg", + "rcid": "", + "type": "banners" } } ], @@ -88,6 +108,8 @@ "BossZone": "BotZone", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": true, "SpawnMode": [ "regular", "pve" @@ -108,6 +130,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -127,6 +151,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -146,6 +172,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -165,6 +193,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -184,6 +214,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -213,7 +245,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -260,7 +309,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -5043,7 +5107,7 @@ }, { "TemplateId": "675aaaf674a7619a5304c233", - "Value": 2 + "Value": 3 }, { "TemplateId": "676bf44c5539167c3603e869", @@ -5104,7 +5168,7 @@ { "BotPreset": "normal", "BotSide": "Savage", - "KeepZoneOnSpawn": true, + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -5121,7 +5185,7 @@ { "BotPreset": "normal", "BotSide": "Savage", - "KeepZoneOnSpawn": true, + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -5138,7 +5202,7 @@ { "BotPreset": "hard", "BotSide": "Savage", - "KeepZoneOnSpawn": true, + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -5155,7 +5219,7 @@ { "BotPreset": "normal", "BotSide": "Savage", - "KeepZoneOnSpawn": true, + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -5172,7 +5236,7 @@ { "BotPreset": "normal", "BotSide": "Savage", - "KeepZoneOnSpawn": true, + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -5189,7 +5253,7 @@ { "BotPreset": "hard", "BotSide": "Savage", - "KeepZoneOnSpawn": true, + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -5206,7 +5270,7 @@ { "BotPreset": "hard", "BotSide": "Savage", - "KeepZoneOnSpawn": true, + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -5223,7 +5287,7 @@ { "BotPreset": "hard", "BotSide": "Savage", - "KeepZoneOnSpawn": true, + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/factory4_night/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/factory4_night/base.json index 614cf8d1..1762bf6f 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/factory4_night/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/factory4_night/base.json @@ -8,71 +8,91 @@ { "id": "67d13656443d3073a3a92427", "pic": { - "path": "CONTENT/banners/banner_factory4.png", - "rcid": "" + "file": "67e40482bec96f5d8e09732b.png", + "path": "banners/67e40482bec96f5d8e09732b.png", + "rcid": "", + "type": "banners" } }, { "id": "5464e0404bdc2d2a708b4567", "pic": { - "path": "CONTENT/banners/banner_usec.jpg", - "rcid": "" + "file": "67e404de22d6081b78031de2.jpg", + "path": "banners/67e404de22d6081b78031de2.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5464e0454bdc2d06708b4567", "pic": { - "path": "CONTENT/banners/banner_bear.jpg", - "rcid": "" + "file": "67e4045225a1aca9270117e7.jpg", + "path": "banners/67e4045225a1aca9270117e7.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5803a58524597710ca36fcb2", "pic": { - "path": "CONTENT/banners/banner_terragroup.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807bfe124597742a92e0a4c", "pic": { - "path": "CONTENT/banners/norvinskzone.jpg", - "rcid": "" + "file": "67e404ffbec96f5d8e097333.jpg", + "path": "banners/67e404ffbec96f5d8e097333.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807c3f124597746bf2db2ce", "pic": { - "path": "CONTENT/banners/banner_scav.jpg", - "rcid": "" + "file": "67e404c222d6081b78031ddf.jpg", + "path": "banners/67e404c222d6081b78031ddf.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807be8924597742c603fa19", "pic": { - "path": "CONTENT/banners/banner_tarkov.jpg", - "rcid": "" + "file": "67e4046dbec96f5d8e09732a.jpg", + "path": "banners/67e4046dbec96f5d8e09732a.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5805f617245977100b2c1f41", "pic": { - "path": "CONTENT/banners/tglabs.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0ad6af99768b777048f4e", "pic": { - "path": "CONTENT/banners/banner_emissary.jpg", - "rcid": "" + "file": "67e4047d22d6081b78031ddb.jpg", + "path": "banners/67e4047d22d6081b78031ddb.jpg", + "rcid": "", + "type": "banners" } } ], @@ -87,6 +107,8 @@ "BossPlayer": false, "BossZone": "BotZone", "IgnoreMaxBots": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -106,6 +128,8 @@ "BossPlayer": false, "BossZone": "BotZone", "IgnoreMaxBots": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -125,6 +149,8 @@ "BossPlayer": false, "BossZone": "", "IgnoreMaxBots": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -143,6 +169,8 @@ "BossPlayer": false, "BossZone": "", "IgnoreMaxBots": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -161,6 +189,8 @@ "BossPlayer": false, "BossZone": "", "IgnoreMaxBots": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -179,6 +209,8 @@ "BossPlayer": false, "BossZone": "", "IgnoreMaxBots": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -207,7 +239,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -254,7 +303,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -5030,7 +5094,7 @@ }, { "TemplateId": "675aaaf674a7619a5304c233", - "Value": 2 + "Value": 3 }, { "TemplateId": "676bf44c5539167c3603e869", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/interchange/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/interchange/base.json index 9b04fb6e..30133913 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/interchange/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/interchange/base.json @@ -22,35 +22,43 @@ { "id": "67d1abc6c5fbfe1a95025e93", "pic": { - "path": "CONTENT/banners/banner_interchange.jpg", - "rcid": "" + "file": "67e40496bec96f5d8e09732c.jpg", + "path": "banners/67e40496bec96f5d8e09732c.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5464e0404bdc2d2a708b4567", "pic": { - "path": "CONTENT/banners/banner_usec.jpg", - "rcid": "" + "file": "67e404de22d6081b78031de2.jpg", + "path": "banners/67e404de22d6081b78031de2.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0acf85174e095610734a0", "pic": { - "path": "CONTENT/banners/banner_sherpa.jpg", - "rcid": "" + "file": "67e404c5bec96f5d8e09732f.jpg", + "path": "banners/67e404c5bec96f5d8e09732f.jpg", + "rcid": "", + "type": "banners" } } ], "BossLocationSpawn": [ { - "BossChance": 30, + "BossChance": 49, "BossDifficult": "normal", "BossEscortAmount": "0", "BossEscortDifficult": "normal", @@ -62,6 +70,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -84,6 +94,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -105,6 +117,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -147,6 +161,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -168,6 +184,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -210,6 +228,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -239,7 +259,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -286,7 +323,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/laboratory/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/laboratory/base.json index b4cb5ed8..2884060e 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/laboratory/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/laboratory/base.json @@ -12,36 +12,46 @@ { "id": "67d1ad1b5df2d64de808e1da", "pic": { - "path": "CONTENT/banners/banner_laboratory.jpg", - "rcid": "" + "file": "67e4049a22d6081b78031ddd.jpg", + "path": "banners/67e4049a22d6081b78031ddd.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5805f617245977100b2c1f41", "pic": { - "path": "CONTENT/banners/tglabs.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807be8924597742c603fa19", "pic": { - "path": "CONTENT/banners/banner_tarkov.jpg", - "rcid": "" + "file": "67e4046dbec96f5d8e09732a.jpg", + "path": "banners/67e4046dbec96f5d8e09732a.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0acf85174e095610734a0", "pic": { - "path": "CONTENT/banners/banner_sherpa.jpg", - "rcid": "" + "file": "67e404c5bec96f5d8e09732f.jpg", + "path": "banners/67e404c5bec96f5d8e09732f.jpg", + "rcid": "", + "type": "banners" } } ], @@ -58,6 +68,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -79,6 +91,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -100,6 +114,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -121,6 +137,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -142,6 +160,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -163,6 +183,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -184,6 +206,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -205,6 +229,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -226,6 +252,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -247,6 +275,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -268,6 +298,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -289,6 +321,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -310,6 +344,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -331,6 +367,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -352,6 +390,8 @@ "Delay": 8, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -373,6 +413,8 @@ "Delay": 8, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -394,6 +436,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -414,6 +458,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -434,6 +480,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -454,6 +502,8 @@ "Delay": 0, "IgnoreMaxBots": false, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -482,7 +532,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -529,7 +596,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -4237,7 +4319,7 @@ "y": 0, "z": 0 }, - "Radius": 27 + "Radius": 75 } }, "CorePointId": 8, @@ -5739,7 +5821,7 @@ }, { "TemplateId": "5c0530ee86f774697952d952", - "Value": 2 + "Value": 3 }, { "TemplateId": "676bf44c5539167c3603e869", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/labyrinth/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/labyrinth/base.json index 7bc984c0..f71a8d94 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/labyrinth/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/labyrinth/base.json @@ -26,22 +26,28 @@ { "id": "67e3f71e445e18765a052687", "pic": { - "path": "CONTENT/banners/minotaur_banner.png", - "rcid": "" + "file": "67eac08e7364605a61079cc8.png", + "path": "banners/67eac08e7364605a61079cc8.png", + "rcid": "", + "type": "banners" } }, { "id": "67e3f72fdb783364cd0a4b63", "pic": { - "path": "CONTENT/banners/banner_Tagilla.jpg", - "rcid": "" + "file": "67eac0afef0822d52d09f6a5.jpg", + "path": "banners/67eac0afef0822d52d09f6a5.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0ad6af99768b777048f4e", "pic": { - "path": "CONTENT/banners/banner_emissary.jpg", - "rcid": "" + "file": "67e4047d22d6081b78031ddb.jpg", + "path": "banners/67e4047d22d6081b78031ddb.jpg", + "rcid": "", + "type": "banners" } } ], @@ -61,6 +67,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -85,6 +93,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -109,6 +119,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -133,6 +145,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -157,6 +171,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -181,6 +197,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -205,6 +223,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -229,6 +249,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -253,6 +275,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -277,6 +301,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -306,7 +332,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -353,7 +396,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/lighthouse/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/lighthouse/base.json index bdca5dad..a3792af2 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/lighthouse/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/lighthouse/base.json @@ -22,29 +22,37 @@ { "id": "67d1ac1a2fb6a5d11b09d6f8", "pic": { - "path": "CONTENT/banners/banner_lighthouse.jpg", - "rcid": "" + "file": "67e4049dbec96f5d8e09732d.jpg", + "path": "banners/67e4049dbec96f5d8e09732d.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5464e0454bdc2d06708b4567", "pic": { - "path": "CONTENT/banners/banner_bear.jpg", - "rcid": "" + "file": "67e4045225a1aca9270117e7.jpg", + "path": "banners/67e4045225a1aca9270117e7.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0acf85174e095610734a0", "pic": { - "path": "CONTENT/banners/banner_sherpa.jpg", - "rcid": "" + "file": "67e404c5bec96f5d8e09732f.jpg", + "path": "banners/67e404c5bec96f5d8e09732f.jpg", + "rcid": "", + "type": "banners" } } ], @@ -64,6 +72,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -88,6 +98,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -112,6 +124,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -158,6 +172,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -182,6 +198,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -206,6 +224,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -230,6 +250,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -254,6 +276,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -278,6 +302,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -302,6 +328,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -326,6 +354,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -350,6 +380,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -373,6 +405,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -396,6 +430,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -419,6 +455,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -442,6 +480,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -488,6 +528,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -512,6 +554,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -541,7 +585,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -588,7 +649,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/rezervbase/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/rezervbase/base.json index 202cf98f..e9dd6f56 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/rezervbase/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/rezervbase/base.json @@ -22,35 +22,43 @@ { "id": "67d1ac705df2d64de808e1d2", "pic": { - "path": "CONTENT/banners/banner_RezervBase.jpg", - "rcid": "" + "file": "67e404a022d6081b78031dde.jpg", + "path": "banners/67e404a022d6081b78031dde.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807bfe124597742a92e0a4c", "pic": { - "path": "CONTENT/banners/norvinskzone.jpg", - "rcid": "" + "file": "67e404ffbec96f5d8e097333.jpg", + "path": "banners/67e404ffbec96f5d8e097333.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0ad6af99768b777048f4e", "pic": { - "path": "CONTENT/banners/banner_emissary.jpg", - "rcid": "" + "file": "67e4047d22d6081b78031ddb.jpg", + "path": "banners/67e4047d22d6081b78031ddb.jpg", + "rcid": "", + "type": "banners" } } ], "BossLocationSpawn": [ { - "BossChance": 30, + "BossChance": 39, "BossDifficult": "normal", "BossEscortAmount": "2", "BossEscortDifficult": "normal", @@ -62,6 +70,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -106,6 +116,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -128,6 +140,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -150,6 +164,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -172,6 +188,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -194,6 +212,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -215,6 +235,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -236,6 +258,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -257,6 +281,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -278,6 +304,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -299,6 +327,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -327,7 +357,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -374,7 +421,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -6649,7 +6711,7 @@ }, { "TemplateId": "675aaa003107dac10006332f", - "Value": 2 + "Value": 3 }, { "TemplateId": "676bf44c5539167c3603e869", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/sandbox/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/sandbox/base.json index 8e0bad63..a8a0cecb 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/sandbox/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/sandbox/base.json @@ -22,22 +22,19 @@ { "id": "67d1ac822b87c1a5a30e5ae8", "pic": { - "path": "CONTENT/banners/banner_Sandbox.jpg", - "rcid": "" + "file": "67e404a9bec96f5d8e09732e.jpg", + "path": "banners/67e404a9bec96f5d8e09732e.jpg", + "rcid": "", + "type": "banners" } }, { "id": "63a9c1f5662a5b0a2c7fbde5", "pic": { - "path": "CONTENT/banners/banner_City_final.jpg", - "rcid": "" - } - }, - { - "id": "64c0acf85174e095610734a0", - "pic": { - "path": "CONTENT/banners/banner_sherpa.jpg", - "rcid": "" + "file": "67e4046dbec96f5d8e09732a.jpg", + "path": "banners/67e4046dbec96f5d8e09732a.jpg", + "rcid": "", + "type": "banners" } } ], @@ -53,6 +50,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -72,6 +71,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -91,6 +92,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -110,6 +113,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -138,7 +143,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -152,11 +174,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "marksman" }, { @@ -185,7 +207,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -199,11 +236,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "marksman" }, { @@ -235,7 +272,7 @@ "DistToActivatePvE": 260, "DistToSleep": 300, "DistToSleepPvE": 300, - "FogVisibilityDistanceCoef": -1.6, + "FogVisibilityDistanceCoef": 0, "FogVisibilitySpeedCoef": 0, "GainSight": 1, "LockSpawnCheckRadius": 150, @@ -248,7 +285,7 @@ "MaxExfiltrationTime": 1500, "MinExfiltrationTime": 1200, "NonWaveSpawnBotsLimitPerPlayer": 10, - "NonWaveSpawnBotsLimitPerPlayerPvE": 15, + "NonWaveSpawnBotsLimitPerPlayerPvE": 10, "RainVisibilityDistanceCoef": 0.35, "RainVisibilitySpeedCoef": 0, "Scattering": 1, @@ -6273,6 +6310,24 @@ } ], "matching_min_seconds": 60, + "maxItemCountInLocation": [ + { + "TemplateId": "57347ca924597744596b4e71", + "Value": 4 + }, + { + "TemplateId": "634959225289190e5e773b3b", + "Value": 7 + }, + { + "TemplateId": "675aaae75a3ab8372d0b02a7", + "Value": 3 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 + } + ], "sav_summon_seconds": 60, "secretExits": [ { @@ -6316,6 +6371,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6331,6 +6387,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6346,6 +6403,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6361,6 +6419,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6376,6 +6435,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6391,6 +6451,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/sandbox_high/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/sandbox_high/base.json index 607749fa..de0cec9d 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/sandbox_high/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/sandbox_high/base.json @@ -22,22 +22,28 @@ { "id": "67d1ac822b87c1a5a30e5ae8", "pic": { - "path": "CONTENT/banners/banner_Sandbox.jpg", - "rcid": "" + "file": "67e404a9bec96f5d8e09732e.jpg", + "path": "banners/67e404a9bec96f5d8e09732e.jpg", + "rcid": "", + "type": "banners" } }, { "id": "63a9c1f5662a5b0a2c7fbde5", "pic": { - "path": "CONTENT/banners/banner_City_final.jpg", - "rcid": "" + "file": "67e4046dbec96f5d8e09732a.jpg", + "path": "banners/67e4046dbec96f5d8e09732a.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0acf85174e095610734a0", "pic": { - "path": "CONTENT/banners/banner_sherpa.jpg", - "rcid": "" + "file": "67e404c5bec96f5d8e09732f.jpg", + "path": "banners/67e404c5bec96f5d8e09732f.jpg", + "rcid": "", + "type": "banners" } } ], @@ -53,6 +59,8 @@ "BossZone": "ZoneSandbox", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -73,6 +81,8 @@ "BossZone": "ZoneSandbox", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -93,6 +103,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -112,6 +124,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -131,6 +145,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -150,6 +166,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -169,6 +187,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -188,6 +208,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -207,6 +229,8 @@ "BossZone": "", "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -236,7 +260,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -283,7 +324,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -6496,6 +6552,24 @@ } ], "matching_min_seconds": 60, + "maxItemCountInLocation": [ + { + "TemplateId": "57347ca924597744596b4e71", + "Value": 2 + }, + { + "TemplateId": "634959225289190e5e773b3b", + "Value": 7 + }, + { + "TemplateId": "675aaae75a3ab8372d0b02a7", + "Value": 3 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 + } + ], "sav_summon_seconds": 60, "secretExits": [ { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/shoreline/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/shoreline/base.json index fd42c0e2..d59fb821 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/shoreline/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/shoreline/base.json @@ -22,29 +22,37 @@ { "id": "67d1ac995df2d64de808e1d6", "pic": { - "path": "CONTENT/banners/banner_shoreline.jpg", - "rcid": "" + "file": "67e404ccbec96f5d8e097330.jpg", + "path": "banners/67e404ccbec96f5d8e097330.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5807c3f124597746bf2db2ce", "pic": { - "path": "CONTENT/banners/banner_scav.jpg", - "rcid": "" + "file": "67e404c222d6081b78031ddf.jpg", + "path": "banners/67e404c222d6081b78031ddf.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0ad6af99768b777048f4e", "pic": { - "path": "CONTENT/banners/banner_emissary.jpg", - "rcid": "" + "file": "67e4047d22d6081b78031ddb.jpg", + "path": "banners/67e4047d22d6081b78031ddb.jpg", + "rcid": "", + "type": "banners" } } ], @@ -59,9 +67,13 @@ "BossPlayer": false, "BossZone": "ZoneGreenHouses,ZonePort,ZoneSanatorium1,ZoneSanatorium2,ZoneSmuglers", "Delay": 0, + "DependKarma": false, + "DependKarmaPVE": false, "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -86,6 +98,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -132,6 +146,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -156,6 +172,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -180,6 +198,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve", "regular" @@ -204,6 +224,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -227,6 +249,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -250,6 +274,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -273,6 +299,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -296,6 +324,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -319,6 +349,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -342,6 +374,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -365,6 +399,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -388,6 +424,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -416,7 +454,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -463,7 +518,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -9912,7 +9982,7 @@ "maxItemCountInLocation": [ { "TemplateId": "57347ca924597744596b4e71", - "Value": 1 + "Value": 2 }, { "TemplateId": "634959225289190e5e773b3b", @@ -9920,7 +9990,7 @@ }, { "TemplateId": "675aab0d6b6addc02a08f097", - "Value": 2 + "Value": 3 }, { "TemplateId": "676bf44c5539167c3603e869", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/tarkovstreets/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/tarkovstreets/base.json index 1957a1a3..89365792 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/tarkovstreets/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/tarkovstreets/base.json @@ -22,29 +22,37 @@ { "id": "67d1acbf5df2d64de808e1d8", "pic": { - "path": "CONTENT/banners/banner_City_final.jpg", - "rcid": "" + "file": "67e4046dbec96f5d8e09732a.jpg", + "path": "banners/67e4046dbec96f5d8e09732a.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5803a58524597710ca36fcb2", "pic": { - "path": "CONTENT/banners/banner_terragroup.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "63a9c1f5662a5b0a2c7fbde5", "pic": { - "path": "CONTENT/banners/banner_City_final.jpg", - "rcid": "" + "file": "67e4046dbec96f5d8e09732a.jpg", + "path": "banners/67e4046dbec96f5d8e09732a.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0acf85174e095610734a0", "pic": { - "path": "CONTENT/banners/banner_sherpa.jpg", - "rcid": "" + "file": "67e404c5bec96f5d8e09732f.jpg", + "path": "banners/67e404c5bec96f5d8e09732f.jpg", + "rcid": "", + "type": "banners" } } ], @@ -62,6 +70,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -106,6 +116,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -150,6 +162,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -172,6 +186,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -193,6 +209,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -214,6 +232,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -235,6 +255,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -256,6 +278,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -277,6 +301,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -298,6 +324,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -319,6 +347,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -340,6 +370,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -361,6 +393,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -411,7 +445,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -458,7 +509,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -14107,6 +14173,24 @@ } ], "matching_min_seconds": 60, + "maxItemCountInLocation": [ + { + "TemplateId": "634959225289190e5e773b3b", + "Value": 9 + }, + { + "TemplateId": "675aaae1dcf102478202c537", + "Value": 3 + }, + { + "TemplateId": "590c621186f774138d11ea29", + "Value": 7 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 + } + ], "sav_summon_seconds": 60, "secretExits": [ { @@ -14221,8 +14305,8 @@ "WildSpawnType": "marksman", "isPlayers": false, "number": 3, - "slots_max": 1, - "slots_min": 1, + "slots_max": 0, + "slots_min": 0, "time_max": -1, "time_min": -1 }, diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/woods/base.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/woods/base.json index 18391ec5..eb8939a5 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/woods/base.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/locations/woods/base.json @@ -22,29 +22,37 @@ { "id": "67d1acda2fb6a5d11b09d6fd", "pic": { - "path": "CONTENT/banners/banner_woods.jpg", - "rcid": "" + "file": "67e404e4bec96f5d8e097332.jpg", + "path": "banners/67e404e4bec96f5d8e097332.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5803a58524597710ca36fcb2", "pic": { - "path": "CONTENT/banners/banner_terragroup.jpg", - "rcid": "" + "file": "67e404d9bec96f5d8e097331.jpg", + "path": "banners/67e404d9bec96f5d8e097331.jpg", + "rcid": "", + "type": "banners" } }, { "id": "5c1b857086f77465f465faa4", "pic": { - "path": "CONTENT/banners/banner_scavraider.jpg", - "rcid": "" + "file": "67e404c722d6081b78031de0.jpg", + "path": "banners/67e404c722d6081b78031de0.jpg", + "rcid": "", + "type": "banners" } }, { "id": "64c0ad6af99768b777048f4e", "pic": { - "path": "CONTENT/banners/banner_emissary.jpg", - "rcid": "" + "file": "67e4047d22d6081b78031ddb.jpg", + "path": "banners/67e4047d22d6081b78031ddb.jpg", + "rcid": "", + "type": "banners" } } ], @@ -64,6 +72,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": true, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -110,6 +120,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -134,6 +146,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -158,6 +172,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "regular", "pve" @@ -182,6 +198,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -205,6 +223,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -228,6 +248,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -251,6 +273,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -274,6 +298,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -297,6 +323,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -343,6 +371,8 @@ "ForceSpawn": false, "IgnoreMaxBots": true, "RandomTimeSpawn": false, + "ShowOnTarkovMap": false, + "ShowOnTarkovMapPvE": false, "SpawnMode": [ "pve" ], @@ -371,7 +401,24 @@ "bossSanitar", "bossKolontay", "bossGluhar", - "bossKnight" + "bossKnight", + "bossBoarSniper", + "bossPartisan", + "followerBigPipe", + "followerBirdEye", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -418,7 +465,22 @@ "bossKojaniy", "bossSanitar", "bossKolontay", - "bossGluhar" + "bossGluhar", + "bossBoarSniper", + "bossPartisan", + "followerBoar", + "followerBoarClose1", + "followerBoarClose2", + "followerBully", + "followerGluharAssault", + "followerGluharScout", + "followerGluharSecurity", + "followerGluharSnipe", + "followerKojaniy", + "followerKolontayAssault", + "followerKolontaySecurity", + "followerSanitar", + "followerTagilla" ], "AlwaysFriends": [ "bossZryachiy", @@ -867,7 +929,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "027273fa-04bc-48d1-acfb-74f008bb196c", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 365.905029, "y": 13.94, @@ -1019,7 +1081,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "0629d023-ea80-45cb-8376-9ea211e740f9", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -63.1000061, "y": 9.763999, @@ -1134,7 +1196,7 @@ "y": 0, "z": 0 }, - "Radius": 100 + "Radius": 130 } }, "CorePointId": 7, @@ -1564,7 +1626,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "158e0a94-64fb-4555-afa0-90109713db91", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -265.82, "y": 10.58, @@ -1685,7 +1747,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "191b6c5a-0fb7-40b2-95b4-3a33397eb872", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -54.1099854, "y": 8.883999, @@ -2263,7 +2325,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "2685c5c9-9bde-40c1-bbc2-3a0f3b024106", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 61.22003, "y": 9.033999, @@ -3325,7 +3387,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "43598be9-9042-4e06-8ee9-11a3d346d570", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -63.6699829, "y": 9.714, @@ -3476,7 +3538,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "4bef69e6-18dd-4c33-8b74-39eba90908cd", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -256.58, "y": 10.61, @@ -3901,7 +3963,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "57b4786d-ee61-4c7f-b6ef-94467e39a3cf", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -260.32, "y": 11.27, @@ -4177,7 +4239,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "5beb21e5-df5f-4db0-b607-202cb7a62ecf", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 59.18402, "y": 8.883999, @@ -4389,7 +4451,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "6767b1b7-da32-4b62-90f0-0d44712a642b", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 370.773, "y": 13.9, @@ -4906,7 +4968,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "76582ea6-095f-494d-83b8-c9335ba3f14f", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 59.8300171, "y": 8.794, @@ -5026,7 +5088,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "794c2ad7-29fa-4faf-8bcf-649c8925444a", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 367.12, "y": 13.2439995, @@ -7311,7 +7373,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "b43bd5a4-aa6c-4dd6-9052-d3359fa6b53c", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -260.74, "y": 10.41, @@ -7464,7 +7526,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "b593e2ff-9764-4bbe-9f8f-e05781071e7b", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 372.94, "y": 15.3039989, @@ -7827,7 +7889,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "bf2a6323-087e-4d49-a160-ea86b8295ac0", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 63.3200073, "y": 8.99399948, @@ -8041,7 +8103,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "c5021df7-1750-44ff-ae44-137022a8bdac", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 365.55, "y": 13.35, @@ -8619,7 +8681,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "ceb25518-5a40-42cd-b57d-076d40d29890", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -60.97, "y": 9.24399948, @@ -9043,7 +9105,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "da22cead-d753-44c4-b44e-131a3d9690b7", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -59.6399841, "y": 9.093999, @@ -9288,7 +9350,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "e0fb7ebc-0a4c-45a3-b5a3-ba5e6b1456ba", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": 64.6600342, "y": 9.084, @@ -9318,7 +9380,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "e1986567-8367-44cd-9bfa-e5c20e9e1460", - "Infiltration": "House", + "Infiltration": "Old Station", "Position": { "x": -253.669983, "y": 11.57, @@ -10470,7 +10532,7 @@ "y": 0, "z": 0 }, - "Radius": 100 + "Radius": 130 } }, "CorePointId": 7, @@ -10745,7 +10807,7 @@ "y": 0, "z": 0 }, - "Radius": 100 + "Radius": 130 } }, "CorePointId": 7, @@ -10898,7 +10960,7 @@ "y": 0, "z": 0 }, - "Radius": 100 + "Radius": 130 } }, "CorePointId": 7, @@ -11192,7 +11254,7 @@ }, { "TemplateId": "675aaa9a3107dac100063331", - "Value": 2 + "Value": 3 }, { "TemplateId": "676bf44c5539167c3603e869", diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs index c94b713c..9ca9c4f1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs @@ -516,11 +516,17 @@ public record Pic [JsonExtensionData] public Dictionary ExtensionData { get; set; } + [JsonPropertyName("file")] + public string? File { get; set; } + [JsonPropertyName("path")] public string? Path { get; set; } [JsonPropertyName("rcid")] public string? Rcid { get; set; } + + [JsonPropertyName("type")] + public string? Type { get; set; } } public record BossLocationSpawn @@ -555,6 +561,12 @@ public record BossLocationSpawn [JsonPropertyName("RandomTimeSpawn")] public bool? IsRandomTimeSpawn { get; set; } + [JsonPropertyName("ShowOnTarkovMap")] + public bool? ShowOnTarkovMap { get; set; } + + [JsonPropertyName("ShowOnTarkovMapPvE")] + public bool? ShowOnTarkovMapPvE { get; set; } + [JsonPropertyName("Time")] public double? Time { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs index 18978fb8..9bcdc5c2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Trader { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("assort")] public TraderAssort? Assort { get; set; } @@ -32,7 +32,7 @@ public record Trader public record TraderBase { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("refreshTraderRagfairOffers")] public bool? RefreshTraderRagfairOffers { get; set; } @@ -85,6 +85,7 @@ public record TraderBase [JsonPropertyName("items_buy_prohibited")] public ItemBuyData? ItemsBuyProhibited { get; set; } + [JsonConverter(typeof(ArrayToObjectFactoryConverter))] [JsonPropertyName("items_sell")] public Dictionary? ItemsSell { get; set; } @@ -132,7 +133,7 @@ public record TraderBase public record ItemBuyData { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } // MongoId [JsonPropertyName("category")] @@ -155,7 +156,7 @@ public record ItemSellData public record TraderInsurance { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("availability")] public bool? Availability { get; set; } @@ -183,7 +184,7 @@ public record TraderInsurance public record TraderLoyaltyLevel { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("buy_price_coef")] public double? BuyPriceCoefficient { get; set; } @@ -215,7 +216,7 @@ public record TraderLoyaltyLevel public record TraderRepair { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("availability")] public bool? Availability { get; set; } @@ -246,7 +247,7 @@ public record TraderRepair public record TraderAssort { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("nextResupply")] public double? NextResupply { get; set; } @@ -264,7 +265,7 @@ public record TraderAssort public record BarterScheme { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } // Confirmed in client [JsonPropertyName("count")] @@ -290,7 +291,7 @@ public record BarterScheme public record Suit { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("_id")] public string? Id { get; set; } @@ -323,7 +324,7 @@ public record Suit public record SuitRequirements { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("achievementRequirements")] public List? AchievementRequirements { get; set; } @@ -354,7 +355,7 @@ public record SuitRequirements public record ItemRequirement { [JsonExtensionData] - public Dictionary ExtensionData { get; set; } + public Dictionary? ExtensionData { get; set; } [JsonPropertyName("count")] public double? Count { get; set; }