Special config parsing for PlayerClass

Author: VirxEC

RLBotCS/ManagerTools/ConfigParser.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using Microsoft.Extensions.Logging;
 using RLBot.Flat;
 using RLBotCS.Model;
@@ -182,6 +182,39 @@ private T GetEnum<T>(TomlTable table, string key, T fallback)
         return fallback;
     }
 
+    private PlayerClass GetAgentType(TomlTable table)
+    {
+        if (table.TryGetValue(Fields.AgentType, out var raw))
+        {
+            if (raw is string val)
+            {
+                switch (val.ToLower())
+                {
+                    case "rlbot":
+                        return PlayerClass.CustomBot;
+                    case "psyonix":
+                        return PlayerClass.PsyonixBot;
+                    case "human":
+                        return PlayerClass.Human;
+                    default:
+                        throw new InvalidCastException(
+                            $"{_context.ToStringWithEnd(Fields.AgentType)} has invalid value \"{raw}\". "
+                                + $"Find valid values on https:/wiki.rlbot.org."
+                        );
+                }
+            }
+            else
+            {
+                throw new InvalidCastException(
+                    $"{_context.ToStringWithEnd(Fields.AgentType)} has value {raw}, but a value of type {typeof(PlayerClass).Name} was expected."
+                );
+            }
+        }
+
+        _missingValues.Add(_context.ToStringWithEnd(Fields.AgentType));
+        return PlayerClass.CustomBot;
+    }
+
     private static string? CombinePaths(string? parent, string? child)
     {
         if (parent == null || child == null)
@@ -267,7 +300,7 @@ private PlayerConfigurationT ParseCarTable(TomlTable table, string matchConfigPa
             loadoutFileOverride = Path.Combine(matchConfigDir, loadoutFileOverride);
         }
 
-        PlayerClass playerClass = GetEnum(table, Fields.AgentType, PlayerClass.CustomBot);
+        PlayerClass playerClass = GetAgentType(table);
         if (playerClass == PlayerClass.Human)
         {
             return new PlayerConfigurationT

RLBotCSTests/TestTomls/bad_team.toml

@@ -2,4 +2,4 @@
 
 [[cars]]
 team = 42
-type = "PsyonixBot"
+type = "Psyonix"

RLBotCSTests/TestTomls/edge.toml

@@ -15,7 +15,7 @@ gravity = "rEvErsE"
 [[cars]]
 # No config
 name = "Boomer"
-type = "pSyOniXbOt"
+type = "pSyOniX"
 skill = "pro"
 
 [[cars]]