Update

Added death messages to be configurable with groups in config instead of using the permission node.
M0RG4N01 · Nov 13, 2016 · e97a354 · e97a354
1 parent 6dce2d7
commit e97a354
Show file tree

Hide file tree

Showing 21 changed files with 52 additions and 12 deletions.
diff --git a/.vs/DeathMessagesRemastered/v14/.suo b/.vs/DeathMessagesRemastered/v14/.suo
diff --git a/Class1.cs b/Class1.cs
@@ -16,6 +16,7 @@
 using DeathMessages;
 using Steamworks;
 using SDG.Unturned;
+using Rocket.API.Serialisation;
 
 namespace Remastered.DeathMessages
 {
@@ -33,15 +34,27 @@ protected override void Load()
 
             #endregion
             Rocket.Core.Logging.Logger.LogError("PLEASE NOTE:");
-            Rocket.Core.Logging.Logger.LogError("Don't forget to set the permission 'deathmessage' in one of the groups.");
+            Rocket.Core.Logging.Logger.LogError("Groups options are now configurable in the config!");
             Rocket.Core.Logging.Logger.Log("##########################################");
 
-            
+
         }
 
+
         private void UnturnedPlayerEvents_OnPlayerDeath(Rocket.Unturned.Player.UnturnedPlayer player, EDeathCause cause, ELimb limb, CSteamID murderer)
+
         {
-            if (player.HasPermission("deathmessage"))
+            int num = Provider.clients.Count;
+            if (Instance.Configuration.Instance.Groups !=null && Instance.Configuration.Instance.Groups.Count > 0)
+                {
+                foreach (SteamPlayer current in Provider.clients)
+                {
+                    if (this.CheckDeathMessage(current.playerID.steamID))
+                    {
+                        num--;
+                    }
+                }
+            }
             {
                 if (cause.ToString() == "ZOMBIE")
                 {
@@ -100,11 +113,11 @@ private void UnturnedPlayerEvents_OnPlayerDeath(Rocket.Unturned.Player.UnturnedP
                 {
                     UnturnedChat.Say(player.CharacterName + " " + this.Configuration.Instance.bleeding, Color.red);
                 }
-                else if (cause.ToString() == "LANDMINE") 
+                else if (cause.ToString() == "LANDMINE")
                 {
                     UnturnedChat.Say(player.CharacterName + " " + this.Configuration.Instance.landmine, Color.red);
                 }
-                else if (cause.ToString() == "BREATH") 
+                else if (cause.ToString() == "BREATH")
                 {
                     UnturnedChat.Say(player.CharacterName + " " + this.Configuration.Instance.breath, Color.red);
                 }
@@ -161,7 +174,7 @@ private void UnturnedPlayerEvents_OnPlayerDeath(Rocket.Unturned.Player.UnturnedP
                 {
                     UnturnedChat.Say(player.CharacterName + " " + this.Configuration.Instance.suicide, Color.red);
                 }
-               
+
             }
         }
         protected override void Unload()
@@ -181,6 +194,20 @@ public void UnturnedPlayerEvents_OnPlayerUpdateHealth(Rocket.Unturned.Player.Unt
                 }
             }
         }
+        private bool CheckDeathMessage(CSteamID CSteamID)
+        {
+            if (SteamAdminlist.checkAdmin(CSteamID))
+            {
+                return true;
+            }
+            foreach (RocketPermissionsGroup current in R.Permissions.GetGroups(new RocketPlayer(CSteamID.ToString(), null, false), true))
+            {
+                if (Instance.Configuration.Instance.Groups.Contains(current.Id))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
-
 }
diff --git a/DMC.cs b/DMC.cs
@@ -1,4 +1,6 @@
 using Rocket.API;
+using System.Collections.Generic;
+using System.Xml.Serialization;
 
 namespace DeathMessages
 {
@@ -40,7 +42,9 @@ public class DMC2 : IRocketPluginConfiguration
         public string fire;
         public string spark;
         public string boulder;
-
+        [XmlArray("Groups"), XmlArrayItem(ElementName = "Group")]
+        public List<string> Groups = new List<string>();
+
         public void LoadDefaults()
         {
 
@@ -79,7 +83,13 @@ public void LoadDefaults()
                     fire = "was killed by fire!";
                     spark = "has been sparked out";
                     boulder = "was killed by a gigantic boulder!";
-
+                    this.Groups = new List<string>
+                    {
+                        "default",
+                        "vip"
+                    };
         }
+
     }
+
 }
diff --git a/DeathMessagesRemastered.csproj b/DeathMessagesRemastered.csproj
@@ -39,9 +39,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Unturned\Unturned_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
-    <Reference Include="Assembly-UnityScript-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Unturned\Unturned_Data\Managed\Assembly-UnityScript-firstpass.dll</HintPath>
+    <Reference Include="Assembly-UnityScript-firstpass">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Unturned\Unturned_Data\Managed\Assembly-UnityScript-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="Rocket.API, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/bin/Release/Assembly-CSharp-firstpass.dll b/bin/Release/Assembly-CSharp-firstpass.dll
diff --git a/bin/Release/Assembly-CSharp.dll b/bin/Release/Assembly-CSharp.dll
diff --git a/bin/Release/Assembly-UnityScript-firstpass.dll b/bin/Release/Assembly-UnityScript-firstpass.dll
diff --git a/bin/Release/Boo.Lang.dll b/bin/Release/Boo.Lang.dll
diff --git a/bin/Release/DeathMessagesRemastered.dll b/bin/Release/DeathMessagesRemastered.dll
diff --git a/bin/Release/DeathMessagesRemastered.pdb b/bin/Release/DeathMessagesRemastered.pdb
diff --git a/bin/Release/Newtonsoft.Json.dll b/bin/Release/Newtonsoft.Json.dll
diff --git a/bin/Release/Rocket.API.dll b/bin/Release/Rocket.API.dll
diff --git a/bin/Release/Rocket.Core.dll b/bin/Release/Rocket.Core.dll
diff --git a/bin/Release/Rocket.Unturned.dll b/bin/Release/Rocket.Unturned.dll
diff --git a/bin/Release/UnityEngine.dll b/bin/Release/UnityEngine.dll
diff --git a/bin/Release/UnityScript.Lang.dll b/bin/Release/UnityScript.Lang.dll
diff --git a/obj/Release/DeathMessagesRemastered.csproj.FileListAbsolute.txt b/obj/Release/DeathMessagesRemastered.csproj.FileListAbsolute.txt
@@ -9,3 +9,7 @@ E:\Death-Messages-Remasterd\bin\Release\DeathMessagesRemastered.dll
 E:\Death-Messages-Remasterd\bin\Release\DeathMessagesRemastered.pdb
 E:\Death-Messages-Remasterd\obj\Release\DeathMessagesRemastered.dll
 E:\Death-Messages-Remasterd\obj\Release\DeathMessagesRemastered.pdb
+E:\Death-Messages-Remasterd\obj\Release\DeathMessagesRemastered.csprojResolveAssemblyReference.cache
+E:\Death-Messages-Remasterd\bin\Release\Assembly-UnityScript-firstpass.dll
+E:\Death-Messages-Remasterd\bin\Release\Boo.Lang.dll
+E:\Death-Messages-Remasterd\bin\Release\UnityScript.Lang.dll
diff --git a/obj/Release/DeathMessagesRemastered.csprojResolveAssemblyReference.cache b/obj/Release/DeathMessagesRemastered.csprojResolveAssemblyReference.cache
diff --git a/obj/Release/DeathMessagesRemastered.dll b/obj/Release/DeathMessagesRemastered.dll
diff --git a/obj/Release/DeathMessagesRemastered.pdb b/obj/Release/DeathMessagesRemastered.pdb
diff --git a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache