feat: random multiple default model

samyycX · samyycX · commit a08d802a69a2 · 2024-12-28T14:45:22.000+08:00
diff --git a/Cache.cs b/Cache.cs
@@ -72,6 +72,7 @@ public void SetPlayerModel(ulong steamid, string modelIndex, Side side, bool per
         );
 
     }
+
     public ModelCache? GetPlayerModelCache(CCSPlayerController player)
     {
         return _Cache.Find(model => model.steamid == player!.AuthorizedSteamID!.SteamId64);
diff --git a/DefaultModelManager.cs b/DefaultModelManager.cs
@@ -1,7 +1,8 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Admin;
-using Newtonsoft.Json;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace PlayerModelChanger;
 
@@ -93,22 +94,75 @@ public DefaultModelEntry(EntryKey key, DefaultModel item, Side side)
     }
 }
 
+public class DefaultModelIndexConverter : JsonConverter
+{
+    public override bool CanConvert(Type objectType)
+    {
+        return objectType == typeof(List<string>) || objectType == typeof(string);
+    }
+
+    public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+    {
+        if (reader.TokenType == JsonToken.String)
+        {
+            return new List<string> { (string)reader.Value! };
+        }
+        else if (reader.TokenType == JsonToken.StartArray)
+        {
+            var list = new List<string>();
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonToken.EndArray)
+                    break;
+                if (reader.TokenType == JsonToken.String)
+                    list.Add((string)reader.Value!);
+            }
+            return list;
+        }
+
+        throw new JsonException("Expected string or array of strings");
+    }
+
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+    {
+        var list = (List<string>?)value;
+        if (list == null) return;
+
+        writer.WriteStartArray();
+        foreach (var item in list)
+        {
+            writer.WriteValue(item);
+        }
+        writer.WriteEndArray();
+    }
+}
+
 public class DefaultModel
 {
-    public required string index;
-    public bool force;
+    [JsonProperty("index")]
+    [JsonConverter(typeof(DefaultModelIndexConverter))]
+    public required List<string> index;
+
+    [JsonProperty("force")]
+    public bool force = false;
 }
 
 class ConfigDefaultModelsTemplate
 {
-    [JsonProperty("all")] public Dictionary<string, DefaultModel>? allModels = null;
-    [JsonProperty("t")] public Dictionary<string, DefaultModel>? tModels = null;
-    [JsonProperty("ct")] public Dictionary<string, DefaultModel>? ctModels = null;
+    [JsonProperty("all")]
+    public Dictionary<string, DefaultModel>? allModels = null;
 
+    [JsonProperty("t")]
+    public Dictionary<string, DefaultModel>? tModels = null;
+
+    [JsonProperty("ct")]
+    public Dictionary<string, DefaultModel>? ctModels = null;
 }
+
 class ConfigTemplate
 {
-    [JsonProperty("DefaultModels")] public required ConfigDefaultModelsTemplate models { get; set; }
+    [JsonProperty("DefaultModels")]
+    public required ConfigDefaultModelsTemplate models { get; set; }
 }
 
 public class DefaultModelManager
@@ -122,8 +176,7 @@ public void ReloadConfig(string ModuleDirectory, ModelService service)
         var filePath = Path.Join(ModuleDirectory, "../../configs/plugins/PlayerModelChanger/DefaultModels.json");
         if (File.Exists(filePath))
         {
-            StreamReader reader = File.OpenText(filePath);
-            string content = reader.ReadToEnd();
+            string content = File.ReadAllText(filePath);
             ConfigTemplate config = JsonConvert.DeserializeObject<ConfigTemplate>(content)!;
 
             DefaultModels = ParseModelConfig(config.models, service);
@@ -188,11 +241,14 @@ private static List<DefaultModelEntry> ParseModelConfig(ConfigDefaultModelsTempl
         }
         for (var i = 0; i < defaultModels.Count; i++)
         {
-
-            if (service.GetModel(defaultModels[i].item.index) == null)
+            foreach (var index in defaultModels[i].item.index)
             {
-                PlayerModelChanger.getInstance().Logger.LogInformation($"model '${defaultModels[i].item.index}' defined in DefaultModels.json does not exist. Skipped.");
-                defaultModels.RemoveAt(i);
+                if (index != "" || service.GetModel(index) == null)
+                {
+                    PlayerModelChanger.getInstance().Logger.LogInformation($"model '${index}' defined in DefaultModels.json does not exist. Skipped.");
+                    defaultModels.RemoveAt(i);
+                    break;
+                }
             }
         }
         return defaultModels;
@@ -226,7 +282,7 @@ private static List<DefaultModelEntry> ParseModelConfig(ConfigDefaultModelsTempl
         {
             return null;
         }
-        if (result.item == null || result.item.index == "")
+        if (result.item == null || result.item.index.Count == 0)
         {
             return null;
         }
diff --git a/Model.cs b/Model.cs
@@ -14,7 +14,7 @@ public class Model
     [JsonConverter(typeof(CaseInsensitiveJsonStringEnumConverter))]
     public Side Side { get; set; } = Side.All;
     [JsonPropertyName("disableleg")] public bool Disableleg { get; set; }
-    [JsonPropertyName("hideinmenu")] public bool Hideinmenu { get; set; }
+    [JsonPropertyName("hideinmenu")] public bool HideInMenu { get; set; }
     [JsonPropertyName("fixedmeshgroups")] public Dictionary<int, int> FixedMeshgroups { get; set; } = [];
     [JsonPropertyName("meshgroups")] public Dictionary<string, dynamic> Meshgroups { get; set; } = new();
 }
diff --git a/PlayerModelChanger.cs b/PlayerModelChanger.cs
@@ -6,12 +6,14 @@
 using System.Drawing;
 using CounterStrikeSharp.API.Modules.Config;
 using Microsoft.Extensions.Logging;
+using CounterStrikeSharp.API.Modules.Memory;
+using System.Runtime.InteropServices;
 namespace PlayerModelChanger;
 
 public partial class PlayerModelChanger : BasePlugin, IPluginConfig<ModelConfig>
 {
     public override string ModuleName => "Player Model Changer";
-    public override string ModuleVersion => "1.8.2";
+    public override string ModuleVersion => "1.8.3";
 
     public override string ModuleAuthor => "samyyc";
     public required ModelConfig Config { get; set; }
@@ -100,8 +102,6 @@ public override void Unload(bool hotReload)
         RemoveListener<Listeners.OnTick>(OnTick);
         DeregisterEventHandler<EventPlayerSpawn>(OnPlayerSpawnEvent);
         Logger.LogInformation("Unloaded successfully.");
-
-
     }
 
     public static PlayerModelChanger getInstance()
@@ -265,24 +265,27 @@ public HookResult OnPlayerSpawnEvent(EventPlayerSpawn @event, GameEventInfo info
                 }
             }
 
-            Server.NextFrame(() =>
+            AddTimer(0.03f, () =>
             {
-                if (!Service.MapDefaultModelInitialized(player))
-                {
-                    Service.SetMapDefaultModel(player, player.PlayerPawn.Value.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.ModelName);
-                }
                 Server.NextFrame(() =>
                 {
-                    var model = Service.GetPlayerNowTeamModel(player);
-                    if (model != null)
+                    if (!Service.MapDefaultModelInitialized(player))
                     {
-                        SetModelNextServerFrame(player, model, model.Disableleg);
+                        Service.SetMapDefaultModel(player, player.PlayerPawn.Value.CBodyComponent!.SceneNode!.GetSkeletonInstance().ModelState.ModelName);
                     }
-                    else
+                    Server.NextFrame(() =>
                     {
-                        var originalRender = player.PlayerPawn.Value.Render;
-                        player.PlayerPawn.Value.Render = Color.FromArgb(255, originalRender.R, originalRender.G, originalRender.B);
-                    }
+                        var model = Service.GetPlayerNowTeamModel(player);
+                        if (model != null)
+                        {
+                            SetModelNextServerFrame(player, model, model.Disableleg);
+                        }
+                        else
+                        {
+                            var originalRender = player.PlayerPawn.Value.Render;
+                            player.PlayerPawn.Value.Render = Color.FromArgb(255, originalRender.R, originalRender.G, originalRender.B);
+                        }
+                    });
                 });
             });
         }
diff --git a/Service.cs b/Service.cs
@@ -48,7 +48,6 @@ public static void InitializeModel(string key, Model model)
             model.Name = model.Index;
         }
     }
-
     public void ReloadConfig(string ModuleDirectory, ModelConfig config)
     {
         this._Config = config;
@@ -125,6 +124,7 @@ public void SetPlayerAllModel(ulong steamid, string? tModel, string? ctModel, bo
             }
         }
     }
+
     public void SetPlayerModel(ulong steamid, string? modelIndex, CsTeam team, bool permissionBypass)
     {
         var side = team == CsTeam.Terrorist ? Side.T : Side.CT;
@@ -157,24 +157,24 @@ public Tuple<bool, bool> CheckAndReplaceModel(CCSPlayerController player)
         var defaultCTModel = _DefaultModelManager.GetPlayerDefaultModel(player, Side.CT);
         if (modelCache == null) // player first time join
         {
-            SetPlayerAllModel(steamid, defaultTModel?.index, defaultCTModel?.index, false, false);
+            SetPlayerAllModel(steamid, "@default", "@default", false, false);
             return new Tuple<bool, bool>(false, false);
         }
         var tValid = CheckModel(player, Side.T, modelCache, defaultTModel);
         var ctValid = CheckModel(player, Side.CT, modelCache, defaultCTModel);
         if (!tValid && !ctValid)
         {
-            SetPlayerAllModel(steamid, defaultTModel?.index, defaultCTModel?.index, false);
+            SetPlayerAllModel(steamid, "@default", "@default", false);
             return new Tuple<bool, bool>(true, true);
         }
         else if (!tValid)
         {
-            SetPlayerModel(steamid, defaultTModel?.index, Side.T, false);
+            SetPlayerModel(steamid, "@default", Side.T, false);
             return new Tuple<bool, bool>(true, false);
         }
         else if (!ctValid)
         {
-            SetPlayerModel(steamid, defaultCTModel?.index, Side.CT, false);
+            SetPlayerModel(steamid, "@default", Side.CT, false);
             return new Tuple<bool, bool>(false, true);
         }
         return new Tuple<bool, bool>(false, false);
@@ -192,18 +192,15 @@ public bool CheckModel(CCSPlayerController player, Side side, ModelCache? modelC
         {
             return true;
         }
-        if (defaultModel != null && defaultModel.force)
+        if (defaultModel != null && defaultModel.force && modelIndex != "@default")
         {
-            if (modelIndex != defaultModel.index)
-            {
-                return false;
-            }
+            return false;
         }
         if (modelIndex == "@random" && _Config.DisableRandomModel)
         {
             return false;
         }
-        if (modelIndex == "" || modelIndex == "@random")
+        if (modelIndex == "" || modelIndex == "@random" || modelIndex == "@default")
         {
             return true;
         }
@@ -216,28 +213,35 @@ public bool CheckModel(CCSPlayerController player, Side side, ModelCache? modelC
         return CanPlayerApplyModel(player, side, model);
     }
 
-    public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelIndex, Side side)
+    private bool IsPlayerInCooldown(CCSPlayerController player)
     {
         if (_ModelChangeCooldown.ContainsKey(player.SteamID))
         {
             var lastTime = _ModelChangeCooldown[player.SteamID];
             if (DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - lastTime < (_Config.ModelChangeCooldownSecond * 1000))
             {
                 player.PrintToChat(_Localizer["command.model.cooldown"]);
-                return false;
+                return true;
             }
         }
+        return false;
+    }
+
+    public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelIndex, Side side)
+    {
+        if (IsPlayerInCooldown(player))
+        {
+            return false;
+        }
 
         var isSpecial = modelIndex == "" || modelIndex == "@random";
 
         if (modelIndex == "@default")
         {
-            var tDefault = _DefaultModelManager.GetPlayerDefaultModel(player, Side.T);
-            var ctDefault = _DefaultModelManager.GetPlayerDefaultModel(player, Side.CT);
             Utils.ExecuteSide(side,
-                () => SetPlayerAllModel(player!.AuthorizedSteamID!.SteamId64, tDefault == null ? "" : tDefault.index, ctDefault == null ? "" : ctDefault.index, false),
-                () => SetPlayerModel(player!.AuthorizedSteamID!.SteamId64, tDefault == null ? "" : tDefault.index, side, false),
-                () => SetPlayerModel(player!.AuthorizedSteamID!.SteamId64, ctDefault == null ? "" : ctDefault.index, side, false)
+                () => SetPlayerAllModel(player!.AuthorizedSteamID!.SteamId64, "@default", "@default", false),
+                () => SetPlayerModel(player!.AuthorizedSteamID!.SteamId64, "@default", side, false),
+                () => SetPlayerModel(player!.AuthorizedSteamID!.SteamId64, "@default", side, false)
             );
             if (_Config.DisableInstantChange || !Utils.CanPlayerSetModelInstantly(player, side))
             {
@@ -277,8 +281,8 @@ public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelInde
             player.PrintToChat(_Localizer["command.model.success", _Localizer["side." + side.ToName()]]);
         }
         return true;
-
     }
+
     public Model? GetPlayerModel(CCSPlayerController player, Side side)
     {
         if (side == Side.All)
@@ -303,6 +307,20 @@ public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelInde
             var index = Random.Shared.Next(models.Count());
             return models[index];
         }
+        if (modelIndex == "@default")
+        {
+            var defaultModel = _DefaultModelManager.GetPlayerDefaultModel(player, side);
+            if (defaultModel == null || defaultModel.index.Count == 0)
+            {
+                return null;
+            }
+            var index = defaultModel.index[Random.Shared.Next(defaultModel.index.Count)];
+            if (index == "")
+            {
+                return null;
+            }
+            return GetModel(index);
+        }
         return GetModel(modelIndex);
     }
 
@@ -316,6 +334,7 @@ public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelInde
         var side = team == CsTeam.Terrorist ? Side.T : Side.CT;
         return GetPlayerModel(player, side);
     }
+
     public string GetPlayerModelName(CCSPlayerController player, CsTeam team)
     {
         var modelCache = _CacheManager.GetPlayerModelCache(player);
@@ -457,5 +476,4 @@ public void ClearMapDefaultModel()
     {
         _MapDefaultModels.Clear();
     }
-
 }
diff --git a/Storage.cs b/Storage.cs
@@ -8,7 +8,6 @@ public interface IStorage
     public void SetPlayerCTModel(ulong SteamID, string modelIndex, bool permissionBypass);
     public void SetAllTModel(string tmodel, bool permissionBypass);
     public void SetAllCTModel(string ctmodel, bool permissionBypass);
-
     public List<int> GetMeshgroupPreference(ulong SteamID, string modelIndex);
     public void AddMeshgroupPreference(ulong SteamID, string modelIndex, int meshgroup);
     public void RemoveMeshgroupPreference(ulong SteamID, string modelIndex, int meshgroup);
diff --git a/build/Release/PlayerModelChanger/PlayerModelChanger.dll b/build/Release/PlayerModelChanger/PlayerModelChanger.dll
diff --git a/build/Release/PlayerModelChanger/PlayerModelChanger.pdb b/build/Release/PlayerModelChanger/PlayerModelChanger.pdb
diff --git a/commands/CommandModelMenu.cs b/commands/CommandModelMenu.cs
@@ -65,7 +65,7 @@ public WasdModelMenu GetSelectModelMenu(CCSPlayerController player, Side side)
 
         foreach (var model in models)
         {
-            if (model.Hideinmenu)
+            if (model.HideInMenu)
             {
                 continue;
             }

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public void SetPlayerModel(ulong steamid, string modelIndex, Side side, bool per`
`72`	`72`	`);`
`73`	`73`
`74`	`74`	`}`
	`75`	`+`
`75`	`76`	`public ModelCache? GetPlayerModelCache(CCSPlayerController player)`
`76`	`77`	`{`
`77`	`78`	`return _Cache.Find(model => model.steamid == player!.AuthorizedSteamID!.SteamId64);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class Model`
`14`	`14`	`[JsonConverter(typeof(CaseInsensitiveJsonStringEnumConverter))]`
`15`	`15`	`public Side Side { get; set; } = Side.All;`
`16`	`16`	`[JsonPropertyName("disableleg")] public bool Disableleg { get; set; }`
`17`		`- [JsonPropertyName("hideinmenu")] public bool Hideinmenu { get; set; }`
	`17`	`+ [JsonPropertyName("hideinmenu")] public bool HideInMenu { get; set; }`
`18`	`18`	`[JsonPropertyName("fixedmeshgroups")] public Dictionary<int, int> FixedMeshgroups { get; set; } = [];`
`19`	`19`	`[JsonPropertyName("meshgroups")] public Dictionary<string, dynamic> Meshgroups { get; set; } = new();`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ public static void InitializeModel(string key, Model model)`
`48`	`48`	`model.Name = model.Index;`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`-`
`52`	`51`	`public void ReloadConfig(string ModuleDirectory, ModelConfig config)`
`53`	`52`	`{`
`54`	`53`	`this._Config = config;`
`@@ -125,6 +124,7 @@ public void SetPlayerAllModel(ulong steamid, string? tModel, string? ctModel, bo`
`125`	`124`	`}`
`126`	`125`	`}`
`127`	`126`	`}`
	`127`	`+`
`128`	`128`	`public void SetPlayerModel(ulong steamid, string? modelIndex, CsTeam team, bool permissionBypass)`
`129`	`129`	`{`
`130`	`130`	`var side = team == CsTeam.Terrorist ? Side.T : Side.CT;`
`@@ -157,24 +157,24 @@ public Tuple<bool, bool> CheckAndReplaceModel(CCSPlayerController player)`
`157`	`157`	`var defaultCTModel = _DefaultModelManager.GetPlayerDefaultModel(player, Side.CT);`
`158`	`158`	`if (modelCache == null) // player first time join`
`159`	`159`	`{`
`160`		`- SetPlayerAllModel(steamid, defaultTModel?.index, defaultCTModel?.index, false, false);`
	`160`	`+ SetPlayerAllModel(steamid, "@default", "@default", false, false);`
`161`	`161`	`return new Tuple<bool, bool>(false, false);`
`162`	`162`	`}`
`163`	`163`	`var tValid = CheckModel(player, Side.T, modelCache, defaultTModel);`
`164`	`164`	`var ctValid = CheckModel(player, Side.CT, modelCache, defaultCTModel);`
`165`	`165`	`if (!tValid && !ctValid)`
`166`	`166`	`{`
`167`		`- SetPlayerAllModel(steamid, defaultTModel?.index, defaultCTModel?.index, false);`
	`167`	`+ SetPlayerAllModel(steamid, "@default", "@default", false);`
`168`	`168`	`return new Tuple<bool, bool>(true, true);`
`169`	`169`	`}`
`170`	`170`	`else if (!tValid)`
`171`	`171`	`{`
`172`		`- SetPlayerModel(steamid, defaultTModel?.index, Side.T, false);`
	`172`	`+ SetPlayerModel(steamid, "@default", Side.T, false);`
`173`	`173`	`return new Tuple<bool, bool>(true, false);`
`174`	`174`	`}`
`175`	`175`	`else if (!ctValid)`
`176`	`176`	`{`
`177`		`- SetPlayerModel(steamid, defaultCTModel?.index, Side.CT, false);`
	`177`	`+ SetPlayerModel(steamid, "@default", Side.CT, false);`
`178`	`178`	`return new Tuple<bool, bool>(false, true);`
`179`	`179`	`}`
`180`	`180`	`return new Tuple<bool, bool>(false, false);`
`@@ -192,18 +192,15 @@ public bool CheckModel(CCSPlayerController player, Side side, ModelCache? modelC`
`192`	`192`	`{`
`193`	`193`	`return true;`
`194`	`194`	`}`
`195`		`- if (defaultModel != null && defaultModel.force)`
	`195`	`+ if (defaultModel != null && defaultModel.force && modelIndex != "@default")`
`196`	`196`	`{`
`197`		`- if (modelIndex != defaultModel.index)`
`198`		`- {`
`199`		`- return false;`
`200`		`- }`
	`197`	`+ return false;`
`201`	`198`	`}`
`202`	`199`	`if (modelIndex == "@random" && _Config.DisableRandomModel)`
`203`	`200`	`{`
`204`	`201`	`return false;`
`205`	`202`	`}`
`206`		`- if (modelIndex == "" \|\| modelIndex == "@random")`
	`203`	`+ if (modelIndex == "" \|\| modelIndex == "@random" \|\| modelIndex == "@default")`
`207`	`204`	`{`
`208`	`205`	`return true;`
`209`	`206`	`}`
`@@ -216,28 +213,35 @@ public bool CheckModel(CCSPlayerController player, Side side, ModelCache? modelC`
`216`	`213`	`return CanPlayerApplyModel(player, side, model);`
`217`	`214`	`}`
`218`	`215`
`219`		`- public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelIndex, Side side)`
	`216`	`+ private bool IsPlayerInCooldown(CCSPlayerController player)`
`220`	`217`	`{`
`221`	`218`	`if (_ModelChangeCooldown.ContainsKey(player.SteamID))`
`222`	`219`	`{`
`223`	`220`	`var lastTime = _ModelChangeCooldown[player.SteamID];`
`224`	`221`	`if (DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - lastTime < (_Config.ModelChangeCooldownSecond * 1000))`
`225`	`222`	`{`
`226`	`223`	`player.PrintToChat(_Localizer["command.model.cooldown"]);`
`227`		`- return false;`
	`224`	`+ return true;`
`228`	`225`	`}`
`229`	`226`	`}`
	`227`	`+ return false;`
	`228`	`+ }`
	`229`	`+`
	`230`	`+ public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelIndex, Side side)`
	`231`	`+ {`
	`232`	`+ if (IsPlayerInCooldown(player))`
	`233`	`+ {`
	`234`	`+ return false;`
	`235`	`+ }`
`230`	`236`
`231`	`237`	`var isSpecial = modelIndex == "" \|\| modelIndex == "@random";`
`232`	`238`
`233`	`239`	`if (modelIndex == "@default")`
`234`	`240`	`{`
`235`		`- var tDefault = _DefaultModelManager.GetPlayerDefaultModel(player, Side.T);`
`236`		`- var ctDefault = _DefaultModelManager.GetPlayerDefaultModel(player, Side.CT);`
`237`	`241`	`Utils.ExecuteSide(side,`
`238`		`- () => SetPlayerAllModel(player!.AuthorizedSteamID!.SteamId64, tDefault == null ? "" : tDefault.index, ctDefault == null ? "" : ctDefault.index, false),`
`239`		`- () => SetPlayerModel(player!.AuthorizedSteamID!.SteamId64, tDefault == null ? "" : tDefault.index, side, false),`
`240`		`- () => SetPlayerModel(player!.AuthorizedSteamID!.SteamId64, ctDefault == null ? "" : ctDefault.index, side, false)`
	`242`	`+ () => SetPlayerAllModel(player!.AuthorizedSteamID!.SteamId64, "@default", "@default", false),`
	`243`	`+ () => SetPlayerModel(player!.AuthorizedSteamID!.SteamId64, "@default", side, false),`
	`244`	`+ () => SetPlayerModel(player!.AuthorizedSteamID!.SteamId64, "@default", side, false)`
`241`	`245`	`);`
`242`	`246`	`if (_Config.DisableInstantChange \|\| !Utils.CanPlayerSetModelInstantly(player, side))`
`243`	`247`	`{`
`@@ -277,8 +281,8 @@ public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelInde`
`277`	`281`	`player.PrintToChat(_Localizer["command.model.success", _Localizer["side." + side.ToName()]]);`
`278`	`282`	`}`
`279`	`283`	`return true;`
`280`		`-`
`281`	`284`	`}`
	`285`	`+`
`282`	`286`	`public Model? GetPlayerModel(CCSPlayerController player, Side side)`
`283`	`287`	`{`
`284`	`288`	`if (side == Side.All)`
`@@ -303,6 +307,20 @@ public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelInde`
`303`	`307`	`var index = Random.Shared.Next(models.Count());`
`304`	`308`	`return models[index];`
`305`	`309`	`}`
	`310`	`+ if (modelIndex == "@default")`
	`311`	`+ {`
	`312`	`+ var defaultModel = _DefaultModelManager.GetPlayerDefaultModel(player, side);`
	`313`	`+ if (defaultModel == null \|\| defaultModel.index.Count == 0)`
	`314`	`+ {`
	`315`	`+ return null;`
	`316`	`+ }`
	`317`	`+ var index = defaultModel.index[Random.Shared.Next(defaultModel.index.Count)];`
	`318`	`+ if (index == "")`
	`319`	`+ {`
	`320`	`+ return null;`
	`321`	`+ }`
	`322`	`+ return GetModel(index);`
	`323`	`+ }`
`306`	`324`	`return GetModel(modelIndex);`
`307`	`325`	`}`
`308`	`326`
`@@ -316,6 +334,7 @@ public bool SetPlayerModelWithCheck(CCSPlayerController player, string modelInde`
`316`	`334`	`var side = team == CsTeam.Terrorist ? Side.T : Side.CT;`
`317`	`335`	`return GetPlayerModel(player, side);`
`318`	`336`	`}`
	`337`	`+`
`319`	`338`	`public string GetPlayerModelName(CCSPlayerController player, CsTeam team)`
`320`	`339`	`{`
`321`	`340`	`var modelCache = _CacheManager.GetPlayerModelCache(player);`
`@@ -457,5 +476,4 @@ public void ClearMapDefaultModel()`
`457`	`476`	`{`
`458`	`477`	`_MapDefaultModels.Clear();`
`459`	`478`	`}`
`460`		`-`
`461`	`479`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public WasdModelMenu GetSelectModelMenu(CCSPlayerController player, Side side)`
`65`	`65`
`66`	`66`	`foreach (var model in models)`
`67`	`67`	`{`
`68`		`- if (model.Hideinmenu)`
	`68`	`+ if (model.HideInMenu)`
`69`	`69`	`{`
`70`	`70`	`continue;`
`71`	`71`	`}`