new parameter LEGAL_TYRES in entry_list.ini: Allow specifying legal t…

…yre compounds for specific cars only
compujuckel · Jun 1, 2024 · ca1c175 · ca1c175
1 parent e83057f
commit ca1c175
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/AssettoServer/Network/Tcp/ACTcpClient.cs b/AssettoServer/Network/Tcp/ACTcpClient.cs
@@ -430,7 +430,7 @@ private async Task ReceiveLoopAsync()
                             ChecksumCount = (byte)checksums.Count,
                             ChecksumPaths = checksums.Select(c => c.Key),
                             CurrentTime = 0, // Ignored by AC
-                            LegalTyres = cfg.LegalTyres,
+                            LegalTyres = EntryCar.LegalTyres,
                             RandomSeed = _configuration.RandomSeed,
                             SessionCount = (byte)_configuration.Sessions.Count,
                             Sessions = _configuration.Sessions,

diff --git a/AssettoServer/Server/Configuration/Kunos/EntryList.cs b/AssettoServer/Server/Configuration/Kunos/EntryList.cs
@@ -25,6 +25,7 @@ public class Entry
         [IniField("FIXED_SETUP")] public string? FixedSetup { get; init; } = null;
         [IniField("GUID")] public string Guid { get; init; } = "";
         [IniField("AI")] public AiMode AiMode { get; internal set; } = AiMode.None;
+        [IniField("LEGAL_TYRES")] public string? LegalTyres { get; init; }
     }
 
     public static EntryList FromFile(string path)

diff --git a/AssettoServer/Server/EntryCar.cs b/AssettoServer/Server/EntryCar.cs
@@ -34,6 +34,7 @@ public partial class EntryCar : IEntryCar<ACTcpClient>
     public long LastPongTime { get; internal set; }
     public ushort Ping { get; internal set; }
     public DriverOptionsFlags DriverOptionsFlags { get; internal set; }
+    public string LegalTyres { get; set; } = "";
 
     public bool IsSpectator { get; internal set; }
     public string Model { get; }

diff --git a/AssettoServer/Server/EntryCarManager.cs b/AssettoServer/Server/EntryCarManager.cs
@@ -226,21 +226,24 @@ internal void Initialize()
             var driverOptions = CSPDriverOptions.Parse(entry.Skin);
             var aiMode = _configuration.Extra.EnableAi ? entry.AiMode : AiMode.None;
 
-            EntryCars[i] = _entryCarFactory(entry.Model, entry.Skin, (byte)i);
-            EntryCars[i].SpectatorMode = entry.SpectatorMode;
-            EntryCars[i].Ballast = entry.Ballast;
-            EntryCars[i].Restrictor = entry.Restrictor;
-            EntryCars[i].FixedSetup = entry.FixedSetup;
-            EntryCars[i].DriverOptionsFlags = driverOptions;
-            EntryCars[i].AiMode = aiMode;
-            EntryCars[i].AiEnableColorChanges = driverOptions.HasFlag(DriverOptionsFlags.AllowColorChange);
-            EntryCars[i].AiControlled = aiMode != AiMode.None;
-            EntryCars[i].NetworkDistanceSquared = MathF.Pow(_configuration.Extra.NetworkBubbleDistance, 2);
-            EntryCars[i].OutsideNetworkBubbleUpdateRateMs = 1000 / _configuration.Extra.OutsideNetworkBubbleRefreshRateHz;
+            var car = _entryCarFactory(entry.Model, entry.Skin, (byte)i);
+            car.SpectatorMode = entry.SpectatorMode;
+            car.Ballast = entry.Ballast;
+            car.Restrictor = entry.Restrictor;
+            car.FixedSetup = entry.FixedSetup;
+            car.DriverOptionsFlags = driverOptions;
+            car.AiMode = aiMode;
+            car.AiEnableColorChanges = driverOptions.HasFlag(DriverOptionsFlags.AllowColorChange);
+            car.AiControlled = aiMode != AiMode.None;
+            car.NetworkDistanceSquared = MathF.Pow(_configuration.Extra.NetworkBubbleDistance, 2);
+            car.OutsideNetworkBubbleUpdateRateMs = 1000 / _configuration.Extra.OutsideNetworkBubbleRefreshRateHz;
+            car.LegalTyres = entry.LegalTyres ?? _configuration.Server.LegalTyres;
             if (!string.IsNullOrWhiteSpace(entry.Guid))
             {
-                EntryCars[i].AllowedGuids = entry.Guid.Split(';').Select(ulong.Parse).ToList();
+                car.AllowedGuids = entry.Guid.Split(';').Select(ulong.Parse).ToList();
             }
+
+            EntryCars[i] = car;
         }
     }
 }