From 5c3b6fc5fb6874c3b37446535fb75c86e35b1b3e Mon Sep 17 00:00:00 2001
From: Virx <virx@virxcase.dev>
Date: Wed, 18 Dec 2024 16:12:10 -0500
Subject: [PATCH] Ignore color lookups

---
 RLBotCS/Conversion/FlatToModel.cs    | 13 ++--------
 RLBotCS/ManagerTools/ConfigParser.cs | 36 ----------------------------
 RLBotCS/ManagerTools/MatchStarter.cs |  3 ---
 3 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/RLBotCS/Conversion/FlatToModel.cs b/RLBotCS/Conversion/FlatToModel.cs
index 5f52b29..474fb7b 100644
--- a/RLBotCS/Conversion/FlatToModel.cs
+++ b/RLBotCS/Conversion/FlatToModel.cs
@@ -71,17 +71,8 @@ internal static Rotator ToRotator(rlbot.flat.Rotator r) =>
 
     internal static Loadout ToLoadout(rlbot.flat.PlayerLoadoutT l, uint team)
     {
-        Color primaryColor = l.PrimaryColorLookup switch
-        {
-            { } p => Color.FromArgb(p.A, p.R, p.G, p.B),
-            _ => ColorSwatches.GetPrimary(l.TeamColorId, team)
-        };
-
-        Color secondaryColor = l.SecondaryColorLookup switch
-        {
-            { } s => Color.FromArgb(s.A, s.R, s.G, s.B),
-            _ => ColorSwatches.GetSecondary(l.CustomColorId)
-        };
+        Color primaryColor = ColorSwatches.GetPrimary(l.TeamColorId, team);
+        Color secondaryColor = ColorSwatches.GetSecondary(l.CustomColorId);
 
         var lp = l.LoadoutPaint;
 
diff --git a/RLBotCS/ManagerTools/ConfigParser.cs b/RLBotCS/ManagerTools/ConfigParser.cs
index 74d4a9e..395640e 100644
--- a/RLBotCS/ManagerTools/ConfigParser.cs
+++ b/RLBotCS/ManagerTools/ConfigParser.cs
@@ -91,24 +91,6 @@ List<string> missingValues
         }
     }
 
-    private static int ParseInt(
-        TomlTable table,
-        string key,
-        int fallback,
-        List<string> missingValues
-    )
-    {
-        try
-        {
-            return (int)(long)table[key];
-        }
-        catch (KeyNotFoundException)
-        {
-            missingValues.Add(key);
-            return fallback;
-        }
-    }
-
     private static uint ParseUint(
         TomlTable table,
         string key,
@@ -127,24 +109,6 @@ List<string> missingValues
         }
     }
 
-    private static float ParseFloat(
-        TomlTable table,
-        string key,
-        float fallback,
-        List<string> missingValues
-    )
-    {
-        try
-        {
-            return Convert.ToSingle(table[key]);
-        }
-        catch (KeyNotFoundException)
-        {
-            missingValues.Add(key);
-            return fallback;
-        }
-    }
-
     private static string? ParseString(TomlTable table, string key, List<string> missingValues)
     {
         try
diff --git a/RLBotCS/ManagerTools/MatchStarter.cs b/RLBotCS/ManagerTools/MatchStarter.cs
index 0d3821e..5e52be9 100644
--- a/RLBotCS/ManagerTools/MatchStarter.cs
+++ b/RLBotCS/ManagerTools/MatchStarter.cs
@@ -23,7 +23,6 @@ int rlbotSocketsPort
     private int _connectionReadies;
 
     private bool _communicationStarted;
-    private bool _hasEverLoadedMap;
     private bool _needsSpawnCars;
 
     public bool HasSpawnedMap;
@@ -71,7 +70,6 @@ public void StartMatch(MatchSettingsT matchSettings)
     public void MapSpawned(string MapName)
     {
         Logger.LogInformation("Got map info for " + MapName);
-        _hasEverLoadedMap = true;
         HasSpawnedMap = true;
 
         if (!_needsSpawnCars)
@@ -217,7 +215,6 @@ private void LoadMatch(MatchSettingsT matchSettings)
         _needsSpawnCars = true;
         if (shouldSpawnNewMap)
         {
-            _hasEverLoadedMap = true;
             HasSpawnedMap = false;
             _matchSettings = null;
             _deferredMatchSettings = matchSettings;