Merge pull request #47 from D1GQ/dev

v1.3.0 Hotfix 1

Commands/DumpCommand.cs

@@ -18,7 +18,7 @@ internal class DumpCommand : BaseCommand
         string logFilePath = Path.Combine(BetterDataManager.filePathFolder, "better-log.txt");
         string log = File.ReadAllText(logFilePath);
         string newLog = string.Empty;
-        string[] logArray = log.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+        string[] logArray = log.Split([Environment.NewLine], StringSplitOptions.None);
         foreach (string text in logArray)
         {
             if (text.Contains("[PrivateLog]"))

Helpers/Colors.cs

@@ -44,6 +44,13 @@ internal static class Colors
     /// <returns>A hexadecimal string representing the Color32 object.</returns>
     internal static string Color32ToHex(this Color32 color) => $"#{color.r:X2}{color.g:X2}{color.b:X2}{255:X2}";
 
+    /// <summary>
+    /// Converts a Color32 object to a hexadecimal string representation.
+    /// </summary>
+    /// <param name="color">The Color32 object to convert.</param>
+    /// <returns>A hexadecimal string representing the Color32 object.</returns>
+    internal static string ColorToHex(this Color color) => $"#{color.r:X2}{color.g:X2}{color.b:X2}{255:X2}";
+
     /// <summary>
     /// Converts a hexadecimal color string to a Color32 object.
     /// </summary>
@@ -96,4 +103,7 @@ internal static class Colors
 
         return Color.Lerp(colors[segmentIndex], colors[segmentIndex + 1], segmentT);
     }
+
+    internal static readonly Color CrewmateBlue = new Color32(140, byte.MaxValue, byte.MaxValue, byte.MaxValue);
+    internal static readonly Color ImpostorRed = new Color32(byte.MaxValue, 25, 25, byte.MaxValue);
 }

Helpers/RoleHelper.cs

@@ -4,13 +4,37 @@ namespace BetterAmongUs.Helpers;
 
 internal static class RoleHelper
 {
-    internal static RoleBehaviour? GetBehaviour(this RoleTypes role) => RoleManager.Instance?.AllRoles.FirstOrDefaultIl2Cpp(r => r.Role == role);
+    private static readonly Lazy<Dictionary<RoleTypes, RoleBehaviour>> roleLookup =
+        new(() =>
+        {
+            var dict = new Dictionary<RoleTypes, RoleBehaviour>();
+            foreach (var r in RoleManager.Instance.AllRoles)
+            {
+                dict[r.Role] = r;
+            }
+            return dict;
+        });
+
+    internal static RoleBehaviour? GetBehaviour(this RoleTypes role)
+    {
+        var lookup = roleLookup.Value;
+        return lookup.TryGetValue(role, out var behaviour) ? behaviour : null;
+    }
 
     internal static bool IsImpostorRole(RoleTypes role) =>
         role.GetBehaviour().TeamType is RoleTeamTypes.Impostor;
 
     internal static string GetRoleName(this RoleTypes role)
     {
+        if (role is RoleTypes.ImpostorGhost)
+        {
+            return RoleTypes.Impostor.GetBehaviour()?.NiceName ?? "???";
+        }
+        else if (role is RoleTypes.CrewmateGhost)
+        {
+            return RoleTypes.Crewmate.GetBehaviour()?.NiceName ?? "???";
+        }
+
         return role.GetBehaviour()?.NiceName ?? "???";
     }
 

Managers/HostManager.cs

@@ -19,6 +19,7 @@ internal static class HostManager
 
     internal static void SyncNames(NameSyncType syncType, float sDelay, int repeat = 1)
     {
+        return;
         if (!GameState.IsHost || !BetterGameSettings.ShowRoleForClients.GetValue()) return;
 
         if (syncCoroutine != null && GameData.Instance != null)
@@ -46,6 +47,7 @@ internal static class HostManager
 
     internal static void SyncNames(NameSyncType syncType)
     {
+        return;
         if (!GameState.IsHost || !BetterGameSettings.ShowRoleForClients.GetValue()) return;
 
         StringBuilder sb = new();
@@ -80,7 +82,6 @@ internal static class HostManager
                 player.BetterPlayerControl().NameSetLastFor[target.Data] = newName;
 
                 RPC.RpcSetNameForTarget(player, newName, target);
-                Logger.Warning($"Setting {player.BetterData().RealName} name to {newName}, for {target.BetterData().RealName}");
             }
         }
     }

ModInfo.cs

@@ -4,12 +4,12 @@ internal static class ModInfo
 {
     internal static readonly ReleaseTypes ReleaseBuildType = ReleaseTypes.Release;
     internal const string BetaNum = "0";
-    internal const string HotfixNum = "0";
-    internal const bool IsHotFix = false;
+    internal const string HotfixNum = "1";
+    internal const bool IsHotFix = true;
     internal const string PluginName = "BetterAmongUs";
     internal const string PluginGuid = "com.ten.betteramongus";
     internal const string PluginVersion = "1.3.0";
-    internal const string ReleaseDate = "10.19.2025"; // mm/dd/yyyy
+    internal const string ReleaseDate = "10.24.2025"; // mm/dd/yyyy
     internal const string Github = "https://github.com/D1GQ/BetterAmongUs-Public";
     internal const string Discord = "https://discord.gg/vjYrXpzNAn";
 }

Mono/PlayerInfoDisplay.cs

@@ -158,12 +158,17 @@ internal class PlayerInfoDisplay : MonoBehaviour
 
         if (!_player.IsInShapeshift())
         {
+            if (_player.IsImpostorTeammate())
+                newName = newName.ToColor(Colors.ImpostorRed);
             _player.RawSetName(newName);
         }
         else
         {
             var targetData = Utils.PlayerDataFromPlayerId(_player.shapeshiftTargetPlayerId);
-            if (targetData != null) _player.RawSetName(targetData.BetterData()?.RealName ?? targetData.PlayerName);
+            var name = targetData.BetterData()?.RealName ?? targetData.PlayerName;
+            if (_player.IsImpostorTeammate())
+                name = name.ToColor(Colors.ImpostorRed);
+            if (targetData != null) _player.RawSetName(name);
         }
 
         UpdateTextIfChanged(_topText, _sbTagTop, ref _lastTopText);
@@ -298,7 +303,7 @@ internal class PlayerInfoDisplay : MonoBehaviour
         if (_player.IsImpostorTeammate() || _player.IsLocalPlayer() ||
             !PlayerControl.LocalPlayer.IsAlive() && !PlayerControl.LocalPlayer.Is(RoleTypes.GuardianAngel))
         {
-            string roleInfo = $"<color={_player.GetTeamHexColor()}>{_player.GetRoleName()}</color>";
+            string roleInfo = _player.GetRoleName().ToColor(_player.Data.Role.TeamColor);
 
             if (!_player.IsImpostorTeam() && _player.myTasks.Count > 0)
             {

Patches/Gameplay/UI/Settings/GameSettingMenuPatch.cs

@@ -63,9 +63,12 @@ internal static class GameSettingMenuPatch
                 BetterGameSettings.UseBanNameList = OptionCheckboxItem.Create(400, BetterSettingsTab, "BetterSetting.Setting.UseBanNameList", true);
                 BetterGameSettings.UseBanWordList = OptionCheckboxItem.Create(500, BetterSettingsTab, "BetterSetting.Setting.UseBanWordList", true);
                 BetterGameSettings.UseBanWordListOnlyLobby = OptionCheckboxItem.Create(1400, BetterSettingsTab, "BetterSetting.Setting.UseBanWordListOnlyLobby", true, BetterGameSettings.UseBanWordList);
-                OptionDividerItem.Create(BetterSettingsTab);
-                BetterGameSettings.ShowRoleForClients = OptionCheckboxItem.Create(1700, BetterSettingsTab, "BetterSetting.Setting.ShowRoleForClients", false);
-                OptionDividerItem.Create(BetterSettingsTab);
+
+                /*
+                  OptionDividerItem.Create(BetterSettingsTab);
+                  BetterGameSettings.ShowRoleForClients = OptionCheckboxItem.Create(1700, BetterSettingsTab, "BetterSetting.Setting.ShowRoleForClients", false);
+                  OptionDividerItem.Create(BetterSettingsTab);
+                  */
             }
 
             OptionTitleItem.Create(BetterSettingsTab, "BetterSetting.TextHeader.Detections");
@@ -73,12 +76,6 @@ internal static class GameSettingMenuPatch
             BetterGameSettings.DetectedLevelAbove = OptionIntItem.Create(600, BetterSettingsTab, "BetterSetting.Setting.DetectedLevelAbove", (100, 5000, 5), 200, ("Lv ", ""));
             BetterGameSettings.DetectCheatClients = OptionCheckboxItem.Create(700, BetterSettingsTab, "BetterSetting.Setting.DetectCheatClients", true);
             BetterGameSettings.DetectInvalidRPCs = OptionCheckboxItem.Create(800, BetterSettingsTab, "BetterSetting.Setting.DetectInvalidRPCs", true);
-
-            /*
-            TitleList.Add(new BetterOptionDividerItem().Create(BetterSettingsTab));
-            TitleList.Add(new BetterOptionTitleItem().Create(BetterSettingsTab, $"<color=#f20>Experimental</color>"));
-            BetterGameSettings.CancelInvalidSabotage = new BetterOptionCheckboxItem().Create(100000, BetterSettingsTab, "Detect Invalid Sabotages", false);
-            */
         }
 
         if (IsPreload || GameState.IsHost)

Patches/Managers/RoleManagerPatch.cs

@@ -20,10 +20,23 @@ internal static class RoleManagerPatch
         return clientData?.BetterData()?.IsVerifiedBetterUser != true;
     };
 
+    [HarmonyPatch(nameof(RoleManager.SetRole))]
+    [HarmonyPrefix]
+    private static void RoleManager_Prefix(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
+    {
+        if (RoleManager.IsGhostRole(roleType))
+        {
+            if (!RoleManager.IsGhostRole(targetPlayer.Data.RoleType))
+            {
+                targetPlayer.BetterData().RoleInfo.DeadDisplayRole = targetPlayer.Data.RoleType;
+            }
+        }
+    }
+
     // Better role algorithm
     [HarmonyPatch(nameof(RoleManager.SelectRoles))]
     [HarmonyPrefix]
-    private static bool RoleManager_Prefix(/*RoleManager __instance*/)
+    private static bool SelectRoles_Prefix(/*RoleManager __instance*/)
     {
         if (!GameState.IsHideNSeek)
         {