From 7b8a10adeb22f5fcc5edccfedb5661ce805c7d18 Mon Sep 17 00:00:00 2001 From: Chomp Date: Wed, 30 Apr 2025 13:11:35 +0100 Subject: [PATCH] Updated map location values --- .../database/locations/bigmap/base.json | 142 +++++++++++------- .../database/locations/factory4_day/base.json | 20 ++- .../locations/factory4_night/base.json | 24 ++- .../database/locations/interchange/base.json | 28 +++- .../database/locations/laboratory/base.json | 27 +++- .../database/locations/lighthouse/base.json | 46 ++++-- .../database/locations/rezervbase/base.json | 45 ++++-- .../database/locations/sandbox_high/base.json | 41 ++++- .../database/locations/shoreline/base.json | 99 ++++++++---- .../locations/tarkovstreets/base.json | 53 ++++--- .../Assets/database/locations/woods/base.json | 133 +++++++++------- .../Models/Eft/Common/LocationBase.cs | 7 + 12 files changed, 444 insertions(+), 221 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/base.json index 1fc88edc..76db3338 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/base.json @@ -92,31 +92,7 @@ ], "BossLocationSpawn": [ { - "BossChance": 30, - "BossDifficult": "normal", - "BossEscortAmount": "0", - "BossEscortDifficult": "normal", - "BossEscortType": "sectantWarrior", - "BossName": "bossPartisan", - "BossPlayer": false, - "BossZone": "", - "Delay": 0, - "DependKarma": true, - "DependKarmaPVE": false, - "ForceSpawn": false, - "IgnoreMaxBots": true, - "RandomTimeSpawn": false, - "SpawnMode": [ - "regular", - "pve" - ], - "Supports": null, - "Time": -1, - "TriggerId": "PARTISAN_TRIGGER", - "TriggerName": "botEvent" - }, - { - "BossChance": 30, + "BossChance": 20, "BossDifficult": "normal", "BossEscortAmount": "2", "BossEscortDifficult": "normal", @@ -188,6 +164,30 @@ { "BossChance": 15, "BossDifficult": "normal", + "BossEscortAmount": "0", + "BossEscortDifficult": "normal", + "BossEscortType": "sectantWarrior", + "BossName": "bossPartisan", + "BossPlayer": false, + "BossZone": "", + "Delay": 0, + "DependKarma": true, + "DependKarmaPVE": false, + "ForceSpawn": false, + "IgnoreMaxBots": true, + "RandomTimeSpawn": false, + "SpawnMode": [ + "regular", + "pve" + ], + "Supports": null, + "Time": -1, + "TriggerId": "PARTISAN_TRIGGER", + "TriggerName": "botEvent" + }, + { + "BossChance": 20, + "BossDifficult": "normal", "BossEscortAmount": "4", "BossEscortDifficult": "normal", "BossEscortType": "sectantWarrior", @@ -425,11 +425,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -472,11 +472,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -584,8 +584,8 @@ "VisibleDistance": 1 }, "BotMarksman": 20, - "BotMax": 19, - "BotMaxPlayer": 9, + "BotMax": 30, + "BotMaxPlayer": 0, "BotMaxPvE": 30, "BotMaxTimePlayer": 0, "BotNormal": 50, @@ -10025,6 +10025,10 @@ { "TemplateId": "675aaab74bca0b001d02f356", "Value": 2 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 } ], "sav_summon_seconds": 60, @@ -10100,9 +10104,27 @@ "users_spawn_seconds_n2": 200, "users_summon_seconds": 0, "waves": [ + { + "BotPreset": "hard", + "BotSide": "Savage", + "KeepZoneOnSpawn": true, + "SpawnMode": [ + "pve", + "regular" + ], + "SpawnPoints": "ZoneScavBase", + "WildSpawnType": "assault", + "isPlayers": false, + "number": 0, + "slots_max": 2, + "slots_min": 1, + "time_max": -1, + "time_min": -1 + }, { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10118,14 +10140,16 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "ZoneDormitory", "WildSpawnType": "assault", "isPlayers": false, "number": 2, - "slots_max": 3, + "slots_max": 2, "slots_min": 1, "time_max": -1, "time_min": -1 @@ -10133,21 +10157,24 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "ZoneGasStation", "WildSpawnType": "assault", "isPlayers": false, "number": 3, - "slots_max": 2, - "slots_min": 0, + "slots_max": 3, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10155,14 +10182,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 4, - "slots_max": 3, - "slots_min": 0, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10178,21 +10206,24 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "ZoneOldAZS", "WildSpawnType": "assault", "isPlayers": false, "number": 6, - "slots_max": 0, - "slots_min": 0, + "slots_max": 3, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10208,6 +10239,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10216,13 +10248,14 @@ "isPlayers": false, "number": 8, "slots_max": 1, - "slots_min": 0, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10238,6 +10271,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10253,6 +10287,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10268,6 +10303,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10283,6 +10319,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10298,6 +10335,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10313,6 +10351,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10328,6 +10367,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10340,24 +10380,10 @@ "time_max": -1, "time_min": -1 }, - { - "BotPreset": "hard", - "BotSide": "Savage", - "SpawnMode": [ - "pve" - ], - "SpawnPoints": "", - "WildSpawnType": "assault", - "isPlayers": false, - "number": 0, - "slots_max": 3, - "slots_min": 1, - "time_max": -1, - "time_min": -1 - }, { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10365,7 +10391,7 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 0, - "slots_max": 3, + "slots_max": 1, "slots_min": 1, "time_max": -1, "time_min": -1 diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/base.json index 1511c572..74af88d8 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/base.json @@ -227,11 +227,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -274,11 +274,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -5044,6 +5044,10 @@ { "TemplateId": "675aaaf674a7619a5304c233", "Value": 2 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 } ], "sav_summon_seconds": 60, @@ -5100,6 +5104,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5116,6 +5121,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5132,6 +5138,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5148,6 +5155,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5164,6 +5172,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5180,6 +5189,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5196,6 +5206,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5212,6 +5223,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/base.json index f27f5426..aa7cda5f 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/base.json @@ -350,17 +350,17 @@ ] } ], - "DistToActivate": 100, - "DistToActivatePvE": 100, + "DistToActivate": 140, + "DistToActivatePvE": 140, "DistToPersueAxemanCoef": 0.9, - "DistToSleep": 120, - "DistToSleepPvE": 120, + "DistToSleep": 150, + "DistToSleepPvE": 150, "FogVisibilityDistanceCoef": 1, "FogVisibilitySpeedCoef": 1, "GainSight": 1, "KhorovodChance": 0, - "LockSpawnCheckRadius": 150, - "LockSpawnCheckRadiusPvE": 150, + "LockSpawnCheckRadius": 120, + "LockSpawnCheckRadiusPvE": 120, "LockSpawnStartTime": 10, "LockSpawnStartTimePvE": 10, "LockSpawnStepTime": 50, @@ -377,9 +377,9 @@ "VisibleDistance": 1 }, "BotMarksman": 0, - "BotMax": 16, + "BotMax": 20, "BotMaxPlayer": 0, - "BotMaxPvE": 22, + "BotMaxPvE": 20, "BotMaxTimePlayer": 0, "BotNormal": 0, "BotSpawnCountStep": 3, @@ -5132,6 +5132,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5148,6 +5149,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5164,6 +5166,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5180,6 +5183,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5196,6 +5200,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5212,6 +5217,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5228,6 +5234,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" @@ -5244,6 +5251,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/base.json index facace14..9b04fb6e 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/base.json @@ -253,11 +253,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -300,11 +300,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -7670,6 +7670,10 @@ { "TemplateId": "634959225289190e5e773b3b", "Value": 7 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 } ], "sav_summon_seconds": 60, @@ -7720,6 +7724,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -7735,21 +7740,24 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "ZoneCenterBot", "WildSpawnType": "assault", "isPlayers": false, "number": 1, - "slots_max": 2, - "slots_min": 0, + "slots_max": 3, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -7765,6 +7773,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -7780,6 +7789,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -7795,6 +7805,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -7810,6 +7821,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -7825,6 +7837,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -7840,6 +7853,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/base.json index b6909094..b4cb5ed8 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/base.json @@ -9,6 +9,13 @@ "AveragePlayTime": 30, "AveragePlayerLevel": 45, "Banners": [ + { + "id": "67d1ad1b5df2d64de808e1da", + "pic": { + "path": "CONTENT/banners/banner_laboratory.jpg", + "rcid": "" + } + }, { "id": "5805f617245977100b2c1f41", "pic": { @@ -489,11 +496,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "marksman" }, { @@ -536,11 +543,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "marksman" }, { @@ -577,8 +584,8 @@ "FogVisibilitySpeedCoef": 1, "GainSight": 1, "KhorovodChance": 0, - "LockSpawnCheckRadius": 150, - "LockSpawnCheckRadiusPvE": 150, + "LockSpawnCheckRadius": 120, + "LockSpawnCheckRadiusPvE": 120, "LockSpawnStartTime": 10, "LockSpawnStartTimePvE": 10, "LockSpawnStepTime": 50, @@ -588,7 +595,7 @@ "MaxExfiltrationTime": 1800, "MinExfiltrationTime": 1200, "NonWaveSpawnBotsLimitPerPlayer": 10, - "NonWaveSpawnBotsLimitPerPlayerPvE": 15, + "NonWaveSpawnBotsLimitPerPlayerPvE": 10, "RainVisibilityDistanceCoef": 1, "RainVisibilitySpeedCoef": 1, "Scattering": 1, @@ -773,7 +780,7 @@ "NewSpawnForPlayers": false, "NonWaveGroupScenario": { "Chance": 50, - "Enabled": false, + "Enabled": true, "MaxToBeGroup": 3, "MinToBeGroup": 2 }, @@ -5733,6 +5740,10 @@ { "TemplateId": "5c0530ee86f774697952d952", "Value": 2 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 } ], "sav_summon_seconds": 60, diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/base.json index 6692b700..bdca5dad 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/base.json @@ -74,7 +74,7 @@ "TriggerName": "" }, { - "BossChance": 30, + "BossChance": 15, "BossDifficult": "normal", "BossEscortAmount": "0", "BossEscortDifficult": "normal", @@ -98,7 +98,7 @@ "TriggerName": "botEvent" }, { - "BossChance": 30, + "BossChance": 20, "BossDifficult": "normal", "BossEscortAmount": "2", "BossEscortDifficult": "normal", @@ -555,11 +555,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -602,11 +602,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -8408,6 +8408,10 @@ { "TemplateId": "675aaa8f7f3c962069072b27", "Value": 2 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 } ], "sav_summon_seconds": 60, @@ -8467,6 +8471,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8474,7 +8479,7 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 1, - "slots_max": 3, + "slots_max": 2, "slots_min": 0, "time_max": -1, "time_min": -1 @@ -8482,6 +8487,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8497,6 +8503,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8512,6 +8519,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8519,7 +8527,7 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 3, - "slots_max": 3, + "slots_max": 2, "slots_min": 0, "time_max": -1, "time_min": -1 @@ -8527,14 +8535,16 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "Zone_Rocks", "WildSpawnType": "assault", "isPlayers": false, "number": 4, - "slots_max": 0, + "slots_max": 2, "slots_min": 0, "time_max": -1, "time_min": -1 @@ -8542,8 +8552,10 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "Zone_Chalet", "WildSpawnType": "assault", @@ -8557,6 +8569,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8572,6 +8585,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8587,14 +8601,16 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "Zone_LongRoad", "WildSpawnType": "assault", "isPlayers": false, "number": 8, - "slots_max": 0, + "slots_max": 2, "slots_min": 0, "time_max": -1, "time_min": -1 @@ -8602,6 +8618,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8617,6 +8634,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8632,6 +8650,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -8647,6 +8666,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/base.json index ccf9fc73..0cea710a 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/base.json @@ -116,7 +116,7 @@ "TriggerName": "" }, { - "BossChance": 25, + "BossChance": 30, "BossDifficult": "normal", "BossEscortAmount": "2,2,2,2,3", "BossEscortDifficult": "normal", @@ -138,7 +138,7 @@ "TriggerName": "interactObject" }, { - "BossChance": 25, + "BossChance": 30, "BossDifficult": "normal", "BossEscortAmount": "2,2,2,2,3", "BossEscortDifficult": "normal", @@ -160,7 +160,7 @@ "TriggerName": "interactObject" }, { - "BossChance": 25, + "BossChance": 30, "BossDifficult": "normal", "BossEscortAmount": "2,2,2,2,3", "BossEscortDifficult": "normal", @@ -363,11 +363,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -410,11 +410,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -6672,6 +6672,10 @@ { "TemplateId": "675aaa003107dac10006332f", "Value": 2 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 } ], "sav_summon_seconds": 60, @@ -6731,6 +6735,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6747,6 +6752,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6763,6 +6769,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6779,22 +6786,24 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" ], - "SpawnPoints": "", + "SpawnPoints": "ZoneSubStorage", "WildSpawnType": "assault", "isPlayers": false, "number": 4, "slots_max": 3, "slots_min": 1, - "time_max": 300, - "time_min": 100 + "time_max": -1, + "time_min": -1 }, { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6811,6 +6820,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6827,6 +6837,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6843,6 +6854,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6859,6 +6871,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6875,6 +6888,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6891,6 +6905,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6907,22 +6922,24 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ "regular", "pve" ], - "SpawnPoints": "", + "SpawnPoints": "ZoneBarrack", "WildSpawnType": "assault", "isPlayers": false, "number": 12, "slots_max": 3, "slots_min": 1, - "time_max": 1400, - "time_min": 900 + "time_max": -1, + "time_min": -1 }, { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6939,6 +6956,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -6955,6 +6973,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/base.json index 0a36583b..607749fa 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/base.json @@ -18,7 +18,29 @@ "Area": 0, "AveragePlayTime": 35, "AveragePlayerLevel": 40, - "Banners": [], + "Banners": [ + { + "id": "67d1ac822b87c1a5a30e5ae8", + "pic": { + "path": "CONTENT/banners/banner_Sandbox.jpg", + "rcid": "" + } + }, + { + "id": "63a9c1f5662a5b0a2c7fbde5", + "pic": { + "path": "CONTENT/banners/banner_City_final.jpg", + "rcid": "" + } + }, + { + "id": "64c0acf85174e095610734a0", + "pic": { + "path": "CONTENT/banners/banner_sherpa.jpg", + "rcid": "" + } + } + ], "BossLocationSpawn": [ { "BossChance": 30, @@ -228,11 +250,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "marksman" }, { @@ -275,11 +297,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 70, + "EnemyChance": 100, "Role": "marksman" }, { @@ -311,7 +333,7 @@ "DistToActivatePvE": 260, "DistToSleep": 300, "DistToSleepPvE": 300, - "FogVisibilityDistanceCoef": -1.6, + "FogVisibilityDistanceCoef": 0, "FogVisibilitySpeedCoef": 0, "GainSight": 1, "LockSpawnCheckRadius": 150, @@ -324,7 +346,7 @@ "MaxExfiltrationTime": 1500, "MinExfiltrationTime": 1200, "NonWaveSpawnBotsLimitPerPlayer": 10, - "NonWaveSpawnBotsLimitPerPlayerPvE": 15, + "NonWaveSpawnBotsLimitPerPlayerPvE": 10, "RainVisibilityDistanceCoef": 0.35, "RainVisibilitySpeedCoef": 0, "Scattering": 1, @@ -6517,6 +6539,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6532,6 +6555,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6547,6 +6571,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6562,6 +6587,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -6577,6 +6603,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/base.json index 648731e8..9e8e2449 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/base.json @@ -71,30 +71,6 @@ "TriggerId": "", "TriggerName": "" }, - { - "BossChance": 30, - "BossDifficult": "normal", - "BossEscortAmount": "0", - "BossEscortDifficult": "normal", - "BossEscortType": "sectantWarrior", - "BossName": "bossPartisan", - "BossPlayer": false, - "BossZone": "", - "Delay": 0, - "DependKarma": true, - "DependKarmaPVE": false, - "ForceSpawn": false, - "IgnoreMaxBots": true, - "RandomTimeSpawn": false, - "SpawnMode": [ - "pve", - "regular" - ], - "Supports": null, - "Time": -1, - "TriggerId": "PARTISAN_TRIGGER", - "TriggerName": "botEvent" - }, { "BossChance": 30, "BossDifficult": "normal", @@ -168,6 +144,30 @@ { "BossChance": 15, "BossDifficult": "normal", + "BossEscortAmount": "0", + "BossEscortDifficult": "normal", + "BossEscortType": "sectantWarrior", + "BossName": "bossPartisan", + "BossPlayer": false, + "BossZone": "", + "Delay": 0, + "DependKarma": true, + "DependKarmaPVE": false, + "ForceSpawn": false, + "IgnoreMaxBots": true, + "RandomTimeSpawn": false, + "SpawnMode": [ + "pve", + "regular" + ], + "Supports": null, + "Time": -1, + "TriggerId": "PARTISAN_TRIGGER", + "TriggerName": "botEvent" + }, + { + "BossChance": 40, + "BossDifficult": "normal", "BossEscortAmount": "3,4", "BossEscortDifficult": "normal", "BossEscortType": "sectantWarrior", @@ -454,11 +454,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -501,11 +501,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -9945,6 +9945,10 @@ { "TemplateId": "675aab0d6b6addc02a08f097", "Value": 2 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 } ], "sav_summon_seconds": 60, @@ -10007,6 +10011,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10022,6 +10027,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10037,6 +10043,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10052,6 +10059,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10067,6 +10075,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10082,6 +10091,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10097,6 +10107,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10112,6 +10123,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10127,6 +10139,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10142,6 +10155,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10157,6 +10171,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10172,6 +10187,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10187,6 +10203,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10202,6 +10219,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10217,10 +10235,12 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], - "SpawnPoints": "", + "SpawnPoints": "ZoneSmuglers", "WildSpawnType": "assault", "isPlayers": false, "number": 15, @@ -10232,6 +10252,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10247,6 +10268,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10262,6 +10284,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10277,6 +10300,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10292,6 +10316,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10307,6 +10332,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10322,6 +10348,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10337,6 +10364,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10352,6 +10380,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10367,6 +10396,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10382,6 +10412,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "pve" ], @@ -10397,8 +10428,10 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "ZoneSanatorium1", "WildSpawnType": "assault", @@ -10412,8 +10445,10 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "ZoneSanatorium2", "WildSpawnType": "assault", diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/base.json index 26fb3cf2..1957a1a3 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/base.json @@ -425,11 +425,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -472,11 +472,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -14161,6 +14161,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14169,14 +14170,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 0, - "slots_max": 4, - "slots_min": 3, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14185,14 +14187,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 1, - "slots_max": 3, - "slots_min": 2, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14201,14 +14204,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 2, - "slots_max": 4, - "slots_min": 3, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14225,6 +14229,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14233,14 +14238,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 4, - "slots_max": 4, - "slots_min": 2, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14257,6 +14263,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14265,14 +14272,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 6, - "slots_max": 3, - "slots_min": 2, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14289,6 +14297,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14305,6 +14314,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14313,7 +14323,7 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 9, - "slots_max": 4, + "slots_max": 1, "slots_min": 1, "time_max": -1, "time_min": -1 @@ -14321,6 +14331,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14329,7 +14340,7 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 10, - "slots_max": 4, + "slots_max": 1, "slots_min": 1, "time_max": -1, "time_min": -1 @@ -14337,6 +14348,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14345,14 +14357,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 11, - "slots_max": 3, - "slots_min": 2, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "SpawnMode": [ "regular", "pve" @@ -14361,8 +14374,8 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 12, - "slots_max": 4, - "slots_min": 2, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 } diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/base.json index eed0e8e1..1e8eeaa9 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/base.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/base.json @@ -50,31 +50,7 @@ ], "BossLocationSpawn": [ { - "BossChance": 30, - "BossDifficult": "normal", - "BossEscortAmount": "0", - "BossEscortDifficult": "normal", - "BossEscortType": "sectantWarrior", - "BossName": "bossPartisan", - "BossPlayer": false, - "BossZone": "", - "Delay": 0, - "DependKarma": true, - "DependKarmaPVE": false, - "ForceSpawn": false, - "IgnoreMaxBots": true, - "RandomTimeSpawn": false, - "SpawnMode": [ - "regular", - "pve" - ], - "Supports": null, - "Time": -1, - "TriggerId": "PARTISAN_TRIGGER", - "TriggerName": "botEvent" - }, - { - "BossChance": 30, + "BossChance": 20, "BossDifficult": "normal", "BossEscortAmount": "2", "BossEscortDifficult": "normal", @@ -146,6 +122,30 @@ { "BossChance": 15, "BossDifficult": "normal", + "BossEscortAmount": "0", + "BossEscortDifficult": "normal", + "BossEscortType": "sectantWarrior", + "BossName": "bossPartisan", + "BossPlayer": false, + "BossZone": "", + "Delay": 0, + "DependKarma": true, + "DependKarmaPVE": false, + "ForceSpawn": false, + "IgnoreMaxBots": true, + "RandomTimeSpawn": false, + "SpawnMode": [ + "regular", + "pve" + ], + "Supports": null, + "Time": -1, + "TriggerId": "PARTISAN_TRIGGER", + "TriggerName": "botEvent" + }, + { + "BossChance": 20, + "BossDifficult": "normal", "BossEscortAmount": "4", "BossEscortDifficult": "normal", "BossEscortType": "sectantWarrior", @@ -337,9 +337,19 @@ "BossName": "arenaFighterEvent", "BossPlayer": false, "BossZone": "ZoneMiniHouse,ZoneClearVill,ZoneRoad,ZoneBrokenVill,ZoneScavBase2", + "Delay": 0, + "DependKarma": false, + "DependKarmaPVE": false, + "ForceSpawn": false, + "IgnoreMaxBots": true, "RandomTimeSpawn": false, - "Supports": [], - "Time": -1 + "SpawnMode": [ + "pve" + ], + "Supports": null, + "Time": -1, + "TriggerId": "", + "TriggerName": "" } ], "BotAssault": 80, @@ -375,11 +385,11 @@ "BotRole": "pmcBEAR", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -422,11 +432,11 @@ "BotRole": "pmcUSEC", "ChancedEnemies": [ { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "assault" }, { - "EnemyChance": 80, + "EnemyChance": 100, "Role": "marksman" }, { @@ -790,7 +800,7 @@ "y": 0, "z": 0 }, - "Radius": 55 + "Radius": 70 } }, "CorePointId": 0, @@ -1009,7 +1019,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "0629d023-ea80-45cb-8376-9ea211e740f9", - "Infiltration": "Old Station", + "Infiltration": "House", "Position": { "x": -63.1000061, "y": 9.763999, @@ -1675,7 +1685,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "191b6c5a-0fb7-40b2-95b4-3a33397eb872", - "Infiltration": "Old Station", + "Infiltration": "House", "Position": { "x": -54.1099854, "y": 8.883999, @@ -3315,7 +3325,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "43598be9-9042-4e06-8ee9-11a3d346d570", - "Infiltration": "Old Station", + "Infiltration": "House", "Position": { "x": -63.6699829, "y": 9.714, @@ -7538,7 +7548,7 @@ "y": 0, "z": 0 }, - "Radius": 55 + "Radius": 70 } }, "CorePointId": 0, @@ -7719,7 +7729,7 @@ "y": 0, "z": 0 }, - "Radius": 55 + "Radius": 70 } }, "CorePointId": 0, @@ -8543,7 +8553,7 @@ "y": 0, "z": 0 }, - "Radius": 55 + "Radius": 70 } }, "CorePointId": 0, @@ -8609,7 +8619,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "ceb25518-5a40-42cd-b57d-076d40d29890", - "Infiltration": "Old Station", + "Infiltration": "House", "Position": { "x": -60.97, "y": 9.24399948, @@ -9033,7 +9043,7 @@ "CorePointId": 0, "DelayToCanSpawnSec": 4, "Id": "da22cead-d753-44c4-b44e-131a3d9690b7", - "Infiltration": "Old Station", + "Infiltration": "House", "Position": { "x": -59.6399841, "y": 9.093999, @@ -10400,7 +10410,7 @@ "y": 0, "z": 0 }, - "Radius": 55 + "Radius": 70 } }, "CorePointId": 0, @@ -10735,7 +10745,7 @@ "y": 0, "z": 0 }, - "Radius": 40 + "Radius": 80 } }, "CorePointId": 7, @@ -11183,6 +11193,10 @@ { "TemplateId": "675aaa9a3107dac100063331", "Value": 2 + }, + { + "TemplateId": "676bf44c5539167c3603e869", + "Value": 0 } ], "sav_summon_seconds": 60, @@ -11254,6 +11268,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11262,7 +11277,7 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 0, - "slots_max": 3, + "slots_max": 1, "slots_min": 1, "time_max": -1, "time_min": -1 @@ -11270,6 +11285,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11278,7 +11294,7 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 1, - "slots_max": 3, + "slots_max": 1, "slots_min": 1, "time_max": -1, "time_min": -1 @@ -11286,22 +11302,25 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": true, "OpenZones": "", "SpawnMode": [ - "pve" + "pve", + "regular" ], "SpawnPoints": "ZoneScavBase2", "WildSpawnType": "assault", "isPlayers": false, "number": 2, - "slots_max": 3, - "slots_min": 1, + "slots_max": 2, + "slots_min": 0, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11318,6 +11337,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11334,6 +11354,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11350,6 +11371,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11366,6 +11388,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11382,6 +11405,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11398,6 +11422,7 @@ { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11414,6 +11439,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11430,6 +11456,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11446,6 +11473,7 @@ { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11462,6 +11490,7 @@ { "BotPreset": "easy", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11470,14 +11499,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 0, - "slots_max": 3, - "slots_min": 0, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "normal", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" @@ -11486,14 +11516,15 @@ "WildSpawnType": "assault", "isPlayers": false, "number": 0, - "slots_max": 3, - "slots_min": 0, + "slots_max": 1, + "slots_min": 1, "time_max": -1, "time_min": -1 }, { "BotPreset": "hard", "BotSide": "Savage", + "KeepZoneOnSpawn": false, "OpenZones": "", "SpawnMode": [ "pve" diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs index 58f73ba6..042a5a5c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs @@ -1955,6 +1955,13 @@ public record Wave set; } + [JsonPropertyName("KeepZoneOnSpawn")] + public bool? KeepZoneOnSpawn + { + get; + set; + } + [JsonPropertyName("SpawnPoints")] public string? SpawnPoints {