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

improve block checking logic to be dynamic based on pool size

Browse Source
This commit is contained in:
Dev 2024-01-29 23:02:09 +00:00
parent f3ec237674
commit 55154c8b1a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
project/src/generators/BotEquipmentModGenerator.ts
View File

@ -832,6 +832,8 @@ export class BotEquipmentModGenerator
}; };
const modParentFilterList = parentSlot._props.filters[0].Filter; const modParentFilterList = parentSlot._props.filters[0].Filter;
// How many times can a mod for the slot be blocked before we stop trying
const maxBlockedAttempts = Math.round(modPool.length * 0.75); // Roughly 75% of pool size
let blockedAttemptCount = 0; let blockedAttemptCount = 0;
while (exhaustableModPool.hasValues()) while (exhaustableModPool.hasValues())
{ {
@ -846,9 +848,11 @@ export class BotEquipmentModGenerator
break; break;
} }
// Check chosen item is on the allowed list of the parent
const isOnModParentFilterList = modParentFilterList.includes(chosenTpl); const isOnModParentFilterList = modParentFilterList.includes(chosenTpl);
if (!isOnModParentFilterList) if (!isOnModParentFilterList)
{ {
// Try again
continue; continue;
} }
@ -861,22 +865,22 @@ export class BotEquipmentModGenerator
if (chosenModResult.slotBlocked) if (chosenModResult.slotBlocked)
{ {
// Give max of 8 attempts of picking an item ifs blocked by another item // Give max of 8 attempts of picking an item ifs blocked by another item
if (blockedAttemptCount > 8) if (blockedAttemptCount > maxBlockedAttempts)
{ {
this.logger.warning(`Attempted to find mod for slot: ${parentSlot._name} on weapon: ${weapon[0]._tpl} and blocked 8 times`);
blockedAttemptCount = 0; blockedAttemptCount = 0;
break; break;
} }
blockedAttemptCount++; blockedAttemptCount++;
// Try again
continue; continue;
} }
// Some mod combos will never work, make sure its not happened // Some mod combos will never work, make sure this isnt the case
if (!chosenModResult.incompatible && !this.weaponModComboIsIncompatible(weapon, chosenTpl)) if (!chosenModResult.incompatible && !this.weaponModComboIsIncompatible(weapon, chosenTpl))
{ {
// Success
chosenModResult.found = true; chosenModResult.found = true;
chosenModResult.incompatible = false; chosenModResult.incompatible = false;
chosenModResult.chosenTpl = chosenTpl; chosenModResult.chosenTpl = chosenTpl;