#1466(make all recruiting roles recruit players to their current team)

Modules/CustomRolesHelper.cs

@@ -4,7 +4,9 @@
 using TOHE.Roles.AddOns.Crewmate;
 using TOHE.Roles.AddOns.Impostor;
 using TOHE.Roles.Core;
+using TOHE.Roles.Coven;
 using TOHE.Roles.Crewmate;
+using TOHE.Roles.Double;
 using TOHE.Roles.Impostor;
 using TOHE.Roles.Neutral;
 using static TOHE.Roles.Core.CustomRoleManager;
@@ -317,11 +319,22 @@ public static bool IsAbleToBeSidekicked(this CustomRoles role)
 
     public static bool IsRecruitingRole(this CustomRoles role)
         => role is
-            CustomRoles.Jackal or
+            //Crewmate
+            CustomRoles.Admirer or
+            CustomRoles.ChiefOfPolice or
+
+            //Impostor
+            CustomRoles.Gangster or
+            CustomRoles.Godfather or
+
+            //Neutral
             CustomRoles.Cultist or
-            CustomRoles.Necromancer or
+            CustomRoles.Infectious or
+            CustomRoles.Jackal or
             CustomRoles.Virus or
             CustomRoles.Spiritcaller or
+
+            //Coven
             CustomRoles.Ritualist;
 
     public static bool IsMadmate(this CustomRoles role)
@@ -413,13 +426,77 @@ CustomRoles.Circumvent or
             CustomRoles.Swift;
     }
 
+    public static CustomRoles GetBetrayalAddon(this PlayerControl pc, bool forRecruiter = false)
+    {
+        //Soulless and Egoist are excluded because they don't actually change player's team.
+        List<CustomRoles> BTAddonList = pc.GetCustomSubRoles().Where(x => x.IsBetrayalAddonV2() && x is not CustomRoles.Soulless and not CustomRoles.Egoist).ToList();
+
+        //Get player's betrayal add-on,NotAssigned if player doesn't have betrayal addon
+        var addon = BTAddonList.Any() ? BTAddonList.FirstOrDefault() : CustomRoles.NotAssigned;
+
+        //for recruiting roles to get their respective betrayal add-on
+        if (forRecruiter)
+        { 
+            if (addon is CustomRoles.NotAssigned)
+                return pc.GetCustomRole() switch //default addon for recruiting roles
+                {
+                    CustomRoles.Admirer => CustomRoles.Admired,
+                    CustomRoles.Gangster or CustomRoles.Godfather => CustomRoles.Madmate,
+                    CustomRoles.CursedSoul => CustomRoles.Soulless,
+                    CustomRoles.Cultist => CustomRoles.Charmed,
+                    CustomRoles.Infectious => CustomRoles.Infected,
+                    CustomRoles.Jackal => CustomRoles.Recruit,
+                    CustomRoles.Virus => CustomRoles.Contagious,
+                    CustomRoles.Ritualist => CustomRoles.Enchanted,
+                    _ => addon
+                };
+        }
+
+        return addon;
+    }
+
+    public static bool CanBeRecruitedBy(this PlayerControl target, PlayerControl recruiter)
+    {
+        var addon = recruiter.GetBetrayalAddon(forRecruiter: true);
+        //Mini shouldn't be recruited
+        if (target.GetCustomRole() is CustomRoles.NiceMini or CustomRoles.EvilMini && Mini.Age < 18) return false;
+
+        //loyal can't be recruited
+        if (target.Is(CustomRoles.Loyal)) return false;
+
+        //target already has this addon
+        else if (target.Is(addon)) return false;
+
+        //settings disabled,hurried cant be recruited
+        else if (target.Is(CustomRoles.Hurried) && !Hurried.CanBeConverted.GetBool()) return false;
+
+        //Coven Leader cant be recruited when they have the necronomicon
+        else if (CovenManager.HasNecronomicon(target.PlayerId) && target.Is(CustomRoles.CovenLeader)) return false;
+
+        return addon switch
+        {
+            CustomRoles.Charmed => Cultist.CanBeCharmed(target),
+            CustomRoles.Madmate => recruiter.Is(CustomRoles.Gangster) ? target.CanBeMadmate(forGangster: true) : target.CanBeMadmate(forAdmirer: true),
+            CustomRoles.Admired => Admirer.CanBeAdmired(target, recruiter),
+            CustomRoles.Enchanted => Ritualist.CanBeConverted(target),
+            CustomRoles.Recruit => Jackal.CanBeSidekick(target),
+            CustomRoles.Infected => Infectious.CanBeBitten(target),
+            CustomRoles.Contagious => target.CanBeInfected(),
+            CustomRoles.Soulless => CursedSoul.CanBeSoulless(target),//Cursed Soul recruits players to Soulless by default
+            _ => false
+        };
+    }    
+
     public static bool IsPlayerImpostorTeam(this PlayerControl player, bool onlyMainRole = false) => Main.PlayerStates.TryGetValue(player.PlayerId, out var state) && state.IsPlayerImpostorTeam(onlyMainRole);
     public static bool IsPlayerImpostorTeam(this PlayerState player, bool onlyMainRole = false)
     {
         if (!onlyMainRole)
+        {
+            if (player.SubRoles.Contains(CustomRoles.Madmate)) return true;
             if (player.SubRoles.Any(x => (x.IsConverted() || x is CustomRoles.Admired) && x is not CustomRoles.Madmate)) return false;
+        }
 
-        return player.MainRole.IsImpostor() || player.MainRole.GetCustomRoleType() is Custom_RoleType.Madmate;
+        return (player.MainRole.IsImpostor() || player.MainRole.GetCustomRoleType() is Custom_RoleType.Madmate) && !player.IsNecromancer;
     }
 
     public static bool IsPlayerCrewmateTeam(this PlayerControl player, bool onlyMainRole = false) => Main.PlayerStates.TryGetValue(player.PlayerId, out var state) && state.IsPlayerCrewmateTeam(onlyMainRole);
@@ -431,7 +508,7 @@ public static bool IsPlayerCrewmateTeam(this PlayerState player, bool onlyMainRo
             if (player.SubRoles.Any(x => (x.IsConverted()))) return false;
         }
 
-        return player.MainRole.IsCrewmate();
+        return player.MainRole.IsCrewmate() && !player.IsNecromancer;
     }
 
     public static bool IsPlayerNeutralTeam(this PlayerControl player, bool onlyMainRole = false) => Main.PlayerStates.TryGetValue(player.PlayerId, out var state) && state.IsPlayerNeutralTeam(onlyMainRole);
@@ -440,11 +517,12 @@ public static bool IsPlayerNeutralTeam(this PlayerState player, bool onlyMainRol
         if (!onlyMainRole)
         {
             if (player.SubRoles.Contains(CustomRoles.Admired)) return false;
+            if (player.SubRoles.Contains(CustomRoles.Enchanted) || player.SubRoles.Contains(CustomRoles.Madmate)) return false;
             if (player.SubRoles.Any(x => (x.IsConverted() && x is not CustomRoles.Madmate or CustomRoles.Enchanted))) return true;
         }
 
         // Imp roles like crewposter and parasite is counted as netural, but should be treated as impostor team in general
-        return player.MainRole.IsNeutral() && player.MainRole.GetCustomRoleType() is not Custom_RoleType.Madmate;
+        return player.MainRole.IsNeutral() && player.MainRole.GetCustomRoleType() is not Custom_RoleType.Madmate && !player.IsNecromancer;
     }
 
     public static bool IsPlayerCovenTeam(this PlayerControl player, bool onlyMainRole = false) => Main.PlayerStates.TryGetValue(player.PlayerId, out var state) && state.IsPlayerCovenTeam(onlyMainRole);
@@ -457,7 +535,7 @@ public static bool IsPlayerCovenTeam(this PlayerState player, bool onlyMainRole
             if (player.SubRoles.Any(x => (x.IsConverted() && x is not CustomRoles.Enchanted))) return false;
         }
 
-        return player.MainRole.IsCoven();
+        return player.MainRole.IsCoven() || player.IsNecromancer;
     }
     public static bool CheckAddonConfilct(CustomRoles role, PlayerControl pc, bool checkLimitAddons = true, bool checkConditions = true)
     {

Patches/CheckGameEndPatch.cs

@@ -142,7 +142,8 @@ public static bool Prefix()
                         }
                         break;
                     case CustomWinner.Cultist:
-                        if ((pc.Is(CustomRoles.Charmed) || pc.Is(CustomRoles.Cultist)) && !WinnerIds.Contains(pc.PlayerId))
+                        if ((pc.Is(CustomRoles.Cultist) && (countType == CountTypes.Cultist || pc.Is(CustomRoles.Soulless)) && !Main.PlayerStates[pc.PlayerId].IsNecromancer) ||
+                            pc.Is(CustomRoles.Charmed) && !WinnerIds.Contains(pc.PlayerId))
                         {
                             WinnerIds.Add(pc.PlayerId);
                         }
@@ -154,7 +155,8 @@ public static bool Prefix()
                         }
                         break;
                     case CustomWinner.Infectious:
-                        if ((pc.Is(CustomRoles.Infected) || pc.Is(CustomRoles.Infectious)) && !WinnerIds.Contains(pc.PlayerId))
+                        if ((pc.Is(CustomRoles.Infectious) && (countType == CountTypes.Infectious || pc.Is(CustomRoles.Soulless)) && !Main.PlayerStates[pc.PlayerId].IsNecromancer) ||
+                            pc.Is(CustomRoles.Infected) && !WinnerIds.Contains(pc.PlayerId))
                         {
                             WinnerIds.Add(pc.PlayerId);
                         }
@@ -166,13 +168,15 @@ public static bool Prefix()
                         }
                         break;
                     case CustomWinner.Virus:
-                        if ((pc.Is(CustomRoles.Contagious) || pc.Is(CustomRoles.Virus)) && !WinnerIds.Contains(pc.PlayerId))
+                        if ((pc.Is(CustomRoles.Virus) && (countType == CountTypes.Virus || pc.Is(CustomRoles.Soulless)) && !Main.PlayerStates[pc.PlayerId].IsNecromancer) ||
+                            pc.Is(CustomRoles.Contagious) && !WinnerIds.Contains(pc.PlayerId))
                         {
                             WinnerIds.Add(pc.PlayerId);
                         }
                         break;
                     case CustomWinner.Jackal:
-                        if ((pc.Is(CustomRoles.Sidekick) || pc.Is(CustomRoles.Recruit) || pc.Is(CustomRoles.Jackal)) && !WinnerIds.Contains(pc.PlayerId))
+                        if (((pc.Is(CustomRoles.Sidekick) || pc.Is(CustomRoles.Jackal)) && (countType == CountTypes.Jackal || pc.Is(CustomRoles.Soulless)) && !Main.PlayerStates[pc.PlayerId].IsNecromancer) ||
+                            pc.Is(CustomRoles.Recruit) && !WinnerIds.Contains(pc.PlayerId))
                         {
                             WinnerIds.Add(pc.PlayerId);
                         }

Patches/MeetingHudPatch.cs

@@ -723,6 +723,7 @@ public static bool Prefix(MeetingHud __instance, byte srcPlayerId, byte suspectP
             voter.RpcChangeRoleBasis(CovenLeader.retrainPlayer[voter.PlayerId]);
             voter.RpcSetCustomRole(CovenLeader.retrainPlayer[voter.PlayerId]);
             voter.GetRoleClass()?.OnAdd(voter.PlayerId);
+            if (CL.GetBetrayalAddon() != CustomRoles.NotAssigned) voter.RpcSetCustomRole(CL.GetBetrayalAddon());
             SendMessage(string.Format(GetString("CovenLeaderAcceptRetrain"), CustomRoles.CovenLeader.ToColoredString(), CovenLeader.retrainPlayer[voter.PlayerId].ToColoredString()), CL.PlayerId);
             SendMessage(string.Format(GetString("RetrainAcceptOffer"), CustomRoles.CovenLeader.ToColoredString(), CovenLeader.retrainPlayer[voter.PlayerId].ToColoredString()), voter.PlayerId);
 

Roles/Coven/Ritualist.cs

@@ -132,7 +132,7 @@ public static bool RitualistMsgCheck(PlayerControl pc, string msg, bool isUI = f
                 RitualLimit[pc.PlayerId] = 0;
                 return true;
             }
-            if (!CanBeConverted(target))
+            if (!target.CanBeRecruitedBy(pc))
             {
                 pc.ShowInfoMessage(isUI, GetString("RitualistRitualImpossible"));
                 return true;
@@ -207,59 +207,17 @@ public override void AfterMeetingTasks()
     }
     public void ConvertRole(PlayerControl killer, PlayerControl target)
     {
-        if (!killer.Is(CustomRoles.Admired) && !killer.Is(CustomRoles.Recruit) && !killer.Is(CustomRoles.Charmed)
-                && !killer.Is(CustomRoles.Infected) && !killer.Is(CustomRoles.Contagious) && !killer.Is(CustomRoles.Madmate)
-               && CanBeConverted(target))
+        var addon = killer.GetBetrayalAddon(true);
+        if (target.CanBeRecruitedBy(killer))
         {
-            Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + CustomRoles.Enchanted.ToString(), "Ritualist Assign");
-            target.RpcSetCustomRole(CustomRoles.Enchanted);
-            killer.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Enchanted), GetString("RitualistSuccessfullyRecruited")));
-            target.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Enchanted), GetString("BeRecruitedByRitualist")));
-        }
-        else if (killer.Is(CustomRoles.Admired) && Admirer.CanBeAdmired(target, killer))
-        {
-            Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + CustomRoles.Admired.ToString(), "Ritualist Assign");
-            target.RpcSetCustomRole(CustomRoles.Admired);
-            killer.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Admired), GetString("RitualistSuccessfullyRecruited")));
-            target.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Admired), GetString("BeRecruitedByRitualist")));
-            Admirer.AdmiredList[killer.PlayerId].Add(target.PlayerId);
-            Admirer.SendRPC(killer.PlayerId, target.PlayerId);
-        }
-        else if (killer.Is(CustomRoles.Recruit) && Jackal.CanBeSidekick(target))
-        {
-            Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + CustomRoles.Recruit.ToString(), "Ritualist Assign");
-            target.RpcSetCustomRole(CustomRoles.Recruit);
-            killer.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Recruit), GetString("RitualistSuccessfullyRecruited")));
-            target.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Recruit), GetString("BeRecruitedByRitualist")));
-        }
-        else if (killer.Is(CustomRoles.Madmate) && target.CanBeMadmate(forAdmirer: true))
-        {
-            Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + CustomRoles.Madmate.ToString(), "Ritualist Assign");
-            target.RpcSetCustomRole(CustomRoles.Madmate);
-            killer.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Madmate), GetString("RitualistSuccessfullyRecruited")));
-            target.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Madmate), GetString("BeRecruitedByRitualist")));
-        }
-        else if (killer.Is(CustomRoles.Charmed) && Cultist.CanBeCharmed(target))
-        {
-            Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + CustomRoles.Charmed.ToString(), "Ritualist Assign");
-            target.RpcSetCustomRole(CustomRoles.Charmed);
-            killer.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Charmed), GetString("RitualistSuccessfullyRecruited")));
-            target.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Charmed), GetString("BeRecruitedByRitualist")));
-        }
-        else if (killer.Is(CustomRoles.Infected) && Infectious.CanBeBitten(target))
-        {
-            Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + CustomRoles.Infected.ToString(), "Ritualist Assign");
-            target.RpcSetCustomRole(CustomRoles.Infected);
-            killer.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Infected), GetString("RitualistSuccessfullyRecruited")));
-            target.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Infected), GetString("BeRecruitedByRitualist")));
-        }
-        else if (killer.Is(CustomRoles.Contagious) && target.CanBeInfected())
-        {
-            Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + CustomRoles.Contagious.ToString(), "Ritualist Assign");
-            target.RpcSetCustomRole(CustomRoles.Contagious);
-            killer.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Contagious), GetString("RitualistSuccessfullyRecruited")));
-            target.Notify(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Contagious), GetString("BeRecruitedByRitualist")));
-        }
+            Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + addon.ToString(), "Ritualist Assign");
+            target.RpcSetCustomRole(addon);
+            if (addon is CustomRoles.Admired)
+            {
+                Admirer.AdmiredList[killer.PlayerId].Add(target.PlayerId);
+                Admirer.SendRPC(killer.PlayerId, target.PlayerId);
+            }
+        } 
     }
     private static bool MsgToPlayerAndRole(string msg, out byte id, out CustomRoles role, out string error)
     {
@@ -324,8 +282,6 @@ public static bool CheckCommond(ref string msg, string command, bool exact = tru
     }
     public static bool CanBeConverted(PlayerControl pc)
     {
-        return pc != null && (!pc.GetCustomRole().IsCovenTeam() && !pc.IsTransformedNeutralApocalypse()) && !pc.Is(CustomRoles.Soulless) && !pc.Is(CustomRoles.Lovers) && !pc.Is(CustomRoles.Loyal)
-            && !((pc.Is(CustomRoles.NiceMini) || pc.Is(CustomRoles.EvilMini)) && Mini.Age < 18)
-            && !(pc.GetCustomSubRoles().Contains(CustomRoles.Hurried) && !Hurried.CanBeConverted.GetBool());
+        return pc != null && (!pc.GetCustomRole().IsCovenTeam() && !pc.IsTransformedNeutralApocalypse());
     }
 }