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

Improved bot vest filtering to not filter down to 0 vests

Browse Source
This commit is contained in:
Dev 2024-09-24 10:09:58 +01:00
parent 68297830ff
commit b4e78d14f2
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
project/src/generators/BotInventoryGenerator.ts
View File

@ -243,13 +243,13 @@ export class BotInventoryGenerator {
// Bot has no armor vest and flagged to be forceed to wear armored rig in this event // Bot has no armor vest and flagged to be forceed to wear armored rig in this event
if (botEquipConfig.forceOnlyArmoredRigWhenNoArmor && !hasArmorVest) { if (botEquipConfig.forceOnlyArmoredRigWhenNoArmor && !hasArmorVest) {
// Filter rigs down to only those with armor // Filter rigs down to only those with armor
this.filterRigsToThoseWithProtection(templateInventory.equipment); this.filterRigsToThoseWithProtection(templateInventory.equipment, botRole);
} }
// Optimisation - Remove armored rigs from pool // Optimisation - Remove armored rigs from pool
if (hasArmorVest) { if (hasArmorVest) {
// Filter rigs down to only those with armor // Filter rigs down to only those with armor
this.filterRigsToThoseWithoutProtection(templateInventory.equipment); this.filterRigsToThoseWithoutProtection(templateInventory.equipment, botRole);
} }
// Bot is flagged as always needing a vest // Bot is flagged as always needing a vest
@ -273,8 +273,9 @@ export class BotInventoryGenerator {
/** /**
* Remove non-armored rigs from parameter data * Remove non-armored rigs from parameter data
* @param templateEquipment Equpiment to filter TacticalVest of * @param templateEquipment Equpiment to filter TacticalVest of
* @param botRole Role of bot vests are being filtered for
*/ */
protected filterRigsToThoseWithProtection(templateEquipment: Equipment): void { protected filterRigsToThoseWithProtection(templateEquipment: Equipment, botRole: string): void {
const tacVestsWithArmor = Object.entries(templateEquipment.TacticalVest).reduce( const tacVestsWithArmor = Object.entries(templateEquipment.TacticalVest).reduce(
(newVestDictionary, [tplKey]) => { (newVestDictionary, [tplKey]) => {
if (this.itemHelper.itemHasSlots(tplKey)) { if (this.itemHelper.itemHasSlots(tplKey)) {
@ -285,14 +286,26 @@ export class BotInventoryGenerator {
{}, {},
); );
if (Object.keys(tacVestsWithArmor).length === 0) {
this.logger.debug(`Unable to filter to only armored rigs as bot: ${botRole} has none in pool`);
return;
}
templateEquipment.TacticalVest = tacVestsWithArmor; templateEquipment.TacticalVest = tacVestsWithArmor;
} }
/** /**
* Remove armored rigs from parameter data * Remove armored rigs from parameter data
* @param templateEquipment Equpiment to filter TacticalVest of * @param templateEquipment Equpiment to filter TacticalVest of
* @param botRole Role of bot vests are being filtered for
* @param allowEmptyResult Should the function return all rigs when 0 unarmored are found
*/ */
protected filterRigsToThoseWithoutProtection(templateEquipment: Equipment): void { protected filterRigsToThoseWithoutProtection(
templateEquipment: Equipment,
botRole: string,
allowEmptyResult = true,
): void {
const tacVestsWithoutArmor = Object.entries(templateEquipment.TacticalVest).reduce( const tacVestsWithoutArmor = Object.entries(templateEquipment.TacticalVest).reduce(
(newVestDictionary, [tplKey]) => { (newVestDictionary, [tplKey]) => {
if (!this.itemHelper.itemHasSlots(tplKey)) { if (!this.itemHelper.itemHasSlots(tplKey)) {
@ -303,6 +316,12 @@ export class BotInventoryGenerator {
{}, {},
); );
if (!allowEmptyResult && Object.keys(tacVestsWithoutArmor).length === 0) {
this.logger.debug(`Unable to filter to only unarmored rigs as bot: ${botRole} has none in pool`);
return;
}
templateEquipment.TacticalVest = tacVestsWithoutArmor; templateEquipment.TacticalVest = tacVestsWithoutArmor;
} }