more improvements and updated readme

RestoreMonarchy · RestoreMonarchy · commit db8af3752952 · 2024-11-10T19:16:42.000+01:00
diff --git a/PlayerStats/Commands/RankCommand.cs b/PlayerStats/Commands/RankCommand.cs
@@ -72,28 +72,31 @@ public void Execute(IRocketPlayer caller, string[] command)
 
                     string rank = playerRanking.Rank.ToString();
                     int minTreshold = pluginInstance.Configuration.Instance.MinimumRankingTreshold;
-                    if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+                    if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
                     {
-                        string kills = playerRanking.Kills.ToString("N0");                      
+                        string kills = playerRanking.Kills.ToString("N0");
                         if (caller.Id == playerRanking.SteamId.ToString())
                         {
                             if (playerRanking.IsUnranked())
                             {
                                 pluginInstance.SendMessageToPlayer(caller, "YouAreUnrankedPVP", kills, minTreshold);
-                            } else
+                            }
+                            else
                             {
                                 pluginInstance.SendMessageToPlayer(caller, "YourPlayerPVPRanking", rank, kills);
-                            }                            
-                        } else
+                            }
+                        }
+                        else
                         {
                             if (playerRanking.IsUnranked())
                             {
                                 pluginInstance.SendMessageToPlayer(caller, "OtherPlayerIsUnrankedPVP", playerRanking.Name, kills, minTreshold);
-                            } else
+                            }
+                            else
                             {
                                 pluginInstance.SendMessageToPlayer(caller, "OtherPlayerPVPRanking", playerRanking.Name, rank, kills);
                             }
-                        }                        
+                        }
                     }
                     else
                     {
@@ -103,16 +106,19 @@ public void Execute(IRocketPlayer caller, string[] command)
                             if (playerRanking.IsUnranked())
                             {
                                 pluginInstance.SendMessageToPlayer(caller, "YouAreUnrankedPVE", zombies, minTreshold);
-                            } else
+                            }
+                            else
                             {
                                 pluginInstance.SendMessageToPlayer(caller, "YourPlayerPVERanking", rank, zombies);
-                            }                            
-                        } else
+                            }
+                        }
+                        else
                         {
                             if (playerRanking.IsUnranked())
                             {
                                 pluginInstance.SendMessageToPlayer(caller, "OtherPlayerIsUnrankedPVE", playerRanking.Name, zombies, minTreshold);
-                            } else
+                            }
+                            else
                             {
                                 pluginInstance.SendMessageToPlayer(caller, "OtherPlayerPVERanking", playerRanking.Name, rank, zombies);
                             }
diff --git a/PlayerStats/Commands/RankingCommand.cs b/PlayerStats/Commands/RankingCommand.cs
@@ -31,7 +31,7 @@ public void Execute(IRocketPlayer caller, string[] command)
                         return;
                     }
 
-                    if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+                    if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
                     {
                         pluginInstance.SendMessageToPlayer(caller, "RankingListHeaderPVP", amount);
                         foreach (PlayerRanking playerRanking in playerRankings)
@@ -52,7 +52,7 @@ public void Execute(IRocketPlayer caller, string[] command)
                             string zombies = playerRanking.Zombies.ToString("N0");
                             pluginInstance.SendMessageToPlayer(caller, "RankingListItemPVE", rank, name, zombies);
                         }
-                    }                    
+                    }
                 });
             });
         }
diff --git a/PlayerStats/Commands/SessionStatsCommand.cs b/PlayerStats/Commands/SessionStatsCommand.cs
@@ -34,7 +34,7 @@ public void Execute(IRocketPlayer caller, string[] command)
             }
 
             PlayerStatsData playerData = component.SessionPlayerData;
-            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+            if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
             {
                 string kills = playerData.Kills.ToString("N0");
                 string deaths = playerData.PVPDeaths.ToString("N0");
@@ -51,7 +51,7 @@ public void Execute(IRocketPlayer caller, string[] command)
                 }
             }
 
-            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVE)
+            if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVE)
             {
                 string zombies = playerData.Zombies.ToString("N0");
                 string megaZombies = playerData.MegaZombies.ToString("N0");
diff --git a/PlayerStats/Commands/StatsCommand.cs b/PlayerStats/Commands/StatsCommand.cs
@@ -20,7 +20,7 @@ public void Execute(IRocketPlayer caller, string[] command)
 
             CommandHelper.GetPlayerData(caller, command, (playerData) =>
             {
-                if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+                if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
                 {
                     string kills = playerData.Kills.ToString("N0");
                     string deaths = playerData.PVPDeaths.ToString("N0");
@@ -30,13 +30,14 @@ public void Execute(IRocketPlayer caller, string[] command)
                     if (caller.Id == playerData.SteamId.ToString())
                     {
                         pluginInstance.SendMessageToPlayer(caller, "YourPVPStats", kills, deaths, kdr, hsPercentage);
-                    } else
+                    }
+                    else
                     {
                         pluginInstance.SendMessageToPlayer(caller, "OtherPVPStats", playerData.Name, kills, deaths, kdr, hsPercentage);
-                    }                    
+                    }
                 }
 
-                if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVE)
+                if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVE)
                 {
                     string zombies = playerData.Zombies.ToString("N0");
                     string megaZombies = playerData.MegaZombies.ToString("N0");
diff --git a/PlayerStats/Commands/StatsUICommand.cs b/PlayerStats/Commands/StatsUICommand.cs
@@ -19,6 +19,12 @@ public void Execute(IRocketPlayer caller, string[] command)
                 return;
             }
 
+            if (!pluginInstance.Configuration.Instance.EnableUIEffect)
+            {
+                pluginInstance.SendMessageToPlayer(player, "StatsUIEffectDisabled");
+                return;
+            }
+
             bool currentUIState = component.PlayerData.UIDisabled ?? !pluginInstance.Configuration.Instance.ShowUIEffectByDefault;
             component.PlayerData.UIDisabled = !currentUIState;
 
diff --git a/PlayerStats/Components/PlayerStatsComponent.UI.cs b/PlayerStats/Components/PlayerStatsComponent.UI.cs
@@ -23,7 +23,7 @@ public void SendUIEffect()
             EffectManager.sendUIEffect(configuration.UIEffectId, Key, TransportConnection, true);
 
             // Use different translations based on UI mode
-            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+            if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
             {
                 EffectManager.sendUIEffectText(Key, TransportConnection, true, "PlayerStats_Stats_Kills_Text", pluginInstance.Translate("UI_Kills"));
                 EffectManager.sendUIEffectText(Key, TransportConnection, true, "PlayerStats_Stats_Deaths_Text", pluginInstance.Translate("UI_Deaths"));
@@ -67,7 +67,7 @@ public void UpdateUIEffect()
                 return;
             }
 
-            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+            if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
             {
                 // PVP Stats
                 string kills = PlayerData.Kills.ToString("N0");
@@ -107,7 +107,7 @@ public void UpdateUIEffect()
                     string progress;
                     int progressPercentage;
 
-                    if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+                    if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
                     {
                         nextReward = pluginInstance.Translate("UI_NextReward", reward.Name);
                         progress = pluginInstance.Translate("UI_RewardProgress", PlayerData.Kills.ToString("N0"), reward.Treshold.ToString("N0"));
diff --git a/PlayerStats/Components/PlayerStatsComponent.cs b/PlayerStats/Components/PlayerStatsComponent.cs
@@ -26,7 +26,7 @@ public partial class PlayerStatsComponent : MonoBehaviour
 
         private Reward GetCurrentReward() 
         { 
-            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+            if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
             {
                 return configuration.Rewards.OrderByDescending(x => x.Treshold).FirstOrDefault(x => x.Treshold <= PlayerData.Kills);
             } else
@@ -37,7 +37,7 @@ private Reward GetCurrentReward()
 
         private Reward GetNextReward()
         {
-            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+            if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
             {
                 return configuration.Rewards.OrderBy(x => x.Treshold).FirstOrDefault(x => x.Treshold > PlayerData.Kills);
             }
@@ -70,7 +70,7 @@ void Awake()
                     ThreadHelper.RunSynchronously(() =>
                     {
                         Logger.Log($"Failed to load player data for {Name} ({SteamId}): {ex.Message}");
-                    });                    
+                    });
                     playerData = PlayerData;
                 }
 
@@ -112,7 +112,7 @@ void Awake()
                             continue;
                         }
 
-                        if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+                        if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
                         {
                             if (reward.Treshold <= PlayerData.Kills)
                             {
@@ -207,7 +207,7 @@ internal void OnPlayerDeath(Player killer, ELimb limb, EDeathCause cause)
             {
                 PlayerData.PVEDeaths++;
                 SessionPlayerData.PVEDeaths++;
-                if (configuration.StatsMode == StatsMode.PVE)
+                if (configuration.ActualStatsMode == StatsMode.PVE)
                 {
                     UpdateUIEffect();
                 }
@@ -230,7 +230,7 @@ internal void CheckGiveReward()
                 {
                     R.Permissions.AddPlayerToGroup(reward.PermissionGroup, unturnedPlayer);
                     string treshold = reward.Treshold.ToString("N0");
-                    if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+                    if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
                     {
                         pluginInstance.SendMessageToPlayer(unturnedPlayer, "RewardReceivedPVP", reward.Name, treshold);
                     } else
@@ -272,7 +272,7 @@ internal void OnPlayerUpdatedStat(EPlayerStat stat)
                     break;
             }
 
-            if (configuration.StatsMode == StatsMode.PVE)
+            if (configuration.ActualStatsMode == StatsMode.PVE)
             {
                 UpdateUIEffect();
             }
diff --git a/PlayerStats/Databases/JsonDatabase.cs b/PlayerStats/Databases/JsonDatabase.cs
@@ -18,7 +18,7 @@ public IEnumerable<PlayerRanking> GetPlayerRankings(int amount, string orderBy =
         {
             if (orderBy == null)
             {
-                orderBy = (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
+                orderBy = (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
             }
 
             List<PlayerRanking> rankings = new();
@@ -56,7 +56,7 @@ public PlayerRanking GetPlayerRanking(ulong steamId, string orderBy = null)
 
             if (orderBy == null)
             {
-                orderBy = (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
+                orderBy = (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
             }
 
             PlayerRanking ranking = new();
diff --git a/PlayerStats/Databases/MySQLDatabase.cs b/PlayerStats/Databases/MySQLDatabase.cs
@@ -20,7 +20,7 @@ public IEnumerable<PlayerRanking> GetPlayerRankings(int amount, string orderBy =
         {
             if (orderBy == null)
             {
-                orderBy = (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
+                orderBy = (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
             }
             
             string query = FormatSql($@"
@@ -44,7 +44,7 @@ public PlayerRanking GetPlayerRanking(ulong steamId, string orderBy = null)
         {
             if (orderBy == null)
             {
-                orderBy = (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
+                orderBy = (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
             }
 
             string query = FormatSql($@"
diff --git a/PlayerStats/Models/PlayerRanking.cs b/PlayerStats/Models/PlayerRanking.cs
@@ -13,7 +13,7 @@ public bool IsUnranked()
         {
             PlayerStatsConfiguration configuration = PlayerStatsPlugin.Instance.Configuration.Instance;
 
-            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+            if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
             {
                 return Kills < configuration.MinimumRankingTreshold;
             }
diff --git a/PlayerStats/Models/StatsMode.cs b/PlayerStats/Models/StatsMode.cs
@@ -1,9 +1,14 @@
-﻿namespace RestoreMonarchy.PlayerStats.Models
+﻿using System.Xml.Serialization;
+
+namespace RestoreMonarchy.PlayerStats.Models
 {
     public enum StatsMode
     {
+        [XmlEnum("both")]
         Both,
+        [XmlEnum("pvp")]
         PVP,
+        [XmlEnum("pve")]
         PVE
     }
 }
diff --git a/PlayerStats/PlayerStats.csproj b/PlayerStats/PlayerStats.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net48</TargetFramework>
 	  <LangVersion>latest</LangVersion>
 	  <RootNamespace>RestoreMonarchy.PlayerStats</RootNamespace>
-    <Version>1.0.3</Version>
+    <Version>1.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/PlayerStats/PlayerStatsConfiguration.cs b/PlayerStats/PlayerStatsConfiguration.cs
@@ -1,5 +1,6 @@
 ﻿using RestoreMonarchy.PlayerStats.Models;
 using Rocket.API;
+using System;
 
 namespace RestoreMonarchy.PlayerStats
 {
@@ -31,42 +32,58 @@ public class PlayerStatsConfiguration : IRocketPluginConfiguration
         public bool PVPUI { get; set; }
 
         // New Stats Settings
-        public StatsMode? StatsMode { get; set; }
+        public string StatsMode { get; set; }
 
         // Ranking & Rewards
         public int MinimumRankingTreshold { get; set; }
         public bool EnableRewards { get; set; }
         public Reward[] Rewards { get; set; }
 
         // Only hide legacy properties when using new StatsMode
-        public bool ShouldSerializeEnablePVPStats() => !StatsMode.HasValue;
-        public bool ShouldSerializeEnablePVEStats() => !StatsMode.HasValue;
-        public bool ShouldSerializePVPRanking() => !StatsMode.HasValue;
-        public bool ShouldSerializePVPRewards() => !StatsMode.HasValue;
-        public bool ShouldSerializePVPUI() => !StatsMode.HasValue;
+        public bool ShouldSerializeEnablePVPStats() => StatsMode == null;
+        public bool ShouldSerializeEnablePVEStats() => StatsMode == null;
+        public bool ShouldSerializePVPRanking() => StatsMode == null;
+        public bool ShouldSerializePVPRewards() => StatsMode == null;
+        public bool ShouldSerializePVPUI() => StatsMode == null;
+
+        internal StatsMode? actualStatsMode;
 
         public StatsMode ActualStatsMode
         {
             get
             {
-                if (StatsMode.HasValue)
-                    return StatsMode.Value;
-
-                if (!EnablePVPStats && !EnablePVEStats)
-                    return Models.StatsMode.Both;
-                if (EnablePVPStats && !EnablePVEStats)
-                    return Models.StatsMode.PVP;
-                if (!EnablePVPStats && EnablePVEStats)
-                    return Models.StatsMode.PVE;
-
-                return Models.StatsMode.Both;
+                if (actualStatsMode.HasValue)
+                {
+                    return actualStatsMode.Value;
+                }
+                
+                
+                if (!string.IsNullOrEmpty(StatsMode))
+                {
+                    actualStatsMode = (StatsMode)Enum.Parse(typeof(StatsMode), StatsMode, true);
+                } else
+                {
+                    if (!EnablePVPStats && !EnablePVEStats)
+                    {
+                        actualStatsMode = Models.StatsMode.Both;
+                    } else if (EnablePVPStats && !EnablePVEStats)
+                    {
+                        actualStatsMode = Models.StatsMode.PVP;
+                    }
+                    else if (!EnablePVPStats && EnablePVEStats)
+                    {
+                        actualStatsMode = Models.StatsMode.PVE;
+                    }
+                    else
+                    {
+                        actualStatsMode = Models.StatsMode.Both;
+                    }
+                }                
+
+                return actualStatsMode.Value;
             }
         }
 
-        public bool IsRankingEnabled => StatsMode.HasValue ?
-            (ActualStatsMode == Models.StatsMode.PVP || ActualStatsMode == Models.StatsMode.Both) && EnableRewards
-            : PVPRanking && PVPRewards;
-
         public void LoadDefaults()
         {
             MessageColor = "yellow";
@@ -92,7 +109,7 @@ public void LoadDefaults()
             PVPUI = true;
 
             // New system defaults to null to use legacy system
-            StatsMode = null;
+            StatsMode = Models.StatsMode.Both.ToString();
 
             MinimumRankingTreshold = 25;
             EnableRewards = true;
diff --git a/PlayerStats/PlayerStatsPlugin.cs b/PlayerStats/PlayerStatsPlugin.cs
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -72,28 +72,31 @@ public void Execute(IRocketPlayer caller, string[] command)`
`72`	`72`
`73`	`73`	`string rank = playerRanking.Rank.ToString();`
`74`	`74`	`int minTreshold = pluginInstance.Configuration.Instance.MinimumRankingTreshold;`
`75`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`75`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`76`	`76`	`{`
`77`		`- string kills = playerRanking.Kills.ToString("N0");`
	`77`	`+ string kills = playerRanking.Kills.ToString("N0");`
`78`	`78`	`if (caller.Id == playerRanking.SteamId.ToString())`
`79`	`79`	`{`
`80`	`80`	`if (playerRanking.IsUnranked())`
`81`	`81`	`{`
`82`	`82`	`pluginInstance.SendMessageToPlayer(caller, "YouAreUnrankedPVP", kills, minTreshold);`
`83`		`- } else`
	`83`	`+ }`
	`84`	`+ else`
`84`	`85`	`{`
`85`	`86`	`pluginInstance.SendMessageToPlayer(caller, "YourPlayerPVPRanking", rank, kills);`
`86`		`- }`
`87`		`- } else`
	`87`	`+ }`
	`88`	`+ }`
	`89`	`+ else`
`88`	`90`	`{`
`89`	`91`	`if (playerRanking.IsUnranked())`
`90`	`92`	`{`
`91`	`93`	`pluginInstance.SendMessageToPlayer(caller, "OtherPlayerIsUnrankedPVP", playerRanking.Name, kills, minTreshold);`
`92`		`- } else`
	`94`	`+ }`
	`95`	`+ else`
`93`	`96`	`{`
`94`	`97`	`pluginInstance.SendMessageToPlayer(caller, "OtherPlayerPVPRanking", playerRanking.Name, rank, kills);`
`95`	`98`	`}`
`96`		`- }`
	`99`	`+ }`
`97`	`100`	`}`
`98`	`101`	`else`
`99`	`102`	`{`
`@@ -103,16 +106,19 @@ public void Execute(IRocketPlayer caller, string[] command)`
`103`	`106`	`if (playerRanking.IsUnranked())`
`104`	`107`	`{`
`105`	`108`	`pluginInstance.SendMessageToPlayer(caller, "YouAreUnrankedPVE", zombies, minTreshold);`
`106`		`- } else`
	`109`	`+ }`
	`110`	`+ else`
`107`	`111`	`{`
`108`	`112`	`pluginInstance.SendMessageToPlayer(caller, "YourPlayerPVERanking", rank, zombies);`
`109`		`- }`
`110`		`- } else`
	`113`	`+ }`
	`114`	`+ }`
	`115`	`+ else`
`111`	`116`	`{`
`112`	`117`	`if (playerRanking.IsUnranked())`
`113`	`118`	`{`
`114`	`119`	`pluginInstance.SendMessageToPlayer(caller, "OtherPlayerIsUnrankedPVE", playerRanking.Name, zombies, minTreshold);`
`115`		`- } else`
	`120`	`+ }`
	`121`	`+ else`
`116`	`122`	`{`
`117`	`123`	`pluginInstance.SendMessageToPlayer(caller, "OtherPlayerPVERanking", playerRanking.Name, rank, zombies);`
`118`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`31`	`31`	`return;`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`34`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`35`	`35`	`{`
`36`	`36`	`pluginInstance.SendMessageToPlayer(caller, "RankingListHeaderPVP", amount);`
`37`	`37`	`foreach (PlayerRanking playerRanking in playerRankings)`
`@@ -52,7 +52,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`52`	`52`	`string zombies = playerRanking.Zombies.ToString("N0");`
`53`	`53`	`pluginInstance.SendMessageToPlayer(caller, "RankingListItemPVE", rank, name, zombies);`
`54`	`54`	`}`
`55`		`- }`
	`55`	`+ }`
`56`	`56`	`});`
`57`	`57`	`});`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`PlayerStatsData playerData = component.SessionPlayerData;`
`37`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`37`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`38`	`38`	`{`
`39`	`39`	`string kills = playerData.Kills.ToString("N0");`
`40`	`40`	`string deaths = playerData.PVPDeaths.ToString("N0");`
`@@ -51,7 +51,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVE)`
	`54`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVE)`
`55`	`55`	`{`
`56`	`56`	`string zombies = playerData.Zombies.ToString("N0");`
`57`	`57`	`string megaZombies = playerData.MegaZombies.ToString("N0");`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`20`	`20`
`21`	`21`	`CommandHelper.GetPlayerData(caller, command, (playerData) =>`
`22`	`22`	`{`
`23`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`23`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`24`	`24`	`{`
`25`	`25`	`string kills = playerData.Kills.ToString("N0");`
`26`	`26`	`string deaths = playerData.PVPDeaths.ToString("N0");`
`@@ -30,13 +30,14 @@ public void Execute(IRocketPlayer caller, string[] command)`
`30`	`30`	`if (caller.Id == playerData.SteamId.ToString())`
`31`	`31`	`{`
`32`	`32`	`pluginInstance.SendMessageToPlayer(caller, "YourPVPStats", kills, deaths, kdr, hsPercentage);`
`33`		`- } else`
	`33`	`+ }`
	`34`	`+ else`
`34`	`35`	`{`
`35`	`36`	`pluginInstance.SendMessageToPlayer(caller, "OtherPVPStats", playerData.Name, kills, deaths, kdr, hsPercentage);`
`36`		`- }`
	`37`	`+ }`
`37`	`38`	`}`
`38`	`39`
`39`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVE)`
	`40`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVE)`
`40`	`41`	`{`
`41`	`42`	`string zombies = playerData.Zombies.ToString("N0");`
`42`	`43`	`string megaZombies = playerData.MegaZombies.ToString("N0");`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void SendUIEffect()`
`23`	`23`	`EffectManager.sendUIEffect(configuration.UIEffectId, Key, TransportConnection, true);`
`24`	`24`
`25`	`25`	`// Use different translations based on UI mode`
`26`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`26`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`27`	`27`	`{`
`28`	`28`	`EffectManager.sendUIEffectText(Key, TransportConnection, true, "PlayerStats_Stats_Kills_Text", pluginInstance.Translate("UI_Kills"));`
`29`	`29`	`EffectManager.sendUIEffectText(Key, TransportConnection, true, "PlayerStats_Stats_Deaths_Text", pluginInstance.Translate("UI_Deaths"));`
`@@ -67,7 +67,7 @@ public void UpdateUIEffect()`
`67`	`67`	`return;`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`70`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`71`	`71`	`{`
`72`	`72`	`// PVP Stats`
`73`	`73`	`string kills = PlayerData.Kills.ToString("N0");`
`@@ -107,7 +107,7 @@ public void UpdateUIEffect()`
`107`	`107`	`string progress;`
`108`	`108`	`int progressPercentage;`
`109`	`109`
`110`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`110`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`111`	`111`	`{`
`112`	`112`	`nextReward = pluginInstance.Translate("UI_NextReward", reward.Name);`
`113`	`113`	`progress = pluginInstance.Translate("UI_RewardProgress", PlayerData.Kills.ToString("N0"), reward.Treshold.ToString("N0"));`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public partial class PlayerStatsComponent : MonoBehaviour`
`26`	`26`
`27`	`27`	`private Reward GetCurrentReward()`
`28`	`28`	`{`
`29`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`29`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`30`	`30`	`{`
`31`	`31`	`return configuration.Rewards.OrderByDescending(x => x.Treshold).FirstOrDefault(x => x.Treshold <= PlayerData.Kills);`
`32`	`32`	`} else`
`@@ -37,7 +37,7 @@ private Reward GetCurrentReward()`
`37`	`37`
`38`	`38`	`private Reward GetNextReward()`
`39`	`39`	`{`
`40`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`40`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`41`	`41`	`{`
`42`	`42`	`return configuration.Rewards.OrderBy(x => x.Treshold).FirstOrDefault(x => x.Treshold > PlayerData.Kills);`
`43`	`43`	`}`
`@@ -70,7 +70,7 @@ void Awake()`
`70`	`70`	`ThreadHelper.RunSynchronously(() =>`
`71`	`71`	`{`
`72`	`72`	`Logger.Log($"Failed to load player data for {Name} ({SteamId}): {ex.Message}");`
`73`		`- });`
	`73`	`+ });`
`74`	`74`	`playerData = PlayerData;`
`75`	`75`	`}`
`76`	`76`
`@@ -112,7 +112,7 @@ void Awake()`
`112`	`112`	`continue;`
`113`	`113`	`}`
`114`	`114`
`115`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`115`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`116`	`116`	`{`
`117`	`117`	`if (reward.Treshold <= PlayerData.Kills)`
`118`	`118`	`{`
`@@ -207,7 +207,7 @@ internal void OnPlayerDeath(Player killer, ELimb limb, EDeathCause cause)`
`207`	`207`	`{`
`208`	`208`	`PlayerData.PVEDeaths++;`
`209`	`209`	`SessionPlayerData.PVEDeaths++;`
`210`		`- if (configuration.StatsMode == StatsMode.PVE)`
	`210`	`+ if (configuration.ActualStatsMode == StatsMode.PVE)`
`211`	`211`	`{`
`212`	`212`	`UpdateUIEffect();`
`213`	`213`	`}`
`@@ -230,7 +230,7 @@ internal void CheckGiveReward()`
`230`	`230`	`{`
`231`	`231`	`R.Permissions.AddPlayerToGroup(reward.PermissionGroup, unturnedPlayer);`
`232`	`232`	`string treshold = reward.Treshold.ToString("N0");`
`233`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`233`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`234`	`234`	`{`
`235`	`235`	`pluginInstance.SendMessageToPlayer(unturnedPlayer, "RewardReceivedPVP", reward.Name, treshold);`
`236`	`236`	`} else`
`@@ -272,7 +272,7 @@ internal void OnPlayerUpdatedStat(EPlayerStat stat)`
`272`	`272`	`break;`
`273`	`273`	`}`
`274`	`274`
`275`		`- if (configuration.StatsMode == StatsMode.PVE)`
	`275`	`+ if (configuration.ActualStatsMode == StatsMode.PVE)`
`276`	`276`	`{`
`277`	`277`	`UpdateUIEffect();`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public IEnumerable<PlayerRanking> GetPlayerRankings(int amount, string orderBy =`
`18`	`18`	`{`
`19`	`19`	`if (orderBy == null)`
`20`	`20`	`{`
`21`		`- orderBy = (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
	`21`	`+ orderBy = (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`List<PlayerRanking> rankings = new();`
`@@ -56,7 +56,7 @@ public PlayerRanking GetPlayerRanking(ulong steamId, string orderBy = null)`
`56`	`56`
`57`	`57`	`if (orderBy == null)`
`58`	`58`	`{`
`59`		`- orderBy = (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
	`59`	`+ orderBy = (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`PlayerRanking ranking = new();`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public IEnumerable<PlayerRanking> GetPlayerRankings(int amount, string orderBy =`
`20`	`20`	`{`
`21`	`21`	`if (orderBy == null)`
`22`	`22`	`{`
`23`		`- orderBy = (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
	`23`	`+ orderBy = (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`string query = FormatSql($@"`
`@@ -44,7 +44,7 @@ public PlayerRanking GetPlayerRanking(ulong steamId, string orderBy = null)`
`44`	`44`	`{`
`45`	`45`	`if (orderBy == null)`
`46`	`46`	`{`
`47`		`- orderBy = (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
	`47`	`+ orderBy = (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`string query = FormatSql($@"`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public bool IsUnranked()`
`13`	`13`	`{`
`14`	`14`	`PlayerStatsConfiguration configuration = PlayerStatsPlugin.Instance.Configuration.Instance;`
`15`	`15`
`16`		`- if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`16`	`+ if (configuration.ActualStatsMode == StatsMode.Both \|\| configuration.ActualStatsMode == StatsMode.PVP)`
`17`	`17`	`{`
`18`	`18`	`return Kills < configuration.MinimumRankingTreshold;`
`19`	`19`	`}`