Everything in PR#1303

Modules/CustomRolesHelper.cs

@@ -233,6 +233,9 @@ CustomRoles.Benefactor or
     }
     public static bool IsCrewKiller(this CustomRoles role)
     {
+        {
+            if (role is CustomRoles.Narc) return true;
+        }
         return role.GetStaticRoleClass().ThisRoleType is Custom_RoleType.CrewmateKilling;
     }
     public static bool IsCrewVenter(this PlayerControl target)
@@ -318,6 +321,18 @@ public static bool IsMadmate(this CustomRoles role)
     {
         return role.GetStaticRoleClass().ThisRoleType is Custom_RoleType.Madmate;
     }
+    public static bool IsBad(PlayerControl pc) //gets all players that keep the game going
+    {
+        var pc_role = pc.GetCustomRole();
+        return (!pc.Is(CustomRoles.Admired) && 
+               (IsNarcImpV3(pc) || pc_role.IsNK() || pc_role.IsNA())) ||
+               pc.Is(CustomRoles.Infected) ||
+               (pc.Is(CustomRoles.Madmate) && Madmate.MadmateCountMode.GetInt() == 1) ||
+               (pc.Is(CustomRoles.Charmed) && Cultist.CharmedCountMode.GetInt() == 1) || 
+               (pc.Is(CustomRoles.Recruit) && Jackal.SidekickCountMode.GetInt() == 1) || 
+               (pc.Is(CustomRoles.Contagious) && Virus.ContagiousCountMode.GetInt() == 1) ||
+               (pc.Is(CustomRoles.Egoist) && Egoist.EgoistCountAsConverted.GetBool());
+    }
     /// <summary>
     /// Role Changes the Crewmates Team, Including changing to Impostor.
     /// </summary>
@@ -330,7 +345,15 @@ CustomRoles.Infected or
             CustomRoles.Contagious or
             CustomRoles.Soulless or
             CustomRoles.Madmate;
-
+    public static bool IsConvertedV2(PlayerControl pc) //add-ons that make players counted as a converted neutral
+    {
+        return pc.Is(CustomRoles.Charmed) || 
+               pc.Is(CustomRoles.Infected) || 
+               pc.Is(CustomRoles.Contagious) || 
+               pc.Is(CustomRoles.Recruit) || 
+               (pc.Is(CustomRoles.Egoist) && Egoist.EgoistCountAsConverted.GetBool());
+    }
+
     public static bool IsNotKnightable(this CustomRoles role)
     {
         return role is
@@ -373,7 +396,13 @@ or CustomRoles.Recruit
             or CustomRoles.Infected
             or CustomRoles.Contagious
             or CustomRoles.Rascal
-            or CustomRoles.Soulless;
+            or CustomRoles.Soulless
+            or CustomRoles.Narc;
+    }
+    public static bool IsBetrayalAddonV2(this CustomRoles role)
+    {
+        return (role.IsBetrayalAddon() && role is not CustomRoles.Rascal) 
+               || role is CustomRoles.Admired;
     }
 
     public static bool IsImpOnlyAddon(this CustomRoles role)
@@ -785,7 +814,9 @@ public static bool CheckAddonConfilct(CustomRoles role, PlayerControl pc, bool c
                     || pc.Is(CustomRoles.Hurried)
                     || pc.Is(CustomRoles.Gangster)
                     || pc.Is(CustomRoles.Admirer)
-                    || pc.Is(CustomRoles.GuardianAngelTOHE))
+                    || pc.Is(CustomRoles.GuardianAngelTOHE)
+                    || pc.Is(CustomRoles.Narc)
+                    || (pc.Is(CustomRoles.Sheriff) && CustomRoles.Narc.RoleExist()))                   
                     return false;
                 if (pc.GetCustomRole().IsNeutral() || pc.GetCustomRole().IsMadmate() || pc.IsAnySubRole(sub => sub.IsConverted()))
                     return false;
@@ -794,7 +825,7 @@ public static bool CheckAddonConfilct(CustomRoles role, PlayerControl pc, bool c
                 break;
 
             case CustomRoles.Mimic:
-                if (pc.Is(CustomRoles.Nemesis))
+                if (pc.Is(CustomRoles.Nemesis) || pc.Is(CustomRoles.Narc))
                     return false;
                 if (!pc.GetCustomRole().IsImpostor())
                     return false;
@@ -827,7 +858,8 @@ public static bool CheckAddonConfilct(CustomRoles role, PlayerControl pc, bool c
                     || pc.Is(CustomRoles.Lightning)
                     || pc.Is(CustomRoles.Swift)
                     || pc.Is(CustomRoles.Swooper)
-                    || pc.Is(CustomRoles.DoubleAgent))
+                    || pc.Is(CustomRoles.DoubleAgent)
+                    || pc.Is(CustomRoles.Narc))
                     return false;
                 if (!pc.GetCustomRole().IsImpostor())
                     return false;
@@ -850,7 +882,8 @@ public static bool CheckAddonConfilct(CustomRoles role, PlayerControl pc, bool c
                     || pc.Is(CustomRoles.Trapster)
                     || pc.Is(CustomRoles.Onbound)
                     || pc.Is(CustomRoles.Rebound)
-                    || pc.Is(CustomRoles.Tired))
+                    || pc.Is(CustomRoles.Tired)
+                    || pc.Is(CustomRoles.Narc))
                     return false;
                 if (!pc.GetCustomRole().IsImpostor())
                     return false;
@@ -882,7 +915,8 @@ public static bool CheckAddonConfilct(CustomRoles role, PlayerControl pc, bool c
                     || pc.Is(CustomRoles.Stealer)
                     || pc.Is(CustomRoles.Tricky)
                     || pc.Is(CustomRoles.DoubleAgent)
-                    || pc.Is(CustomRoles.YinYanger))
+                    || pc.Is(CustomRoles.YinYanger)
+                    || pc.Is(CustomRoles.Narc))
                     return false;
                 if (!pc.GetCustomRole().IsImpostor())
                     return false;
@@ -1103,6 +1137,22 @@ public static bool CheckAddonConfilct(CustomRoles role, PlayerControl pc, bool c
                 if (pc.IsNeutralApocalypse())
                     return false;
                 break;
+            case CustomRoles.Narc:
+                if (!pc.GetCustomRole().IsImpostorTeamV3())
+                    return false;
+                if (pc.Is(CustomRoles.Egoist)
+                    || pc.Is(CustomRoles.Mare)
+                    || pc.Is(CustomRoles.Mimic)
+                    || pc.Is(CustomRoles.Tricky)
+                    || pc.Is(CustomRoles.Swift))
+                    return false;
+                if (
+                    (pc.Is(CustomRoles.Visionary) && !Narc.VisionaryCanBeNarc.GetBool())
+                    || (pc.Is(CustomRoles.DoubleAgent) && !Narc.DoubleAgentCanBeNarc.GetBool())
+                    || ((pc.Is(CustomRoles.Zombie) || pc.Is(CustomRoles.KillingMachine)) && ! Narc.ZombieAndKMCanBeNarc.GetBool())
+                    )
+                    return false;
+                break;
         }
 
         return true;
@@ -1146,6 +1196,31 @@ public static RoleTypes GetRoleTypes(this CustomRoles role)
     public static bool IsNeutralKillerTeam(this CustomRoles role) => role.IsNK() && !role.IsMadmate();
     public static bool IsPassiveNeutralTeam(this CustomRoles role) => role.IsNonNK() && !role.IsMadmate();
     public static bool IsNNK(this CustomRoles role) => role.IsNeutral() && !role.IsNK();
+    /// <summary>
+    /// A lot of team type features did not function properly when I used "CustomRoles role",
+    /// so I used "PlayerControl pc" and the features worked again.
+    /// </summary>
+    public static bool IsNarcCrew(PlayerControl pc)// gets Crewmate or Narc
+    {
+        return pc.GetCustomRole().IsCrewmate() || pc.Is(CustomRoles.Narc);
+    }
+    public static bool IsNarcImp(PlayerControl pc)//gets non-Narc Impostors
+    {
+        return pc.GetCustomRole().IsImpostor() && !pc.Is(CustomRoles.Narc);
+    }
+    public static bool IsNarcMM(PlayerControl pc)//gets non-Narc Madmates
+    {
+        return pc.GetCustomRole().IsMadmate() && !pc.Is(CustomRoles.Narc);
+    }
+    public static bool IsNarcImpV3(PlayerControl pc)// gets non-Narc Impostors/Madmates
+    {
+        return IsNarcImp(pc) || IsNarcMM(pc);
+    }
+    public static bool IsNarcNeutral(PlayerControl pc)// gets non-Madmate,non-Narc Neutrals
+    {
+        return pc.GetCustomRole().IsNeutral() && !pc.GetCustomRole().IsMadmate() && !pc.Is(CustomRoles.Narc);
+    }
+
     public static bool IsVanilla(this CustomRoles role)
     {
         return role is
@@ -1333,6 +1408,7 @@ var r when r.IsNA() => CountTypes.Apocalypse,
             CustomRoles.Mini => CustomWinner.NiceMini,
             CustomRoles.Doppelganger => CustomWinner.Doppelganger,
             CustomRoles.Shocker => CustomWinner.Shocker,
+            CustomRoles.Narc => CustomWinner.Narc,
             _ => throw new NotImplementedException()
 
         };

Modules/CustomWinnerHolder.cs

@@ -53,12 +53,15 @@ public static bool CheckForConvertedWinner(byte playerId)
     {
         foreach (var role in playerId.GetPlayer()?.GetCustomSubRoles().ToArray())
         {
-            if (!(role == CustomRoles.Madmate || role == CustomRoles.Admired || role.IsConverted())) continue;
+            if (!(role == CustomRoles.Madmate || role == CustomRoles.Admired || role == CustomRoles.Narc || role.IsConverted())) continue;
             switch (role)
             {
                 case CustomRoles.Admired:
                     ResetAndSetWinner(CustomWinner.Crewmate);
                     return true;
+                case CustomRoles.Narc:
+                    ResetAndSetWinner(CustomWinner.Crewmate);
+                    return true;
                 case CustomRoles.Madmate:
                     ResetAndSetWinner(CustomWinner.Impostor);
                     return true;
@@ -116,4 +119,4 @@ public static void ReadFrom(MessageReader reader)
         for (int i = 0; i < WinnerIdsCount; i++)
             WinnerIds.Add(reader.ReadByte());
     }
-}
+}

Modules/ExtendedPlayerControl.cs

@@ -1109,7 +1109,8 @@ public static bool CanUseImpostorVentButton(this PlayerControl pc)
     public static bool CanUseSabotage(this PlayerControl pc)
     {
         if (pc.Is(Custom_Team.Impostor) && !pc.IsAlive() && Options.DeadImpCantSabotage.GetBool()) return false;
-
+        if (Narc.CantUseSabotage(pc)) return false;
+
         var playerRoleClass = pc.GetRoleClass();
         if (playerRoleClass != null && playerRoleClass.CanUseSabotage(pc)) return true;
 
@@ -1185,7 +1186,8 @@ CustomRoles.Admired and not
             CustomRoles.Soulless and not
             CustomRoles.Lovers and not
             CustomRoles.Infected and not
-            CustomRoles.Contagious;
+            CustomRoles.Contagious and not
+            CustomRoles.Narc;
     }
 
     public static void AddInSwitchAddons(this PlayerControl Killed, PlayerControl target, CustomRoles Addon = CustomRoles.NotAssigned, CustomRoles? IsAddon = CustomRoles.NotAssigned)
@@ -1284,14 +1286,14 @@ public static bool KnowRoleTarget(PlayerControl seer, PlayerControl target)
         else if (Altruist.HasEnabled && seer.IsMurderedThisRound()) return false;
         else if (seer.GetCustomRole() == target.GetCustomRole() && seer.GetCustomRole().IsNK()) return true;
         else if (Options.LoverKnowRoles.GetBool() && seer.Is(CustomRoles.Lovers) && target.Is(CustomRoles.Lovers)) return true;
-        else if (Options.ImpsCanSeeEachOthersRoles.GetBool() && seer.Is(Custom_Team.Impostor) && target.Is(Custom_Team.Impostor)) return true;
+        else if (Options.ImpsCanSeeEachOthersRoles.GetBool() && (seer.Is(Custom_Team.Impostor) && !seer.Is(CustomRoles.Narc)) && target.Is(Custom_Team.Impostor)) return true;
         else if (Madmate.MadmateKnowWhosImp.GetBool() && seer.Is(CustomRoles.Madmate) && target.Is(Custom_Team.Impostor)) return true;
-        else if (Madmate.ImpKnowWhosMadmate.GetBool() && target.Is(CustomRoles.Madmate) && seer.Is(Custom_Team.Impostor)) return true;
+        else if (Madmate.ImpKnowWhosMadmate.GetBool() && target.Is(CustomRoles.Madmate) && (seer.Is(Custom_Team.Impostor) && !seer.Is(CustomRoles.Narc))) return true;
         else if (seer.Is(Custom_Team.Impostor) && target.GetCustomRole().IsGhostRole() && target.GetCustomRole().IsImpostor()) return true;
         else if (target.GetRoleClass().KnowRoleTarget(seer, target)) return true;
         else if (seer.GetRoleClass().KnowRoleTarget(seer, target)) return true;
         else if (Solsticer.OtherKnowSolsticer(target)) return true;
-        else if (Overseer.IsRevealedPlayer(seer, target) && !target.Is(CustomRoles.Trickster)) return true;
+        else if (Overseer.IsRevealedPlayer(seer, target) && !(target.Is(CustomRoles.Trickster) && !target.Is(CustomRoles.Narc))) return true;
         else if (Gravestone.EveryoneKnowRole(target)) return true;
         else if (Mimic.CanSeeDeadRoles(seer, target)) return true;
         else if (Workaholic.OthersKnowWorka(target)) return true;
@@ -1322,15 +1324,18 @@ public static bool ShowSubRoleTarget(this PlayerControl seer, PlayerControl targ
         else if (seer.Is(CustomRoles.GM) || target.Is(CustomRoles.GM) || seer.Is(CustomRoles.God) || (seer.IsHost() && Main.GodMode.Value)) return true;
         else if (Options.ImpsCanSeeEachOthersAddOns.GetBool() && seer.Is(Custom_Team.Impostor) && target.Is(Custom_Team.Impostor) && !subRole.IsBetrayalAddon()) return true;
         else if (Options.ApocCanSeeEachOthersAddOns.GetBool() && seer.IsNeutralApocalypse() && target.IsNeutralApocalypse() && !subRole.IsBetrayalAddon()) return true;
-
+        else if (Options.SeeEjectedRolesInMeeting.GetBool() && Main.PlayerStates[target.PlayerId].deathReason == PlayerState.DeathReason.Vote && subRole.IsBetrayalAddonV2()) return true;
+        else if (Overseer.IsRevealedPlayer(seer, target) && subRole == CustomRoles.Narc) return true;
+
         else if ((subRole is CustomRoles.Madmate
                 or CustomRoles.Sidekick
                 or CustomRoles.Recruit
                 or CustomRoles.Admired
                 or CustomRoles.Charmed
                 or CustomRoles.Infected
                 or CustomRoles.Contagious
-                or CustomRoles.Egoist)
+                or CustomRoles.Egoist
+                or CustomRoles.Narc)
             && KnowSubRoleTarget(seer, target))
             return true;
         else if (Main.VisibleTasksCount && !seer.IsAlive())
@@ -1351,7 +1356,7 @@ public static bool KnowSubRoleTarget(PlayerControl seer, PlayerControl target)
     {
         //if (seer.GetRoleClass().KnowRoleTarget(seer, target)) return true;
 
-        if (seer.Is(Custom_Team.Impostor))
+        if (seer.Is(Custom_Team.Impostor) && !seer.Is(CustomRoles.Narc))
         {
             // Imp know Madmate
             if (target.Is(CustomRoles.Madmate) && Madmate.ImpKnowWhosMadmate.GetBool())

Modules/GameState.cs

@@ -93,6 +93,10 @@ public void SetMainRole(CustomRoles role)
         {
             countTypes = CountTypes.Crew;
         }
+        if (pc.Is(CustomRoles.Narc))
+        {
+            countTypes = CountTypes.Crew;
+        }
         if (pc.Is(CustomRoles.Soulless))
         {
             countTypes = CountTypes.OutOfGame;
@@ -132,6 +136,7 @@ public void SetSubRole(CustomRoles role, PlayerControl pc = null)
 
             foreach (var subRole in SubRoles.ToArray())
             {
+                if (subRole != CustomRoles.Narc)//Narc cannot be cleansed
                 RemoveSubRole(subRole);
             }
         }
@@ -219,6 +224,10 @@ public void SetSubRole(CustomRoles role, PlayerControl pc = null)
                 SubRoles.Remove(CustomRoles.Loyal);
                 break;
 
+            case CustomRoles.Narc:
+                countTypes = CountTypes.Crew;
+                break;
+
             case CustomRoles.Soulless:
                 countTypes = CountTypes.OutOfGame;
                 break;

Modules/GuessManager.cs

@@ -225,6 +225,18 @@ public static bool GuesserMsg(PlayerControl pc, string msg, bool isUI = false)
                     return true;
                 }
 
+                if (pc.Is(CustomRoles.Narc) && target.Is(CustomRoles.Sheriff))
+                {
+                    pc.ShowInfoMessage(isUI,GetString("GuessSheriffOrNarc"));
+                    return true;
+                }
+
+                if (pc.Is(CustomRoles.Sheriff) && target.Is(CustomRoles.Narc))
+                {
+                    pc.ShowInfoMessage(isUI,GetString("GuessSheriffOrNarc"));
+                    return true;
+                }
+
                 if (role == CustomRoles.Bait && target.Is(CustomRoles.Bait) && Bait.BaitNotification.GetBool())
                 {
                     pc.ShowInfoMessage(isUI, GetString("GuessNotifiedBait"));
@@ -1098,4 +1110,4 @@ public static void ReceiveRPC(MessageReader reader, PlayerControl pc)
 
         GuesserMsg(pc, $"/bt {PlayerId} {GetString(role.ToString())}", true);
     }
-}
+}

Modules/NameColorManager.cs

@@ -45,10 +45,19 @@ private static bool KnowTargetRoleColor(PlayerControl seer, PlayerControl target
         // Impostor & Madmate
         if (seer.Is(Custom_Team.Impostor) && target.Is(Custom_Team.Impostor)) color = (seer.Is(CustomRoles.Egoist) && target.Is(CustomRoles.Egoist) && Egoist.ImpEgoistVisibalToAllies.GetBool() && seer != target) ? Main.roleColors[CustomRoles.Egoist] : Main.roleColors[CustomRoles.Impostor];
         if (seer.Is(CustomRoles.Madmate) && target.Is(Custom_Team.Impostor) && Madmate.MadmateKnowWhosImp.GetBool()) color = Main.roleColors[CustomRoles.Impostor];
-        if (seer.Is(Custom_Team.Impostor) && target.Is(CustomRoles.Madmate) && Madmate.ImpKnowWhosMadmate.GetBool()) color = Main.roleColors[CustomRoles.Madmate];
+        if (seer.Is(Custom_Team.Impostor) && !seer.Is(CustomRoles.Narc) && target.Is(CustomRoles.Madmate) && Madmate.ImpKnowWhosMadmate.GetBool()) color = Main.roleColors[CustomRoles.Madmate];
         if (seer.Is(Custom_Team.Impostor) && target.GetCustomRole().IsGhostRole() && target.GetCustomRole().IsImpostor()) color = Main.roleColors[CustomRoles.Madmate];
         if (seer.Is(CustomRoles.Madmate) && target.Is(CustomRoles.Madmate) && Madmate.MadmateKnowWhosMadmate.GetBool()) color = Main.roleColors[CustomRoles.Madmate];
 
+        // Narc,Impostors and Madmates
+        if (seer.Is(CustomRoles.Narc) && seer.Is(Custom_Team.Impostor) && target.Is(CustomRoles.Crewpostor) && Crewpostor.AlliesKnowCrewpostor.GetBool() && Narc.NarcCanSeeTeammates.GetBool()) color = Main.roleColors[CustomRoles.Traitor];
+        if (seer.Is(CustomRoles.Narc) && seer.Is(Custom_Team.Impostor) && target.Is(CustomRoles.Madmate) && Madmate.ImpKnowWhosMadmate.GetBool() && Narc.NarcCanSeeTeammates.GetBool()) color = Main.roleColors[CustomRoles.Traitor];
+        if (seer.Is(CustomRoles.Narc) && seer.Is(Custom_Team.Impostor) && target.Is(CustomRoles.Refugee) && Narc.NarcCanSeeTeammates.GetBool()) color = Main.roleColors[CustomRoles.Traitor];
+        if (seer.Is(CustomRoles.Narc) && seer.Is(CustomRoles.Crewpostor) && target.Is(Custom_Team.Impostor) && Crewpostor.KnowsAllies.GetBool() && Narc.NarcCanSeeTeammates.GetBool()) color = Main.roleColors[CustomRoles.Impostor];
+        // to prevent Narc Impostor from seeing Madmates when ImpKnowWhosMadmate is on while NarcCanSeeMadmates is off
+        if (seer.Is(CustomRoles.Narc) && seer.Is(Custom_Team.Impostor) && target.Is(CustomRoles.Madmate) && Madmate.ImpKnowWhosMadmate.GetBool() && !Narc.NarcCanSeeTeammates.GetBool()) color = "ffffff";
+        if (seer.Is(CustomRoles.Narc) && seer.Is(Custom_Team.Impostor) && target.Is(CustomRoles.Refugee) && !Narc.NarcCanSeeTeammates.GetBool()) color = "ffffff";
+
         // Cultist
         if (Cultist.NameRoleColor(seer, target)) color = Main.roleColors[CustomRoles.Cultist];