From cd36e3993dc93949d785b27c6f4ce85f54743af2 Mon Sep 17 00:00:00 2001 From: Dev Date: Tue, 14 Nov 2023 21:43:37 +0000 Subject: [PATCH] When rewarding a weapon for a repeatable quest, choose a random default preset if the chosen weapon has no defaults --- project/src/generators/RepeatableQuestGenerator.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/project/src/generators/RepeatableQuestGenerator.ts b/project/src/generators/RepeatableQuestGenerator.ts index f85fe623..07439862 100644 --- a/project/src/generators/RepeatableQuestGenerator.ts +++ b/project/src/generators/RepeatableQuestGenerator.ts @@ -836,16 +836,20 @@ export class RepeatableQuestGenerator continue; } - // If we provide ammo we don't want to provide just one bullet + // Randomise the cartridge count returned value = this.randomUtil.randInt(repeatableConfig.rewardAmmoStackMinSize, itemSelected._props.StackMaxSize); } else if (this.itemHelper.isOfBaseclass(itemSelected._id, BaseClasses.WEAPON)) { - const defaultPreset = this.presetHelper.getDefaultPreset(itemSelected._id); - if (defaultPreset) + let defaultPreset = this.presetHelper.getDefaultPreset(itemSelected._id); + if (!defaultPreset) { - children = this.ragfairServerHelper.reparentPresets(defaultPreset._items[0], defaultPreset._items); + // No default for chosen weapon found, get any random default weapon preset + const defaultPresets = Object.values(this.presetHelper.getDefaultPresets()); + defaultPreset = this.randomUtil.getArrayValue(defaultPresets); } + + children = this.ragfairServerHelper.reparentPresets(defaultPreset._items[0], defaultPreset._items); } rewards.Success.push(this.generateRewardItem(itemSelected._id, value, index, children));