From 78bac784f66d63a6c95a8c98f118f8fb902847d1 Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:19:39 +0800 Subject: [PATCH 01/14] Update ExtendedPlayerControl.cs --- Modules/ExtendedPlayerControl.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs index a2285ccba..b6d8f9b95 100644 --- a/Modules/ExtendedPlayerControl.cs +++ b/Modules/ExtendedPlayerControl.cs @@ -1301,7 +1301,7 @@ public static bool KnowRoleTarget(PlayerControl seer, PlayerControl target) else if (target.GetRoleClass().KnowRoleTarget(seer, target) && !Main.PlayerStates[seer.PlayerId].IsNecromancer && !Main.PlayerStates[target.PlayerId].IsNecromancer) return true; else if (seer.GetRoleClass().KnowRoleTarget(seer, target) && !Main.PlayerStates[seer.PlayerId].IsNecromancer && !Main.PlayerStates[target.PlayerId].IsNecromancer) return true; else if (Solsticer.OtherKnowSolsticer(target)) return true; - else if (Overseer.IsRevealedPlayer(seer, target) && !(target.Is(CustomRoles.Trickster) && (!target.Is(CustomRoles.Narc) || seer.Is(CustomRoles.Madmate)))) return true; + else if (Overseer.IsRevealedPlayer(seer, target) && !target.Is(CustomRoles.Trickster) && (!target.Is(CustomRoles.Narc) || seer.Is(CustomRoles.Madmate))) return true; else if (Gravestone.EveryoneKnowRole(target)) return true; else if (Mimic.CanSeeDeadRoles(seer, target)) return true; else if (Workaholic.OthersKnowWorka(target)) return true; @@ -1334,7 +1334,6 @@ public static bool ShowSubRoleTarget(this PlayerControl seer, PlayerControl targ else if (Options.ImpsCanSeeEachOthersAddOns.GetBool() && seer.CheckMMCanSeeImp() && !seer.Is(CustomRoles.Narc) && target.CheckMMCanSeeImp() && !subRole.IsBetrayalAddon()) return true; else if (Options.CovenCanSeeEachOthersAddOns.GetBool() && seer.Is(Custom_Team.Coven) && target.Is(Custom_Team.Coven) && !subRole.IsBetrayalAddon()) return true; else if (Options.ApocCanSeeEachOthersAddOns.GetBool() && seer.IsNeutralApocalypse() && target.IsNeutralApocalypse() && !subRole.IsBetrayalAddon()) return true; - else if (Overseer.IsRevealedPlayer(seer, target) && subRole == CustomRoles.Narc && !seer.Is(CustomRoles.Madmate)) return true; else if ((subRole is CustomRoles.Madmate or CustomRoles.Sidekick From 868b16f9256de3ee00fefdbf46a42b4ae6c61571 Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:21:44 +0800 Subject: [PATCH 02/14] Update Utils.cs --- Modules/Utils.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Modules/Utils.cs b/Modules/Utils.cs index ed976ba52..073463ebb 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -2171,25 +2171,30 @@ public static Task DoNotifyRoles(PlayerControl SpecifySeer = null, PlayerControl string TargetRoleText = KnowRoleTarget ? $"{seer.GetDisplayRoleAndSubName(target, false)}{GetProgressText(target)}\r\n" : ""; - if (seer.IsAlive() && Overseer.IsRevealedPlayer(seer, target) && target.Is(CustomRoles.Trickster) && (!target.Is(CustomRoles.Narc) || seer.Is(CustomRoles.Madmate))) + string BlankRT = string.Empty; + + if (seer.IsAlive() && Overseer.IsRevealedPlayer(seer, target) && target.Is(CustomRoles.Trickster)) { - TargetRoleText = Overseer.GetRandomRole(seer.PlayerId); // Random trickster role - TargetRoleText += TaskState.GetTaskState(); // Random task count for revealed trickster + BlankRT = Overseer.GetRandomRole(seer.PlayerId); // Random trickster role + BlankRT += TaskState.GetTaskState(); // Random task count for revealed trickster + TargetRoleText = $"{BlankRT}"; } // Same thing as Trickster but for Illusioned Coven if (seer.IsAlive() && Overseer.IsRevealedPlayer(seer, target) && Illusionist.IsCovIllusioned(target.PlayerId)) { - TargetRoleText = Overseer.GetRandomRole(seer.PlayerId); - TargetRoleText += TaskState.GetTaskState(); + BlankRT = Overseer.GetRandomRole(seer.PlayerId); + BlankRT += TaskState.GetTaskState(); + TargetRoleText = $"{BlankRT}"; } if (seer.IsAlive() && Overseer.IsRevealedPlayer(seer, target) && Illusionist.IsNonCovIllusioned(target.PlayerId)) { var randomRole = CustomRolesHelper.AllRoles.Where(role => role.IsEnable() && !role.IsAdditionRole() && role.IsCoven()).ToList().RandomElement(); - TargetRoleText = ColorString(GetRoleColor(randomRole), GetString(randomRole.ToString())); + BlankRT = ColorString(GetRoleColor(randomRole), GetString(randomRole.ToString())); if (randomRole is CustomRoles.CovenLeader or CustomRoles.Jinx or CustomRoles.Illusionist or CustomRoles.VoodooMaster) // Roles with Ability Uses { - TargetRoleText += randomRole.GetStaticRoleClass().GetProgressText(target.PlayerId, false); + BlankRT += randomRole.GetStaticRoleClass().GetProgressText(target.PlayerId, false); } + TargetRoleText = $"{BlankRT}"; } // ====== Target player name ====== From b33c173988319e3cdefeda923cb08544a81ce360 Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:24:32 +0800 Subject: [PATCH 03/14] Update MeetingHudPatch.cs --- Patches/MeetingHudPatch.cs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs index 68b98ba26..203bf4ee0 100644 --- a/Patches/MeetingHudPatch.cs +++ b/Patches/MeetingHudPatch.cs @@ -1145,25 +1145,29 @@ public static void Postfix(MeetingHud __instance) var myRole = PlayerControl.LocalPlayer.GetRoleClass(); var enable = true; - if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && pc.Is(CustomRoles.Trickster) && (!pc.Is(CustomRoles.Narc) || PlayerControl.LocalPlayer.Is(CustomRoles.Madmate))) + string BlankRT = string.Empty; + + if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && pc.Is(CustomRoles.Trickster)) { - roleTextMeeting.text = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); // random role for revealed trickster - roleTextMeeting.text += TaskState.GetTaskState(); // Random task count for revealed trickster - //enable = false; + BlankRT = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); // random role for revealed trickster + BlankRT += TaskState.GetTaskState(); // Random task count for revealed trickster + roleTextMeeting.text = $"{BlankRT}"; } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && Illusionist.IsCovIllusioned(pc.PlayerId)) { - roleTextMeeting.text = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); - roleTextMeeting.text += TaskState.GetTaskState(); + BlankRT = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); + BlankRT += TaskState.GetTaskState(); + roleTextMeeting.text = $"{BlankRT}"; } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && Illusionist.IsNonCovIllusioned(pc.PlayerId)) { var randomRole = CustomRolesHelper.AllRoles.Where(role => role.IsEnable() && !role.IsAdditionRole() && role.IsCoven()).ToList().RandomElement(); - roleTextMeeting.text = ColorString(GetRoleColor(randomRole), GetString(randomRole.ToString())); + BlankRT = ColorString(GetRoleColor(randomRole), GetString(randomRole.ToString())); if (randomRole.GetStaticRoleClass().IsMethodOverridden("GetProgressText")) // Roles with Ability Uses { - roleTextMeeting.text += randomRole.GetStaticRoleClass().GetProgressText(PlayerControl.LocalPlayer.PlayerId, false); + BlankRT += randomRole.GetStaticRoleClass().GetProgressText(PlayerControl.LocalPlayer.PlayerId, false); } + roleTextMeeting.text = $"{BlankRT}"; } var suffixBuilder = new StringBuilder(32); From af2ac137616ad7309a0d3291d34f54bc2e1b118a Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:27:37 +0800 Subject: [PATCH 04/14] Update PlayerControlPatch.cs --- Patches/PlayerControlPatch.cs | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs index 8393cf7f2..5bf37bed9 100644 --- a/Patches/PlayerControlPatch.cs +++ b/Patches/PlayerControlPatch.cs @@ -1316,24 +1316,32 @@ public static Task DoPostfix(PlayerControl __instance) else if (ExtendedPlayerControl.KnowRoleTarget(PlayerControl.LocalPlayer, __instance)) RoleText.enabled = true; else RoleText.enabled = false; - if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && __instance.Is(CustomRoles.Trickster) && (!__instance.Is(CustomRoles.Narc) || PlayerControl.LocalPlayer.Is(CustomRoles.Madmate))) + string BlankRT = string.Empty; + + if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && __instance.Is(CustomRoles.Trickster)) { - RoleText.text = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); // random role for revealed trickster - RoleText.text += TaskState.GetTaskState(); // random task count for revealed trickster + RoleText.enabled = true; //have to make it return true otherwise modded Overseer won't be able to reveal Trickster's role,same for Illusionist's targets + BlankRT = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); // random role for revealed trickster + BlankRT += TaskState.GetTaskState(); // random task count for revealed trickster + RoleText.text = $"{BlankRT}"; } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && Illusionist.IsCovIllusioned(__instance.PlayerId)) { - RoleText.text = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); - RoleText.text += TaskState.GetTaskState(); + RoleText.enabled = true; + BlankRT = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); + BlankRT += TaskState.GetTaskState(); + RoleText.text = $"{BlankRT}"; } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && Illusionist.IsNonCovIllusioned(__instance.PlayerId)) { + RoleText.enabled = true; var randomRole = CustomRolesHelper.AllRoles.Where(role => role.IsEnable() && !role.IsAdditionRole() && role.IsCoven()).ToList().RandomElement(); - RoleText.text = Utils.ColorString(Utils.GetRoleColor(randomRole), GetString(randomRole.ToString())); + BlankRT = Utils.ColorString(Utils.GetRoleColor(randomRole), GetString(randomRole.ToString())); if (randomRole is CustomRoles.CovenLeader or CustomRoles.Jinx or CustomRoles.Illusionist or CustomRoles.VoodooMaster) // Roles with Ability Uses { - RoleText.text += randomRole.GetStaticRoleClass().GetProgressText(PlayerControl.LocalPlayer.PlayerId, false); + BlankRT += randomRole.GetStaticRoleClass().GetProgressText(PlayerControl.LocalPlayer.PlayerId, false); } + RoleText.text = $"{BlankRT}"; } From e2cde5a911b0f1ad5eebdf65d32c039deb7c9308 Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:28:36 +0800 Subject: [PATCH 05/14] Update Overseer.cs --- Roles/Crewmate/Overseer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Roles/Crewmate/Overseer.cs b/Roles/Crewmate/Overseer.cs index 8aa6e9728..888785f2c 100644 --- a/Roles/Crewmate/Overseer.cs +++ b/Roles/Crewmate/Overseer.cs @@ -266,7 +266,7 @@ public override void OnReportDeadBody(PlayerControl reporter, NetworkedPlayerInf //string roleName = GetRoleName(randomRole); string RoleText = ColorString(GetRoleColor(randomRole), GetString(randomRole.ToString())); - return $"{RoleText}"; + return RoleText; } public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false) From 052fba8e026f87cb527d6ae9bc6114b27326d92f Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:48:02 +0800 Subject: [PATCH 06/14] Update Utils.cs --- Modules/Utils.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Modules/Utils.cs b/Modules/Utils.cs index 073463ebb..5ec3a1974 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -2173,12 +2173,19 @@ public static Task DoNotifyRoles(PlayerControl SpecifySeer = null, PlayerControl string BlankRT = string.Empty; - if (seer.IsAlive() && Overseer.IsRevealedPlayer(seer, target) && target.Is(CustomRoles.Trickster)) + if (seer.IsAlive() && Overseer.IsRevealedPlayer(seer, target) && target.Is(CustomRoles.Trickster) && (!target.Is(CustomRoles.Narc) || seer.Is(CustomRoles.Madmate))) { BlankRT = Overseer.GetRandomRole(seer.PlayerId); // Random trickster role BlankRT += TaskState.GetTaskState(); // Random task count for revealed trickster TargetRoleText = $"{BlankRT}"; } + if (seer.IsAlive() && Overseer.IsRevealedPlayer(seer, target) && target.Is(CustomRoles.Narc) && !seer.Is(CustomRoles.Madmate)) + { + BlankRT = ColorString(GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff + if (Sheriff.ShowShotLimit.GetBool()) + BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f) $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text + TargetRoleText = $"{BlankRT}"; + } // Same thing as Trickster but for Illusioned Coven if (seer.IsAlive() && Overseer.IsRevealedPlayer(seer, target) && Illusionist.IsCovIllusioned(target.PlayerId)) { From 648ee84f189f7b8cb286e9340192d0361a2a2c6f Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:50:23 +0800 Subject: [PATCH 07/14] Update MeetingHudPatch.cs --- Patches/MeetingHudPatch.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs index 203bf4ee0..0c3b4620c 100644 --- a/Patches/MeetingHudPatch.cs +++ b/Patches/MeetingHudPatch.cs @@ -1147,12 +1147,19 @@ public static void Postfix(MeetingHud __instance) string BlankRT = string.Empty; - if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && pc.Is(CustomRoles.Trickster)) + if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && pc.Is(CustomRoles.Trickster) && (!pc.Is(CustomRoles.Narc) || PlayerControl.LocalPlayer.Is(CustomRoles.Madmate))) { BlankRT = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); // random role for revealed trickster BlankRT += TaskState.GetTaskState(); // Random task count for revealed trickster roleTextMeeting.text = $"{BlankRT}"; } + if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && pc.Is(CustomRoles.Narc) && !PlayerControl.LocalPlayer.Is(CustomRoles.Madmate)) + { + BlankRT = ColorString(GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff + if (Sheriff.ShowShotLimit.GetBool()) + BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f) $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text + roleTextMeeting.text = $"{BlankRT}"; + } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && Illusionist.IsCovIllusioned(pc.PlayerId)) { BlankRT = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); From efdc93ef7e44dcdb5777e389c3ca34bfbdc5c505 Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:53:19 +0800 Subject: [PATCH 08/14] Update PlayerControlPatch.cs --- Patches/PlayerControlPatch.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs index 5bf37bed9..f83a53f6f 100644 --- a/Patches/PlayerControlPatch.cs +++ b/Patches/PlayerControlPatch.cs @@ -1318,13 +1318,21 @@ public static Task DoPostfix(PlayerControl __instance) string BlankRT = string.Empty; - if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && __instance.Is(CustomRoles.Trickster)) + if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && __instance.Is(CustomRoles.Trickster) && (!__instance.Is(CustomRoles.Narc) || PlayerControl.LocalPlayer.Is(CustomRoles.Madmate))) { RoleText.enabled = true; //have to make it return true otherwise modded Overseer won't be able to reveal Trickster's role,same for Illusionist's targets BlankRT = Overseer.GetRandomRole(PlayerControl.LocalPlayer.PlayerId); // random role for revealed trickster BlankRT += TaskState.GetTaskState(); // random task count for revealed trickster RoleText.text = $"{BlankRT}"; } + if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && __instance.Is(CustomRoles.Narc) && !PlayerControl.LocalPlayer.Is(CustomRoles.Madmate)) + { + RoleText.enabled = true; + BlankRT = ColorString(GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff + if (Sheriff.ShowShotLimit.GetBool()) + BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f) $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text + RoleText.text = $"{BlankRT}"; + } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && Illusionist.IsCovIllusioned(__instance.PlayerId)) { RoleText.enabled = true; From f8568c2f2e7f2833c1328c6cf6ce10cf96e376db Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:54:23 +0800 Subject: [PATCH 09/14] Update Sheriff.cs --- Roles/Crewmate/Sheriff.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Roles/Crewmate/Sheriff.cs b/Roles/Crewmate/Sheriff.cs index 745ea8cba..55bdf144f 100644 --- a/Roles/Crewmate/Sheriff.cs +++ b/Roles/Crewmate/Sheriff.cs @@ -18,8 +18,8 @@ internal class Sheriff : RoleBase private static OptionItem KillCooldown; private static OptionItem MisfireKillsTarget; - private static OptionItem ShotLimitOpt; - private static OptionItem ShowShotLimit; + public static OptionItem ShotLimitOpt; + public static OptionItem ShowShotLimit; private static OptionItem CanKillAllAlive; private static OptionItem CanKillCoven; private static OptionItem MisfireOnAdmired; From f24642d70b5d415c8a4a20224d2c8800d2bd6ddc Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 00:59:56 +0800 Subject: [PATCH 10/14] Update Utils.cs --- Modules/Utils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Utils.cs b/Modules/Utils.cs index 5ec3a1974..6fe382c22 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -2183,7 +2183,7 @@ public static Task DoNotifyRoles(PlayerControl SpecifySeer = null, PlayerControl { BlankRT = ColorString(GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff if (Sheriff.ShowShotLimit.GetBool()) - BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f) $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text + BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f), $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text TargetRoleText = $"{BlankRT}"; } // Same thing as Trickster but for Illusioned Coven From e3e08fd432a51b0952e7bab28f6433c5f138a53d Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 01:01:05 +0800 Subject: [PATCH 11/14] Update MeetingHudPatch.cs --- Patches/MeetingHudPatch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs index 0c3b4620c..ce7f429cc 100644 --- a/Patches/MeetingHudPatch.cs +++ b/Patches/MeetingHudPatch.cs @@ -1157,7 +1157,7 @@ public static void Postfix(MeetingHud __instance) { BlankRT = ColorString(GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff if (Sheriff.ShowShotLimit.GetBool()) - BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f) $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text + BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f), $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text roleTextMeeting.text = $"{BlankRT}"; } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && Illusionist.IsCovIllusioned(pc.PlayerId)) From 7a1113d4057dd151e3b10b41891482d9d242c7d4 Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 01:01:45 +0800 Subject: [PATCH 12/14] Update PlayerControlPatch.cs --- Patches/PlayerControlPatch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs index f83a53f6f..1e4003720 100644 --- a/Patches/PlayerControlPatch.cs +++ b/Patches/PlayerControlPatch.cs @@ -1330,7 +1330,7 @@ public static Task DoPostfix(PlayerControl __instance) RoleText.enabled = true; BlankRT = ColorString(GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff if (Sheriff.ShowShotLimit.GetBool()) - BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f) $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text + BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f), $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text RoleText.text = $"{BlankRT}"; } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && Illusionist.IsCovIllusioned(__instance.PlayerId)) From a1c8a672e1b9e8655292d743d9848a86b1cc5bcc Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 01:06:22 +0800 Subject: [PATCH 13/14] Update MeetingHudPatch.cs --- Patches/MeetingHudPatch.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs index ce7f429cc..e598f022e 100644 --- a/Patches/MeetingHudPatch.cs +++ b/Patches/MeetingHudPatch.cs @@ -1155,9 +1155,9 @@ public static void Postfix(MeetingHud __instance) } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && pc.Is(CustomRoles.Narc) && !PlayerControl.LocalPlayer.Is(CustomRoles.Madmate)) { - BlankRT = ColorString(GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff + BlankRT = Utils.ColorString(Utils.GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff if (Sheriff.ShowShotLimit.GetBool()) - BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f), $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text + BlankRT += Utils.ColorString(Utils.GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f), $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text roleTextMeeting.text = $"{BlankRT}"; } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, pc) && Illusionist.IsCovIllusioned(pc.PlayerId)) From 38547f6834def14af8b8a0dbc170dea71e11238a Mon Sep 17 00:00:00 2001 From: ImpyIsLazy Date: Sat, 18 Jan 2025 01:07:17 +0800 Subject: [PATCH 14/14] Update PlayerControlPatch.cs --- Patches/PlayerControlPatch.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs index 1e4003720..5a170b9a1 100644 --- a/Patches/PlayerControlPatch.cs +++ b/Patches/PlayerControlPatch.cs @@ -1328,9 +1328,9 @@ public static Task DoPostfix(PlayerControl __instance) if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && __instance.Is(CustomRoles.Narc) && !PlayerControl.LocalPlayer.Is(CustomRoles.Madmate)) { RoleText.enabled = true; - BlankRT = ColorString(GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff + BlankRT = Utils.ColorString(Utils.GetRoleColor(CustomRoles.Sheriff), GetString(CustomRoles.Sheriff.ToString())); //Sheriff if (Sheriff.ShowShotLimit.GetBool()) - BlankRT += ColorString(GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f), $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text + BlankRT += Utils.ColorString(Utils.GetRoleColor(CustomRoles.Sheriff).ShadeColor(0.25f), $"({Sheriff.ShotLimitOpt.GetInt()})"); // Sheriff progress text RoleText.text = $"{BlankRT}"; } if (!PlayerControl.LocalPlayer.Data.IsDead && Overseer.IsRevealedPlayer(PlayerControl.LocalPlayer, __instance) && Illusionist.IsCovIllusioned(__instance.PlayerId))