improved better sinkhole

SynapseSL · Dec 19, 2020 · 1b8a269 · 1b8a269
1 parent 89ea1fa
commit 1b8a269
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/Scp106Rework/EventHandlers.cs b/Scp106Rework/EventHandlers.cs
@@ -28,13 +28,8 @@ private void ScpAttack(Synapse.Api.Events.SynapseEventArguments.ScpAttackEventAr
 
         private void Sinkhole(Synapse.Api.Events.SynapseEventArguments.PlayerWalkOnSinkholeEventArgs ev)
         {
-            if (ev.Allow && PluginClass.Config.BetterSinkhole && Vector3.Distance(ev.Player.Position,ev.Sinkhole.transform.position) <= PluginClass.Config.SinkholeTeleportDistance)
-            {
-                ev.Player.Position = Vector3.down * 1998.5f;
-                ev.Player.PlayerEffectsController.GetEffect<CustomPlayerEffects.Corroding>().IsInPd = true;
-                ev.Player.GiveEffect(Synapse.Api.Enum.Effect.Corroding);
-                MEC.Timing.CallDelayed(0.1f, () => ev.Player.GiveEffect(Synapse.Api.Enum.Effect.SinkHole, 0));
-            }
+            if (ev.Allow && PluginClass.Config.BetterSinkhole && Vector3.Distance(ev.Player.Position, ev.Sinkhole.transform.position) <= PluginClass.Config.SinkholeTeleportDistance)
+                ev.Player.GetComponent<Scp106ReworkScript>().DoPocketTrapAnimation(true);
         }
 
         private void SetClass(Synapse.Api.Events.SynapseEventArguments.PlayerSetClassEventArgs ev)
@@ -52,7 +47,7 @@ private void Move(Synapse.Api.Events.SynapseEventArguments.PlayerSyncDataEventAr
 
             if (portal != null)
                 if (Vector3.Distance(ev.Player.Position, portal.transform.position) <= 2.5 && ev.Player.RealTeam != Team.SCP && portal.transform.position != Vector3.zero)
-                    ev.Player.GetComponent<Scp106ReworkScript>().DoPocketTrapAnimation();
+                    ev.Player.GetComponent<Scp106ReworkScript>().DoPocketTrapAnimation(false);
         }
 
         private void Join(Synapse.Api.Events.SynapseEventArguments.PlayerJoinEventArgs ev) => RefreshPortal();

diff --git a/Scp106Rework/Scp106Rework.csproj b/Scp106Rework/Scp106Rework.csproj
@@ -35,19 +35,19 @@
       <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-pre\lib\net472\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.3.0\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-pre\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.3.0\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-pre\lib\net472\Mirror.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\Mirror.dll</HintPath>
     </Reference>
     <Reference Include="Synapse, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.3.0-pre\lib\net472\Synapse.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.3.0\lib\net472\Synapse.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -59,13 +59,13 @@
     <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-pre\lib\net472\UnityEngine.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.3.0\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-pre\lib\net472\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.3.0\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-pre\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.3.0\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/Scp106Rework/Scp106ReworkScript.cs b/Scp106Rework/Scp106ReworkScript.cs
@@ -87,18 +87,21 @@ public void Stalk(bool check)
         #endregion
 
         #region PocketTrap
-        public void DoPocketTrapAnimation()
+        public void DoPocketTrapAnimation(bool sinkhole)
         {
-            if (player.GodMode || player.Room.Zone == Synapse.Api.Enum.ZoneType.Pocket || Server.Get.Players.Any(x => x.ClassManager.Scp106 == null ? false : x.ClassManager.Scp106.goingViaThePortal)) return;
+            if (player.GodMode || player.Room.Zone == Synapse.Api.Enum.ZoneType.Pocket) return;
+
+            if (!sinkhole && RoleType.Scp106.GetPlayers().Count > 0 && Server.Get.Players.Any(x => x.ClassManager.Scp106 == null ? false : x.ClassManager.Scp106.goingViaThePortal))
+                return;
 
             if (player.ClassManager.Scp106.goingViaThePortal) return;
 
             player.ClassManager.Scp106.goingViaThePortal = true;
 
-            MEC.Timing.RunCoroutine(PocketTrapAnimation());
+            MEC.Timing.RunCoroutine(PocketTrapAnimation(sinkhole));
         }
 
-        private IEnumerator<float> PocketTrapAnimation()
+        private IEnumerator<float> PocketTrapAnimation(bool sinkhole)
         {
             for (int i = 0; i < 50; i++)
             {
@@ -114,6 +117,8 @@ private IEnumerator<float> PocketTrapAnimation()
 
             yield return MEC.Timing.WaitForSeconds(0.1f);
             player.ClassManager.Scp106.goingViaThePortal = false;
+            if (sinkhole)
+                player.GiveEffect(Synapse.Api.Enum.Effect.SinkHole, 0);
         }
         #endregion
     }

diff --git a/Scp106Rework/packages.config b/Scp106Rework/packages.config
@@ -2,6 +2,6 @@
 <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-pre" targetFramework="net472" />
+  <package id="SynapseSL" version="2.3.0" targetFramework="net472" />
   <package id="YamlDotNet" version="8.1.2" targetFramework="net472" />
 </packages>