improved 056 spawning

SynapseSL · Jan 7, 2021 · 8ff23c5 · 8ff23c5
1 parent ae63d77
commit 8ff23c5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/Scp056/EventHandlers.cs b/Scp056/EventHandlers.cs
@@ -14,6 +14,16 @@ public EventHandlers()
             Server.Get.Events.Player.PlayerDeathEvent += OnDeath;
             Server.Get.Events.Round.SpawnPlayersEvent += OnSpawn;
             Server.Get.Events.Player.PlayerCuffTargetEvent += OnCuff;
+            Server.Get.Events.Player.PlayerSetClassEvent += OnSetClass;
+        }
+
+        private void OnSetClass(Synapse.Api.Events.SynapseEventArguments.PlayerSetClassEventArgs ev)
+        {
+            if(ev.Player.RoleID == 56 && (ev.Player.CustomRole is Scp056PlayerScript script) && !script.Spawned)
+            {
+                script.Spawned = true;
+                ev.Position = PluginClass.Config.Scp056SpawnPoint.Parse().Position;
+            }
         }
 
         private void OnCuff(Synapse.Api.Events.SynapseEventArguments.PlayerCuffTargetEventArgs ev)

diff --git a/Scp056/PluginClass.cs b/Scp056/PluginClass.cs
@@ -9,10 +9,10 @@ namespace Scp056
         Description = "An Plugin which adds the new Role Scp056 to the game",
         LoadPriority = 1,
         Name = "Scp056",
-        SynapseMajor = SynapseController.SynapseMajor,
-        SynapseMinor = SynapseController.SynapseMinor,
-        SynapsePatch = SynapseController.SynapsePatch,
-        Version = "v.1.1.1"
+        SynapseMajor = 2,
+        SynapseMinor = 4,
+        SynapsePatch = 1,
+        Version = "v.1.1.2"
         )]
     public class PluginClass : AbstractPlugin
     {

diff --git a/Scp056/Scp056.csproj b/Scp056/Scp056.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.4.1\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.4.1\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.4.1\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.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SynapseSL.2.4.1\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.4.1\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.4.1\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.4.1\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>

diff --git a/Scp056/Scp056PlayerScript.cs b/Scp056/Scp056PlayerScript.cs
@@ -22,8 +22,8 @@ public override System.Collections.Generic.List<Team> GetFriends()
 
         public override void Spawn()
         {
+            Spawned = false;
             Player.RoleType = RoleType.FacilityGuard;
-            Timing.CallDelayed(0.5f, () => Player.Position = PluginClass.Config.Scp056SpawnPoint.Parse().Position);
 
             Player.Inventory.Clear();
 
@@ -40,6 +40,8 @@ public override void Spawn()
             Player.OpenReportWindow(PluginClass.GetTranslation("spawn"));
         }
 
+        internal bool Spawned = false;
+
         public override void DeSpawn() => NineTailedFoxAnnouncer.CheckForZombies(Player.gameObject);
     }
 }
diff --git a/Scp056/packages.config b/Scp056/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.4.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
   <package id="YamlDotNet" version="8.1.2" targetFramework="net472" />
 </packages>