From 79cb201b82fab5b44fb6124dca90b842120f7ed9 Mon Sep 17 00:00:00 2001
From: Dev <dev@dev.sp-tarkov.com>
Date: Sat, 18 Nov 2023 12:32:03 +0000
Subject: [PATCH] Split `maxExtracts` into additional
 `maxExtractsWithSpecificExit` for repeatable quests

---
 project/assets/configs/quest.json                  | 9 ++++++---
 project/src/generators/RepeatableQuestGenerator.ts | 7 +++++--
 project/src/models/spt/config/IQuestConfig.ts      | 5 +++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/project/assets/configs/quest.json b/project/assets/configs/quest.json
index 65d92f6f..02ef5453 100644
--- a/project/assets/configs/quest.json
+++ b/project/assets/configs/quest.json
@@ -262,7 +262,8 @@
             ],
             "questConfig": {
                 "Exploration": {
-                    "maxExtracts": 3,
+                    "maxExtracts": 5,
+					"maxExtractsWithSpecificExit": 3,
                     "possibleSkillRewards": ["Endurance", "Strength", "Vitality"],
                     "specificExits": {
                         "probability": 0.25,
@@ -901,7 +902,8 @@
             "questConfig": {
                 "Exploration": {
                     "possibleSkillRewards": ["Endurance", "Strength", "Vitality"],
-                    "maxExtracts": 10,
+                    "maxExtracts": 25,
+					"maxExtractsWithSpecificExit": 12,
                     "specificExits": {
                         "probability": 0.4,
                         "passageRequirementWhitelist": [
@@ -1522,7 +1524,8 @@
             "questConfig": {
                 "Exploration": {
                     "possibleSkillRewards": ["Endurance", "Strength", "Vitality"],
-                    "maxExtracts": 3,
+                    "maxExtracts": 4,
+					"maxExtractsWithSpecificExit": 2,
                     "specificExits": {
                         "probability": 0.25,
                         "passageRequirementWhitelist": [
diff --git a/project/src/generators/RepeatableQuestGenerator.ts b/project/src/generators/RepeatableQuestGenerator.ts
index 6f5c1a27..fc7f59d6 100644
--- a/project/src/generators/RepeatableQuestGenerator.ts
+++ b/project/src/generators/RepeatableQuestGenerator.ts
@@ -680,6 +680,7 @@ export class RepeatableQuestGenerator
     ): IExploration
     {
         const explorationConfig = repeatableConfig.questConfig.Exploration;
+        const requiresSpecificExtract = Math.random() < repeatableConfig.questConfig.Exploration.specificExits.probability;
 
         if (Object.keys(questTypePool.pool.Exploration.locations).length === 0)
         {
@@ -696,7 +697,8 @@ export class RepeatableQuestGenerator
         // remove the location from the available pool
         delete questTypePool.pool.Exploration.locations[locationKey];
 
-        const numExtracts = this.randomUtil.randInt(1, explorationConfig.maxExtracts + 1);
+        // Different max extract count when specific extract needed
+        const numExtracts = this.randomUtil.randInt(1, requiresSpecificExtract ? explorationConfig.maxExtractsWithSpecificExit : explorationConfig.maxExtracts + 1);
 
         const quest = this.generateRepeatableTemplate("Exploration", traderId, repeatableConfig.side) as IExploration;
 
@@ -715,7 +717,8 @@ export class RepeatableQuestGenerator
         quest.conditions.AvailableForFinish[0]._props.id = this.objectId.generate();
         quest.location = this.getQuestLocationByMapId(locationKey);
 
-        if (Math.random() < repeatableConfig.questConfig.Exploration.specificExits.probability)
+        
+        if (requiresSpecificExtract)
         {
             // Filter by whitelist, it's also possible that the field "PassageRequirement" does not exist (e.g. Shoreline)
             // Scav exits are not listed at all in locations.base currently. If that changes at some point, additional filtering will be required
diff --git a/project/src/models/spt/config/IQuestConfig.ts b/project/src/models/spt/config/IQuestConfig.ts
index 5e664496..a761743a 100644
--- a/project/src/models/spt/config/IQuestConfig.ts
+++ b/project/src/models/spt/config/IQuestConfig.ts
@@ -89,8 +89,9 @@ export interface IRepeatableQuestTypesConfig
 
 export interface IExploration extends IBaseQuestConfig
 {
-    maxExtracts: number;
-    specificExits: ISpecificExits;
+    maxExtracts: number
+    maxExtractsWithSpecificExit: number
+    specificExits: ISpecificExits
 }
 
 export interface ISpecificExits