From 051c8a5a288d228ade0d592c7a962efeb923b2e3 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Sat, 18 Jan 2025 12:08:29 +0000
Subject: [PATCH] Replaced `EliminationTarget` with a dictionary

---
 Core/Controllers/RepeatableQuestController.cs |  6 +--
 Core/Generators/RepeatableQuestGenerator.cs   |  1 +
 Core/Models/Spt/Repeatable/QuestTypePool.cs   | 50 +------------------
 .../EliminationTargetPoolExtensions.cs        | 12 -----
 4 files changed, 5 insertions(+), 64 deletions(-)
 delete mode 100644 Core/Utils/Extensions/EliminationTargetPoolExtensions.cs

diff --git a/Core/Controllers/RepeatableQuestController.cs b/Core/Controllers/RepeatableQuestController.cs
index 695d7e3a..0865a056 100644
--- a/Core/Controllers/RepeatableQuestController.cs
+++ b/Core/Controllers/RepeatableQuestController.cs
@@ -323,7 +323,7 @@ public class RepeatableQuestController
             // Target is boss
             if (targetKvP.Data.IsBoss.GetValueOrDefault(false))
             {
-                var targets = questPool.Pool.Elimination.Targets.Get<TargetLocation>(targetKvP.Key);
+                questPool.Pool.Elimination.Targets.TryGetValue(targetKvP.Key, out var targets);
                     targets.Locations.Clear();
                     targets.Locations.Add("any");
             }
@@ -332,7 +332,7 @@ public class RepeatableQuestController
                 // Non-boss targets
                 var possibleLocations = locations;
 
-                var targets = questPool.Pool.Elimination.Targets.Get<TargetLocation>(targetKvP.Key);
+                questPool.Pool.Elimination.Targets.TryGetValue(targetKvP.Key, out var targets);
                 var targetsClone = _cloner.Clone(targets);
                 var allowedLocations = targetKvP.Key == "Savage"
                         ? targetsClone.Locations.Where((location) => location != "laboratory") // Exclude labs for Savage targets.
@@ -360,7 +360,7 @@ public class RepeatableQuestController
                 },
                 Elimination = new EliminationPool
                 {
-                    Targets = new EliminationTargetPool()
+                    Targets = new Dictionary<string, TargetLocation>()
                 },
                 Pickup = new ExplorationPool
                 {
diff --git a/Core/Generators/RepeatableQuestGenerator.cs b/Core/Generators/RepeatableQuestGenerator.cs
index abdd0c09..ada78075 100644
--- a/Core/Generators/RepeatableQuestGenerator.cs
+++ b/Core/Generators/RepeatableQuestGenerator.cs
@@ -150,6 +150,7 @@ public class RepeatableQuestGenerator
 
         var maxKillDifficulty = eliminationConfig.MaxKills;
 
+        var targetPool = questTypePool.Pool.Elimination;
         targetsConfig = (ProbabilityObjectArray<Target, string, BossInfo>)targetsConfig.Where((x) => questTypePool.Pool.Elimination.Targets.Contains(x.Key));
         if (targetsConfig.Count == 0 || targetsConfig.All((x) => x.Data.IsBoss.GetValueOrDefault(false)))
         {
diff --git a/Core/Models/Spt/Repeatable/QuestTypePool.cs b/Core/Models/Spt/Repeatable/QuestTypePool.cs
index ccee6fb1..17bcd918 100644
--- a/Core/Models/Spt/Repeatable/QuestTypePool.cs
+++ b/Core/Models/Spt/Repeatable/QuestTypePool.cs
@@ -36,55 +36,7 @@ public record ExplorationPool
 public record EliminationPool
 {
     [JsonPropertyName("targets")]
-    public EliminationTargetPool? Targets { get; set; }
-}
-
-public record EliminationTargetPool
-{
-    [JsonPropertyName("Savage")]
-    public TargetLocation? Savage { get; set; }
-
-    [JsonPropertyName("AnyPmc")]
-    public TargetLocation? AnyPmc { get; set; }
-
-    [JsonPropertyName("bossBully")]
-    public TargetLocation? BossBully { get; set; }
-
-    [JsonPropertyName("bossGluhar")]
-    public TargetLocation? BossGluhar { get; set; }
-
-    [JsonPropertyName("bossKilla")]
-    public TargetLocation? BossKilla { get; set; }
-
-    [JsonPropertyName("bossSanitar")]
-    public TargetLocation? BossSanitar { get; set; }
-
-    [JsonPropertyName("bossTagilla")]
-    public TargetLocation? BossTagilla { get; set; }
-
-    [JsonPropertyName("bossKnight")]
-    public TargetLocation? BossKnight { get; set; }
-
-    [JsonPropertyName("bossZryachiy")]
-    public TargetLocation? BossZryachiy { get; set; }
-
-    [JsonPropertyName("bossBoar")]
-    public TargetLocation? BossBoar { get; set; }
-
-    [JsonPropertyName("bossBoarSniper")]
-    public TargetLocation? BossBoarSniper { get; set; }
-
-    public EliminationTargetPool? this[string toLower]
-    {
-        get
-        {
-            return (EliminationTargetPool?)GetType().GetProperties().SingleOrDefault(p => p.GetJsonName() == toLower)?.GetValue(this);
-        }
-        set
-        {
-            // Implement
-        }
-    }
+    public Dictionary<string, TargetLocation>? Targets { get; set; }
 }
 
 public record TargetLocation
diff --git a/Core/Utils/Extensions/EliminationTargetPoolExtensions.cs b/Core/Utils/Extensions/EliminationTargetPoolExtensions.cs
deleted file mode 100644
index c9c003dc..00000000
--- a/Core/Utils/Extensions/EliminationTargetPoolExtensions.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Core.Models.Spt.Repeatable;
-
-namespace Core.Utils.Extensions
-{
-    public static class EliminationTargetPoolExtensions
-    {
-        public static void Remove(this EliminationTargetPool pool, string key)
-        {
-            pool[key] = null;
-        }
-    }
-}