From d86aa2343a04abc42217408a86ca3a66e6947c27 Mon Sep 17 00:00:00 2001 From: Ape <155788660+ApeMV@users.noreply.github.com> Date: Sat, 7 Nov 2026 13:03:17 +0100 Subject: [PATCH] Okay, I suppose --- AmongUsRevamped.cs | 2 +- Modules/FixedUpdate.cs | 9 ++++++++- Modules/Hotkeys.cs | 4 +--- Modules/Utils.cs | 34 +++++++++++++++++++++------------- Patches/ChatPatches.cs | 8 ++------ Patches/SabotagePatches.cs | 6 +++--- README.md | 2 +- 7 files changed, 37 insertions(+), 28 deletions(-) diff --git a/AmongUsRevamped.cs b/AmongUsRevamped.cs index e4d0e2d..1be1a07 100644 --- a/AmongUsRevamped.cs +++ b/AmongUsRevamped.cs @@ -46,7 +46,7 @@ public partial class Main : BasePlugin public static bool HasArgumentException; public static string CredentialsText; - public const string ModVersion = "v2.2.3"; + public const string ModVersion = "v2.3.0"; public static float GameTimer; public static float AfkTimer; diff --git a/Modules/FixedUpdate.cs b/Modules/FixedUpdate.cs index cfa1a27..506f7a4 100644 --- a/Modules/FixedUpdate.cs +++ b/Modules/FixedUpdate.cs @@ -192,11 +192,18 @@ class FixedUpdateInGamePatch } if ( !Main.DisableLobbyInfo.Value && __instance.cosmetics.nameText.text != $"Lv.{__instance.Data.PlayerLevel} | {AmongUsClient.Instance.GetClientFromCharacter(__instance).PlatformData.Platform}\n{__instance.Data.PlayerName}") { - __instance.cosmetics.nameText.text = $"Lv.{__instance.Data.PlayerLevel} | {AmongUsClient.Instance.GetClientFromCharacter(__instance).PlatformData.Platform}\n{__instance.Data.PlayerName}"; + __instance.cosmetics.nameText.text = $"Lv.{__instance.Data.PlayerLevel + 1} | {Utils.ConvertPlatform(AmongUsClient.Instance.GetClientFromCharacter(__instance).PlatformData.Platform)}\n{__instance.Data.PlayerName} "; } LastColors[__instance.PlayerId] = color; } } + if (Utils.InGame) + { + if (__instance.cosmetics.nameText.text != __instance.Data.PlayerName) + { + __instance.cosmetics.nameText.text = __instance.Data.PlayerName; + } + } if (!AmongUsClient.Instance.AmHost) return; diff --git a/Modules/Hotkeys.cs b/Modules/Hotkeys.cs index a0bb196..f2002f6 100644 --- a/Modules/Hotkeys.cs +++ b/Modules/Hotkeys.cs @@ -28,9 +28,7 @@ internal class Hotkeys if (Input.GetKey(KeyCode.L) && Shift && Enter) { - MessageWriter writer = AmongUsClient.Instance.StartEndGame(); - writer.Write((byte)GameOverReason.ImpostorDisconnect); - AmongUsClient.Instance.FinishEndGame(writer); + GameManager.Instance.RpcEndGame(GameOverReason.ImpostorDisconnect, false); } if (Input.GetKey(KeyCode.M) && Shift && Enter && Utils.InGame) diff --git a/Modules/Utils.cs b/Modules/Utils.cs index caad357..bdfb262 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -460,17 +460,18 @@ public static class Utils { foreach (PlayerControl pc in PlayerControl.AllPlayerControls) { - CustomGameOverReason = (byte)GameOverReason.ImpostorsByVote; pc.RpcSetRole(AmongUs.GameOptions.RoleTypes.CrewmateGhost, false); } + new LateTask(() => + { + ContinueEndGame(GameOverReason.ImpostorsByVote); + }, 1f, "CustomWinnerEndGame"); } if (winnerType == 1) { foreach (PlayerControl pc in PlayerControl.AllPlayerControls) { - CustomGameOverReason = (byte)GameOverReason.ImpostorsByVote; - if (pc != winner) { pc.RpcSetRole(AmongUs.GameOptions.RoleTypes.CrewmateGhost, false); @@ -480,19 +481,16 @@ public static class Utils pc.RpcSetRole(AmongUs.GameOptions.RoleTypes.ImpostorGhost, false); } } - } - - new LateTask(() => - { - ContinueEndGame((byte)CustomGameOverReason); - }, 1f, "CustomWinnerEndGame"); + new LateTask(() => + { + ContinueEndGame(GameOverReason.ImpostorsByVote); + }, 1f, "CustomWinnerEndGame"); + } } - public static void ContinueEndGame(byte gameOverReason) + public static void ContinueEndGame(GameOverReason gameOverReason) { - MessageWriter writer = AmongUsClient.Instance.StartEndGame(); - writer.Write(gameOverReason); - AmongUsClient.Instance.FinishEndGame(writer); + GameManager.Instance.RpcEndGame(gameOverReason, false); HandlingGameEnd = false; Logger.Info($"{gameOverReason}", "ContinueEndGame"); } @@ -913,4 +911,14 @@ public static class Utils return newText; } + + public static string ConvertPlatform(Platforms input) + { + if (input == Platforms.StandaloneSteamPC) return "Steam"; + if (input == Platforms.Playstation) return "PS"; + if (input == Platforms.StandaloneWin10) return "Win10"; + if (input == Platforms.StandaloneEpicPC) return "Epic"; + + return input.ToString(); + } } \ No newline at end of file diff --git a/Patches/ChatPatches.cs b/Patches/ChatPatches.cs index 234c806..aba16b3 100644 --- a/Patches/ChatPatches.cs +++ b/Patches/ChatPatches.cs @@ -149,9 +149,7 @@ internal static class SendChatPatch __instance.freeChatField.textArea.SetText(string.Empty); if (!Utils.InGame) return false; - MessageWriter writer = AmongUsClient.Instance.StartEndGame(); - writer.Write((byte)GameOverReason.ImpostorDisconnect); - AmongUsClient.Instance.FinishEndGame(writer); + GameManager.Instance.RpcEndGame(GameOverReason.ImpostorDisconnect, false); return false; } @@ -859,9 +857,7 @@ public static class RPCHandlerPatch if (text == "/eg" || text == "/endgame") { if (Utils.CheckAccessLevel(__instance.Data.FriendCode) < Options.SlashStartAndEndGameCmd.GetValue()) return; - MessageWriter writer = AmongUsClient.Instance.StartEndGame(); - writer.Write((byte)GameOverReason.ImpostorDisconnect); - AmongUsClient.Instance.FinishEndGame(writer); + GameManager.Instance.RpcEndGame(GameOverReason.ImpostorDisconnect, false); } if (text == "/em" || text == "/endmeeting") diff --git a/Patches/SabotagePatches.cs b/Patches/SabotagePatches.cs index 8450a16..79d658c 100644 --- a/Patches/SabotagePatches.cs +++ b/Patches/SabotagePatches.cs @@ -167,7 +167,7 @@ public static class ReactorSystemTypePatch { if (__instance.IsActive && __instance.Countdown <= 0 && !Utils.HandlingGameEnd) { - Utils.ContinueEndGame((byte)GameOverReason.ImpostorsBySabotage); + Utils.ContinueEndGame(GameOverReason.ImpostorsBySabotage); NormalGameEndChecker.CheckWinnerText("ImpostorSabotage"); } } @@ -201,7 +201,7 @@ public static class HeliSabotageSystemPatch { if (__instance.IsActive && __instance.Countdown <= 0 && !Utils.HandlingGameEnd) { - Utils.ContinueEndGame((byte)GameOverReason.ImpostorsBySabotage); + Utils.ContinueEndGame(GameOverReason.ImpostorsBySabotage); NormalGameEndChecker.CheckWinnerText("ImpostorSabotage"); } } @@ -245,7 +245,7 @@ public static class LifeSuppSystemTypePatch { if (__instance.IsActive && __instance.Countdown <= 0 && !Utils.HandlingGameEnd) { - Utils.ContinueEndGame((byte)GameOverReason.ImpostorsBySabotage); + Utils.ContinueEndGame(GameOverReason.ImpostorsBySabotage); NormalGameEndChecker.CheckWinnerText("ImpostorSabotage"); } } diff --git a/README.md b/README.md index aef5c39..e3a2779 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ **** ‎ -# 🎮 Features (v2.2.3): +# 🎮 Features (v2.3.0): ## ♠️ Client Side settings: - Toggle Game Master (Spectator)