From b3b1f76a77d2169ab64856292ded6a9ddf7e7c83 Mon Sep 17 00:00:00 2001 From: chomp Date: Thu, 6 Jun 2024 16:59:44 +0000 Subject: [PATCH] Migrate PMCs (sptBear/sptUsec) To Bsg Types (pmcBEAR/pmcUSEC) (!360) Co-authored-by: Dev Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/360 --- project/assets/configs/bot.json | 10 +- project/assets/configs/location.json | 272 +++++++++--------- project/assets/configs/pmc.json | 8 +- project/src/controllers/BotController.ts | 4 +- project/src/controllers/InraidController.ts | 4 +- project/src/generators/BotLootGenerator.ts | 2 +- project/src/generators/PMCLootGenerator.ts | 6 +- project/src/helpers/BotDifficultyHelper.ts | 4 +- project/src/helpers/BotHelper.ts | 6 +- project/src/models/spt/config/IBotConfig.ts | 6 +- .../src/services/PmcChatResponseService.ts | 2 +- project/tests/helpers/BotHelper.test.ts | 10 +- 12 files changed, 167 insertions(+), 167 deletions(-) diff --git a/project/assets/configs/bot.json b/project/assets/configs/bot.json index 5ca6f9d4..ff7a64fe 100644 --- a/project/assets/configs/bot.json +++ b/project/assets/configs/bot.json @@ -1,6 +1,6 @@ { "presetBatch": { - "assault": 50, + "assault": 45, "bossBully": 5, "bossGluhar": 5, "bossKilla": 5, @@ -45,8 +45,8 @@ "peacefullZryachiyEvent": 5, "ravangeZryachiyEvent": 5, "sectactPriestEvent": 10, - "sptUsec": 15, - "sptBear": 15 + "pmcUSEC": 15, + "pmcBEAR": 15 }, "bosses": [ "bossbully", @@ -276,8 +276,8 @@ "chanceAssaultScavHasPlayerScavName": 10, "secureContainerAmmoStackCount": 20, "botRolesWithDogTags": [ - "sptbear", - "sptusec" + "pmcbear", + "pmcusec" ], "revenge": { "assault": [ diff --git a/project/assets/configs/location.json b/project/assets/configs/location.json index 726c720c..e1fefd89 100644 --- a/project/assets/configs/location.json +++ b/project/assets/configs/location.json @@ -43,19 +43,19 @@ "boss": { "factory4_day": [ { - "sptId": "sptBearFactoryDayBossSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARFactoryDayBossSpawn", + "BossName": "pmcBEAR", "BossChance": 25, "BossZone": "BotZone", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -66,19 +66,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecFactoryDayBossSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECFactoryDayBossSpawn", + "BossName": "pmcUSEC", "BossChance": 25, "BossZone": "BotZone", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -91,19 +91,19 @@ ], "bigmap": [ { - "sptId": "sptBearCustomsScavBaseNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARCustomsScavBaseNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 25, "BossZone": "ZoneScavBase", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -114,19 +114,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecCustomsScavBaseNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECCustomsScavBaseNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 25, "BossZone": "ZoneScavBase", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -139,19 +139,19 @@ ], "woods": [ { - "sptId": "sptBearWoodScavBaseNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARWoodScavBaseNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 25, "BossZone": "ZoneScavBase2", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -162,19 +162,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecWoodScavBaseNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECWoodScavBaseNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 25, "BossZone": "ZoneScavBase2", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -185,19 +185,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptBearWoodRoadNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARWoodRoadNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 25, "BossZone": "ZoneRoad", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -208,19 +208,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecWoodRoadNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECWoodRoadNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 25, "BossZone": "ZoneRoad", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -231,19 +231,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptBearWoodVillageNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARWoodVillageNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 25, "BossZone": "ZoneClearVill", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -254,19 +254,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecWoodVillageNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECWoodVillageNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 25, "BossZone": "ZoneClearVill", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -279,19 +279,19 @@ ], "shoreline": [ { - "sptId": "sptBearShorelinePortNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARShorelinePortNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 20, "BossZone": "ZonePort", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -302,19 +302,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecShorelinePortNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECShorelinePortNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 20, "BossZone": "ZonePort", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -325,19 +325,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecShorelineSanatorium1NormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECShorelineSanatorium1NormalSpawn", + "BossName": "pmcUSEC", "BossChance": 10, "BossZone": "ZoneSanatorium1", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -348,19 +348,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptBearShorelineSanatorium1NormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARShorelineSanatorium1NormalSpawn", + "BossName": "pmcBEAR", "BossChance": 10, "BossZone": "ZoneSanatorium1", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -371,19 +371,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecShorelineSanatorium2NormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECShorelineSanatorium2NormalSpawn", + "BossName": "pmcUSEC", "BossChance": 10, "BossZone": "ZoneSanatorium2", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -394,19 +394,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptBearShorelineSanatorium2NormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARShorelineSanatorium2NormalSpawn", + "BossName": "pmcBEAR", "BossChance": 10, "BossZone": "ZoneSanatorium2", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -419,19 +419,19 @@ ], "laboratory": [ { - "sptId": "sptBearLabsZoneFloor1NormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARLabsZoneFloor1NormalSpawn", + "BossName": "pmcBEAR", "BossChance": 30, "BossZone": "BotZoneFloor1", "BossDifficult": "normal", "BossEscortAmount": "1", "BossEscortDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossPlayer": false, "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -442,19 +442,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptBearLabsZoneFloor2NormalSpawn", + "sptId": "pmcBEARLabsZoneFloor2NormalSpawn", "BossChance": 30, - "BossName": "sptBear", + "BossName": "pmcBEAR", "BossZone": "BotZoneFloor2", "BossDifficult": "normal", "BossEscortAmount": "1", "BossEscortDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossPlayer": false, "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -465,19 +465,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptBearLabsZoneBasementNormalSpawn", + "sptId": "pmcBEARLabsZoneBasementNormalSpawn", "BossChance": 30, "BossDifficult": "normal", "BossEscortAmount": "0", "BossEscortDifficult": "normal", - "BossEscortType": "sptBear", - "BossName": "sptBear", + "BossEscortType": "pmcBEAR", + "BossName": "pmcBEAR", "BossPlayer": false, "BossZone": "BotZoneBasement", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -488,19 +488,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecLabsZoneFloor1NormalSpawn", + "sptId": "pmcUSECLabsZoneFloor1NormalSpawn", "BossChance": 30, "BossDifficult": "normal", "BossEscortAmount": "1", "BossEscortDifficult": "normal", - "BossEscortType": "sptUsec", - "BossName": "sptUsec", + "BossEscortType": "pmcUSEC", + "BossName": "pmcUSEC", "BossPlayer": false, "BossZone": "BotZoneFloor1", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -511,19 +511,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecLabsZoneFloor2NormalSpawn", + "sptId": "pmcUSECLabsZoneFloor2NormalSpawn", "BossChance": 30, "BossDifficult": "normal", "BossEscortAmount": "1", "BossEscortDifficult": "normal", - "BossEscortType": "sptUsec", - "BossName": "sptUsec", + "BossEscortType": "pmcUSEC", + "BossName": "pmcUSEC", "BossPlayer": false, "BossZone": "BotZoneFloor2", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -534,19 +534,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecLabsZoneBasementNormalSpawn", + "sptId": "pmcUSECLabsZoneBasementNormalSpawn", "BossChance": 30, "BossDifficult": "normal", "BossEscortAmount": "0", "BossEscortDifficult": "normal", - "BossEscortType": "sptUsec", - "BossName": "sptUsec", + "BossEscortType": "pmcUSEC", + "BossName": "pmcUSEC", "BossPlayer": false, "BossZone": "BotZoneBasement", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -559,19 +559,19 @@ ], "interchange": [ { - "sptId": "sptBearInterchangeNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARInterchangeNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 15, "BossZone": "ZoneCenter,ZoneCenterBot,ZoneOLI,ZoneIDEA,ZoneGoshan,ZonePowerStation", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -582,19 +582,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecInterchangeNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECInterchangeNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 15, "BossZone": "ZoneCenter,ZoneCenterBot,ZoneOLI,ZoneIDEA,ZoneGoshan,ZonePowerStation", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -607,19 +607,19 @@ ], "lighthouse": [ { - "sptId": "sptBearLighthouseNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARLighthouseNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 15, "BossZone": "Zone_Village,Zone_Chalet,Zone_DestroyedHouse,Zone_Rocks,Zone_OldHouse", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -630,19 +630,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecLighthouseNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECLighthouseNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 15, "BossZone": "Zone_Village,Zone_Chalet,Zone_DestroyedHouse,Zone_Rocks,Zone_OldHouse", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -655,19 +655,19 @@ ], "rezervbase": [ { - "sptId": "sptBearReserveNormalSpawnA", - "BossName": "sptBear", + "sptId": "pmcBEARReserveNormalSpawnA", + "BossName": "pmcBEAR", "BossChance": 15, "BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -678,19 +678,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptBearReserveNormalSpawnB", - "BossName": "sptBear", + "sptId": "pmcBEARReserveNormalSpawnB", + "BossName": "pmcBEAR", "BossChance": 15, "BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -701,19 +701,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecReserveNormalSpawnA", - "BossName": "sptUsec", + "sptId": "pmcUSECReserveNormalSpawnA", + "BossName": "pmcUSEC", "BossChance": 15, "BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -724,19 +724,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecReserveNormalSpawnB", - "BossName": "sptUsec", + "sptId": "pmcUSECReserveNormalSpawnB", + "BossName": "pmcUSEC", "BossChance": 15, "BossZone": "ZoneBarrack,ZonePTOR1,ZonePTOR2,ZoneSubCommand,ZoneSubStorage,ZoneRailStrorage", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "1", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -749,19 +749,19 @@ ], "sandbox": [ { - "sptId": "sptBearSandboxNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARSandboxNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 30, "BossZone": "ZoneSandbox", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -772,19 +772,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecSandboxNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECSandboxNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 30, "BossZone": "ZoneSandbox", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], @@ -797,19 +797,19 @@ ], "sandbox_high": [ { - "sptId": "sptBearSandboxNormalSpawn", - "BossName": "sptBear", + "sptId": "pmcBEARSandboxNormalSpawn", + "BossName": "pmcBEAR", "BossChance": 30, "BossZone": "ZoneSandbox", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptBear", + "BossEscortType": "pmcBEAR", "BossEscortDifficult": [ "normal" ], @@ -820,19 +820,19 @@ "ChanceGroup": 0 }, { - "sptId": "sptUsecSandboxNormalSpawn", - "BossName": "sptUsec", + "sptId": "pmcUSECSandboxNormalSpawn", + "BossName": "pmcUSEC", "BossChance": 30, "BossZone": "ZoneSandbox", "BossPlayer": false, "BossDifficult": "normal", - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": "normal", "BossEscortAmount": "2", "Time": -1, "Supports": [ { - "BossEscortType": "sptUsec", + "BossEscortType": "pmcUSEC", "BossEscortDifficult": [ "normal" ], diff --git a/project/assets/configs/pmc.json b/project/assets/configs/pmc.json index 724131bb..9c00b127 100644 --- a/project/assets/configs/pmc.json +++ b/project/assets/configs/pmc.json @@ -175,7 +175,7 @@ "chanceSameSideIsHostilePercent": 90, "_pmcType": "Controls what bot brain can be chosen for each PMC bot type, the number is the weighting to be picked", "pmcType": { - "sptbear": { + "pmcbear": { "factory4_day": { "bossKilla": 2, "bossKnight": 2, @@ -422,7 +422,7 @@ "pmcBot": 7 } }, - "sptusec": { + "pmcusec": { "factory4_day": { "bossKilla": 2, "bossKnight": 2, @@ -670,8 +670,8 @@ } } }, - "usecType": "sptUsec", - "bearType": "sptBear", + "usecType": "pmcUSEC", + "bearType": "pmcBEAR", "looseWeaponInBackpackChancePercent": 15, "weaponHasEnhancementChancePercent": 5, "looseWeaponInBackpackLootMinMax": { diff --git a/project/src/controllers/BotController.ts b/project/src/controllers/BotController.ts index 784acd16..95902f0d 100644 --- a/project/src/controllers/BotController.ts +++ b/project/src/controllers/BotController.ts @@ -151,7 +151,7 @@ export class BotController for (let botType of botTypes) { 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) ? this.botHelper.getPmcSideByRole(botType).toLowerCase() : botType.toLowerCase(); @@ -315,7 +315,7 @@ export class BotController } // 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)) { botGenerationDetails.isPmc = true; diff --git a/project/src/controllers/InraidController.ts b/project/src/controllers/InraidController.ts index df1ea6de..cf91c5ab 100644 --- a/project/src/controllers/InraidController.ts +++ b/project/src/controllers/InraidController.ts @@ -248,8 +248,8 @@ export class InraidController } } - const victims = postRaidRequest.profile.Stats.Eft.Victims.filter((x) => - ["sptbear", "sptusec"].includes(x.Role.toLowerCase()), + const victims = postRaidRequest.profile.Stats.Eft.Victims.filter((victim) => + ["pmcbear", "pmcusec"].includes(victim.Role.toLowerCase()), ); if (victims?.length > 0) { diff --git a/project/src/generators/BotLootGenerator.ts b/project/src/generators/BotLootGenerator.ts index 3ee6f7ce..23696107 100644 --- a/project/src/generators/BotLootGenerator.ts +++ b/project/src/generators/BotLootGenerator.ts @@ -360,7 +360,7 @@ export class BotLootGenerator /** * Force healing items onto bot to ensure they can heal in-raid * @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 { diff --git a/project/src/generators/PMCLootGenerator.ts b/project/src/generators/PMCLootGenerator.ts index 2b8077c9..eccd0be4 100644 --- a/project/src/generators/PMCLootGenerator.ts +++ b/project/src/generators/PMCLootGenerator.ts @@ -48,7 +48,7 @@ export class PMCLootGenerator { const items = this.databaseService.getItems(); const pmcPriceOverrides - = this.databaseService.getBots().types[botRole === "sptBear" ? "bear" : "usec"].inventory.items + = this.databaseService.getBots().types[botRole === "pmcBEAR" ? "bear" : "usec"].inventory.items .Pockets; const allowedItemTypes = this.pmcConfig.pocketLoot.whitelist; @@ -108,7 +108,7 @@ export class PMCLootGenerator { const items = this.databaseService.getItems(); const pmcPriceOverrides - = this.databaseService.getBots().types[botRole === "sptBear" ? "bear" : "usec"].inventory.items + = this.databaseService.getBots().types[botRole === "pmcBEAR" ? "bear" : "usec"].inventory.items .TacticalVest; const allowedItemTypes = this.pmcConfig.vestLoot.whitelist; @@ -178,7 +178,7 @@ export class PMCLootGenerator { const items = this.databaseService.getItems(); const pmcPriceOverrides - = this.databaseService.getBots().types[botRole === "sptBear" ? "bear" : "usec"].inventory.items + = this.databaseService.getBots().types[botRole === "pmcBEAR" ? "bear" : "usec"].inventory.items .Backpack; const allowedItemTypes = this.pmcConfig.backpackLoot.whitelist; diff --git a/project/src/helpers/BotDifficultyHelper.ts b/project/src/helpers/BotDifficultyHelper.ts index 92227288..3fea0dc3 100644 --- a/project/src/helpers/BotDifficultyHelper.ts +++ b/project/src/helpers/BotDifficultyHelper.ts @@ -32,8 +32,8 @@ export class BotDifficultyHelper * Get a difficulty object modified to handle fighting other PMCs * @param pmcType 'bear or 'usec' * @param difficulty easy / normal / hard / impossible - * @param usecType sptUsec - * @param bearType sptBear + * @param usecType pmcUSEC + * @param bearType pmcBEAR * @returns Difficulty object */ public getPmcDifficultySettings( diff --git a/project/src/helpers/BotHelper.ts b/project/src/helpers/BotHelper.ts index 16f0eac6..0afb54b9 100644 --- a/project/src/helpers/BotHelper.ts +++ b/project/src/helpers/BotHelper.ts @@ -43,7 +43,7 @@ export class BotHelper */ 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 @@ -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 */ 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 * @returns side (usec/bear) */ diff --git a/project/src/models/spt/config/IBotConfig.ts b/project/src/models/spt/config/IBotConfig.ts index 8a969c7e..02647ddf 100644 --- a/project/src/models/spt/config/IBotConfig.ts +++ b/project/src/models/spt/config/IBotConfig.ts @@ -8,7 +8,7 @@ export interface IBotConfig extends IBaseConfig kind: "spt-bot" /** How many variants of each bot should be generated on raid start */ 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[] /** What bot types should be classified as bosses */ bosses: string[] @@ -84,8 +84,8 @@ export interface PresetBatch crazyAssaultEvent: number bossBoar: number bossBoarSniper: number - sptUsec: number - sptBear: number + pmcUSEC: number + pmcBEAR: number } export interface IWalletLootSettings diff --git a/project/src/services/PmcChatResponseService.ts b/project/src/services/PmcChatResponseService.ts index 909d77e8..c0776940 100644 --- a/project/src/services/PmcChatResponseService.ts +++ b/project/src/services/PmcChatResponseService.ts @@ -92,7 +92,7 @@ export class PmcChatResponseService } // If kill was not a PMC, skip - if (!["sptUsec", "sptBear"].includes(killerDetailsInCache.Info.Settings.Role)) + if (!["pmcUSEC", "pmcBEAR"].includes(killerDetailsInCache.Info.Settings.Role)) { return; } diff --git a/project/tests/helpers/BotHelper.test.ts b/project/tests/helpers/BotHelper.test.ts index 8a56aa6e..0315c5e4 100644 --- a/project/tests/helpers/BotHelper.test.ts +++ b/project/tests/helpers/BotHelper.test.ts @@ -27,7 +27,7 @@ describe("BotHelper", () => it("should return true when uppercase PMC role is provided", () => { - const result = botHelper.isBotPmc("SPTBEAR"); + const result = botHelper.isBotPmc("pmcBEAR"); expect(result).toBe(true); }); @@ -91,15 +91,15 @@ describe("BotHelper", () => 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"); }); - 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"); });