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

Rework on equipment generation to process mods on an item if the item supports them instead of if the bots mods array has mods

Browse Source 
Add new bots to bot.json
This commit is contained in:
Dev 2023-12-28 18:36:37 +00:00
parent cf132de542
commit 17c4d6cec0
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
project/assets/configs/bot.json
View File

@ -279,6 +279,7 @@
"bosszryachiy": 3, "bosszryachiy": 3,
"bossboar": 3, "bossboar": 3,
"bossboarsniper": 3, "bossboarsniper": 3,
"bosskolontay": 3,
"cursedassault": 4, "cursedassault": 4,
"exusec": 4, "exusec": 4,
"followerbigpipe": 4, "followerbigpipe": 4,
@ -294,6 +295,10 @@
"followertest": 4, "followertest": 4,
"followerzryachiy": 4, "followerzryachiy": 4,
"followerboar": 4, "followerboar": 4,
"followerBoarClose1": 4,
"followerBoarClose2": 4,
"followerKolontayAssault": 4,
"followerKolontaySecurity": 4,
"gifter": 4, "gifter": 4,
"pmcbot": 4, "pmcbot": 4,
"sectantpriest": 4, "sectantpriest": 4,

2
project/assets/database/locales/server/en.json
View File

@ -21,7 +21,7 @@
"bot-missing_saved_match_info": "getBotCap() Unable to get saved match info, falling back to default. Did you restart the server and not the client?", "bot-missing_saved_match_info": "getBotCap() Unable to get saved match info, falling back to default. Did you restart the server and not the client?",
"bot-missing_weapon_preset": "Unable to find preset for weapon with tpl: %s", "bot-missing_weapon_preset": "Unable to find preset for weapon with tpl: %s",
"bot-mod_not_in_slot_filter_list": "Mod: {{modId}} not found in compatible item filter for slot: '{{modSlot}}' for item: {{parentName}}, skipping - {{botRole}}", "bot-mod_not_in_slot_filter_list": "Mod: {{modId}} not found in compatible item filter for slot: '{{modSlot}}' for item: {{parentName}}, skipping - {{botRole}}",
"bot-mod_slot_missing_from_item": "Slot '{{modSlot}}' does not exist for item: {{parentId}} {{parentName}}", "bot-mod_slot_missing_from_item": "Slot '{{modSlot}}' does not exist for item: {{parentId}} {{parentName}} on {{botRole}}",
"bot-no_ammo_found_in_bot_json": "Unable to find ammo for bot type: %s", "bot-no_ammo_found_in_bot_json": "Unable to find ammo for bot type: %s",
"bot-no_bot_cap_found_for_location": "No bot location cap limit found for bot: %s, using default", "bot-no_bot_cap_found_for_location": "No bot location cap limit found for bot: %s, using default",
"bot-no_bot_type_in_cache": "WARNING - Bot cache has no knowledge of type %s", "bot-no_bot_type_in_cache": "WARNING - Bot cache has no knowledge of type %s",

7
project/src/controllers/BotController.ts
View File

@ -255,9 +255,10 @@ export class BotController
public getBotCap(): number public getBotCap(): number
{ {
const defaultMapCapId = "default"; const defaultMapCapId = "default";
const raidConfig = this.applicationContext.getLatestValue(ContextVariableType.RAID_CONFIGURATION).getValue< const raidConfig = this.applicationContext
IGetRaidConfigurationRequestData .getLatestValue(ContextVariableType.RAID_CONFIGURATION)
>(); .getValue<IGetRaidConfigurationRequestData>();
if (!raidConfig) if (!raidConfig)
{ {
this.logger.warning(this.localisationService.getText("bot-missing_saved_match_info")); this.logger.warning(this.localisationService.getText("bot-missing_saved_match_info"));

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

@ -74,6 +74,10 @@ export class BotEquipmentModGenerator
): Item[] ): Item[]
{ {
const compatibleModsPool = modPool[parentTemplate._id]; const compatibleModsPool = modPool[parentTemplate._id];
if (!compatibleModsPool)
{
this.logger.warning(`bot: ${botRole} lacks a mod slot pool for item: ${parentTemplate._id} ${parentTemplate._name}`);
}
// Iterate over mod pool and choose mods to add to item // Iterate over mod pool and choose mods to add to item
for (const modSlot in compatibleModsPool) for (const modSlot in compatibleModsPool)
@ -86,6 +90,7 @@ export class BotEquipmentModGenerator
modSlot: modSlot, modSlot: modSlot,
parentId: parentTemplate._id, parentId: parentTemplate._id,
parentName: parentTemplate._name, parentName: parentTemplate._name,
botRole: botRole
}), }),
); );
continue; continue;

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

@ -308,10 +308,8 @@ export class BotInventoryGenerator
); );
} }
if ( // Item has slots
typeof (modPool[equipmentItemTpl]) !== "undefined" if ( itemTemplate[1]._props.Slots?.length > 0 )
|| Object.keys(modPool[equipmentItemTpl] || {}).length > 0
)
{ {
const items = this.botEquipmentModGenerator.generateModsForEquipment( const items = this.botEquipmentModGenerator.generateModsForEquipment(
[item], [item],