Fixed Intercom

README.md

@@ -9,8 +9,8 @@ Remade version of this plugin: https://github.com/TruthfullyHonest/WaitAndChill
 - Choice of randomly setting a room for users to be spawnned in
 
  ## Note
-- %player will return one of two options for messages ((0 or x players have connected) or (1 player has connected))
-- %seconds will return one of four options for messages (The server is paused, The round has started, 1 second remains, x seconds remain)
+- **{player}** will return one of two options for messages ((0 or x players have connected) or (1 player has connected))
+- **{seconds}** will return one of four options for messages (The server is paused, The round has started, 1 second remains, x seconds remain)
 
 # Config
 ```yml
@@ -55,7 +55,7 @@ wait_and_chill_reborn:
   # Determines the position of the Hint on the users screen (32 = Top, 0 = Middle, -15 = Below)
   hint_vert_pos: 25
 ```
-#Translations
+# Translations
 ```yml
   translations:
     top_message: <size=40><color=yellow><b>The game will be starting soon, {seconds}</b></color></size>

WaitAndChillReborn/Handler.cs

@@ -151,7 +151,7 @@ internal void OnTeleporting(TeleportingEventArgs ev)
 
         internal void OnSendingRemoteAdminCommand(SendingRemoteAdminCommandEventArgs ev)
         {
-            if (IsLobby && ev.Name == "destroy" && ev.Arguments[0] == "**")
+            if (spawnedDoors.Count > 0 && ev.Name == "destroy" && ev.Arguments[0] == "**")
             {
                 ev.IsAllowed = false;
                 ev.Success = false;
@@ -162,9 +162,6 @@ internal void OnSendingRemoteAdminCommand(SendingRemoteAdminCommandEventArgs ev)
 
         internal void OnRoundStarted()
         {
-            Intercom.host.CustomContent = string.Empty;
-            Intercom.host.Network_state = Intercom.State.Ready;
-
             SubClassHandler(true);
 
             Timing.CallDelayed(0.25f, () =>

WaitAndChillReborn/Methods.cs

@@ -198,7 +198,7 @@ internal void Scp079sDoors(bool state)
         }
 
         byte doorType = 0;
-        internal void SpawnDoor(Vector3 position, Vector3 rotation)
+        internal void SpawnDoor(Vector3 position, Vector3 rotation, bool big = false)
         {
             // Original code by 初音早猫(sanyae2439)#0001
 
@@ -217,6 +217,9 @@ internal void SpawnDoor(Vector3 position, Vector3 rotation)
 
             var door = Object.Instantiate(prefab.TargetPrefab, position, Quaternion.Euler(rotation));
 
+            if (big)
+                door.transform.localScale = new Vector3(4f, 4f, 2.5f);
+
             spawnedDoors.Add(door.gameObject);
             NetworkServer.Spawn(door.gameObject);
         }
@@ -281,6 +284,7 @@ internal void SpawnParkour()
 
             SpawnDoor(new Vector3(231f, 1029f, -20f), new Vector3(90f, 0f, 0f));
 
+            //Tower floor
             for (int x = 0; x < 6; x++)
             {
                 for (int z = 0; z < 4; z++)
@@ -290,6 +294,32 @@ internal void SpawnParkour()
                 }
             }
 
+            // Tower wall
+            for (int z = 0; z < 7; z++)
+            {
+                doorType = 2;
+                SpawnDoor(new Vector3(217f, 1029f, -24 + z * 2f), new Vector3(0f, 90f, 0f));
+            }
+
+            // Tower wall
+            for (int x = 0; x < 6; x++)
+            {
+                doorType = 2;
+                SpawnDoor(new Vector3(228f - x * 2f, 1029f, -25f), new Vector3(0f, 0f, 0f));
+            }
+
+            // Tower wall
+            for (int x = 0; x < 6; x++)
+            {
+                doorType = 2;
+                SpawnDoor(new Vector3(228f - x * 2f, 1029f, -12f), new Vector3(0f, 0f, 0f));
+            }
+
+            doorType = 1;
+            SpawnDoor(new Vector3(233f, 1020f, -12f), new Vector3(0f, 0f, 0f), true);
+            doorType = 1;
+            SpawnDoor(new Vector3(233f, 1020f, -25f), new Vector3(0f, 0f, 0f), true);
+
             byte[,] slArray = {
                 { 0,0,0,0,0,0,0,0,0,0,0,0,0 },
                 { 0, 0,1,1,1, 0,0, 1,0,0,0, 0,0 },

WaitAndChillReborn/Patches/IntercomPatch.cs

@@ -2,15 +2,19 @@
 {
     using Exiled.API.Features;
     using HarmonyLib;
+    using MEC;
     using System.Linq;
 
     [HarmonyPatch(typeof(Intercom), nameof(Intercom.Start))]
     public static class IntercomStartPatch
     {
-        private static void Postfix(Intercom __instance)
+        internal static bool first = true;
+
+        public static void Postfix(Intercom __instance)
         {
             if (!string.IsNullOrEmpty(WaitAndChillReborn.Singleton.Config.Translations.Intercom))
             {
+                first = true;
                 __instance.Network_state = Intercom.State.Custom;
             }
         }
@@ -19,21 +23,33 @@ private static void Postfix(Intercom __instance)
     [HarmonyPatch(typeof(Intercom), nameof(Intercom.Update))]
     public static class IntercomUpdatePatch
     {
-        private static bool Prefix(Intercom __instance)
+        public static bool Prefix(Intercom __instance)
         {
             if (Handler.IsLobby && !string.IsNullOrEmpty(WaitAndChillReborn.Singleton.Config.Translations.Intercom))
             {
                 string intercomText = WaitAndChillReborn.Singleton.Config.Translations.Intercom;
                 intercomText = intercomText.Replace("{servername}", Server.Name).Replace("{playercount}", Player.List.Count().ToString()).Replace("{maxplayers}", CustomNetworkManager.slots.ToString());
 
                 __instance.CustomContent = intercomText;
-                __instance.Network_intercomText = __instance.Network_intercomText;
                 __instance.UpdateText();
 
                 return false;
             }
             else
+            {
+                if (IntercomStartPatch.first)
+                {
+                    Timing.CallDelayed(1f, () =>
+                    {
+                        __instance.CustomContent = string.Empty;
+                        __instance.Network_intercomText = string.Empty;
+                        __instance.UpdateText();
+
+                        IntercomStartPatch.first = false;
+                    });
+                }
                 return true;
+            }
         }
     }
 }