add ShowCombinedDeaths configuration option

Author: RestoreMonarchy

PlayerStats/Commands/SessionStatsCommand.cs

@@ -37,8 +37,8 @@ public void Execute(IRocketPlayer caller, string[] command)
             if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
             {
                 string kills = playerData.Kills.ToString("N0");
-                string deaths = playerData.PVPDeaths.ToString("N0");
-                string kdr = deaths == "0" ? kills : (playerData.Kills / playerData.PVPDeaths).ToString("N2");
+                string deaths = playerData.Deaths.ToString("N0");
+                string kdr = deaths == "0" ? kills : (playerData.Kills / playerData.Deaths).ToString("N2");
                 string hsPercentage = (playerData.Kills == 0 ? "0" : (((decimal)playerData.Headshots / playerData.Kills) * 100).ToString("N0")) + "%";
 
                 if (caller.Id == playerData.SteamId.ToString())

PlayerStats/Commands/StatsCommand.cs

@@ -23,8 +23,8 @@ public void Execute(IRocketPlayer caller, string[] command)
                 if (configuration.ActualStatsMode == StatsMode.Both || configuration.ActualStatsMode == StatsMode.PVP)
                 {
                     string kills = playerData.Kills.ToString("N0");
-                    string deaths = playerData.PVPDeaths.ToString("N0");
-                    string kdr = deaths == "0" ? kills : ((decimal)playerData.Kills / playerData.PVPDeaths).ToString("N2");
+                    string deaths = playerData.Deaths.ToString("N0");
+                    string kdr = deaths == "0" ? kills : ((decimal)playerData.Kills / playerData.Deaths).ToString("N2");
                     string hsPercentage = (playerData.Kills == 0 ? "0" : (((decimal)playerData.Headshots / playerData.Kills) * 100).ToString("N0")) + "%";
 
                     if (caller.Id == playerData.SteamId.ToString())

PlayerStats/Components/PlayerStatsComponent.UI.cs

@@ -71,10 +71,10 @@ public void UpdateUIEffect()
             {
                 // PVP Stats
                 string kills = PlayerData.Kills.ToString("N0");
-                string deaths = PlayerData.PVPDeaths.ToString("N0");
+                string deaths = PlayerData.Deaths.ToString("N0");
                 string headshots = PlayerData.Headshots.ToString("N0");
                 string hsPercentage = (PlayerData.Kills == 0 ? "0" : (((decimal)PlayerData.Headshots / PlayerData.Kills) * 100).ToString("N0")) + "%";
-                string kdr = PlayerData.PVPDeaths == 0 ? PlayerData.Kills.ToString("N2") : ((decimal)PlayerData.Kills / PlayerData.PVPDeaths).ToString("N2");
+                string kdr = PlayerData.Deaths == 0 ? PlayerData.Kills.ToString("N2") : ((decimal)PlayerData.Kills / PlayerData.Deaths).ToString("N2");
 
                 EffectManager.sendUIEffectText(Key, TransportConnection, true, "PlayerStats_Stats_Kills_Stats_Text", kills);
                 EffectManager.sendUIEffectText(Key, TransportConnection, true, "PlayerStats_Stats_Deaths_Stats_Text", deaths);
@@ -89,7 +89,7 @@ public void UpdateUIEffect()
                 string megaZombieKills = PlayerData.MegaZombies.ToString("N0");
                 string animalKills = PlayerData.Animals.ToString("N0");
                 string resourcesGathered = PlayerData.Resources.ToString("N0");
-                string pveDeaths = PlayerData.PVEDeaths.ToString("N0");
+                string pveDeaths = PlayerData.Deaths.ToString("N0");
 
                 EffectManager.sendUIEffectText(Key, TransportConnection, true, "PlayerStats_Stats_Kills_Stats_Text", zombieKills);
                 EffectManager.sendUIEffectText(Key, TransportConnection, true, "PlayerStats_Stats_Deaths_Stats_Text", megaZombieKills);

PlayerStats/Models/PlayerStatsData.cs

@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 
 namespace RestoreMonarchy.PlayerStats.Models
 {
@@ -21,5 +22,21 @@ public class PlayerStatsData
         public ulong Playtime  { get; set; }
         public bool? UIDisabled { get; set; }
         public DateTime LastUpdated { get; set; }
+
+        [JsonIgnore]
+        public int Deaths
+        {
+            get
+            {
+                if (PlayerStatsPlugin.Instance.Configuration.Instance.ShowCombinedDeaths)
+                {
+                    return PVPDeaths + PVEDeaths;
+                }
+                else
+                {
+                    return PlayerStatsPlugin.Instance.Configuration.Instance.ActualStatsMode == StatsMode.Both || PlayerStatsPlugin.Instance.Configuration.Instance.ActualStatsMode == StatsMode.PVP ? PVPDeaths : PVEDeaths;
+                }
+            }
+        }
     }
 }

PlayerStats/PlayerStats.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net48</TargetFramework>
 	  <LangVersion>latest</LangVersion>
 	  <RootNamespace>RestoreMonarchy.PlayerStats</RootNamespace>
-    <Version>1.1.1</Version>
+    <Version>1.1.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

PlayerStats/PlayerStatsConfiguration.cs

@@ -33,6 +33,7 @@ public class PlayerStatsConfiguration : IRocketPluginConfiguration
 
         // New Stats Settings
         public string StatsMode { get; set; }
+        public bool ShowCombinedDeaths { get; set; } = false;
 
         // Ranking & Rewards
         public int MinimumRankingTreshold { get; set; }
@@ -110,6 +111,7 @@ public void LoadDefaults()
 
             // New system defaults to null to use legacy system
             StatsMode = Models.StatsMode.Both.ToString();
+            ShowCombinedDeaths = true;
 
             MinimumRankingTreshold = 25;
             EnableRewards = true;

README.md

@@ -62,6 +62,7 @@ The UI is optional and only for PVP stats. You can use the following workshop it
   <ShowUIEffectByDefault>true</ShowUIEffectByDefault>
   <EnableJoinLeaveMessages>true</EnableJoinLeaveMessages>
   <StatsMode>Both</StatsMode>
+  <ShowCombinedDeaths>true</ShowCombinedDeaths>
   <MinimumRankingTreshold>25</MinimumRankingTreshold>
   <EnableRewards>true</EnableRewards>
   <Rewards>