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

Improved handling of bot stock generation.

Browse Source 
Moved code into own function
Expanded force stock check to look for any child items instead of ones for slot `mod_stock`
Expanded check to include additional slot names
This commit is contained in:
Dev 2024-08-12 17:43:42 +01:00
parent 08d66d9e42
commit 4582bb6fe2
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,16 +455,11 @@ export class BotEquipmentModGenerator {
} }
// If stock mod can take a sub stock mod, force spawn chance to be 100% to ensure sub-stock gets added // If stock mod can take a sub stock mod, force spawn chance to be 100% to ensure sub-stock gets added
// Or if mod_stock is configured to be forced on // Or if bot has stock force enabled
if ( if (this.shouldForceSubStockSlots(modSlot, botEquipConfig, modToAddTemplate)) {
modSlot === "mod_stock" &&
modToAddTemplate._props.Slots.some(
(slot) => slot._name.includes("mod_stock") || botEquipConfig.forceStock,
)
) {
// Stock mod can take additional stocks, could be a locking device, force 100% chance // Stock mod can take additional stocks, could be a locking device, force 100% chance
const stockSlots = ["mod_stock", "mod_stock_000", "mod_stock_akms"]; const subStockSlots = ["mod_stock", "mod_stock_000", "mod_stock_001", "mod_stock_akms"];
this.adjustSlotSpawnChances(request.modSpawnChances, stockSlots, 100); this.adjustSlotSpawnChances(request.modSpawnChances, subStockSlots, 100);
} }
// Gather stats on mods being added to weapon // Gather stats on mods being added to weapon
@ -538,6 +533,27 @@ export class BotEquipmentModGenerator {
return request.weapon; return request.weapon;
} }
/**
* Should the provided bot have its stock chance values altered to 100%
* @param modSlot Slot to check
* @param botEquipConfig Bots equipment config/chance values
* @param modToAddTemplate Mod being added to bots weapon
* @returns True if it should
*/
protected shouldForceSubStockSlots(
modSlot: string,
botEquipConfig: EquipmentFilters,
modToAddTemplate: ITemplateItem,
): boolean {
// Slots a weapon can store its stock in
const stockSlots = ["mod_stock", "mod_stock_000", "mod_stock_001", "mod_stock_akms"];
// Can the stock hold child items
const hasSubSlots = modToAddTemplate._props.Slots?.length > 0;
return (stockSlots.includes(modSlot) && hasSubSlots) || botEquipConfig.forceStock;
}
/** /**
* Is this modslot a front or rear sight * Is this modslot a front or rear sight
* @param modSlot Slot to check * @param modSlot Slot to check