diff --git a/project/assets/configs/pmc.json b/project/assets/configs/pmc.json index 371cea1d..3ace0c24 100644 --- a/project/assets/configs/pmc.json +++ b/project/assets/configs/pmc.json @@ -189,7 +189,6 @@ "botRelativeLevelDeltaMin": 70, "_isUsec": "Percentage chance PMC will be USEC", "isUsec": 50, - "chanceSameSideIsHostilePercent": 90, "_pmcType": "Controls what bot brain can be chosen for each PMC bot type, the number is the weighting to be picked", "pmcType": { "pmcbear": { diff --git a/project/src/helpers/BotDifficultyHelper.ts b/project/src/helpers/BotDifficultyHelper.ts index 0666794d..4663658c 100644 --- a/project/src/helpers/BotDifficultyHelper.ts +++ b/project/src/helpers/BotDifficultyHelper.ts @@ -43,22 +43,10 @@ export class BotDifficultyHelper { const difficultySettings = this.getDifficultySettings(pmcType, difficulty); const friendlyType = pmcType === "bear" ? bearType : usecType; - const enemyType = pmcType === "bear" ? usecType : bearType; - - // Is PMC hostile to other PMC side - const hostileToSameSide = this.randomUtil.getChance100(this.pmcConfig.chanceSameSideIsHostilePercent); // Add all non-PMC types to PMCs enemy list this.addBotToEnemyList(difficultySettings, this.pmcConfig.enemyTypes, friendlyType); - // Add same/opposite side to enemy list - const hostilePMCTypes = hostileToSameSide ? [enemyType, friendlyType] : [enemyType]; - this.addBotToEnemyList(difficultySettings, hostilePMCTypes); - - if (hostileToSameSide) { - this.setDifficultyToHostileToBearAndUsec(difficultySettings); - } - return difficultySettings; } @@ -89,18 +77,6 @@ export class BotDifficultyHelper { } } - /** - * Configure difficulty settings to be hostile to USEC and BEAR - * Look up value in bot.json/chanceSameSideIsHostilePercent - * @param difficultySettings pmc difficulty settings - */ - protected setDifficultyToHostileToBearAndUsec(difficultySettings: Difficulty): void { - difficultySettings.Mind.CAN_RECEIVE_PLAYER_REQUESTS_BEAR = false; - difficultySettings.Mind.CAN_RECEIVE_PLAYER_REQUESTS_USEC = false; - difficultySettings.Mind.DEFAULT_USEC_BEHAVIOUR = "AlwaysEnemies"; - difficultySettings.Mind.DEFAULT_BEAR_BEHAVIOUR = "AlwaysEnemies"; - } - /** * Get difficulty settings for desired bot type, if not found use assault bot types * @param type bot type to retrieve difficulty of diff --git a/project/src/models/spt/config/IPmcConfig.ts b/project/src/models/spt/config/IPmcConfig.ts index a13f338e..d883314e 100644 --- a/project/src/models/spt/config/IPmcConfig.ts +++ b/project/src/models/spt/config/IPmcConfig.ts @@ -30,7 +30,6 @@ export interface IPmcConfig extends IBaseConfig { usecType: string; /** WildSpawnType enum value BEAR PMCs use */ bearType: string; - chanceSameSideIsHostilePercent: number; /** What 'brain' does a PMC use, keyed by map and side (USEC/BEAR) key: map location, value: type for usec/bear */ pmcType: Record>>; maxBackpackLootTotalRub: number;