From 9af84609d9232da7612bf63cb1d6bb2872bd0c98 Mon Sep 17 00:00:00 2001 From: Ape <155788660+ApeMV@users.noreply.github.com> Date: Sat, 21 Feb 2026 23:28:41 +0100 Subject: [PATCH] New moderator system and /reload fix --- Modules/BanManager.cs | 20 +++++++++++--- Modules/CustomOptionsHolder.cs | 26 ++++++++++++++++++- Modules/FixedUpdate.cs | 27 +++++++++++++------ Modules/Translator.cs | 19 +++++++++++++- Modules/Utils.cs | 24 ++++++++++++----- Patches/ChatPatches.cs | 46 ++++++++++++++++++++++++++------- Patches/DleksPatch.cs | 13 +++++++++- Patches/JoinAndLeavePatches.cs | 17 +----------- Patches/OnGameStartedPatch.cs | 2 +- Resources/Language/English.json | 14 ++++++++-- 10 files changed, 157 insertions(+), 51 deletions(-) diff --git a/Modules/BanManager.cs b/Modules/BanManager.cs index dd6aefa..1a9fb42 100644 --- a/Modules/BanManager.cs +++ b/Modules/BanManager.cs @@ -21,8 +21,10 @@ public static class BanManager public static string RemoveHtmlTags(this string str) => Regex.Replace(str, "<[^>]*?>", ""); private static readonly string DenyNameListPath = $"{DataPath}/AUR-DATA/DenyNameList.txt"; - private static string BanListPath = $"{DataPath}/AUR-DATA/BanList.txt"; - private static string ModeratorListPath = $"{DataPath}/AUR-DATA/ModeratorList.txt"; + private static string BanListPath = $"{DataPath}/AUR-DATA/Banlist.txt"; + private static string VipListPath = $"{DataPath}/AUR-DATA/VIP.txt"; + private static string ModeratorListPath = $"{DataPath}/AUR-DATA/Moderator.txt"; + private static string AdminListPath = $"{DataPath}/AUR-DATA/Admin.txt"; public static List TempBanWhiteList = []; public static void Init() { @@ -37,14 +39,24 @@ public static class BanManager } if (!File.Exists(BanListPath)) { - Logger.Warn("Creating a new BanList.txt file", "BanManager"); + Logger.Warn("Creating a new Banlist.txt file", "BanManager"); File.Create(BanListPath).Close(); } + if (!File.Exists(VipListPath)) + { + Logger.Warn("Creating a new VIP.txt file", "BanManager"); + File.Create(VipListPath).Close(); + } if (!File.Exists(ModeratorListPath)) { - Logger.Warn("Creating a new ModeratorList.txt file", "BanManager"); + Logger.Warn("Creating a new Moderator.txt file", "BanManager"); File.Create(ModeratorListPath).Close(); } + if (!File.Exists(AdminListPath)) + { + Logger.Warn("Creating a new Admin.txt file", "BanManager"); + File.Create(AdminListPath).Close(); + } } catch (Exception ex) diff --git a/Modules/CustomOptionsHolder.cs b/Modules/CustomOptionsHolder.cs index 82c1ac0..b714b25 100644 --- a/Modules/CustomOptionsHolder.cs +++ b/Modules/CustomOptionsHolder.cs @@ -62,6 +62,11 @@ namespace AmongUsRevamped "Moderators", "Everyone", "Nobody" }; + public static readonly string[] accessLevels = + { + "Everyone", "VIP And Above", "Moderator And Above", "Admin", "Only You" + }; + //System public static OptionItem Gamemode; @@ -97,6 +102,16 @@ namespace AmongUsRevamped public static OptionItem ColorCommandLevel; public static OptionItem AllowFortegreen; public static OptionItem NoGameEnd; + + public static OptionItem TabGroupAccess; + public static OptionItem SlashColorCmd; + public static OptionItem SlashRolesAndGamemodeCmd; + public static OptionItem SlashLastGameCmd; + public static OptionItem SlashHelpAndAurCmd; + public static OptionItem SlashKickCmd; + public static OptionItem SlashBanCmd; + public static OptionItem SlashEndMeetingCmd; + public static OptionItem SlashStartAndEndGameCmd; //Gameplay public static OptionItem TabGroupSabotages; @@ -345,7 +360,16 @@ namespace AmongUsRevamped NoGameEnd = BooleanOptionItem.Create(60383, Translator.Get("noGameEnd"), false, TabGroup.SystemSettings, false) .SetColor(Color.red); - + TabGroupAccess = TextOptionItem.Create(60400, Translator.Get("tabGroupAccess"), TabGroup.SystemSettings) + .SetColor(Color.red); + SlashColorCmd = StringOptionItem.Create(60401, Translator.Get("slashColorCmd"), accessLevels, 1, TabGroup.SystemSettings, false); + SlashRolesAndGamemodeCmd = StringOptionItem.Create(60402, Translator.Get("slashRolesAndGamemodeCmd"), accessLevels, 1, TabGroup.SystemSettings, false); + SlashLastGameCmd = StringOptionItem.Create(60403, Translator.Get("slashLastGameCmd"), accessLevels, 1, TabGroup.SystemSettings, false); + SlashHelpAndAurCmd = StringOptionItem.Create(60404, Translator.Get("slashHelpAndAurCmd"), accessLevels, 1, TabGroup.SystemSettings, false); + SlashKickCmd = StringOptionItem.Create(60405, Translator.Get("slashKickCmd"), accessLevels, 2, TabGroup.SystemSettings, false); + SlashBanCmd = StringOptionItem.Create(60406, Translator.Get("slashBanCmd"), accessLevels, 2, TabGroup.SystemSettings, false); + SlashEndMeetingCmd = StringOptionItem.Create(60407, Translator.Get("slashEndMeetingCmd"), accessLevels, 3, TabGroup.SystemSettings, false); + SlashStartAndEndGameCmd = StringOptionItem.Create(60403, Translator.Get("slashStartAndEndGameCmd"), accessLevels, 3, TabGroup.SystemSettings, false); // Custom role settings diff --git a/Modules/FixedUpdate.cs b/Modules/FixedUpdate.cs index 2d7bef2..2ec7541 100644 --- a/Modules/FixedUpdate.cs +++ b/Modules/FixedUpdate.cs @@ -36,17 +36,28 @@ public static class FixedUpdate [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.FixedUpdate))] class FixedUpdateInGamePatch { - public static readonly HashSet ProcessedModerators = new HashSet(); - public static void Postfix(PlayerControl __instance) { if (__instance == null || __instance.PlayerId == 255 || !AmongUsClient.Instance.AmHost) return; - if (Utils.IsPlayerModerator(__instance.Data.FriendCode) && !ProcessedModerators.Contains(__instance.PlayerId)) + int access = Utils.CheckAccessLevel(__instance.Data.FriendCode); + string color = access switch { - __instance.SetName($"★{__instance.Data.PlayerName}★"); - ProcessedModerators.Add(__instance.PlayerId); + 1 => "yellow", + 2 => "purple", + 3 => "red", + _ => "white" + }; + + if (!__instance.cosmetics.nameText.text.Contains($"{color}") && Utils.IsLobby) + { + __instance.cosmetics.nameText.text = $"{__instance.Data.PlayerName}"; } + if (!Utils.IsLobby && __instance.cosmetics.nameText.text != __instance.Data.PlayerName) + { + __instance.cosmetics.nameText.text = __instance.Data.PlayerName; + } + GameObject g = GameObject.Find("GameSettingsLabel"); @@ -84,7 +95,7 @@ class FixedUpdateInGamePatch if (__instance == PlayerControl.LocalPlayer && Main.GM.Value) return; Utils.CustomWinnerEndGame(__instance, 1); - NormalGameEndChecker.LastWinReason = $"★ {__instance.Data.PlayerName} Wins! (Completed tasks first)"; + NormalGameEndChecker.LastWinReason = $"{__instance.Data.PlayerName} Wins! (Completed tasks first)"; } } @@ -121,7 +132,7 @@ class FixedUpdateInGamePatch Utils.ContinueEndGame((byte)GameOverReason.CrewmatesByVote); Logger.Info($" Crewmates won because the game took longer than {Options.CrewAutoWinsGameAfter.GetInt()}s", "SNSManager"); - NormalGameEndChecker.LastWinReason = $"★ Crewmates win! (Timer)\n\nImpostors:\n" + string.Join("\n", NormalGameEndChecker.imps.Select(p => p.Data.PlayerName)); + NormalGameEndChecker.LastWinReason = $"Crewmates win! (Timer)\n\nImpostors:\n" + string.Join("\n", NormalGameEndChecker.imps.Select(p => p.Data.PlayerName)); } } // 3 = Speedrun @@ -133,7 +144,7 @@ class FixedUpdateInGamePatch Utils.CustomWinnerEndGame(PlayerControl.LocalPlayer, 0); Logger.Info($" No one won because the game took longer than {Options.GameAutoEndsAfter.GetInt()}s", "SpeedrunManager"); - NormalGameEndChecker.LastWinReason = $"★ No one wins! (Timer)"; + NormalGameEndChecker.LastWinReason = $"No one wins! (Timer)"; } } } diff --git a/Modules/Translator.cs b/Modules/Translator.cs index e0f4cae..9df1551 100644 --- a/Modules/Translator.cs +++ b/Modules/Translator.cs @@ -77,7 +77,7 @@ public static class Translator } } - private static void LoadLanguage(SupportedLangs lang) + private static void LoadLanguage(SupportedLangs lang, bool reset = false) { string path = GetLanguagePath(lang); @@ -121,6 +121,23 @@ public static class Translator public static void Reload() { + string path = GetLanguagePath(_currentLang); + var assembly = Assembly.GetExecutingAssembly(); + string targetFile = $"{_currentLang}.json"; + + foreach (var name in assembly.GetManifestResourceNames()) + { + if (name.EndsWith(targetFile, StringComparison.OrdinalIgnoreCase)) + { + using var stream = assembly.GetManifestResourceStream(name); + using var reader = new StreamReader(stream); + string json = reader.ReadToEnd(); + + File.WriteAllText(path, json); + + break; + } + } LoadLanguage(_currentLang); } } \ No newline at end of file diff --git a/Modules/Utils.cs b/Modules/Utils.cs index 7497921..c1937ac 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -47,13 +47,24 @@ public static class Utils public static string ColorToHex(Color32 color) => $"#{color.r:x2}{color.g:x2}{color.b:x2}{color.a:x2}"; public static byte GetActiveMapId() => GameOptionsManager.Instance.CurrentGameOptions.MapId; - public static bool IsPlayerModerator(string friendCode) + public static int CheckAccessLevel(string friendCode) { - if (friendCode == "") return false; + if (friendCode == "") return 0; - var friendCodesFilePath = @$"{BanManager.DataPath}/AUR-DATA/ModeratorList.txt"; - var friendCodes = File.ReadAllLines(friendCodesFilePath); - return friendCodes.Any(code => code.Contains(friendCode)); + var vipFilePath = @$"{BanManager.DataPath}/AUR-DATA/VIP.txt"; + var vipFriendCodes = File.ReadAllLines(vipFilePath); + + var moderatorFilePath = @$"{BanManager.DataPath}/AUR-DATA/Moderator.txt"; + var moderatorFriendCodes = File.ReadAllLines(moderatorFilePath); + + var adminFilePath = @$"{BanManager.DataPath}/AUR-DATA/Admin.txt"; + var adminFriendCodes = File.ReadAllLines(adminFilePath); + + if (adminFriendCodes.Any(code => code.Contains(friendCode))) return 3; + if (moderatorFriendCodes.Any(code => code.Contains(friendCode))) return 2; + if (vipFriendCodes.Any(code => code.Contains(friendCode))) return 1; + + return 0; } public static string GetTabName(TabGroup tab) @@ -194,8 +205,7 @@ public static class Utils OnGameJoinedPatch.AutoStartCheck = false; Main.GameTimer = 0f; MurderPlayerPatch.misfireCount.Clear(); - LateTask.Tasks.Clear(); - FixedUpdateInGamePatch.ProcessedModerators.Clear(); + LateTask.Tasks.Clear(); NormalGameEndChecker.ImpCheckComplete = false; CreateOptionsPickerPatch.SetDleks2 = false; CanCallMeetings = true; diff --git a/Patches/ChatPatches.cs b/Patches/ChatPatches.cs index a6be9b1..1eb6107 100644 --- a/Patches/ChatPatches.cs +++ b/Patches/ChatPatches.cs @@ -93,6 +93,7 @@ internal static class SendChatPatch if (text == "/reload" || text == "/translatereload" || text == "/reset" || text == "/translatereset") { + HudManager.Instance.Chat.AddChat(PlayerControl.LocalPlayer, $"{Translator.Get("translationReloaded")}"); Translator.Reload(); __instance.freeChatField.textArea.Clear(); __instance.freeChatField.textArea.SetText(string.Empty); @@ -303,7 +304,7 @@ public static class RPCHandlerPatch c = keywords.Any(k => text == k); } - if (c && !Utils.IsPlayerModerator(__instance.Data.FriendCode) && Options.AutoKickStart.GetBool() && !Utils.InGame) + if (c && Utils.CheckAccessLevel(__instance.Data.FriendCode) >= 1 && Options.AutoKickStart.GetBool() && !Utils.InGame) { int clientId = __instance.Data.ClientId; @@ -330,7 +331,7 @@ public static class RPCHandlerPatch if (Utils.TryGetColorId(argCol, out byte colId)) { - if (Options.ColorCommandLevel.GetValue() == 0 && Utils.IsPlayerModerator(__instance.Data.FriendCode) || Options.ColorCommandLevel.GetValue() == 1) + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) >= Options.SlashColorCmd.GetValue()) { if (colId > 17 && !Options.AllowFortegreen.GetBool()) return; __instance.RpcSetColor(colId); @@ -349,7 +350,7 @@ public static class RPCHandlerPatch if (isKick || isBan || isColorKick || isColorBan) { - if (Utils.IsPlayerModerator(__instance.Data.FriendCode)) + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) >= Options.SlashKickCmd.GetValue()) { string arg = text.Substring(isKick ? 6 : isBan ? 5 : isColorKick ? 7 : isColorBan ? 6 : 0).Trim(); @@ -357,7 +358,7 @@ public static class RPCHandlerPatch foreach (PlayerControl p in PlayerControl.AllPlayerControls) { - if (p.Data == null || p == PlayerControl.LocalPlayer || Utils.IsPlayerModerator(p.Data.FriendCode)) continue; + if (p.Data == null || p == PlayerControl.LocalPlayer || Utils.CheckAccessLevel(p.Data.FriendCode) >= 1) continue; if ((isKick || isBan) && p.Data.PlayerName.Equals(arg, StringComparison.OrdinalIgnoreCase)) { @@ -374,6 +375,7 @@ public static class RPCHandlerPatch } } } + if (banLog && Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashBanCmd.GetValue()) return; if (target != null) { @@ -387,7 +389,7 @@ public static class RPCHandlerPatch if (text == "/h" || text == "/help" || text == "/cmd" || text == "/commands") { - if (!Utils.IsPlayerModerator(__instance.Data.FriendCode) || !Options.ModeratorCanUseCommand.GetBool()) return; + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashHelpAndAurCmd.GetValue()) return; OnGameJoinedPatch.WaitingForChat = true; new LateTask(() => @@ -406,36 +408,60 @@ public static class RPCHandlerPatch }, 6.6f, "MHP3"); } + if (text == "/eg" || text == "/endgame" || text == "/finishgame" || text == "/stop") + { + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashStartAndEndGameCmd.GetValue()) return; + MessageWriter writer = AmongUsClient.Instance.StartEndGame(); + writer.Write((byte)GameOverReason.ImpostorDisconnect); + AmongUsClient.Instance.FinishEndGame(writer); + } + + if (text == "/em" || text == "/endmeeting" || text == "/finishmeeting" || text == "/stopmeeting") + { + if (Utils.IsMeeting) + { + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashEndMeetingCmd.GetValue()) return; + MeetingHud.Instance.RpcClose(); + } + } + + if (text == "/s" || text == "/start" || text == "/startgame" || text == "/begin") + { + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashStartAndEndGameCmd.GetValue()) return; + GameStartManager.Instance.BeginGame(); + } + if (text == "/l" || text == "/lastgame" || text == "/win" || text == "/winner") { - if (!Utils.IsPlayerModerator(__instance.Data.FriendCode) || !Options.ModeratorCanUseCommand.GetBool()) return; + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashLastGameCmd.GetValue()) return; if (string.IsNullOrEmpty(NormalGameEndChecker.LastWinReason) || Utils.InGame) return; Utils.ModeratorChatCommand($"{NormalGameEndChecker.LastWinReason}", "", false); } if (text == "/0kc" || text == "/0kcd" || text == "/0killcooldown") { - if (!Utils.IsPlayerModerator(__instance.Data.FriendCode) || !Options.ModeratorCanUseCommand.GetBool()) return; + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashRolesAndGamemodeCmd.GetValue()) return; Utils.ModeratorChatCommand(Translator.Get("noKcdMode"), "", false); } if (text == "/sns" || text == "/shiftandseek" || text == "/shift&seek") { - if (!Utils.IsPlayerModerator(__instance.Data.FriendCode) || !Options.ModeratorCanUseCommand.GetBool()) return; + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashRolesAndGamemodeCmd.GetValue()) return; Utils.ModeratorChatCommand(Translator.Get("SnSModeOne"), Translator.Get("SnSModeTwo", Options.CrewAutoWinsGameAfter.GetInt(), Options.CantKillTime.GetInt(), Options.MisfiresToSuicide.GetInt()), true); } if (text == "/sp" || text == "/sr" || text == "/speedrun") { - if (!Utils.IsPlayerModerator(__instance.Data.FriendCode) || !Options.ModeratorCanUseCommand.GetBool()) return; + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashRolesAndGamemodeCmd.GetValue()) return; Utils.ModeratorChatCommand(Translator.Get("speedrunMode", Options.GameAutoEndsAfter.GetInt()), "", false); } if (text == "/r" || text == "/roles" || text == "/gamemode" || text == "/gm") { - if (!Utils.IsPlayerModerator(__instance.Data.FriendCode) || !Options.ModeratorCanUseCommand.GetBool()) return; + if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashRolesAndGamemodeCmd.GetValue()) return; switch (Options.Gamemode.GetValue()) { case 0: + Utils.ModeratorChatCommand($"Enabled Custom Roles:\n\n{CustomRoleManagement.GetActiveRoles()}", "", false); break; case 1: diff --git a/Patches/DleksPatch.cs b/Patches/DleksPatch.cs index 030664e..e626da6 100644 --- a/Patches/DleksPatch.cs +++ b/Patches/DleksPatch.cs @@ -22,6 +22,7 @@ class CreateOptionsPickerPatch { public static bool SetDleks = false; public static bool SetDleks2; + private static bool InitiatedDleks; private static MapSelectButton DleksButton; [HarmonyPatch] public static class GameOptionsMapPickerPatch @@ -30,7 +31,17 @@ class CreateOptionsPickerPatch [HarmonyPostfix] public static void Postfix_Initialize(CreateGameMapPicker __instance) { - float delay = SceneManager.GetActiveScene().name == "MainMenu" ? 0.2f : 0f; + float delay; + if (SceneManager.GetActiveScene().name == "MainMenu" && InitiatedDleks) + { + delay = 0.2f; + } + else + { + delay = 0f; + InitiatedDleks = true; + } + if (SceneManager.GetActiveScene().name == "FindAGame") return; new LateTask(() => diff --git a/Patches/JoinAndLeavePatches.cs b/Patches/JoinAndLeavePatches.cs index c057749..429c08f 100644 --- a/Patches/JoinAndLeavePatches.cs +++ b/Patches/JoinAndLeavePatches.cs @@ -79,13 +79,8 @@ class OnPlayerJoinedPatch if (AmongUsClient.Instance.AmHost) { BanManager.CheckBanPlayer(Client); - BanManager.IsPlayerInDenyName(Client, Client.PlayerName); - - if (Utils.IsPlayerModerator(Client.FriendCode) && Options.ApplyModeratorList.GetBool()) - { - Logger.Info($" {Client.PlayerName} is moderator", "ModeratorCheck"); - } + Logger.Info($" {Client.PlayerName} has access level {Utils.CheckAccessLevel(Client.FriendCode)}", "AccessCheck"); if (HasInvalidFriendCode(Client.FriendCode) && Options.KickInvalidFriendCodes.GetBool()) { @@ -104,14 +99,4 @@ class OnPlayerJoinedPatch } } } -} - -[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnPlayerLeft))] -class OnPlayerLeftPatch -{ - static void Prefix([HarmonyArgument(0)] ClientData client) - { - if (client?.Character == null) return; - FixedUpdateInGamePatch.ProcessedModerators.Remove(client.Character.PlayerId); - } } \ No newline at end of file diff --git a/Patches/OnGameStartedPatch.cs b/Patches/OnGameStartedPatch.cs index fe6557f..8a03ea1 100644 --- a/Patches/OnGameStartedPatch.cs +++ b/Patches/OnGameStartedPatch.cs @@ -86,7 +86,7 @@ class PlayerControlSetRolePatch Seekers.Clear(); FirstAssign = false; i = 0; - Logger.Info("PCSRP successful", "."); + Logger.Info("PCSRP successful", "RoleManaging"); } return true; diff --git a/Resources/Language/English.json b/Resources/Language/English.json index 322f871..29b3715 100644 --- a/Resources/Language/English.json +++ b/Resources/Language/English.json @@ -27,6 +27,16 @@ "allowFortegreen": "Allow Fortegreen Color", "noGameEnd": "No Game End", + "tabGroupAccess": "Access Levels", + "slashColorCmd": "Who Can Use /color", + "slashRolesAndGamemodeCmd": "Who Can Use /r", + "slashLastGameCmd": "Who Can Use /l", + "slashHelpAndAurCmd": "Who Can Use /help And /aur", + "slashKickCmd": "Who Can Use /kick And /ckick", + "slashBanCmd": "Who Can Use /ban And /cban", + "slashEndMeetingCmd": "Who Can Use /endmeeting", + "slashStartAndEndGameCmd": "Who Can Use /startgame And /endgame", + "tabGroupCrewmate": "Crewmate Roles", "mayorPerc": "PLACEHOLDER", "tabGroupNeutral": "Neutral Roles", @@ -96,7 +106,7 @@ "tabGroupTasks": "Tasks", "allPlayersSameTasks": "Everyone has same tasks", - "overrideTaskSettings": "<#ffd>Di<#ffb>sa<#ff9>bl<#ffb>e T<#ffd>as<#ffb>ks", + "overrideTaskSettings": "Disable Tasks", "disableMiraTasks": "Disable Mira HQ Tasks", "disableBuyBeverage": "Disable Buy Beverage", @@ -195,7 +205,7 @@ "allCommandsOne": "Commands:\n/r - Current mode description\n/0kc, /sns, /sp - Specific mode description\n/l - Shows last winner info", "allCommandsTwo": "/kick, /ban - Bans or kicks a player by name\n/ckick, /cban - Bans or kicks a player by color", "socialsAll": "AUR socials:\n\ng i t h u b . c o m /\nApeMV/AmongUsRevamped\n\nd i s c o r d . g g /\n83Zhzhyhya", - + "translationReloaded": "Your file has successfully been reset.\nTo apply the changes, restart your game.", "Mayor": "Mayor", "MayorPriv": "PRIVATE:\n\nYour role is Mayor!\n\nYou are a crewmate with i total votes. Use your voting power to eject Impostors.",