Update to Synapse 2.5.3 and added Translation

Author: GrafDimenzio

Scp035/EventHandlers.cs

@@ -20,19 +20,52 @@ public EventHandlers()
 
         private void Death(Synapse.Api.Events.SynapseEventArguments.PlayerDeathEventArgs ev)
         {
-            if (ev.Victim.RoleID == 35)
-                Map.Get.AnnounceScpDeath("0 3 5");
-
             if (ev.Victim != ev.Killer && ev.Killer?.RoleID == 35)
-                ev.Victim.OpenReportWindow(PluginClass.GetTranslation("killedby035"));
+                ev.Victim.OpenReportWindow(PluginClass.Translation.ActiveTranslation.KilledBy035);
         }
 
         private void Use(Synapse.Api.Events.SynapseEventArguments.PlayerItemInteractEventArgs ev)
         {
             if (IsScp035Item(ev.CurrentItem))
             {
                 ev.Allow = false;
-                ev.Player.GiveTextHint(PluginClass.GetTranslation("035interact"));
+                ev.Player.GiveTextHint(PluginClass.Translation.ActiveTranslation.InteractWith035);
+            }
+        }
+
+        private bool IsScp035Item(SynapseItem item) => item != null && item.Name.Contains("Scp035-Item-");
+
+        private void Pickup(Synapse.Api.Events.SynapseEventArguments.PlayerPickUpItemEventArgs ev)
+        {
+            if (IsScp035Item(ev.Item))
+            {
+                if(!SynapseExtensions.CanHarmScp(ev.Player) || ev.Player.RoleID == (int)RoleType.Tutorial)
+                    ev.Player.SendBroadcast(8, PluginClass.Translation.ActiveTranslation.ScpPickup035);
+                else
+                {
+                    ev.Allow = false;
+
+                    var players = Server.Get.GetPlayers(x => x.RoleID == (int)RoleType.Spectator && !x.OverWatch);
+
+                    if(players.Count == 0)
+                    {
+                        ev.Player.SendBroadcast(8, PluginClass.Translation.ActiveTranslation.Survived035);
+                        RemoveScp035Items(true);
+                        return;
+                    }
+
+                    players = players.OrderBy(x => x.DeathTime).ToList();
+
+                    Player player;
+
+                    if (PluginClass.Config.DeathTime)
+                        player = players.FirstOrDefault();
+                    else
+                        player = players.ElementAt(UnityEngine.Random.Range(0, players.Count));
+
+                    player.CustomRole = new Scp035PlayerScript(ev.Player);
+                    RemoveScp035Items(true);
+                }
             }
         }
 
@@ -44,16 +77,14 @@ private void Use(Synapse.Api.Events.SynapseEventArguments.PlayerItemInteractEven
 
         private IEnumerator<float> Respawn035Items()
         {
-            for(; ; )
+            for (; ; )
             {
                 if (!Server.Get.Players.Any(x => x.RoleID == 35))
                     Spawn035Item();
                 yield return Timing.WaitForSeconds(PluginClass.Config.PickupSpawnInterval);
             }
         }
 
-        private bool IsScp035Item(SynapseItem item) => item.Name.Contains("Scp035-Item-");
-
         public void Spawn035Item()
         {
             RemoveScp035Items();
@@ -83,39 +114,5 @@ private void RemoveScp035Items(bool clearinventory = false)
                 foreach (var item in Map.Get.Items.Where(x => IsScp035Item(x) && x.State == Synapse.Api.Enum.ItemState.Map).ToArray())
                     item.Destroy();
         }
-
-        private void Pickup(Synapse.Api.Events.SynapseEventArguments.PlayerPickUpItemEventArgs ev)
-        {
-            if (IsScp035Item(ev.Item))
-            {
-                if(ev.Player.RealTeam == Team.SCP || ev.Player.RoleID == (int)RoleType.Tutorial)
-                    ev.Player.SendBroadcast(8, PluginClass.GetTranslation("035pickup"));
-                else
-                {
-                    ev.Allow = false;
-
-                    var players = Server.Get.GetPlayers(x => x.RoleID == (int)RoleType.Spectator && !x.OverWatch);
-
-                    if(players.Count == 0)
-                    {
-                        ev.Player.SendBroadcast(8, PluginClass.GetTranslation("survived035"));
-                        RemoveScp035Items(true);
-                        return;
-                    }
-
-                    players = players.OrderBy(x => x.DeathTime).ToList();
-
-                    Player player;
-
-                    if (PluginClass.Config.DeathTime)
-                        player = players.FirstOrDefault();
-                    else
-                        player = players.ElementAt(UnityEngine.Random.Range(0, players.Count));
-
-                    player.CustomRole = new Scp035PlayerScript(ev.Player);
-                    RemoveScp035Items(true);
-                }
-            }
-        }
     }
 }

Scp035/PluginClass.cs

@@ -1,6 +1,7 @@
 using Synapse;
 using Synapse.Api.Plugin;
 using System.Collections.Generic;
+using Synapse.Translation;
 
 namespace Scp035
 {
@@ -9,18 +10,19 @@ namespace Scp035
         Author = "Dimenzio",
         Description = "Adds the Role Scp035 to the Game",
         LoadPriority = 1,
-        SynapseMajor = SynapseController.SynapseMajor,
-        SynapseMinor = SynapseController.SynapseMinor,
-        SynapsePatch = SynapseController.SynapsePatch,
-        Version = "v.1.0.2"
+        SynapseMajor = 2,
+        SynapseMinor = 5,
+        SynapsePatch = 3,
+        Version = "v.1.1.0"
         )]
     public class PluginClass : AbstractPlugin
     {
-        private static Translation trans;
-
         [Synapse.Api.Plugin.Config(section = "Scp035")]
         public static Config Config;
 
+        [SynapseTranslation]
+        public static new SynapseTranslation<PluginTranslation> Translation { get; set; }
+
         public override void Load()
         {
             Server.Get.RoleManager.RegisterCustomRole<Scp035PlayerScript>();
@@ -36,21 +38,18 @@ public override void Load()
                     });
                 }
 
-            var translation = new Dictionary<string, string>
+            Translation.AddTranslation(new PluginTranslation());
+            Translation.AddTranslation(new PluginTranslation
             {
-                {"035pickup","This Item is an Scp035 Item, so if you drop it and a other Player takes it, Scp035 will take the player as his host" },
-                {"survived035" , "This was Scp035 but you have survived it" },
-                {"035interact","You can't use a Scp-035 Item for any interaction with it!" },
-                {"pickup035","<b>You have picked up <color=red>Scp-035</color>.</b>" },
-                {"spawn035","<b>You are <color=red>SCP-035</color></b>" },
-                {"killedby035","<b>You was killed by <color=red>SCP</color>-035</b>" }
-            };
-            Translation.CreateTranslations(translation);
-            trans = Translation;
+                ScpPickup035 = "Du hast <color=red>SCP-035</color> aufgeboben. Gib es einem anderem Spieler damit er zu <color=red>SCP-035</color> wird",
+                Survived035 = "Das war <color=red>SCP-035</color> aber du hast es überlebt",
+                InteractWith035 = "Du kannst nicht mit einem <color=red>SCP-035</color> Item interagieren",
+                Pickup035 = "<b>Du hast <color=red>SCP-035</color> aufgehoben</b>",
+                Spawn035 = "<b>Du bist jetzt <color=red>SCP-035</color></b",
+                KilledBy035 = "<b>Du wurdest von <color=red>SCP-035</color> umgebracht</b>"
+            }, "GERMAN");
 
             new EventHandlers();
         }
-
-        public static string GetTranslation(string key) => trans.GetTranslation(key);
     }
 }

Scp035/PluginTranslation.cs

@@ -0,0 +1,19 @@
+using Synapse.Translation;
+
+namespace Scp035
+{
+    public class PluginTranslation : IPluginTranslation
+    {
+        public string ScpPickup035 { get; set; } = "This Item is an Scp035 Item, so if you drop it and a other Player takes it, Scp035 will take the player as his host";
+
+        public string Survived035 { get; set; } = "This was Scp035 but you have survived it";
+
+        public string InteractWith035 { get; set; } = "You can't use a Scp-035 Item for any interaction with it!";
+
+        public string Pickup035 { get; set; } = "<b>You have picked up <color=red>Scp-035</color>.</b>";
+
+        public string Spawn035 { get; set; } = "<b>You are <color=red>SCP-035</color></b>";
+
+        public string KilledBy035 { get; set; } = "<b>You was killed by <color=red>SCP</color>-035</b>";
+    }
+}

Scp035/Scp035.csproj

@@ -35,37 +35,40 @@
       <HintPath>..\packages\Lib.Harmony.2.0.4\lib\net472\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="LiteDB, Version=5.0.9.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
       <HintPath>..\packages\LiteDB.5.0.9\lib\net45\LiteDB.dll</HintPath>
     </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\Mirror.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Mirror.dll</HintPath>
     </Reference>
-    <Reference Include="Synapse, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\Synapse.dll</HintPath>
+    <Reference Include="Synapse, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Synapse.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\UnityEngine.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
     </Reference>
     <Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
       <HintPath>..\packages\YamlDotNet.8.1.2\lib\net45\YamlDotNet.dll</HintPath>
@@ -74,6 +77,7 @@
   <ItemGroup>
     <Compile Include="EventHandlers.cs" />
     <Compile Include="Config.cs" />
+    <Compile Include="PluginTranslation.cs" />
     <Compile Include="Scp035PlayerScript.cs" />
     <Compile Include="PluginClass.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Scp035/Scp035PlayerScript.cs

@@ -6,7 +6,7 @@ namespace Scp035
 {
     public class Scp035PlayerScript : Synapse.Api.Roles.Role
     {
-        private Player _target;
+        private readonly Player _target;
 
         public Scp035PlayerScript() { }
         public Scp035PlayerScript(Player target) => _target = target;
@@ -15,12 +15,9 @@ public Scp035PlayerScript() { }
 
         public override string GetRoleName() => "Scp035";
 
-        public override List<Team> GetFriends()
-        {
-            return PluginClass.Config.ff ? new List<Team>() : new List<Team> { Team.SCP };
-        }
+        public override List<int> GetFriendsID() => PluginClass.Config.ff ? new List<int>() : new List<int> { (int)Team.SCP };
 
-        public override Team GetTeam() => Team.SCP;
+        public override int GetTeamID() => (int)Team.SCP;
 
         public override void Spawn()
         {
@@ -44,16 +41,20 @@ public override void Spawn()
 
                 _target.RoleID = (int)RoleType.Spectator;
 
-                _target.SendBroadcast(5, PluginClass.GetTranslation("pickup035"));
+                _target.SendBroadcast(5, PluginClass.Translation.ActiveTranslation.Pickup035);
             }
 
             Player.Health = PluginClass.Config.Scp035Health;
             Player.MaxHealth = PluginClass.Config.Scp035Health;
             Player.DisplayInfo = $"<color={PluginClass.Config.DisplayColor}>{PluginClass.Config.DisplayName}</color>";
 
-            Player.SendBroadcast(5, PluginClass.GetTranslation("spawn035"));
+            Player.SendBroadcast(5, PluginClass.Translation.ActiveTranslation.Spawn035);
         }
 
-        public override void DeSpawn() => Player.DisplayInfo = "";
+        public override void DeSpawn()
+        {
+            Player.DisplayInfo = "";
+            Map.Get.AnnounceScpDeath("0 3 5");
+        }
     }
 }

Scp035/packages.config

@@ -2,6 +2,7 @@
 <packages>
   <package id="Lib.Harmony" version="2.0.4" targetFramework="net472" />
   <package id="LiteDB" version="5.0.9" targetFramework="net472" />
-  <package id="SynapseSL" version="2.3.0" targetFramework="net472" />
+  <package id="SynapseSL" version="2.5.3" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
   <package id="YamlDotNet" version="8.1.2" targetFramework="net472" />
 </packages>