simplify configuration and other improvements

RestoreMonarchy · RestoreMonarchy · commit 2a015ff8b5e6 · 2024-11-10T18:18:53.000+01:00
diff --git a/PlayerStats/Commands/RankCommand.cs b/PlayerStats/Commands/RankCommand.cs
@@ -16,6 +16,7 @@ namespace RestoreMonarchy.PlayerStats.Commands
     public class RankCommand : IRocketCommand
     {
         private PlayerStatsPlugin pluginInstance => PlayerStatsPlugin.Instance;
+        private PlayerStatsConfiguration configuration => pluginInstance.Configuration.Instance;
 
         public void Execute(IRocketPlayer caller, string[] command)
         {
@@ -71,7 +72,7 @@ public void Execute(IRocketPlayer caller, string[] command)
 
                     string rank = playerRanking.Rank.ToString();
                     int minTreshold = pluginInstance.Configuration.Instance.MinimumRankingTreshold;
-                    if (pluginInstance.Configuration.Instance.PVPRanking)
+                    if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
                     {
                         string kills = playerRanking.Kills.ToString("N0");                      
                         if (caller.Id == playerRanking.SteamId.ToString())
diff --git a/PlayerStats/Commands/RankingCommand.cs b/PlayerStats/Commands/RankingCommand.cs
@@ -9,6 +9,7 @@ namespace RestoreMonarchy.PlayerStats.Commands
     public class RankingCommand : IRocketCommand
     {
         private PlayerStatsPlugin pluginInstance => PlayerStatsPlugin.Instance;
+        private PlayerStatsConfiguration configuration => pluginInstance.Configuration.Instance;
 
         public void Execute(IRocketPlayer caller, string[] command)
         {
@@ -30,7 +31,7 @@ public void Execute(IRocketPlayer caller, string[] command)
                         return;
                     }
 
-                    if (pluginInstance.Configuration.Instance.PVPRanking)
+                    if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
                     {
                         pluginInstance.SendMessageToPlayer(caller, "RankingListHeaderPVP", amount);
                         foreach (PlayerRanking playerRanking in playerRankings)
diff --git a/PlayerStats/Commands/SessionStatsCommand.cs b/PlayerStats/Commands/SessionStatsCommand.cs
@@ -2,18 +2,14 @@
 using RestoreMonarchy.PlayerStats.Models;
 using Rocket.API;
 using Rocket.Unturned.Player;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static Rocket.Unturned.Events.UnturnedPlayerEvents;
 
 namespace RestoreMonarchy.PlayerStats.Commands
 {
     public class SessionStatsCommand : IRocketCommand
     {
         private PlayerStatsPlugin pluginInstance => PlayerStatsPlugin.Instance;
+        private PlayerStatsConfiguration configuration => pluginInstance.Configuration.Instance;
 
         public void Execute(IRocketPlayer caller, string[] command)
         {
@@ -38,7 +34,7 @@ public void Execute(IRocketPlayer caller, string[] command)
             }
 
             PlayerStatsData playerData = component.SessionPlayerData;
-            if (pluginInstance.Configuration.Instance.EnablePVPStats)
+            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
             {
                 string kills = playerData.Kills.ToString("N0");
                 string deaths = playerData.PVPDeaths.ToString("N0");
@@ -55,7 +51,7 @@ public void Execute(IRocketPlayer caller, string[] command)
                 }
             }
 
-            if (pluginInstance.Configuration.Instance.EnablePVEStats)
+            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == 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
@@ -1,4 +1,5 @@
 ﻿using RestoreMonarchy.PlayerStats.Helpers;
+using RestoreMonarchy.PlayerStats.Models;
 using Rocket.API;
 using System.Collections.Generic;
 
@@ -7,6 +8,7 @@ namespace RestoreMonarchy.PlayerStats.Commands
     public class StatsCommand : IRocketCommand
     {
         private PlayerStatsPlugin pluginInstance => PlayerStatsPlugin.Instance;
+        private PlayerStatsConfiguration configuration => pluginInstance.Configuration.Instance;
 
         public void Execute(IRocketPlayer caller, string[] command)
         {
@@ -18,7 +20,7 @@ public void Execute(IRocketPlayer caller, string[] command)
 
             CommandHelper.GetPlayerData(caller, command, (playerData) =>
             {
-                if (pluginInstance.Configuration.Instance.EnablePVPStats)
+                if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
                 {
                     string kills = playerData.Kills.ToString("N0");
                     string deaths = playerData.PVPDeaths.ToString("N0");
@@ -34,7 +36,7 @@ public void Execute(IRocketPlayer caller, string[] command)
                     }                    
                 }
 
-                if (pluginInstance.Configuration.Instance.EnablePVEStats)
+                if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVE)
                 {
                     string zombies = playerData.Zombies.ToString("N0");
                     string megaZombies = playerData.MegaZombies.ToString("N0");
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.PVPUI)
+            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == 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.PVPUI)
+            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
             {
                 // PVP Stats
                 string kills = PlayerData.Kills.ToString("N0");
@@ -107,7 +107,7 @@ public void UpdateUIEffect()
                     string progress;
                     int progressPercentage;
 
-                    if (configuration.PVPRewards)
+                    if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == 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.PVPRewards)
+            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == 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.PVPRewards)
+            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
             {
                 return configuration.Rewards.OrderBy(x => x.Treshold).FirstOrDefault(x => x.Treshold > PlayerData.Kills);
             }
@@ -101,6 +101,32 @@ void Awake()
                             SendUIEffect();
                         }
                     }
+
+                    // Give rewards if he doesn't have them
+                    UnturnedPlayer unturnedPlayer = UnturnedPlayer.FromPlayer(Player);
+                    List<RocketPermissionsGroup> groups = R.Permissions.GetGroups(unturnedPlayer, true);
+                    foreach (Reward reward in configuration.Rewards)
+                    {
+                        if (groups.Exists(x => x.Id.Equals(reward.PermissionGroup, StringComparison.OrdinalIgnoreCase)))
+                        {
+                            continue;
+                        }
+
+                        if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
+                        {
+                            if (reward.Treshold <= PlayerData.Kills)
+                            {
+                                R.Permissions.AddPlayerToGroup(reward.PermissionGroup, unturnedPlayer);
+                            }
+                        }
+                        else
+                        {
+                            if (reward.Treshold <= PlayerData.Zombies)
+                            {
+                                R.Permissions.AddPlayerToGroup(reward.PermissionGroup, unturnedPlayer);
+                            }
+                        }
+                    }
                 });
             });
         }
@@ -181,7 +207,7 @@ internal void OnPlayerDeath(Player killer, ELimb limb, EDeathCause cause)
             {
                 PlayerData.PVEDeaths++;
                 SessionPlayerData.PVEDeaths++;
-                if (!configuration.PVPUI)
+                if (configuration.StatsMode == StatsMode.PVE)
                 {
                     UpdateUIEffect();
                 }
@@ -200,11 +226,11 @@ internal void CheckGiveReward()
             {
                 UnturnedPlayer unturnedPlayer = UnturnedPlayer.FromPlayer(Player);
                 List<RocketPermissionsGroup> groups = R.Permissions.GetGroups(unturnedPlayer, false);
-                if (!groups.Exists(x => x.Id.Equals(reward.PermissionGroup, System.StringComparison.OrdinalIgnoreCase)))
+                if (!groups.Exists(x => x.Id.Equals(reward.PermissionGroup, StringComparison.OrdinalIgnoreCase)))
                 {
                     R.Permissions.AddPlayerToGroup(reward.PermissionGroup, unturnedPlayer);
                     string treshold = reward.Treshold.ToString("N0");
-                    if (configuration.PVPRewards)
+                    if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
                     {
                         pluginInstance.SendMessageToPlayer(unturnedPlayer, "RewardReceivedPVP", reward.Name, treshold);
                     } else
@@ -231,7 +257,6 @@ internal void OnPlayerUpdatedStat(EPlayerStat stat)
                 case EPlayerStat.KILLS_ZOMBIES_MEGA:
                     PlayerData.MegaZombies++;
                     SessionPlayerData.MegaZombies++;
-                    CheckGiveReward();
                     break;
                 case EPlayerStat.FOUND_RESOURCES:
                     PlayerData.Resources++;
@@ -247,7 +272,7 @@ internal void OnPlayerUpdatedStat(EPlayerStat stat)
                     break;
             }
 
-            if (!configuration.PVPUI)
+            if (configuration.StatsMode == 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.PVPRanking ? "Kills" : "Zombies";
+                orderBy = (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == 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.PVPRanking ? "Kills" : "Zombies";
+                orderBy = (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == 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.PVPRanking ? "Kills" : "Zombies";
+                orderBy = (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
             }
             
             string query = FormatSql($@"
@@ -44,7 +44,7 @@ public PlayerRanking GetPlayerRanking(ulong steamId, string orderBy = null)
         {
             if (orderBy == null)
             {
-                orderBy = configuration.PVPRanking ? "Kills" : "Zombies";
+                orderBy = (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";
             }
 
             string query = FormatSql($@"
diff --git a/PlayerStats/Models/PlayerRanking.cs b/PlayerStats/Models/PlayerRanking.cs
@@ -11,13 +11,15 @@ public class PlayerRanking
 
         public bool IsUnranked()
         {
-            if (PlayerStatsPlugin.Instance.Configuration.Instance.PVPRanking)
+            PlayerStatsConfiguration configuration = PlayerStatsPlugin.Instance.Configuration.Instance;
+
+            if (configuration.StatsMode == StatsMode.Both || configuration.StatsMode == StatsMode.PVP)
             {
-                return Kills < PlayerStatsPlugin.Instance.Configuration.Instance.MinimumRankingTreshold;
+                return Kills < configuration.MinimumRankingTreshold;
             }
             else
             {
-                return Zombies < PlayerStatsPlugin.Instance.Configuration.Instance.MinimumRankingTreshold;
+                return Zombies < configuration.MinimumRankingTreshold;
             }
         }
     }
diff --git a/PlayerStats/Models/StatsMode.cs b/PlayerStats/Models/StatsMode.cs
@@ -0,0 +1,9 @@
+﻿namespace RestoreMonarchy.PlayerStats.Models
+{
+    public enum StatsMode
+    {
+        Both,
+        PVP,
+        PVE
+    }
+}
diff --git a/PlayerStats/PlayerStatsConfiguration.cs b/PlayerStats/PlayerStatsConfiguration.cs
@@ -7,46 +7,96 @@ public class PlayerStatsConfiguration : IRocketPluginConfiguration
     {
         public string MessageColor { get; set; }
         public string MessageIconUrl { get; set; }
+
+        // Database Settings
         public string DatabaseProvider { get; set; }
         public string JsonFilePath { get; set; }
         public string MySQLConnectionString { get; set; }
         public string PlayerStatsTableName { get; set; }
         public float SaveIntervalSeconds { get; set; }
+
+        // UI Settings
         public bool EnableUIEffect { get; set; }
         public ushort UIEffectId { get; set; }
         public bool ShowUIEffectByDefault { get; set; }
+
+        // Feature Toggles
         public bool EnableJoinLeaveMessages { get; set; }
+
+        // Legacy Stats Settings
         public bool EnablePVPStats { get; set; }
         public bool EnablePVEStats { get; set; }
         public bool PVPRanking { get; set; }
         public bool PVPRewards { get; set; }
-        public bool PVPUI { get; set; } = true;
+        public bool PVPUI { get; set; }
+
+        // New Stats Settings
+        public StatsMode? 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 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;
+            }
+        }
+
+        public bool IsRankingEnabled => StatsMode.HasValue ?
+            (ActualStatsMode == Models.StatsMode.PVP || ActualStatsMode == Models.StatsMode.Both) && EnableRewards
+            : PVPRanking && PVPRewards;
+
         public void LoadDefaults()
         {
             MessageColor = "yellow";
             MessageIconUrl = "https://i.imgur.com/TWjBtCA.png";
+
             DatabaseProvider = "json";
             JsonFilePath = "{rocket_directory}/Plugins/PlayerStats/PlayerStats.json";
             MySQLConnectionString = "Server=127.0.0.1;Port=3306;Database=unturned;Uid=root;Pwd=passw;";
             PlayerStatsTableName = "PlayerStats";
             SaveIntervalSeconds = 300;
+
             EnableUIEffect = false;
             UIEffectId = 22512;
             ShowUIEffectByDefault = true;
+
             EnableJoinLeaveMessages = true;
+
+            // Legacy defaults
             EnablePVPStats = true;
             EnablePVEStats = true;
             PVPRanking = true;
             PVPRewards = true;
             PVPUI = true;
+
+            // New system defaults to null to use legacy system
+            StatsMode = null;
+
             MinimumRankingTreshold = 25;
             EnableRewards = true;
-            Rewards =
-            [
+            Rewards = [
                 new Reward
                 {
                     Name = "VIP Rank",
@@ -62,4 +112,4 @@ public void LoadDefaults()
             ];
         }
     }
-}
+}
diff --git a/PlayerStats/PlayerStatsPlugin.cs b/PlayerStats/PlayerStatsPlugin.cs

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ namespace RestoreMonarchy.PlayerStats.Commands`
`16`	`16`	`public class RankCommand : IRocketCommand`
`17`	`17`	`{`
`18`	`18`	`private PlayerStatsPlugin pluginInstance => PlayerStatsPlugin.Instance;`
	`19`	`+ private PlayerStatsConfiguration configuration => pluginInstance.Configuration.Instance;`
`19`	`20`
`20`	`21`	`public void Execute(IRocketPlayer caller, string[] command)`
`21`	`22`	`{`
`@@ -71,7 +72,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`71`	`72`
`72`	`73`	`string rank = playerRanking.Rank.ToString();`
`73`	`74`	`int minTreshold = pluginInstance.Configuration.Instance.MinimumRankingTreshold;`
`74`		`- if (pluginInstance.Configuration.Instance.PVPRanking)`
	`75`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
`75`	`76`	`{`
`76`	`77`	`string kills = playerRanking.Kills.ToString("N0");`
`77`	`78`	`if (caller.Id == playerRanking.SteamId.ToString())`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace RestoreMonarchy.PlayerStats.Commands`
`9`	`9`	`public class RankingCommand : IRocketCommand`
`10`	`10`	`{`
`11`	`11`	`private PlayerStatsPlugin pluginInstance => PlayerStatsPlugin.Instance;`
	`12`	`+ private PlayerStatsConfiguration configuration => pluginInstance.Configuration.Instance;`
`12`	`13`
`13`	`14`	`public void Execute(IRocketPlayer caller, string[] command)`
`14`	`15`	`{`
`@@ -30,7 +31,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`30`	`31`	`return;`
`31`	`32`	`}`
`32`	`33`
`33`		`- if (pluginInstance.Configuration.Instance.PVPRanking)`
	`34`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
`34`	`35`	`{`
`35`	`36`	`pluginInstance.SendMessageToPlayer(caller, "RankingListHeaderPVP", amount);`
`36`	`37`	`foreach (PlayerRanking playerRanking in playerRankings)`
Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,14 @@`
`2`	`2`	`using RestoreMonarchy.PlayerStats.Models;`
`3`	`3`	`using Rocket.API;`
`4`	`4`	`using Rocket.Unturned.Player;`
`5`		`-using System;`
`6`	`5`	`using System.Collections.Generic;`
`7`		`-using System.Linq;`
`8`		`-using System.Text;`
`9`		`-using System.Threading.Tasks;`
`10`		`-using static Rocket.Unturned.Events.UnturnedPlayerEvents;`
`11`	`6`
`12`	`7`	`namespace RestoreMonarchy.PlayerStats.Commands`
`13`	`8`	`{`
`14`	`9`	`public class SessionStatsCommand : IRocketCommand`
`15`	`10`	`{`
`16`	`11`	`private PlayerStatsPlugin pluginInstance => PlayerStatsPlugin.Instance;`
	`12`	`+ private PlayerStatsConfiguration configuration => pluginInstance.Configuration.Instance;`
`17`	`13`
`18`	`14`	`public void Execute(IRocketPlayer caller, string[] command)`
`19`	`15`	`{`
`@@ -38,7 +34,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`38`	`34`	`}`
`39`	`35`
`40`	`36`	`PlayerStatsData playerData = component.SessionPlayerData;`
`41`		`- if (pluginInstance.Configuration.Instance.EnablePVPStats)`
	`37`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
`42`	`38`	`{`
`43`	`39`	`string kills = playerData.Kills.ToString("N0");`
`44`	`40`	`string deaths = playerData.PVPDeaths.ToString("N0");`
`@@ -55,7 +51,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`55`	`51`	`}`
`56`	`52`	`}`
`57`	`53`
`58`		`- if (pluginInstance.Configuration.Instance.EnablePVEStats)`
	`54`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVE)`
`59`	`55`	`{`
`60`	`56`	`string zombies = playerData.Zombies.ToString("N0");`
`61`	`57`	`string megaZombies = playerData.MegaZombies.ToString("N0");`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using RestoreMonarchy.PlayerStats.Helpers;`
	`2`	`+using RestoreMonarchy.PlayerStats.Models;`
`2`	`3`	`using Rocket.API;`
`3`	`4`	`using System.Collections.Generic;`
`4`	`5`
`@@ -7,6 +8,7 @@ namespace RestoreMonarchy.PlayerStats.Commands`
`7`	`8`	`public class StatsCommand : IRocketCommand`
`8`	`9`	`{`
`9`	`10`	`private PlayerStatsPlugin pluginInstance => PlayerStatsPlugin.Instance;`
	`11`	`+ private PlayerStatsConfiguration configuration => pluginInstance.Configuration.Instance;`
`10`	`12`
`11`	`13`	`public void Execute(IRocketPlayer caller, string[] command)`
`12`	`14`	`{`
`@@ -18,7 +20,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`18`	`20`
`19`	`21`	`CommandHelper.GetPlayerData(caller, command, (playerData) =>`
`20`	`22`	`{`
`21`		`- if (pluginInstance.Configuration.Instance.EnablePVPStats)`
	`23`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
`22`	`24`	`{`
`23`	`25`	`string kills = playerData.Kills.ToString("N0");`
`24`	`26`	`string deaths = playerData.PVPDeaths.ToString("N0");`
`@@ -34,7 +36,7 @@ public void Execute(IRocketPlayer caller, string[] command)`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`
`37`		`- if (pluginInstance.Configuration.Instance.EnablePVEStats)`
	`39`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVE)`
`38`	`40`	`{`
`39`	`41`	`string zombies = playerData.Zombies.ToString("N0");`
`40`	`42`	`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.PVPUI)`
	`26`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == 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.PVPUI)`
	`70`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == 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.PVPRewards)`
	`110`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == 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.PVPRewards)`
	`29`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == 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.PVPRewards)`
	`40`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
`41`	`41`	`{`
`42`	`42`	`return configuration.Rewards.OrderBy(x => x.Treshold).FirstOrDefault(x => x.Treshold > PlayerData.Kills);`
`43`	`43`	`}`
`@@ -101,6 +101,32 @@ void Awake()`
`101`	`101`	`SendUIEffect();`
`102`	`102`	`}`
`103`	`103`	`}`
	`104`	`+`
	`105`	`+ // Give rewards if he doesn't have them`
	`106`	`+ UnturnedPlayer unturnedPlayer = UnturnedPlayer.FromPlayer(Player);`
	`107`	`+ List<RocketPermissionsGroup> groups = R.Permissions.GetGroups(unturnedPlayer, true);`
	`108`	`+ foreach (Reward reward in configuration.Rewards)`
	`109`	`+ {`
	`110`	`+ if (groups.Exists(x => x.Id.Equals(reward.PermissionGroup, StringComparison.OrdinalIgnoreCase)))`
	`111`	`+ {`
	`112`	`+ continue;`
	`113`	`+ }`
	`114`	`+`
	`115`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
	`116`	`+ {`
	`117`	`+ if (reward.Treshold <= PlayerData.Kills)`
	`118`	`+ {`
	`119`	`+ R.Permissions.AddPlayerToGroup(reward.PermissionGroup, unturnedPlayer);`
	`120`	`+ }`
	`121`	`+ }`
	`122`	`+ else`
	`123`	`+ {`
	`124`	`+ if (reward.Treshold <= PlayerData.Zombies)`
	`125`	`+ {`
	`126`	`+ R.Permissions.AddPlayerToGroup(reward.PermissionGroup, unturnedPlayer);`
	`127`	`+ }`
	`128`	`+ }`
	`129`	`+ }`
`104`	`130`	`});`
`105`	`131`	`});`
`106`	`132`	`}`
`@@ -181,7 +207,7 @@ internal void OnPlayerDeath(Player killer, ELimb limb, EDeathCause cause)`
`181`	`207`	`{`
`182`	`208`	`PlayerData.PVEDeaths++;`
`183`	`209`	`SessionPlayerData.PVEDeaths++;`
`184`		`- if (!configuration.PVPUI)`
	`210`	`+ if (configuration.StatsMode == StatsMode.PVE)`
`185`	`211`	`{`
`186`	`212`	`UpdateUIEffect();`
`187`	`213`	`}`
`@@ -200,11 +226,11 @@ internal void CheckGiveReward()`
`200`	`226`	`{`
`201`	`227`	`UnturnedPlayer unturnedPlayer = UnturnedPlayer.FromPlayer(Player);`
`202`	`228`	`List<RocketPermissionsGroup> groups = R.Permissions.GetGroups(unturnedPlayer, false);`
`203`		`- if (!groups.Exists(x => x.Id.Equals(reward.PermissionGroup, System.StringComparison.OrdinalIgnoreCase)))`
	`229`	`+ if (!groups.Exists(x => x.Id.Equals(reward.PermissionGroup, StringComparison.OrdinalIgnoreCase)))`
`204`	`230`	`{`
`205`	`231`	`R.Permissions.AddPlayerToGroup(reward.PermissionGroup, unturnedPlayer);`
`206`	`232`	`string treshold = reward.Treshold.ToString("N0");`
`207`		`- if (configuration.PVPRewards)`
	`233`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
`208`	`234`	`{`
`209`	`235`	`pluginInstance.SendMessageToPlayer(unturnedPlayer, "RewardReceivedPVP", reward.Name, treshold);`
`210`	`236`	`} else`
`@@ -231,7 +257,6 @@ internal void OnPlayerUpdatedStat(EPlayerStat stat)`
`231`	`257`	`case EPlayerStat.KILLS_ZOMBIES_MEGA:`
`232`	`258`	`PlayerData.MegaZombies++;`
`233`	`259`	`SessionPlayerData.MegaZombies++;`
`234`		`- CheckGiveReward();`
`235`	`260`	`break;`
`236`	`261`	`case EPlayerStat.FOUND_RESOURCES:`
`237`	`262`	`PlayerData.Resources++;`
`@@ -247,7 +272,7 @@ internal void OnPlayerUpdatedStat(EPlayerStat stat)`
`247`	`272`	`break;`
`248`	`273`	`}`
`249`	`274`
`250`		`- if (!configuration.PVPUI)`
	`275`	`+ if (configuration.StatsMode == StatsMode.PVE)`
`251`	`276`	`{`
`252`	`277`	`UpdateUIEffect();`
`253`	`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.PVPRanking ? "Kills" : "Zombies";`
	`21`	`+ orderBy = (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == 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.PVPRanking ? "Kills" : "Zombies";`
	`59`	`+ orderBy = (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == 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.PVPRanking ? "Kills" : "Zombies";`
	`23`	`+ orderBy = (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == 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.PVPRanking ? "Kills" : "Zombies";`
	`47`	`+ orderBy = (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP) ? "Kills" : "Zombies";`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`string query = FormatSql($@"`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,15 @@ public class PlayerRanking`
`11`	`11`
`12`	`12`	`public bool IsUnranked()`
`13`	`13`	`{`
`14`		`- if (PlayerStatsPlugin.Instance.Configuration.Instance.PVPRanking)`
	`14`	`+ PlayerStatsConfiguration configuration = PlayerStatsPlugin.Instance.Configuration.Instance;`
	`15`	`+`
	`16`	`+ if (configuration.StatsMode == StatsMode.Both \|\| configuration.StatsMode == StatsMode.PVP)`
`15`	`17`	`{`
`16`		`- return Kills < PlayerStatsPlugin.Instance.Configuration.Instance.MinimumRankingTreshold;`
	`18`	`+ return Kills < configuration.MinimumRankingTreshold;`
`17`	`19`	`}`
`18`	`20`	`else`
`19`	`21`	`{`
`20`		`- return Zombies < PlayerStatsPlugin.Instance.Configuration.Instance.MinimumRankingTreshold;`
	`22`	`+ return Zombies < configuration.MinimumRankingTreshold;`
`21`	`23`	`}`
`22`	`24`	`}`
`23`	`25`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +namespace RestoreMonarchy.PlayerStats.Models
 +{
 +    public enum StatsMode
 +    {
 +        Both,
 +        PVP,
 +        PVE
 +    }
 +}