diff --git a/AmongUsRevamped.cs b/AmongUsRevamped.cs index ff4cccc..f08d312 100644 --- a/AmongUsRevamped.cs +++ b/AmongUsRevamped.cs @@ -42,7 +42,7 @@ public partial class Main : BasePlugin public static bool HasArgumentException; public static string CredentialsText; - public const string ModVersion = "v1.6.1"; + public const string ModVersion = "v1.6.2"; public static float GameTimer; diff --git a/Patches/ChatPatches.cs b/Patches/ChatPatches.cs index d6b0589..b87c809 100644 --- a/Patches/ChatPatches.cs +++ b/Patches/ChatPatches.cs @@ -311,7 +311,7 @@ public static class RPCHandlerPatch c = keywords.Any(k => text == k); } - if (c && Utils.CheckAccessLevel(__instance.Data.FriendCode) >= 1 && Options.AutoKickStart.GetBool() && !Utils.InGame) + if (c && Utils.CheckAccessLevel(__instance.Data.FriendCode) < 1 && Options.AutoKickStart.GetBool() && !Utils.InGame) { int clientId = __instance.Data.ClientId; diff --git a/Patches/ClientOptionsPatch.cs b/Patches/ClientOptionsPatch.cs index fd0a648..2e81f82 100644 --- a/Patches/ClientOptionsPatch.cs +++ b/Patches/ClientOptionsPatch.cs @@ -22,18 +22,18 @@ namespace AmongUsRevamped if (GM == null || GM.ToggleButton == null) { - GM = ClientOptionItem.Create("Game Master", Main.GM, __instance, GMButtonToggle); + GM = ClientOptionItem.Create(Translator.Get("gameMaster"), Main.GM, __instance, GMButtonToggle); static void GMButtonToggle() { if (Main.GM.Value) - HudManager.Instance.ShowPopUp("You will now spectate games until GM is turned off."); + HudManager.Instance.ShowPopUp(Translator.Get("gameMasterWarning")); } } if (UnlockFPS == null || UnlockFPS.ToggleButton == null) { - UnlockFPS = ClientOptionItem.Create("Unlock FPS", Main.UnlockFps, __instance, UnlockFPSButtonToggle); + UnlockFPS = ClientOptionItem.Create(Translator.Get("unlockFPS"), Main.UnlockFps, __instance, UnlockFPSButtonToggle); static void UnlockFPSButtonToggle() { @@ -43,11 +43,11 @@ namespace AmongUsRevamped } if (ShowFPS == null || ShowFPS.ToggleButton == null) - ShowFPS = ClientOptionItem.Create("Show FPS", Main.ShowFps, __instance); + ShowFPS = ClientOptionItem.Create(Translator.Get("showFPS"), Main.ShowFps, __instance); if (AutoStart == null || AutoStart.ToggleButton == null) { - AutoStart = ClientOptionItem.Create("Auto Start", Main.AutoStart, __instance, AutoStartButtonToggle); + AutoStart = ClientOptionItem.Create(Translator.Get("autoStart"), Main.AutoStart, __instance, AutoStartButtonToggle); static void AutoStartButtonToggle() { @@ -55,16 +55,16 @@ namespace AmongUsRevamped GameStartManager.Instance.startState == GameStartManager.StartingStates.Countdown) { GameStartManager.Instance.ResetStartState(); - Logger.SendInGame("CancelStartCountDown"); + Logger.SendInGame(Translator.Get("CancelStartCountDown")); } } } if (DarkTheme == null || DarkTheme.ToggleButton == null) - DarkTheme = ClientOptionItem.Create("Enable Dark Theme", Main.DarkTheme, __instance); + DarkTheme = ClientOptionItem.Create(Translator.Get("enableDarkTheme"), Main.DarkTheme, __instance); if (LobbyMusic == null || LobbyMusic.ToggleButton == null) - LobbyMusic = ClientOptionItem.Create("Lobby Music", Main.LobbyMusic, __instance); + LobbyMusic = ClientOptionItem.Create(Translator.Get("enableLobbyMusic"), Main.LobbyMusic, __instance); } } @@ -92,7 +92,7 @@ namespace AmongUsRevamped { public static void Postfix(HudManager __instance) { - if (Main.GM.Value) + if (Main.GM.Value && AmongUsClient.Instance.AmHost) { __instance.Chat.gameObject.SetActive(true); __instance.MapButton.gameObject.SetActive(true); diff --git a/Resources/Language/English.json b/Resources/Language/English.json index 0d42123..d4698fe 100644 --- a/Resources/Language/English.json +++ b/Resources/Language/English.json @@ -1,6 +1,17 @@ { "LanguageID": "0", + "gameMaster": "Game Master", + "unlockFPS": "Unlock FPS", + "showFPS": "Show FPS", + "autoStart": "Auto Start", + "enableDarkTheme": "Enable Dark Theme", + "enableLobbyMusic": "Lobby Music", + + "gameMasterWarning":"You will now spectate games until GM is turned off. WARNING: Custom role notifications will not work with this setting on!", + + "cancelStartCountdown": "Start countdown canceled", + "gamemode": "Gamemode", "tabGroupMain": "Moderation", "kickLowLevelPlayer": "Kick Players Under Level",