From c29dfc486df2f1f395a8c8b53c8ff5188eca1682 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Fri, 17 Jan 2025 21:06:56 +0000
Subject: [PATCH] Repeatable quest changes

---
 Core/Controllers/RepeatableQuestController.cs |  2 --
 Core/Helpers/RepeatableQuestHelper.cs         |  4 +--
 Core/Models/Spt/Config/QuestConfig.cs         | 27 ++++---------------
 .../Collections/ProbabilityObjectArray.cs     |  8 ++++++
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/Core/Controllers/RepeatableQuestController.cs b/Core/Controllers/RepeatableQuestController.cs
index 63f24b35..592c9e4e 100644
--- a/Core/Controllers/RepeatableQuestController.cs
+++ b/Core/Controllers/RepeatableQuestController.cs
@@ -297,8 +297,6 @@ public class RepeatableQuestController
 
     private QuestTypePool GenerateQuestPool(RepeatableQuestConfig repeatableConfig, int? pmcLevel)
     {
-        _logger.Error("BYPASSED GenerateQuestPool");
-        return new();
         var questPool = CreateBaseQuestPool(repeatableConfig);
 
         // Get the allowed locations based on the PMC's level
diff --git a/Core/Helpers/RepeatableQuestHelper.cs b/Core/Helpers/RepeatableQuestHelper.cs
index b7f66c9b..9192d919 100644
--- a/Core/Helpers/RepeatableQuestHelper.cs
+++ b/Core/Helpers/RepeatableQuestHelper.cs
@@ -40,8 +40,8 @@ public class RepeatableQuestHelper
 
     public ProbabilityObjectArray<K, V>
         ProbabilityObjectArray<K, V>(
-            List<ProbabilityObject<K, V>> configArrayInput
-        ) // TODO: ProbabilityObjectArray<K, V> for return type , param type was List<ProbabilityObject<K, V>>
+            List<ProbabilityObject<K, V>>? configArrayInput
+        )
     {
         var configArray = _cloner.Clone(configArrayInput);
         var probabilityArray = new ProbabilityObjectArray<K, V>(_mathUtil, _cloner, configArray);
diff --git a/Core/Models/Spt/Config/QuestConfig.cs b/Core/Models/Spt/Config/QuestConfig.cs
index cd9b08c9..c2bc7732 100644
--- a/Core/Models/Spt/Config/QuestConfig.cs
+++ b/Core/Models/Spt/Config/QuestConfig.cs
@@ -1,6 +1,7 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Core.Models.Common;
 using Core.Models.Enums;
+using Core.Utils.Collections;
 using Core.Utils.Json.Converters;
 
 namespace Core.Models.Spt.Config;
@@ -344,10 +345,8 @@ public record BaseQuestConfig
     public List<string>? PossibleSkillRewards { get; set; }
 }
 
-public record Target : ProbabilityObject
+public class Target : ProbabilityObject<string, BossInfo>
 {
-    [JsonPropertyName("data")]
-    public BossInfo? Data { get; set; }
 }
 
 public record BossInfo
@@ -359,26 +358,10 @@ public record BossInfo
     public bool? IsPmc { get; set; }
 }
 
-public record BodyPart : ProbabilityObject
+public class BodyPart : ProbabilityObject<string, List<string>>
 {
-    [JsonPropertyName("data")]
-    public List<string>? Data { get; set; }
 }
 
-public record WeaponRequirement : ProbabilityObject
+public class WeaponRequirement : ProbabilityObject<string, List<string>>
 {
-    [JsonPropertyName("data")]
-    public List<string>? Data { get; set; }
-}
-
-public record ProbabilityObject
-{
-    [JsonPropertyName("key")]
-    public string? Key { get; set; }
-
-    [JsonPropertyName("relativeProbability")]
-    public double? RelativeProbability { get; set; }
-
-    [JsonPropertyName("data")]
-    public object? Data { get; set; }
 }
diff --git a/Core/Utils/Collections/ProbabilityObjectArray.cs b/Core/Utils/Collections/ProbabilityObjectArray.cs
index 33b72582..b6b60411 100644
--- a/Core/Utils/Collections/ProbabilityObjectArray.cs
+++ b/Core/Utils/Collections/ProbabilityObjectArray.cs
@@ -1,4 +1,5 @@
 using Core.Utils.Cloners;
+using System.Text.Json.Serialization;
 
 namespace Core.Utils.Collections;
 
@@ -214,8 +215,15 @@ public class ProbabilityObjectArray<K, V> : List<ProbabilityObject<K, V?>>
  */
 public class ProbabilityObject<K, V>
 {
+    public ProbabilityObject()
+    { }
+    [JsonPropertyName("key")]
     public K Key { get; }
+
+    [JsonPropertyName("relativeProbability")]
     public double RelativeProbability { get; }
+
+    [JsonPropertyName("data")]
     public V? Data { get; }
 
     /**