From 7891db84def97cae144fc5e0d2dcfe05d5c5b410 Mon Sep 17 00:00:00 2001 From: Dev Date: Thu, 20 Jun 2024 13:37:38 +0100 Subject: [PATCH] Updated `createRandomLoot()` to make use of `rewardItemBlacklist` black list --- project/src/generators/LootGenerator.ts | 9 ++++++++- project/src/models/spt/services/LootRequest.ts | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/project/src/generators/LootGenerator.ts b/project/src/generators/LootGenerator.ts index df9ab9ac..dce16de2 100644 --- a/project/src/generators/LootGenerator.ts +++ b/project/src/generators/LootGenerator.ts @@ -50,10 +50,17 @@ export class LootGenerator const itemTypeCounts = this.initItemLimitCounter(options.itemLimits); const itemsDb = this.databaseService.getItems(); - const itemBlacklist = new Set([ + let itemBlacklist = new Set([ ...this.itemFilterService.getBlacklistedItems(), ...options.itemBlacklist, ]); + + if (options.useRewarditemBlacklist) + { + const itemsToAdd = this.itemFilterService.getItemRewardBlacklist(); + itemBlacklist = new Set([...itemBlacklist, ...itemsToAdd]); + } + if (!options.allowBossItems) { for (const bossItem of this.itemFilterService.getBossItems()) diff --git a/project/src/models/spt/services/LootRequest.ts b/project/src/models/spt/services/LootRequest.ts index 69b47ebd..29a610f9 100644 --- a/project/src/models/spt/services/LootRequest.ts +++ b/project/src/models/spt/services/LootRequest.ts @@ -13,4 +13,5 @@ export interface LootRequest itemStackLimits: Record armorLevelWhitelist: number[] allowBossItems: boolean + useRewarditemBlacklist?: boolean }