470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate PMCs (sptBear/sptUsec) To Bsg Types (pmcBEAR/pmcUSEC) (!360)

Browse Source 
Co-authored-by: Dev <dev@dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/360
This commit is contained in:
chomp 2024-06-06 16:59:44 +00:00
parent 75b2661f72
commit b3b1f76a77
12 changed files with 167 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
project/assets/configs/bot.json
View File

@ -1,6 +1,6 @@
{ {
"presetBatch": { "presetBatch": {
"assault": 50, "assault": 45,
"bossBully": 5, "bossBully": 5,
"bossGluhar": 5, "bossGluhar": 5,
"bossKilla": 5, "bossKilla": 5,
@ -45,8 +45,8 @@
"peacefullZryachiyEvent": 5, "peacefullZryachiyEvent": 5,
"ravangeZryachiyEvent": 5, "ravangeZryachiyEvent": 5,
"sectactPriestEvent": 10, "sectactPriestEvent": 10,
"sptUsec": 15, "pmcUSEC": 15,
"sptBear": 15 "pmcBEAR": 15
}, },
"bosses": [ "bosses": [
"bossbully", "bossbully",
@ -276,8 +276,8 @@
"chanceAssaultScavHasPlayerScavName": 10, "chanceAssaultScavHasPlayerScavName": 10,
"secureContainerAmmoStackCount": 20, "secureContainerAmmoStackCount": 20,
"botRolesWithDogTags": [ "botRolesWithDogTags": [
"sptbear", "pmcbear",
"sptusec" "pmcusec"
], ],
"revenge": { "revenge": {
"assault": [ "assault": [

272
project/assets/configs/location.json
View File

@ -43,19 +43,19 @@
"boss": { "boss": {
"factory4_day": [ "factory4_day": [
{ {
"sptId": "sptBearFactoryDayBossSpawn", "sptId": "pmcBEARFactoryDayBossSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 25, "BossChance": 25,
"BossZone": "BotZone", "BossZone": "BotZone",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -66,19 +66,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecFactoryDayBossSpawn", "sptId": "pmcUSECFactoryDayBossSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 25, "BossChance": 25,
"BossZone": "BotZone", "BossZone": "BotZone",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -91,19 +91,19 @@
], ],
"bigmap": [ "bigmap": [
{ {
"sptId": "sptBearCustomsScavBaseNormalSpawn", "sptId": "pmcBEARCustomsScavBaseNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 25, "BossChance": 25,
"BossZone": "ZoneScavBase", "BossZone": "ZoneScavBase",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -114,19 +114,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecCustomsScavBaseNormalSpawn", "sptId": "pmcUSECCustomsScavBaseNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 25, "BossChance": 25,
"BossZone": "ZoneScavBase", "BossZone": "ZoneScavBase",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -139,19 +139,19 @@
], ],
"woods": [ "woods": [
{ {
"sptId": "sptBearWoodScavBaseNormalSpawn", "sptId": "pmcBEARWoodScavBaseNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 25, "BossChance": 25,
"BossZone": "ZoneScavBase2", "BossZone": "ZoneScavBase2",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -162,19 +162,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecWoodScavBaseNormalSpawn", "sptId": "pmcUSECWoodScavBaseNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 25, "BossChance": 25,
"BossZone": "ZoneScavBase2", "BossZone": "ZoneScavBase2",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -185,19 +185,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptBearWoodRoadNormalSpawn", "sptId": "pmcBEARWoodRoadNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 25, "BossChance": 25,
"BossZone": "ZoneRoad", "BossZone": "ZoneRoad",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -208,19 +208,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecWoodRoadNormalSpawn", "sptId": "pmcUSECWoodRoadNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 25, "BossChance": 25,
"BossZone": "ZoneRoad", "BossZone": "ZoneRoad",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -231,19 +231,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptBearWoodVillageNormalSpawn", "sptId": "pmcBEARWoodVillageNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 25, "BossChance": 25,
"BossZone": "ZoneClearVill", "BossZone": "ZoneClearVill",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -254,19 +254,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecWoodVillageNormalSpawn", "sptId": "pmcUSECWoodVillageNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 25, "BossChance": 25,
"BossZone": "ZoneClearVill", "BossZone": "ZoneClearVill",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -279,19 +279,19 @@
], ],
"shoreline": [ "shoreline": [
{ {
"sptId": "sptBearShorelinePortNormalSpawn", "sptId": "pmcBEARShorelinePortNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 20, "BossChance": 20,
"BossZone": "ZonePort", "BossZone": "ZonePort",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -302,19 +302,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecShorelinePortNormalSpawn", "sptId": "pmcUSECShorelinePortNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 20, "BossChance": 20,
"BossZone": "ZonePort", "BossZone": "ZonePort",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -325,19 +325,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecShorelineSanatorium1NormalSpawn", "sptId": "pmcUSECShorelineSanatorium1NormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 10, "BossChance": 10,
"BossZone": "ZoneSanatorium1", "BossZone": "ZoneSanatorium1",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -348,19 +348,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptBearShorelineSanatorium1NormalSpawn", "sptId": "pmcBEARShorelineSanatorium1NormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 10, "BossChance": 10,
"BossZone": "ZoneSanatorium1", "BossZone": "ZoneSanatorium1",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -371,19 +371,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecShorelineSanatorium2NormalSpawn", "sptId": "pmcUSECShorelineSanatorium2NormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 10, "BossChance": 10,
"BossZone": "ZoneSanatorium2", "BossZone": "ZoneSanatorium2",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -394,19 +394,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptBearShorelineSanatorium2NormalSpawn", "sptId": "pmcBEARShorelineSanatorium2NormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 10, "BossChance": 10,
"BossZone": "ZoneSanatorium2", "BossZone": "ZoneSanatorium2",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -419,19 +419,19 @@
], ],
"laboratory": [ "laboratory": [
{ {
"sptId": "sptBearLabsZoneFloor1NormalSpawn", "sptId": "pmcBEARLabsZoneFloor1NormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 30, "BossChance": 30,
"BossZone": "BotZoneFloor1", "BossZone": "BotZoneFloor1",
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossPlayer": false, "BossPlayer": false,
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -442,19 +442,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptBearLabsZoneFloor2NormalSpawn", "sptId": "pmcBEARLabsZoneFloor2NormalSpawn",
"BossChance": 30, "BossChance": 30,
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossZone": "BotZoneFloor2", "BossZone": "BotZoneFloor2",
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossPlayer": false, "BossPlayer": false,
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -465,19 +465,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptBearLabsZoneBasementNormalSpawn", "sptId": "pmcBEARLabsZoneBasementNormalSpawn",
"BossChance": 30, "BossChance": 30,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortAmount": "0", "BossEscortAmount": "0",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossPlayer": false, "BossPlayer": false,
"BossZone": "BotZoneBasement", "BossZone": "BotZoneBasement",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -488,19 +488,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecLabsZoneFloor1NormalSpawn", "sptId": "pmcUSECLabsZoneFloor1NormalSpawn",
"BossChance": 30, "BossChance": 30,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossPlayer": false, "BossPlayer": false,
"BossZone": "BotZoneFloor1", "BossZone": "BotZoneFloor1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -511,19 +511,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecLabsZoneFloor2NormalSpawn", "sptId": "pmcUSECLabsZoneFloor2NormalSpawn",
"BossChance": 30, "BossChance": 30,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossPlayer": false, "BossPlayer": false,
"BossZone": "BotZoneFloor2", "BossZone": "BotZoneFloor2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -534,19 +534,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecLabsZoneBasementNormalSpawn", "sptId": "pmcUSECLabsZoneBasementNormalSpawn",
"BossChance": 30, "BossChance": 30,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortAmount": "0", "BossEscortAmount": "0",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossPlayer": false, "BossPlayer": false,
"BossZone": "BotZoneBasement", "BossZone": "BotZoneBasement",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -559,19 +559,19 @@
], ],
"interchange": [ "interchange": [
{ {
"sptId": "sptBearInterchangeNormalSpawn", "sptId": "pmcBEARInterchangeNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 15, "BossChance": 15,
"BossZone": "ZoneCenter,ZoneCenterBot,ZoneOLI,ZoneIDEA,ZoneGoshan,ZonePowerStation", "BossZone": "ZoneCenter,ZoneCenterBot,ZoneOLI,ZoneIDEA,ZoneGoshan,ZonePowerStation",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -582,19 +582,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecInterchangeNormalSpawn", "sptId": "pmcUSECInterchangeNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 15, "BossChance": 15,
"BossZone": "ZoneCenter,ZoneCenterBot,ZoneOLI,ZoneIDEA,ZoneGoshan,ZonePowerStation", "BossZone": "ZoneCenter,ZoneCenterBot,ZoneOLI,ZoneIDEA,ZoneGoshan,ZonePowerStation",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -607,19 +607,19 @@
], ],
"lighthouse": [ "lighthouse": [
{ {
"sptId": "sptBearLighthouseNormalSpawn", "sptId": "pmcBEARLighthouseNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 15, "BossChance": 15,
"BossZone": "Zone_Village,Zone_Chalet,Zone_DestroyedHouse,Zone_Rocks,Zone_OldHouse", "BossZone": "Zone_Village,Zone_Chalet,Zone_DestroyedHouse,Zone_Rocks,Zone_OldHouse",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -630,19 +630,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecLighthouseNormalSpawn", "sptId": "pmcUSECLighthouseNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 15, "BossChance": 15,
"BossZone": "Zone_Village,Zone_Chalet,Zone_DestroyedHouse,Zone_Rocks,Zone_OldHouse", "BossZone": "Zone_Village,Zone_Chalet,Zone_DestroyedHouse,Zone_Rocks,Zone_OldHouse",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -655,19 +655,19 @@
], ],
"rezervbase": [ "rezervbase": [
{ {
"sptId": "sptBearReserveNormalSpawnA", "sptId": "pmcBEARReserveNormalSpawnA",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 15, "BossChance": 15,
"BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage", "BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -678,19 +678,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptBearReserveNormalSpawnB", "sptId": "pmcBEARReserveNormalSpawnB",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 15, "BossChance": 15,
"BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage", "BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -701,19 +701,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecReserveNormalSpawnA", "sptId": "pmcUSECReserveNormalSpawnA",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 15, "BossChance": 15,
"BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage", "BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -724,19 +724,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecReserveNormalSpawnB", "sptId": "pmcUSECReserveNormalSpawnB",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 15, "BossChance": 15,
"BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage", "BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "1", "BossEscortAmount": "1",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -749,19 +749,19 @@
], ],
"sandbox": [ "sandbox": [
{ {
"sptId": "sptBearSandboxNormalSpawn", "sptId": "pmcBEARSandboxNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 30, "BossChance": 30,
"BossZone": "ZoneSandbox", "BossZone": "ZoneSandbox",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -772,19 +772,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecSandboxNormalSpawn", "sptId": "pmcUSECSandboxNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 30, "BossChance": 30,
"BossZone": "ZoneSandbox", "BossZone": "ZoneSandbox",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -797,19 +797,19 @@
], ],
"sandbox_high": [ "sandbox_high": [
{ {
"sptId": "sptBearSandboxNormalSpawn", "sptId": "pmcBEARSandboxNormalSpawn",
"BossName": "sptBear", "BossName": "pmcBEAR",
"BossChance": 30, "BossChance": 30,
"BossZone": "ZoneSandbox", "BossZone": "ZoneSandbox",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptBear", "BossEscortType": "pmcBEAR",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],
@ -820,19 +820,19 @@
"ChanceGroup": 0 "ChanceGroup": 0
}, },
{ {
"sptId": "sptUsecSandboxNormalSpawn", "sptId": "pmcUSECSandboxNormalSpawn",
"BossName": "sptUsec", "BossName": "pmcUSEC",
"BossChance": 30, "BossChance": 30,
"BossZone": "ZoneSandbox", "BossZone": "ZoneSandbox",
"BossPlayer": false, "BossPlayer": false,
"BossDifficult": "normal", "BossDifficult": "normal",
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": "normal", "BossEscortDifficult": "normal",
"BossEscortAmount": "2", "BossEscortAmount": "2",
"Time": -1, "Time": -1,
"Supports": [ "Supports": [
{ {
"BossEscortType": "sptUsec", "BossEscortType": "pmcUSEC",
"BossEscortDifficult": [ "BossEscortDifficult": [
"normal" "normal"
], ],

8
project/assets/configs/pmc.json
View File

@ -175,7 +175,7 @@
"chanceSameSideIsHostilePercent": 90, "chanceSameSideIsHostilePercent": 90,
"_pmcType": "Controls what bot brain can be chosen for each PMC bot type, the number is the weighting to be picked", "_pmcType": "Controls what bot brain can be chosen for each PMC bot type, the number is the weighting to be picked",
"pmcType": { "pmcType": {
"sptbear": { "pmcbear": {
"factory4_day": { "factory4_day": {
"bossKilla": 2, "bossKilla": 2,
"bossKnight": 2, "bossKnight": 2,
@ -422,7 +422,7 @@
"pmcBot": 7 "pmcBot": 7
} }
}, },
"sptusec": { "pmcusec": {
"factory4_day": { "factory4_day": {
"bossKilla": 2, "bossKilla": 2,
"bossKnight": 2, "bossKnight": 2,
@ -670,8 +670,8 @@
} }
} }
}, },
"usecType": "sptUsec", "usecType": "pmcUSEC",
"bearType": "sptBear", "bearType": "pmcBEAR",
"looseWeaponInBackpackChancePercent": 15, "looseWeaponInBackpackChancePercent": 15,
"weaponHasEnhancementChancePercent": 5, "weaponHasEnhancementChancePercent": 5,
"looseWeaponInBackpackLootMinMax": { "looseWeaponInBackpackLootMinMax": {

4
project/src/controllers/BotController.ts
View File

@ -151,7 +151,7 @@ export class BotController
for (let botType of botTypes) for (let botType of botTypes)
{ {
const enumType = botType.toLowerCase(); const enumType = botType.toLowerCase();
// sptBear/sptUsec need to be converted into `usec`/`bear` so we can read difficulty settings from bots/types // pmcBEAR/pmcUSEC need to be converted into `usec`/`bear` so we can read difficulty settings from bots/types
botType = this.botHelper.isBotPmc(botType) botType = this.botHelper.isBotPmc(botType)
? this.botHelper.getPmcSideByRole(botType).toLowerCase() ? this.botHelper.getPmcSideByRole(botType).toLowerCase()
: botType.toLowerCase(); : botType.toLowerCase();
@ -315,7 +315,7 @@ export class BotController
} }
// Custom map waves can have spt roles in them // Custom map waves can have spt roles in them
// Is bot type sptusec/sptbear, set is pmc true and set side // Is bot type pmcUSEC/pmcBEAR, set is pmc true and set side
if (this.botHelper.botRoleIsPmc(condition.Role)) if (this.botHelper.botRoleIsPmc(condition.Role))
{ {
botGenerationDetails.isPmc = true; botGenerationDetails.isPmc = true;

4
project/src/controllers/InraidController.ts
View File

@ -248,8 +248,8 @@ export class InraidController
} }
} }
const victims = postRaidRequest.profile.Stats.Eft.Victims.filter((x) => const victims = postRaidRequest.profile.Stats.Eft.Victims.filter((victim) =>
["sptbear", "sptusec"].includes(x.Role.toLowerCase()), ["pmcbear", "pmcusec"].includes(victim.Role.toLowerCase()),
); );
if (victims?.length > 0) if (victims?.length > 0)
{ {

2
project/src/generators/BotLootGenerator.ts
View File

@ -360,7 +360,7 @@ export class BotLootGenerator
/** /**
* Force healing items onto bot to ensure they can heal in-raid * Force healing items onto bot to ensure they can heal in-raid
* @param botInventory Inventory to add items to * @param botInventory Inventory to add items to
* @param botRole Role of bot (sptBear/sptUsec) * @param botRole Role of bot (pmcBEAR/pmcUSEC)
*/ */
protected addForcedMedicalItemsToPmcSecure(botInventory: PmcInventory, botRole: string): void protected addForcedMedicalItemsToPmcSecure(botInventory: PmcInventory, botRole: string): void
{ {

6
project/src/generators/PMCLootGenerator.ts
View File

@ -48,7 +48,7 @@ export class PMCLootGenerator
{ {
const items = this.databaseService.getItems(); const items = this.databaseService.getItems();
const pmcPriceOverrides const pmcPriceOverrides
= this.databaseService.getBots().types[botRole === "sptBear" ? "bear" : "usec"].inventory.items = this.databaseService.getBots().types[botRole === "pmcBEAR" ? "bear" : "usec"].inventory.items
.Pockets; .Pockets;
const allowedItemTypes = this.pmcConfig.pocketLoot.whitelist; const allowedItemTypes = this.pmcConfig.pocketLoot.whitelist;
@ -108,7 +108,7 @@ export class PMCLootGenerator
{ {
const items = this.databaseService.getItems(); const items = this.databaseService.getItems();
const pmcPriceOverrides const pmcPriceOverrides
= this.databaseService.getBots().types[botRole === "sptBear" ? "bear" : "usec"].inventory.items = this.databaseService.getBots().types[botRole === "pmcBEAR" ? "bear" : "usec"].inventory.items
.TacticalVest; .TacticalVest;
const allowedItemTypes = this.pmcConfig.vestLoot.whitelist; const allowedItemTypes = this.pmcConfig.vestLoot.whitelist;
@ -178,7 +178,7 @@ export class PMCLootGenerator
{ {
const items = this.databaseService.getItems(); const items = this.databaseService.getItems();
const pmcPriceOverrides const pmcPriceOverrides
= this.databaseService.getBots().types[botRole === "sptBear" ? "bear" : "usec"].inventory.items = this.databaseService.getBots().types[botRole === "pmcBEAR" ? "bear" : "usec"].inventory.items
.Backpack; .Backpack;
const allowedItemTypes = this.pmcConfig.backpackLoot.whitelist; const allowedItemTypes = this.pmcConfig.backpackLoot.whitelist;

4
project/src/helpers/BotDifficultyHelper.ts
View File

@ -32,8 +32,8 @@ export class BotDifficultyHelper
* Get a difficulty object modified to handle fighting other PMCs * Get a difficulty object modified to handle fighting other PMCs
* @param pmcType 'bear or 'usec' * @param pmcType 'bear or 'usec'
* @param difficulty easy / normal / hard / impossible * @param difficulty easy / normal / hard / impossible
* @param usecType sptUsec * @param usecType pmcUSEC
* @param bearType sptBear * @param bearType pmcBEAR
* @returns Difficulty object * @returns Difficulty object
*/ */
public getPmcDifficultySettings( public getPmcDifficultySettings(

6
project/src/helpers/BotHelper.ts
View File

@ -43,7 +43,7 @@ export class BotHelper
*/ */
public isBotPmc(botRole: string): boolean public isBotPmc(botRole: string): boolean
{ {
return ["usec", "bear", "pmc", "sptbear", "sptusec"].includes(botRole?.toLowerCase()); return ["usec", "bear", "pmc", "pmcbear", "pmcusec"].includes(botRole?.toLowerCase());
} }
public isBotBoss(botRole: string): boolean public isBotBoss(botRole: string): boolean
@ -167,7 +167,7 @@ export class BotHelper
} }
/** /**
* Choose between sptBear and sptUsec at random based on the % defined in pmcConfig.isUsec * Choose between pmcBEAR and pmcUSEC at random based on the % defined in pmcConfig.isUsec
* @returns pmc role * @returns pmc role
*/ */
public getRandomizedPmcRole(): string public getRandomizedPmcRole(): string
@ -176,7 +176,7 @@ export class BotHelper
} }
/** /**
* Get the corresponding side when sptBear or sptUsec is passed in * Get the corresponding side when pmcBEAR or pmcUSEC is passed in
* @param botRole role to get side for * @param botRole role to get side for
* @returns side (usec/bear) * @returns side (usec/bear)
*/ */

6
project/src/models/spt/config/IBotConfig.ts
View File

@ -8,7 +8,7 @@ export interface IBotConfig extends IBaseConfig
kind: "spt-bot" kind: "spt-bot"
/** How many variants of each bot should be generated on raid start */ /** How many variants of each bot should be generated on raid start */
presetBatch: PresetBatch presetBatch: PresetBatch
/** Bot roles that should not have PMC types (sptBear/sptUsec) added as enemies to */ /** Bot roles that should not have PMC types (pmcBEAR/pmcUSEC) added as enemies to */
botsToNotAddPMCsAsEnemiesTo: string[] botsToNotAddPMCsAsEnemiesTo: string[]
/** What bot types should be classified as bosses */ /** What bot types should be classified as bosses */
bosses: string[] bosses: string[]
@ -84,8 +84,8 @@ export interface PresetBatch
crazyAssaultEvent: number crazyAssaultEvent: number
bossBoar: number bossBoar: number
bossBoarSniper: number bossBoarSniper: number
sptUsec: number pmcUSEC: number
sptBear: number pmcBEAR: number
} }
export interface IWalletLootSettings export interface IWalletLootSettings

2
project/src/services/PmcChatResponseService.ts
View File

@ -92,7 +92,7 @@ export class PmcChatResponseService
} }
// If kill was not a PMC, skip // If kill was not a PMC, skip
if (!["sptUsec", "sptBear"].includes(killerDetailsInCache.Info.Settings.Role)) if (!["pmcUSEC", "pmcBEAR"].includes(killerDetailsInCache.Info.Settings.Role))
{ {
return; return;
} }

10
project/tests/helpers/BotHelper.test.ts
View File

@ -27,7 +27,7 @@ describe("BotHelper", () =>
it("should return true when uppercase PMC role is provided", () => it("should return true when uppercase PMC role is provided", () =>
{ {
const result = botHelper.isBotPmc("SPTBEAR"); const result = botHelper.isBotPmc("pmcBEAR");
expect(result).toBe(true); expect(result).toBe(true);
}); });
@ -91,15 +91,15 @@ describe("BotHelper", () =>
describe("getPmcSideByRole", () => describe("getPmcSideByRole", () =>
{ {
it("should return `Bear` when sptBear role is provided", () => it("should return `Bear` when pmcBEAR role is provided", () =>
{ {
const result = botHelper.getPmcSideByRole("sptBear"); const result = botHelper.getPmcSideByRole("pmcBEAR");
expect(result).toBe("Bear"); expect(result).toBe("Bear");
}); });
it("should return `Usec` when sptBear role is provided", () => it("should return `Usec` when pmcUSEC role is provided", () =>
{ {
const result = botHelper.getPmcSideByRole("sptUsec"); const result = botHelper.getPmcSideByRole("pmcUSEC");
expect(result).toBe("Usec"); expect(result).toBe("Usec");
}); });