Coven (New Faction... again....)

Modules/AntiBlackout.cs

@@ -10,7 +10,7 @@ namespace TOHE;
 public static class AntiBlackout
 {
     ///<summary>
-    /// Check num alive Impostors & Crewmates & NeutralKillers
+    /// Check num alive Impostors & Crewmates & NeutralKillers & Coven
     ///</summary>
     public static bool BlackOutIsActive => false; /*!Options.DisableAntiBlackoutProtects.GetBool() && CheckBlackOut();*/
 
@@ -26,6 +26,7 @@ public static bool CheckBlackOut()
         HashSet<byte> Impostors = [];
         HashSet<byte> Crewmates = [];
         HashSet<byte> NeutralKillers = [];
+        HashSet<byte> Coven = [];
 
         var lastExiled = ExileControllerWrapUpPatch.AntiBlackout_LastExiled;
         foreach (var pc in Main.AllAlivePlayerControls)
@@ -41,17 +42,23 @@ public static bool CheckBlackOut()
             else if (pc.IsNeutralKiller() || pc.IsNeutralApocalypse())
                 NeutralKillers.Add(pc.PlayerId);
 
+            //Coven
+            if (pc.Is(Custom_Team.Coven))
+                Coven.Add(pc.PlayerId);
+
             // Crewmate
             else Crewmates.Add(pc.PlayerId);
         }
 
         var numAliveImpostors = Impostors.Count;
         var numAliveCrewmates = Crewmates.Count;
         var numAliveNeutralKillers = NeutralKillers.Count;
+        var numAliveCoven = Coven.Count;
 
         Logger.Info($" {numAliveImpostors}", "AntiBlackout Num Alive Impostors");
         Logger.Info($" {numAliveCrewmates}", "AntiBlackout Num Alive Crewmates");
         Logger.Info($" {numAliveNeutralKillers}", "AntiBlackout Num Alive Neutral Killers");
+        Logger.Info($" {numAliveCoven}", "AntiBlackout Num Alive Coven");
 
         var BlackOutIsActive = false;
 
@@ -61,12 +68,20 @@ public static bool CheckBlackOut()
 
         // Alive Impostors > or = others team count
         if (!BlackOutIsActive)
-            BlackOutIsActive = (numAliveNeutralKillers + numAliveCrewmates) <= numAliveImpostors;
+            BlackOutIsActive = (numAliveNeutralKillers + numAliveCrewmates + numAliveCoven) <= numAliveImpostors;
 
         // One Impostor and one Neutral Killer is alive, and living Crewmates very few
         if (!BlackOutIsActive)
             BlackOutIsActive = numAliveNeutralKillers == 1 && numAliveImpostors == 1 && numAliveCrewmates <= 2;
 
+        // One Neutral Killer and one Coven is alive, and living Crewmates very few
+        if (!BlackOutIsActive)
+            BlackOutIsActive = numAliveNeutralKillers == 1 && numAliveCoven == 1 && numAliveCrewmates <= 2;
+
+        // One Coven and one Impostor is alive, and living Crewmates very few
+        if (!BlackOutIsActive)
+            BlackOutIsActive = numAliveCoven == 1 && numAliveImpostors == 1 && numAliveCrewmates <= 2;
+
         Logger.Info($" {BlackOutIsActive}", "BlackOut Is Active");
         return BlackOutIsActive;
     }

Modules/CustomWinnerHolder.cs

@@ -74,6 +74,9 @@ public static bool CheckForConvertedWinner(byte playerId)
                 case CustomRoles.Contagious:
                     ResetAndSetWinner(CustomWinner.Virus);
                     return true;
+                case CustomRoles.Enchanted:
+                    ResetAndSetWinner(CustomWinner.Coven);
+                    return true;
             }
         }
         return false;

Modules/DisableDevice.cs

@@ -60,6 +60,7 @@ public static void FixedUpdate()
                 bool ignore = (Options.DisableDevicesIgnoreImpostors.GetBool() && pc.Is(Custom_Team.Impostor)) ||
                         (Options.DisableDevicesIgnoreNeutrals.GetBool() && pc.Is(Custom_Team.Neutral)) ||
                         (Options.DisableDevicesIgnoreCrewmates.GetBool() && pc.Is(Custom_Team.Crewmate)) ||
+                        (Options.DisableDevicesIgnoreCoven.GetBool() && pc.Is(Custom_Team.Coven)) ||
                         (Options.DisableDevicesIgnoreAfterAnyoneDied.GetBool() && GameStates.AlreadyDied);
 
                 var mapId = Utils.GetActiveMapId();
@@ -157,6 +158,7 @@ public static void UpdateDisableDevices()
             (Options.DisableDevicesIgnoreImpostors.GetBool() && player.Is(Custom_Team.Impostor)) ||
             (Options.DisableDevicesIgnoreNeutrals.GetBool() && player.Is(Custom_Team.Neutral)) ||
             (Options.DisableDevicesIgnoreCrewmates.GetBool() && player.Is(Custom_Team.Crewmate)) ||
+            (Options.DisableDevicesIgnoreCoven.GetBool() && player.Is(Custom_Team.Coven)) ||
             (Options.DisableDevicesIgnoreAfterAnyoneDied.GetBool() && GameStates.AlreadyDied);
 
         var admins = UnityEngine.Object.FindObjectsOfType<MapConsole>(true);

Modules/ExtendedPlayerControl.cs

@@ -8,6 +8,7 @@
 using TOHE.Roles.AddOns.Common;
 using TOHE.Roles.AddOns.Impostor;
 using TOHE.Roles.Core;
+using TOHE.Roles.Coven;
 using TOHE.Roles.Crewmate;
 using TOHE.Roles.Impostor;
 using TOHE.Roles.Neutral;
@@ -1162,7 +1163,8 @@ public static bool IsNonCrewSheriff(this PlayerControl sheriff)
             || sheriff.Is(CustomRoles.Charmed)
             || sheriff.Is(CustomRoles.Infected)
             || sheriff.Is(CustomRoles.Contagious)
-            || sheriff.Is(CustomRoles.Egoist);
+            || sheriff.Is(CustomRoles.Egoist)
+            || sheriff.Is(CustomRoles.Enchanted);
     }
     public static bool ShouldBeDisplayed(this CustomRoles subRole)
     {
@@ -1175,6 +1177,7 @@ CustomRoles.Admired and not
             CustomRoles.Soulless and not
             CustomRoles.Lovers and not
             CustomRoles.Infected and not
+            CustomRoles.Enchanted and not
             CustomRoles.Contagious;
     }
 
@@ -1248,9 +1251,11 @@ public static List<PlayerControl> GetPlayersInAbilityRangeSorted(this PlayerCont
     public static bool IsTransformedNeutralApocalypse(this PlayerControl player) => player.GetCustomRole().IsTNA();
     public static bool IsNonNeutralKiller(this PlayerControl player) => player.GetCustomRole().IsNonNK();
 
+    public static bool IsPlayerCoven(this PlayerControl player) => player.GetCustomRole().IsCoven();
     public static bool IsMurderedThisRound(this PlayerControl player) => player.PlayerId.IsMurderedThisRound();
     public static bool IsMurderedThisRound(this byte playerId) => Main.MurderedThisRound.Contains(playerId);
 
+
     public static bool KnowDeathReason(this PlayerControl seer, PlayerControl target)
         => (Options.EveryoneCanSeeDeathReason.GetBool()
         || seer.Is(CustomRoles.Doctor) || seer.Is(CustomRoles.Autopsy)
@@ -1279,6 +1284,9 @@ public static bool KnowRoleTarget(PlayerControl seer, PlayerControl target)
         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 (seer.Is(Custom_Team.Impostor) && target.GetCustomRole().IsGhostRole() && target.GetCustomRole().IsImpostor()) return true;
+        else if (Ritualist.EnchantedKnowsCoven.GetBool() && seer.Is(CustomRoles.Enchanted) && target.Is(Custom_Team.Coven)) return true;
+        else if (target.Is(CustomRoles.Enchanted) && seer.Is(Custom_Team.Coven)) return true;
+        else if (target.Is(Custom_Team.Coven) && seer.Is(Custom_Team.Coven)) 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;
@@ -1303,6 +1311,7 @@ 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 (Main.VisibleTasksCount && !seer.IsAlive() && Options.GhostCanSeeOtherRoles.GetBool()) return true;
         else if (Options.ImpsCanSeeEachOthersAddOns.GetBool() && seer.Is(Custom_Team.Impostor) && target.Is(Custom_Team.Impostor) && !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 ((subRole is CustomRoles.Madmate
@@ -1312,7 +1321,8 @@ or CustomRoles.Admired
                 or CustomRoles.Charmed
                 or CustomRoles.Infected
                 or CustomRoles.Contagious
-                or CustomRoles.Egoist)
+                or CustomRoles.Egoist
+                or CustomRoles.Enchanted)
             && KnowSubRoleTarget(seer, target))
             return true;
 
@@ -1333,6 +1343,10 @@ public static bool KnowSubRoleTarget(PlayerControl seer, PlayerControl target)
             else if (seer.Is(CustomRoles.Egoist) && target.Is(CustomRoles.Egoist) && Egoist.ImpEgoistVisibalToAllies.GetBool())
                 return true;
         }
+        if (seer.Is(Custom_Team.Coven))
+        {
+            if (target.Is(CustomRoles.Enchanted) && Ritualist.EnchantedKnowsCoven.GetBool()) return true;
+        }
         else if (Admirer.HasEnabled && Admirer.CheckKnowRoleTarget(seer, target)) return true;
         else if (Cultist.HasEnabled && Cultist.KnowRole(seer, target)) return true;
         else if (Infectious.HasEnabled && Infectious.KnowRole(seer, target)) return true;

Modules/GameState.cs

@@ -96,6 +96,10 @@ public void SetMainRole(CustomRoles role)
         {
             countTypes = CountTypes.OutOfGame;
         }
+        if (pc.Is(CustomRoles.Enchanted))
+        {
+            countTypes = CountTypes.Coven;
+        }
 
         if (GameStates.IsInGame && preMainRole != CustomRoles.NotAssigned)
         {
@@ -213,6 +217,10 @@ public void SetSubRole(CustomRoles role, PlayerControl pc = null)
             case CustomRoles.Soulless:
                 countTypes = CountTypes.OutOfGame;
                 break;
+
+            case CustomRoles.Enchanted:
+                countTypes = CountTypes.Coven;
+                break;
         }
     }
     public void RemoveSubRole(CustomRoles addOn)
@@ -310,6 +318,7 @@ public enum DeathReason
         Sacrificed,
         Electrocuted,
         Scavenged,
+        BlastedOff,
 
         //Please add all new roles with deathreason & new deathreason in Utils.DeathReasonIsEnable();
         etc = -1,

Modules/GuessManager.cs

@@ -6,6 +6,7 @@
 using TOHE.Modules.ChatManager;
 using TOHE.Roles.AddOns.Common;
 using TOHE.Roles.Core;
+using TOHE.Roles.Coven;
 using TOHE.Roles.Crewmate;
 using TOHE.Roles.Double;
 using TOHE.Roles.Impostor;
@@ -150,6 +151,11 @@ public static bool GuesserMsg(PlayerControl pc, string msg, bool isUI = false)
             pc.ShowInfoMessage(isUI, GetString("GuessNotAllowed"));
             return true;
         }
+        if (pc.GetCustomRole().IsCoven() && !Options.CovenCanGuess.GetBool() && !pc.Is(CustomRoles.Guesser))
+        {
+            pc.ShowInfoMessage(isUI, GetString("GuessNotAllowed"));
+            return true;
+        }
 
         if (operate == 1)
         {
@@ -187,6 +193,15 @@ public static bool GuesserMsg(PlayerControl pc, string msg, bool isUI = false)
 
             if (target != null)
             {
+
+                if (target.Is(CustomRoles.VoodooMaster) && VoodooMaster.Dolls[target.PlayerId].Count > 0)
+                {
+                    target = Utils.GetPlayerById(VoodooMaster.Dolls[target.PlayerId].Where(x => Utils.GetPlayerById(x).IsAlive()).ToList().RandomElement());
+                    _ = new LateTask(() =>
+                    {
+                        Utils.SendMessage(string.Format(GetString("VoodooMasterTargetInMeeting"), target.GetRealName()), Utils.GetPlayerListByRole(CustomRoles.VoodooMaster).First().PlayerId);
+                    }, 2f, "Voodoo Master Notify");
+                }
                 GuessMaster.OnGuess(role);
                 bool guesserSuicide = false;
 
@@ -284,6 +299,13 @@ public static bool GuesserMsg(PlayerControl pc, string msg, bool isUI = false)
                             return true;
                         }
 
+                        // Coven Cant Guess Addons
+                        if (Options.CovenCanGuess.GetBool() && pc.Is(Custom_Team.Coven) && !pc.Is(CustomRoles.Guesser))
+                        {
+                            pc.ShowInfoMessage(isUI, GetString("GuessAdtRole"));
+                            return true;
+                        }
+
                         // Neutrals Cant Guess Addons
                         if ((Options.NeutralKillersCanGuess.GetBool() || Options.PassiveNeutralsCanGuess.GetBool()) && pc.Is(Custom_Team.Neutral) && !(pc.Is(CustomRoles.Doomsayer) || pc.Is(CustomRoles.Guesser)))
                         {
@@ -299,6 +321,14 @@ public static bool GuesserMsg(PlayerControl pc, string msg, bool isUI = false)
                             return true;
                         }
                     }
+                    if (role.IsCoven() && !Options.CovenCanGuessCoven.GetBool())
+                    {
+                        if (Options.CovenCanGuess.GetBool() && (pc.Is(Custom_Team.Coven) || pc.Is(CustomRoles.Enchanted)) && !pc.Is(CustomRoles.Guesser))
+                        {
+                            pc.ShowInfoMessage(isUI, GetString("GuessCovenRole"));
+                            return true;
+                        }
+                    }
                     if (role.IsCrewmate() && !Options.CrewCanGuessCrew.GetBool())
                     {
                         if (Options.CrewmatesCanGuess.GetBool() && pc.Is(Custom_Team.Crewmate) && !(pc.Is(CustomRoles.NiceGuesser) || pc.Is(CustomRoles.Guesser)))
@@ -614,6 +644,8 @@ public static void Postfix(MeetingHud __instance)
                     CreateGuesserButton(__instance);
                 if (PlayerControl.LocalPlayer.IsAlive() && PlayerControl.LocalPlayer.GetCustomRole().IsNonNK() && Options.PassiveNeutralsCanGuess.GetBool())
                     CreateGuesserButton(__instance);
+                if (PlayerControl.LocalPlayer.IsAlive() && PlayerControl.LocalPlayer.GetCustomRole().IsCoven() && Options.CovenCanGuess.GetBool())
+                    CreateGuesserButton(__instance);
                 else if (PlayerControl.LocalPlayer.GetCustomRole() is CustomRoles.Doomsayer && !Options.PassiveNeutralsCanGuess.GetBool() && !Doomsayer.CheckCantGuess)
                     CreateGuesserButton(__instance);
             }
@@ -703,7 +735,7 @@ static void GuesserOnClick(byte playerId, MeetingHud __instance)
             container.transform.localPosition = new Vector3(0, 0, -200f);
             guesserUI = container.gameObject;
 
-            List<int> info = [0, 0, 0, 0];
+            List<int> info = [0, 0, 0, 0, 0];
             var buttonTemplate = __instance.playerStates[0].transform.FindChild("votePlayerBase");
             var maskTemplate = __instance.playerStates[0].transform.FindChild("MaskArea");
             var smallButtonTemplate = __instance.playerStates[0].Buttons.transform.Find("CancelButton");
@@ -743,11 +775,12 @@ static void GuesserOnClick(byte playerId, MeetingHud __instance)
                 Crewmate   = 0
                 Impostor   = 1
                 Neutral    = 2
-                Add-ons    = 3
+                Coven      = 3
+                Add-ons    = 4
             */
 
             int tabCount = 0;
-            for (int TabId = 0; TabId < 4; TabId++)
+            for (int TabId = 0; TabId < 5; TabId++)
             {
                 if (PlayerControl.LocalPlayer.Is(CustomRoles.EvilGuesser))
                 {
@@ -765,7 +798,7 @@ static void GuesserOnClick(byte playerId, MeetingHud __instance)
                 {
                     //if (!Options.GCanGuessCrew.GetBool() && TabId == 0) continue;
                     //if (!Options.GCanGuessImp.GetBool() && TabId == 1) continue;
-                    if (!Guesser.GCanGuessAdt.GetBool() && TabId == 3) continue;
+                    if (!Guesser.GCanGuessAdt.GetBool() && TabId == 4) continue;
                 }
                 else if (Options.GuesserMode.GetBool() &&
                     !(PlayerControl.LocalPlayer.Is(CustomRoles.EvilGuesser) ||
@@ -775,7 +808,8 @@ static void GuesserOnClick(byte playerId, MeetingHud __instance)
                 {
                     if (!Options.CrewCanGuessCrew.GetBool() && PlayerControl.LocalPlayer.Is(Custom_Team.Crewmate) && TabId == 0) continue;
                     if (!Options.ImpCanGuessImp.GetBool() && PlayerControl.LocalPlayer.Is(Custom_Team.Impostor) && TabId == 1) continue;
-                    if (!Options.CanGuessAddons.GetBool() && TabId == 3) continue;
+                    if (!Options.CovenCanGuessCoven.GetBool() && PlayerControl.LocalPlayer.Is(Custom_Team.Coven) && TabId == 3) continue;
+                    if (!Options.CanGuessAddons.GetBool() && TabId == 4) continue;
                 }
 
                 Transform TeambuttonParent = new GameObject().transform;
@@ -793,6 +827,7 @@ static void GuesserOnClick(byte playerId, MeetingHud __instance)
                     Custom_Team.Crewmate => new Color32(140, 255, 255, byte.MaxValue),
                     Custom_Team.Impostor => new Color32(255, 25, 25, byte.MaxValue),
                     Custom_Team.Neutral => new Color32(127, 140, 141, byte.MaxValue),
+                    Custom_Team.Coven => new Color32(172, 66, 242, byte.MaxValue),
                     Custom_Team.Addon => new Color32(255, 154, 206, byte.MaxValue),
                     _ => throw new NotImplementedException(),
                 };
@@ -951,6 +986,12 @@ void ClickEvent()
                         listOfRoles.Add(CustomRoles.War);
                 }
 
+                if (CustomRoles.Ritualist.IsEnable())
+                {
+                    if (!listOfRoles.Contains(CustomRoles.Enchanted))
+                        listOfRoles.Add(CustomRoles.Enchanted);
+                }
+
                 arrayOfRoles = [.. listOfRoles];
             }
             else
@@ -984,6 +1025,7 @@ or CustomRoles.Mare
                     or CustomRoles.Cyber
                     or CustomRoles.Sloth
                     or CustomRoles.Apocalypse
+                    or CustomRoles.Coven
                     || (role.IsTNA() && !Options.TransformedNeutralApocalypseCanBeGuessed.GetBool())) continue;
 
                 if (role is CustomRoles.NiceMini && Mini.Age < 18) continue;

Modules/NameColorManager.cs

@@ -2,6 +2,7 @@
 using TOHE.Roles.AddOns.Common;
 using TOHE.Roles.AddOns.Impostor;
 using TOHE.Roles.Core;
+using TOHE.Roles.Coven;
 using TOHE.Roles.Crewmate;
 using TOHE.Roles.Impostor;
 using TOHE.Roles.Neutral;
@@ -49,6 +50,12 @@ private static bool KnowTargetRoleColor(PlayerControl seer, PlayerControl target
         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];
 
+        // Coven
+        if (seer.Is(Custom_Team.Coven) && target.Is(Custom_Team.Coven)) color = Main.roleColors[CustomRoles.Coven];
+        if (seer.Is(CustomRoles.Enchanted) && target.Is(Custom_Team.Coven) && Ritualist.EnchantedKnowsCoven.GetBool()) color = Main.roleColors[CustomRoles.Coven];
+        if (seer.Is(Custom_Team.Coven) && target.Is(CustomRoles.Enchanted)) color = Main.roleColors[CustomRoles.Enchanted];
+        if (seer.Is(CustomRoles.Enchanted) && target.Is(CustomRoles.Enchanted) && Ritualist.EnchantedKnowsEnchanted.GetBool()) color = Main.roleColors[CustomRoles.Enchanted];
+
         // Cultist
         if (Cultist.NameRoleColor(seer, target)) color = Main.roleColors[CustomRoles.Cultist];