From 5ca4f8531c8b2eda3cf9ed68b1806754ab95334c Mon Sep 17 00:00:00 2001 From: Dev Date: Thu, 19 Sep 2024 14:02:57 +0100 Subject: [PATCH] Fixed typos Added skier/peacemaker bots to pmc enemy list Flagged scav as always an enemy of PMCs Removed forced warning of assault from PMCs --- project/assets/configs/pmc.json | 24 +++++++++++++------ project/assets/database/bots/types/bear.json | 16 ++++--------- project/assets/database/bots/types/usec.json | 16 ++++--------- .../src/services/LocationLifecycleService.ts | 8 +++---- 4 files changed, 29 insertions(+), 35 deletions(-) diff --git a/project/assets/configs/pmc.json b/project/assets/configs/pmc.json index 1fffe543..875736fc 100644 --- a/project/assets/configs/pmc.json +++ b/project/assets/configs/pmc.json @@ -774,9 +774,11 @@ } }, "hostilitySettings": { - "pmcbear": { + "pmcusec": { "additionalEnemyTypes": [ - "bossPartisan" + "bossPartisan", + "peacemaker", + "skier" ], "chancedEnemies": [{ "EnemyChance": 100, @@ -787,18 +789,23 @@ }, { "EnemyChance": 85, "Role": "pmcUSEC" + }, { + "EnemyChance": 100, + "Role": "pmcBEAR" } ], "bearEnemyChance": 85, "usecEnemyChance": 100, "savageEnemyChance": 95, - "savagePlayerBehaviour": "ChancedEnemies" + "savagePlayerBehaviour": "AlwaysEnemies" }, "pmcbear": { "additionalEnemyTypes": [ - "bossPartisan" + "bossPartisan", + "peacemaker", + "skier" ], - "ChancedEnemies": [{ + "chancedEnemies": [{ "EnemyChance": 100, "Role": "assault" }, { @@ -807,12 +814,15 @@ }, { "EnemyChance": 85, "Role": "pmcBEAR" - } + }, { + "EnemyChance": 100, + "Role": "pmcUSEC" + } ], "bearEnemyChance": 85, "usecEnemyChance": 100, "savageEnemyChance": 95, - "savagePlayerBehaviour": "ChancedEnemies" + "savagePlayerBehaviour": "AlwaysEnemies" } }, "forceHealingItemsIntoSecure": true, diff --git a/project/assets/database/bots/types/bear.json b/project/assets/database/bots/types/bear.json index 72a802f5..4bfbc7be 100644 --- a/project/assets/database/bots/types/bear.json +++ b/project/assets/database/bots/types/bear.json @@ -535,9 +535,7 @@ "TIME_TO_FIND_ENEMY": 22, "TIME_TO_FORGOR_ABOUT_ENEMY_SEC": 52, "TIME_TO_RUN_TO_COVER_CAUSE_SHOOT_SEC": 15, - "WARN_BOT_TYPES": [ - "assault" - ] + "WARN_BOT_TYPES": [] }, "Move": { "BASESTART_SLOW_DIST": 1.1, @@ -1054,9 +1052,7 @@ "TIME_TO_FIND_ENEMY": 8, "TIME_TO_FORGOR_ABOUT_ENEMY_SEC": 180, "TIME_TO_RUN_TO_COVER_CAUSE_SHOOT_SEC": 15, - "WARN_BOT_TYPES": [ - "assault" - ] + "WARN_BOT_TYPES": [] }, "Move": { "BASESTART_SLOW_DIST": 1.1, @@ -1571,9 +1567,7 @@ "TIME_TO_FIND_ENEMY": 8, "TIME_TO_FORGOR_ABOUT_ENEMY_SEC": 180, "TIME_TO_RUN_TO_COVER_CAUSE_SHOOT_SEC": 15, - "WARN_BOT_TYPES": [ - "assault" - ] + "WARN_BOT_TYPES": [] }, "Move": { "BASESTART_SLOW_DIST": 1.1, @@ -2088,9 +2082,7 @@ "TIME_TO_FIND_ENEMY": 8, "TIME_TO_FORGOR_ABOUT_ENEMY_SEC": 180, "TIME_TO_RUN_TO_COVER_CAUSE_SHOOT_SEC": 15, - "WARN_BOT_TYPES": [ - "assault" - ] + "WARN_BOT_TYPES": [] }, "Move": { "BASESTART_SLOW_DIST": 1.1, diff --git a/project/assets/database/bots/types/usec.json b/project/assets/database/bots/types/usec.json index a61b406d..66909f50 100644 --- a/project/assets/database/bots/types/usec.json +++ b/project/assets/database/bots/types/usec.json @@ -524,9 +524,7 @@ "TIME_TO_FIND_ENEMY": 22, "TIME_TO_FORGOR_ABOUT_ENEMY_SEC": 52, "TIME_TO_RUN_TO_COVER_CAUSE_SHOOT_SEC": 15, - "WARN_BOT_TYPES": [ - "assault" - ] + "WARN_BOT_TYPES": [] }, "Move": { "BASESTART_SLOW_DIST": 1.1, @@ -1043,9 +1041,7 @@ "TIME_TO_FIND_ENEMY": 8, "TIME_TO_FORGOR_ABOUT_ENEMY_SEC": 180, "TIME_TO_RUN_TO_COVER_CAUSE_SHOOT_SEC": 15, - "WARN_BOT_TYPES": [ - "assault" - ] + "WARN_BOT_TYPES": [] }, "Move": { "BASESTART_SLOW_DIST": 1.1, @@ -1560,9 +1556,7 @@ "TIME_TO_FIND_ENEMY": 8, "TIME_TO_FORGOR_ABOUT_ENEMY_SEC": 180, "TIME_TO_RUN_TO_COVER_CAUSE_SHOOT_SEC": 15, - "WARN_BOT_TYPES": [ - "assault" - ] + "WARN_BOT_TYPES": [] }, "Move": { "BASESTART_SLOW_DIST": 1.1, @@ -2077,9 +2071,7 @@ "TIME_TO_FIND_ENEMY": 8, "TIME_TO_FORGOR_ABOUT_ENEMY_SEC": 180, "TIME_TO_RUN_TO_COVER_CAUSE_SHOOT_SEC": 15, - "WARN_BOT_TYPES": [ - "assault" - ] + "WARN_BOT_TYPES": [] }, "Move": { "BASESTART_SLOW_DIST": 1.1, diff --git a/project/src/services/LocationLifecycleService.ts b/project/src/services/LocationLifecycleService.ts index c68958df..7def1b48 100644 --- a/project/src/services/LocationLifecycleService.ts +++ b/project/src/services/LocationLifecycleService.ts @@ -191,22 +191,22 @@ export class LocationLifecycleService { } } - // Adjust bear hostility chance + // Adjust vs bear hostility chance if (typeof configHostilityChanges.bearEnemyChance !== "undefined") { locationBotHostilityDetails.BearEnemyChance = configHostilityChanges.bearEnemyChance; } - // Adjust usec hostility chance + // Adjust vs usec hostility chance if (typeof configHostilityChanges.usecEnemyChance !== "undefined") { locationBotHostilityDetails.UsecEnemyChance = configHostilityChanges.usecEnemyChance; } - // Adjust usec hostility chance + // Adjust vs savage hostility chance if (typeof configHostilityChanges.savageEnemyChance !== "undefined") { locationBotHostilityDetails.SavageEnemyChance = configHostilityChanges.savageEnemyChance; } - // Adjust scav hostility behaviour + // Adjust vs scav hostility behaviour if (typeof configHostilityChanges.savagePlayerBehaviour !== "undefined") { locationBotHostilityDetails.SavagePlayerBehaviour = configHostilityChanges.savagePlayerBehaviour; }