From 52c85dd1f8a4e88fdcc43a24075afa967c7c5f7a Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Sun, 21 Apr 2024 21:39:53 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D1=81=D0=B0=D0=BC=D0=BE=D0=B5=20=D0=B2?= =?UTF-8?q?=D0=B0=D0=B6=D0=BD=D0=BE=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source Code/EventHandlers.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source Code/EventHandlers.cs b/Source Code/EventHandlers.cs index c392daf..01fe54a 100644 --- a/Source Code/EventHandlers.cs +++ b/Source Code/EventHandlers.cs @@ -37,14 +37,15 @@ public void roundended(RoundEndedEventArgs ev) public IEnumerator cor() { - for (;;) + while (true) { { string HintMessage = Plugin.Instance.Config.Hint.Replace("%tps%", Server.Tps.ToString()) .Replace("{MinPlayers}", Server.PlayerCount.ToString()) .Replace("{MaxPlayers}", Server.MaxPlayerCount.ToString()) .Replace("{Minutes}", Round.ElapsedTime.Minutes.ToString()) - .Replace("{Seconds}", Round.ElapsedTime.Seconds.ToString()).Replace("%NameServer%", Server.Name) + .Replace("{Seconds}", Round.ElapsedTime.Seconds.ToString()) + .Replace("%NameServer%", Server.Name) .Replace("{FF}", Server.FriendlyFire.ToString()) .Replace("{ServerName}", Server.Name) .Replace("{SCPs}", Round.SurvivingSCPs.ToString()) From ecdd2d72179de515560c065add2139abdd0eac19 Mon Sep 17 00:00:00 2001 From: RandomInternetUser <83414705+jailedfish@users.noreply.github.com> Date: Mon, 22 Apr 2024 17:57:08 +0300 Subject: [PATCH 2/2] pass --- Source Code/EventHandlers.cs | 76 ++++++++---------------------------- 1 file changed, 17 insertions(+), 59 deletions(-) diff --git a/Source Code/EventHandlers.cs b/Source Code/EventHandlers.cs index 01fe54a..68e4853 100644 --- a/Source Code/EventHandlers.cs +++ b/Source Code/EventHandlers.cs @@ -1,21 +1,8 @@ using System.Collections.Generic; -using System.ComponentModel; -using System.Globalization; -using Discord; -using Exiled.API.Enums; -using Exiled.API.Extensions; -using Exiled.API.Features; -using Exiled.API.Features.Roles; using Exiled.Events.EventArgs.Player; using Exiled.Events.EventArgs.Server; using MEC; using PlayerRoles; -using PlayerRoles.FirstPersonControl; -using PluginAPI.Core; -using PluginAPI.Roles; -using RemoteAdmin.Communication; -using YamlDotNet.Core; -using static Exiled.API.Enums.GeneratorState; using Player = Exiled.API.Features.Player; using Round = Exiled.API.Features.Round; using Server = Exiled.API.Features.Server; @@ -40,6 +27,20 @@ public IEnumerator cor() while (true) { { + Dictionary roleColorDict = new Dictionary() + { + {RoleTypeId.ClassD, "FF8E00"}, + {RoleTypeId.Scientist,"FFFF7C"}, + {RoleTypeId.FacilityGuard, "5B6370"}, + {RoleTypeId.NtfCaptain, "003ECA"}, + {RoleTypeId.NtfSergeant, "0096FF"}, + {RoleTypeId.NtfSpecialist, "0096FF"}, + {RoleTypeId.NtfPrivate, "6FC3FF"}, + {RoleTypeId.ChaosRepressor, "006728"}, + {RoleTypeId.ChaosMarauder, "006728"}, + {RoleTypeId.ChaosRifleman, "006728"}, + { RoleTypeId.ChaosConscript, "006728"} + }; string HintMessage = Plugin.Instance.Config.Hint.Replace("%tps%", Server.Tps.ToString()) .Replace("{MinPlayers}", Server.PlayerCount.ToString()) .Replace("{MaxPlayers}", Server.MaxPlayerCount.ToString()) @@ -51,52 +52,9 @@ public IEnumerator cor() .Replace("{SCPs}", Round.SurvivingSCPs.ToString()) .Replace("{UserRole}", RoleTranslations.RoleNamesFile); - foreach (Player player in Player.List) - { - if (player.Role.Type == RoleTypeId.ClassD) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.Scientist) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.FacilityGuard) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.NtfCaptain) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.NtfSergeant) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.NtfSpecialist) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.NtfPrivate) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.ChaosRepressor) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.ChaosMarauder) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.ChaosRifleman) - { - player.ShowHint($" {HintMessage}", 50); - } - if (player.Role.Type == RoleTypeId.ChaosConscript) - { - player.ShowHint($" {HintMessage}", 50); - } + foreach (Player player in Player.List) { + player.ShowHint($" {HintMessage}", + 50); } } yield return Timing.WaitForSeconds(1f);