diff --git a/HelpSense/API/Events/CustomEventHandler.cs b/HelpSense/API/Events/CustomEventHandler.cs index 3821c70..15d39a8 100644 --- a/HelpSense/API/Events/CustomEventHandler.cs +++ b/HelpSense/API/Events/CustomEventHandler.cs @@ -96,6 +96,22 @@ public class CustomEventHandler : CustomEventsHandler public static TranslateConfig TranslateConfig; public static SSSSTranslateConfig SSSSTranslateConfig; public static CommandTranslateConfig CommandTranslateConfig; + + public IEnumerator Scp029InfEffect(Player player) + { + while(true) + { + yield return Timing.WaitForSeconds(1f); + if(!player.HasEffect()) + player.EnableEffect(20); + if (!player.HasEffect()) + player.EnableEffect(2); + if (!player.HasEffect()) + player.EnableEffect(15); + if (player.GetRoleName() != "SCP-029") + yield break; + } + } public override void OnServerWaitingForPlayers() { @@ -586,6 +602,8 @@ public override void OnServerRoundStarted() player.EnableEffect(15); player.Health = 120; + + Timing.RunCoroutine(Scp029InfEffect(player)); }; }); } diff --git a/HelpSense/Handler/LobbyLocationHandler.cs b/HelpSense/Handler/LobbyLocationHandler.cs index 7139df3..e3e1225 100644 --- a/HelpSense/Handler/LobbyLocationHandler.cs +++ b/HelpSense/Handler/LobbyLocationHandler.cs @@ -14,12 +14,12 @@ public static void TowerLocation() { LobbyPosition = Random.Range(1, 6) switch { - 1 => new Vector3(162.893f, 1019.470f, -13.430f), - 2 => new Vector3(107.698f, 1014.048f, -12.555f), - 3 => new Vector3(39.262f, 1014.112f, -31.844f), - 4 => new Vector3(-15.854f, 1014.461f, -31.543f), - 5 => new Vector3(130.483f, 993.366f, 20.601f), - _ => new Vector3(39.262f, 1014.112f, -31.844f), + 1 => new Vector3(162.893f, 319.470f, -13.430f), + 2 => new Vector3(107.698f, 314.048f, -12.555f), + 3 => new Vector3(39.262f, 314.112f, -31.844f), + 4 => new Vector3(-15.854f, 314.461f, -31.543f), + 5 => new Vector3(130.483f, 293.366f, 20.601f), + _ => new Vector3(39.262f, 314.112f, -31.844f), }; } @@ -36,13 +36,13 @@ public static void IntercomLocation() public static void MountainLocation() { - LobbyPosition = new Vector3(103.492f, 998.946f, 24.672f); + LobbyPosition = new Vector3(103.492f, 298.946f, 24.672f); } public static void ChaosLocation() { - LobbyPosition = new Vector3(-49.074f, 989.055f, -42.844f); - //LobbyPosition = new Vector3(-7.500f, 995.402f, -7.910f); + LobbyPosition = new Vector3(-49.074f, 289.055f, -42.844f); + //LobbyPosition = new Vector3(-7.500f, 295.402f, -7.910f); } } -} \ No newline at end of file +}