diff --git a/project/assets/database/templates/prices.json b/project/assets/database/templates/prices.json index 94bb6f0d..eb5e6f5a 100644 --- a/project/assets/database/templates/prices.json +++ b/project/assets/database/templates/prices.json @@ -714,7 +714,6 @@ "5aa2b986e5b5b00014028f4c": 8889, "5aa2b9aee5b5b00015693121": 23371, "5aa2b9ede5b5b000137b758b": 19374, - "5aa2ba19e5b5b00014028f4e": 9622, "5aa2ba46e5b5b000137b758d": 39810, "5aa2ba71e5b5b000137b758f": 50525, "5aa66a9be5b5b0214e506e89": 27124, diff --git a/project/src/generators/RepeatableQuestGenerator.ts b/project/src/generators/RepeatableQuestGenerator.ts index fcb9086d..83b88ac4 100644 --- a/project/src/generators/RepeatableQuestGenerator.ts +++ b/project/src/generators/RepeatableQuestGenerator.ts @@ -565,6 +565,7 @@ export class RepeatableQuestGenerator } // Draw items to ask player to retrieve + let isAmmo = 0 for (let i = 0; i < distinctItemsToRetrieveCount; i++) { const itemSelected = itemSelection[this.randomUtil.randInt(itemSelection.length)]; @@ -573,6 +574,14 @@ export class RepeatableQuestGenerator let maxValue = completionConfig.maxRequestedAmount; if (this.itemHelper.isOfBaseclass(itemSelected[0], BaseClasses.AMMO)) { + // Prevent multiple ammo requirements from being picked, stop after 6 attempts + if (isAmmo > 0 && isAmmo < 6) + { + isAmmo++; + i--; + continue; + } + isAmmo++; minValue = completionConfig.minRequestedBulletAmount; maxValue = completionConfig.maxRequestedBulletAmount; }