From 095f94bb384cfecabe51bdd38cf2b635ef09b7f8 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Mon, 9 Sep 2024 21:57:43 -0400
Subject: [PATCH 001/101] work from the past 3 days
---
Modules/CustomRolesHelper.cs | 38 +++----
Modules/ExtendedPlayerControl.cs | 2 +
Modules/OptionHolder.cs | 58 ++++++++++
Modules/OptionItem/OptionItem.cs | 1 +
Modules/RPC.cs | 1 +
Patches/GameSettingMenuPatch.cs | 2 +
Patches/IntroPatch.cs | 28 +++++
Patches/MeetingHudPatch.cs | 1 +
Patches/PlayerControlPatch.cs | 1 +
Resources/Lang/en_US.json | 40 +++++--
Resources/roleColor.json | 1 +
Roles/Core/AssignManager/RoleAssign.cs | 128 +++++++++++++++++++++++
Roles/Coven/CovenLeader.cs | 81 ++++++++++++++
Roles/Coven/CovenManager.cs | 29 +++++
Roles/{Neutral => Coven}/HexMaster.cs | 15 +--
Roles/{Neutral => Coven}/Jinx.cs | 19 ++--
Roles/{Neutral => Coven}/Medusa.cs | 17 +--
Roles/{Neutral => Coven}/Necromancer.cs | 19 ++--
Roles/{Neutral => Coven}/Poisoner.cs | 17 +--
Roles/{Neutral => Coven}/PotionMaster.cs | 17 +--
main.cs | 24 +++--
21 files changed, 458 insertions(+), 81 deletions(-)
create mode 100644 Roles/Coven/CovenLeader.cs
create mode 100644 Roles/Coven/CovenManager.cs
rename Roles/{Neutral => Coven}/HexMaster.cs (94%)
rename Roles/{Neutral => Coven}/Jinx.cs (80%)
rename Roles/{Neutral => Coven}/Medusa.cs (80%)
rename Roles/{Neutral => Coven}/Necromancer.cs (84%)
rename Roles/{Neutral => Coven}/Poisoner.cs (87%)
rename Roles/{Neutral => Coven}/PotionMaster.cs (86%)
diff --git a/Modules/CustomRolesHelper.cs b/Modules/CustomRolesHelper.cs
index 81e323557..fdf8af3f6 100644
--- a/Modules/CustomRolesHelper.cs
+++ b/Modules/CustomRolesHelper.cs
@@ -287,7 +287,14 @@ CustomRoles.Impostor or
CustomRoles.Shapeshifter or
CustomRoles.Phantom;
}
-
+ public static bool IsCoven(this CustomRoles role)
+ {
+ return role.GetStaticRoleClass().ThisRoleType is
+ Custom_RoleType.CovenKilling or
+ Custom_RoleType.CovenPower or
+ Custom_RoleType.CovenTrickery or
+ Custom_RoleType.CovenUtility;
+ }
public static bool IsAbleToBeSidekicked(this CustomRoles role)
=> role.GetDYRole() == RoleTypes.Impostor && !role.IsImpostor() && !role.IsRecruitingRole();
@@ -1054,9 +1061,9 @@ public static RoleTypes GetRoleTypes(this CustomRoles role)
///
public static bool IsImpostorTeam(this CustomRoles role) => role.IsImpostor() || role == CustomRoles.Madmate;
///
- /// Role Is Not Impostor nor Madmate Nor Neutral.
+ /// Role Is Not Impostor nor Madmate Nor Neutral nor Coven.
///
- public static bool IsCrewmate(this CustomRoles role) => !role.IsImpostor() && !role.IsNeutral() && !role.IsMadmate();
+ public static bool IsCrewmate(this CustomRoles role) => !role.IsImpostor() && !role.IsNeutral() && !role.IsMadmate() && !role.IsCoven();
///
/// Role is Rascal or Madmate and not trickster.
///
@@ -1091,6 +1098,7 @@ public static Custom_Team GetCustomRoleTeam(this CustomRoles role)
Custom_Team team = Custom_Team.Crewmate;
if (role.IsImpostor()) team = Custom_Team.Impostor;
if (role.IsNeutral()) team = Custom_Team.Neutral;
+ if (role.IsCoven()) team = Custom_Team.Coven;
if (role.IsAdditionRole()) team = Custom_Team.Addon;
return team;
}
@@ -1164,29 +1172,25 @@ public static CountTypes GetCountTypes(this CustomRoles role)
CustomRoles.Demon => CountTypes.Demon,
CustomRoles.BloodKnight => CountTypes.BloodKnight,
CustomRoles.Cultist => CountTypes.Cultist,
- CustomRoles.HexMaster => CountTypes.HexMaster,
- CustomRoles.Necromancer => CountTypes.Necromancer,
CustomRoles.Stalker => !Stalker.SnatchesWin.GetBool() ? CountTypes.Stalker : CountTypes.Crew,
CustomRoles.Arsonist => Arsonist.CanIgniteAnytime() ? CountTypes.Arsonist : CountTypes.Crew,
CustomRoles.Shroud => CountTypes.Shroud,
CustomRoles.Werewolf => CountTypes.Werewolf,
CustomRoles.Wraith => CountTypes.Wraith,
var r when r.IsNA() => CountTypes.Apocalypse,
+ var r when r.IsCoven() => CountTypes.Coven,
CustomRoles.Agitater => CountTypes.Agitater,
CustomRoles.Parasite => CountTypes.Impostor,
CustomRoles.SerialKiller => CountTypes.SerialKiller,
CustomRoles.Quizmaster => CountTypes.Quizmaster,
CustomRoles.Juggernaut => CountTypes.Juggernaut,
- CustomRoles.Jinx => CountTypes.Jinx,
CustomRoles.Infectious or CustomRoles.Infected => CountTypes.Infectious,
CustomRoles.Crewpostor => CountTypes.Impostor,
CustomRoles.Pyromaniac => CountTypes.Pyromaniac,
CustomRoles.PlagueDoctor => CountTypes.PlagueDoctor,
CustomRoles.Virus => CountTypes.Virus,
- CustomRoles.PotionMaster => CountTypes.PotionMaster,
CustomRoles.Pickpocket => CountTypes.Pickpocket,
CustomRoles.Traitor => CountTypes.Traitor,
- CustomRoles.Medusa => CountTypes.Medusa,
CustomRoles.Refugee => CountTypes.Impostor,
CustomRoles.Huntsman => CountTypes.Huntsman,
CustomRoles.Glitch => CountTypes.Glitch,
@@ -1272,8 +1276,6 @@ var r when r.IsNA() => CountTypes.Apocalypse,
CountTypes.Demon => CustomRoles.Demon,
CountTypes.BloodKnight => CustomRoles.BloodKnight,
CountTypes.Cultist => CustomRoles.Cultist,
- CountTypes.HexMaster => CustomRoles.HexMaster,
- CountTypes.Necromancer => CustomRoles.Necromancer,
CountTypes.Shroud => CustomRoles.Shroud,
CountTypes.Werewolf => CustomRoles.Werewolf,
CountTypes.Wraith => CustomRoles.Wraith,
@@ -1282,14 +1284,11 @@ var r when r.IsNA() => CountTypes.Apocalypse,
CountTypes.SerialKiller => CustomRoles.SerialKiller,
CountTypes.Quizmaster => CustomRoles.Quizmaster,
CountTypes.Juggernaut => CustomRoles.Juggernaut,
- CountTypes.Jinx => CustomRoles.Jinx,
CountTypes.Infectious => CustomRoles.Infectious,
CountTypes.Pyromaniac => CustomRoles.Pyromaniac,
CountTypes.Virus => CustomRoles.Virus,
- CountTypes.PotionMaster => CustomRoles.PotionMaster,
CountTypes.Pickpocket => CustomRoles.Pickpocket,
CountTypes.Traitor => CustomRoles.Traitor,
- CountTypes.Medusa => CustomRoles.Medusa,
CountTypes.Huntsman => CustomRoles.Huntsman,
CountTypes.Glitch => CustomRoles.Glitch,
CountTypes.Stalker => CustomRoles.Stalker,
@@ -1305,6 +1304,7 @@ public enum Custom_Team
Crewmate,
Impostor,
Neutral,
+ Coven,
Addon,
}
public enum Custom_RoleType
@@ -1335,6 +1335,12 @@ public enum Custom_RoleType
NeutralKilling,
NeutralApocalypse,
+ // Coven
+ CovenPower,
+ CovenKilling,
+ CovenTrickery,
+ CovenUtility,
+
None
}
public enum CountTypes
@@ -1353,18 +1359,14 @@ public enum CountTypes
Poisoner,
Charmed,
Cultist,
- HexMaster,
Wraith,
SerialKiller,
Juggernaut,
Infectious,
Virus,
Stalker,
- Jinx,
- PotionMaster,
Pickpocket,
Traitor,
- Medusa,
Spiritcaller,
Quizmaster,
Apocalypse,
@@ -1376,5 +1378,5 @@ public enum CountTypes
Werewolf,
Agitater,
RuthlessRomantic,
- Necromancer
+ Coven
}
diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs
index 5b8fc782a..84e5d03a7 100644
--- a/Modules/ExtendedPlayerControl.cs
+++ b/Modules/ExtendedPlayerControl.cs
@@ -10,6 +10,7 @@
using TOHE.Roles.Crewmate;
using TOHE.Roles.Impostor;
using TOHE.Roles.Neutral;
+using TOHE.Roles.Coven;
using UnityEngine;
using static TOHE.Translator;
@@ -886,6 +887,7 @@ public static List GetPlayersInAbilityRangeSorted(this PlayerCont
public static bool IsNeutralApocalypse(this PlayerControl player) => player.GetCustomRole().IsNA();
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 KnowDeathReason(this PlayerControl seer, PlayerControl target)
=> (Options.EveryoneCanSeeDeathReason.GetBool()
diff --git a/Modules/OptionHolder.cs b/Modules/OptionHolder.cs
index 640a7e663..3c931268b 100644
--- a/Modules/OptionHolder.cs
+++ b/Modules/OptionHolder.cs
@@ -473,10 +473,12 @@ private enum RatesZeroOne
public static OptionItem NeutralKillersCanGuess;
public static OptionItem NeutralApocalypseCanGuess;
public static OptionItem PassiveNeutralsCanGuess;
+ public static OptionItem CovenCanGuess;
public static OptionItem CanGuessAddons;
public static OptionItem ImpCanGuessImp;
public static OptionItem CrewCanGuessCrew;
public static OptionItem ApocCanGuessApoc;
+ public static OptionItem CovenCanGuessCoven;
public static OptionItem HideGuesserCommands;
public static OptionItem ShowOnlyEnabledRolesInGuesserUI;
@@ -502,6 +504,10 @@ private enum RatesZeroOne
public static OptionItem NeutralRoleWinTogether;
public static OptionItem NeutralWinTogether;
+ // Coven
+ public static OptionItem CovenRolesMinPlayer;
+ public static OptionItem CovenRolesMaxPlayer;
+
// Add-on
public static OptionItem NameDisplayAddons;
public static OptionItem AddBracketsToAddons;
@@ -705,6 +711,14 @@ private static System.Collections.IEnumerator CoLoadOptions()
.SetParent(NeutralRoleWinTogether)
.SetGameMode(CustomGameMode.Standard);
+ CovenRolesMinPlayer = IntegerOptionItem.Create(60025, "CovenRolesMinPlayer", new(0, 15, 1), 0, TabGroup.CovenRoles, false)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetHeader(true)
+ .SetValueFormat(OptionFormat.Players);
+ CovenRolesMaxPlayer = IntegerOptionItem.Create(60026, "CovenRolesMaxPlayer", new(0, 15, 1), 0, TabGroup.CovenRoles, false)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetValueFormat(OptionFormat.Players);
+
NameDisplayAddons = BooleanOptionItem.Create(60019, "NameDisplayAddons", true, TabGroup.Addons, false)
.SetGameMode(CustomGameMode.Standard)
.SetHeader(true);
@@ -920,6 +934,45 @@ private static System.Collections.IEnumerator CoLoadOptions()
yield return null;
+ #region Coven Settings
+ if (CustomRoleManager.RoleClass.Where(x => x.Key.IsCoven()).Any(r => r.Value.IsExperimental))
+ {
+ TextOptionItem.Create(10000023, "Experimental.Roles", TabGroup.NeutralRoles)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetColor(new Color32(141, 70, 49, byte.MaxValue));
+
+ CustomRoleManager.GetExperimentalOptions(Custom_Team.Coven).ForEach(r => r.SetupCustomOption());
+
+
+ }
+
+ TextOptionItem.Create(10000016, "RoleType.CovenPower", TabGroup.CovenRoles)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetColor(new Color32(172, 66, 242, byte.MaxValue));
+
+ CustomRoleManager.GetNormalOptions(Custom_RoleType.CovenPower).ForEach(r => r.SetupCustomOption());
+
+ TextOptionItem.Create(10000017, "RoleType.CovenKilling", TabGroup.CovenRoles)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetColor(new Color32(172, 66, 242, byte.MaxValue));
+
+ CustomRoleManager.GetNormalOptions(Custom_RoleType.CovenKilling).ForEach(r => r.SetupCustomOption());
+
+ TextOptionItem.Create(10000018, "RoleType.CovenTrickery", TabGroup.CovenRoles)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetColor(new Color32(172, 66, 242, byte.MaxValue));
+
+ CustomRoleManager.GetNormalOptions(Custom_RoleType.CovenTrickery).ForEach(r => r.SetupCustomOption());
+
+ TextOptionItem.Create(10000019, "RoleType.CovenUtility", TabGroup.CovenRoles)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetColor(new Color32(172, 66, 242, byte.MaxValue));
+
+ CustomRoleManager.GetNormalOptions(Custom_RoleType.CovenUtility).ForEach(r => r.SetupCustomOption());
+ #endregion
+
+ yield return null;
+
#region Add-Ons Settings
int titleId = 100100;
@@ -1673,6 +1726,8 @@ private static System.Collections.IEnumerator CoLoadOptions()
.SetParent(GuesserMode);
PassiveNeutralsCanGuess = BooleanOptionItem.Create(60684, "PassiveNeutralsCanGuess", false, TabGroup.ModifierSettings, false)
.SetParent(GuesserMode);
+ CovenCanGuess = BooleanOptionItem.Create(60693, "CovenCanGuess", false, TabGroup.ModifierSettings, false)
+ .SetParent(GuesserMode);
CanGuessAddons = BooleanOptionItem.Create(60685, "CanGuessAddons", true, TabGroup.ModifierSettings, false)
.SetParent(GuesserMode);
CrewCanGuessCrew = BooleanOptionItem.Create(60686, "CrewCanGuessCrew", true, TabGroup.ModifierSettings, false)
@@ -1684,6 +1739,9 @@ private static System.Collections.IEnumerator CoLoadOptions()
ApocCanGuessApoc = BooleanOptionItem.Create(60691, "ApocCanGuessApoc", false, TabGroup.ModifierSettings, false)
.SetHidden(true)
.SetParent(GuesserMode);
+ CovenCanGuessCoven = BooleanOptionItem.Create(60692, "CovenCanGuessCoven", false, TabGroup.ModifierSettings, false)
+ .SetHidden(true)
+ .SetParent(GuesserMode);
HideGuesserCommands = BooleanOptionItem.Create(60688, "GuesserTryHideMsg", true, TabGroup.ModifierSettings, false)
.SetParent(GuesserMode)
.SetColor(Color.green);
diff --git a/Modules/OptionItem/OptionItem.cs b/Modules/OptionItem/OptionItem.cs
index ff38d57a9..98356b5f0 100644
--- a/Modules/OptionItem/OptionItem.cs
+++ b/Modules/OptionItem/OptionItem.cs
@@ -306,6 +306,7 @@ public enum TabGroup
ImpostorRoles,
CrewmateRoles,
NeutralRoles,
+ CovenRoles,
Addons
}
public enum OptionFormat
diff --git a/Modules/RPC.cs b/Modules/RPC.cs
index e4a225e8f..aacfc5536 100644
--- a/Modules/RPC.cs
+++ b/Modules/RPC.cs
@@ -11,6 +11,7 @@
using TOHE.Roles.Crewmate;
using TOHE.Roles.Impostor;
using TOHE.Roles.Neutral;
+using TOHE.Roles.Coven;
using static TOHE.Translator;
namespace TOHE;
diff --git a/Patches/GameSettingMenuPatch.cs b/Patches/GameSettingMenuPatch.cs
index cb7dce266..924c67037 100644
--- a/Patches/GameSettingMenuPatch.cs
+++ b/Patches/GameSettingMenuPatch.cs
@@ -53,6 +53,7 @@ public static void StartPostfix(GameSettingMenu __instance)
TabGroup.ImpostorRoles => "#f74631",
TabGroup.CrewmateRoles => "#8cffff",
TabGroup.NeutralRoles => "#7f8c8d",
+ TabGroup.CovenRoles => "#ac42f2",
TabGroup.Addons => "#ff9ace",
_ => "#ffffff",
};
@@ -355,6 +356,7 @@ public static bool ChangeTabPrefix(GameSettingMenu __instance, ref int tabNum, [
case TabGroup.ImpostorRoles:
case TabGroup.CrewmateRoles:
case TabGroup.NeutralRoles:
+ case TabGroup.CovenRoles:
case TabGroup.Addons:
__instance.MenuDescriptionText.text = GetString("TabMenuDescription_Roles&AddOns");
break;
diff --git a/Patches/IntroPatch.cs b/Patches/IntroPatch.cs
index 66ca0529f..dd5a81d03 100644
--- a/Patches/IntroPatch.cs
+++ b/Patches/IntroPatch.cs
@@ -272,6 +272,17 @@ public static bool Prefix(IntroCutscene __instance, ref Il2CppSystem.Collections
__instance.overlayHandle.color = Palette.ImpostorRed;
return false;
}
+ else if (PlayerControl.LocalPlayer.IsPlayerCoven())
+ {
+ var covTeam = new Il2CppSystem.Collections.Generic.List();
+ covTeam.Add(PlayerControl.LocalPlayer);
+ foreach (var pc in Main.AllAlivePlayerControls)
+ {
+ if (pc.IsPlayerCoven() && pc != PlayerControl.LocalPlayer)
+ covTeam.Add(pc);
+ }
+ teamToDisplay = covTeam;
+ }
else if (PlayerControl.LocalPlayer.IsNeutralApocalypse())
{
var apocTeam = new Il2CppSystem.Collections.Generic.List();
@@ -343,6 +354,13 @@ public static void Postfix(IntroCutscene __instance)
__instance.ImpostorText.gameObject.SetActive(true);
__instance.ImpostorText.text = GetString("SubText.Neutral");
break;
+ case Custom_Team.Coven:
+ __instance.TeamTitle.text = GetString("TeamCoven");
+ __instance.TeamTitle.color = __instance.BackgroundBar.material.color = new Color32(172, 66, 242, byte.MaxValue);
+ PlayerControl.LocalPlayer.Data.Role.IntroSound = GetIntroSound(RoleTypes.Phantom);
+ __instance.ImpostorText.gameObject.SetActive(true);
+ __instance.ImpostorText.text = GetString("SubText.Coven");
+ break;
}
switch (role)
{
@@ -509,6 +527,16 @@ public static bool Prefix(IntroCutscene __instance, ref Il2CppSystem.Collections
return false;
}
+ if (role.IsCoven())
+ {
+ yourTeam = new();
+ yourTeam.Add(PlayerControl.LocalPlayer);
+ foreach (var pc in Main.AllPlayerControls.Where(x => !x.AmOwner)) yourTeam.Add(pc);
+ __instance.BeginCrewmate(yourTeam);
+ __instance.overlayHandle.color = new Color32(172, 66, 242, byte.MaxValue);
+ return false;
+ }
+
BeginCrewmatePatch.Prefix(__instance, ref yourTeam);
return true;
}
diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs
index ab32a4c4d..21d58381a 100644
--- a/Patches/MeetingHudPatch.cs
+++ b/Patches/MeetingHudPatch.cs
@@ -8,6 +8,7 @@
using TOHE.Roles.Crewmate;
using TOHE.Roles.Impostor;
using TOHE.Roles.Neutral;
+using TOHE.Roles.Coven;
using UnityEngine;
using static TOHE.Utils;
using static TOHE.Translator;
diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs
index a7c7f5450..cc28d54ec 100644
--- a/Patches/PlayerControlPatch.cs
+++ b/Patches/PlayerControlPatch.cs
@@ -15,6 +15,7 @@
using TOHE.Roles.Double;
using TOHE.Roles.Impostor;
using TOHE.Roles.Neutral;
+using TOHE.Roles.Coven;
using TOHE.Roles.Core;
using static TOHE.Translator;
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index d4f680c14..e52e9d571 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -22,22 +22,26 @@
"SubText.Impostor": "Sabotage and kill everyone",
"SubText.Neutral": "Work alone to achieve your victory",
"SubText.Apocalypse": "Become unstoppable with your team",
+ "SubText.Coven": "Bewitch and kill everyone",
"SubText.Madmate": "Help the Impostors",
"TypeImpostor": "Impostors",
"TypeCrewmate": "Crewmates",
"TypeNeutral": "Neutrals",
+ "TypeCoven": "Coven",
"TypeAddon": "Add-ons",
"GuesserMode": "Guesser Mode",
"TeamImpostor": "Impostor",
"TeamNeutral": "Neutral",
"TeamCrewmate": "Crewmate",
+ "TeamCoven": "Coven",
"TeamMadmate": "Madmate",
"YouAreCrewmate": "You are a Crewmate",
"YouAreImpostor": "You are an Impostor",
"YouAreNeutral": "You are a Neutral",
+ "YouAreCoven": "You are a Coven member",
"YouAreMadmate": "You are a Madmate",
@@ -67,6 +71,7 @@
"ImpostorsCanGuess": "Impostors can guess",
"NeutralKillersCanGuess": "Neutral Killers can guess",
"NeutralApocalypseCanGuess": "Neutral Apocalypse can guess",
+ "CovenCanGuess": "Coven can guess",
"PassiveNeutralsCanGuess": "Passive Neutrals can guess",
"CanGuessAddons": "Can Guess Add-ons",
@@ -74,6 +79,7 @@
"CrewCanGuessCrew": "Crewmates Can Guess Crewmate Roles",
"ImpCanGuessImp": "Impostors Can Guess Impostor Roles",
"ApocCanGuessApoc": "Neutral Apocalypse Can Guess Neutral Apocalypse Roles",
+ "CovenCanGuessCoven": "Coven Can Guess Coven Roles",
"GuessImmune": "Sorry, but target is immune to being guessed!",
@@ -292,7 +298,6 @@
"Vulture": "Vulture",
"Taskinator": "Taskinator",
"Benefactor": "Benefactor",
- "Medusa": "Medusa",
"Spiritcaller": "Spiritcaller",
"Amnesiac": "Amnesiac",
"Imitator": "Imitator",
@@ -310,12 +315,14 @@
"Romantic": "Romantic",
"VengefulRomantic": "Vengeful Romantic",
"RuthlessRomantic": "Ruthless Romantic",
+ "Wraith": "Wraith",
"Poisoner": "Poisoner",
+ "Medusa": "Medusa",
"HexMaster": "Hex Master",
- "Wraith": "Wraith",
"Jinx": "Jinx",
"PotionMaster": "Potion Master",
"Necromancer": "Necromancer",
+ "CovenLeader": "Coven Leader",
"Warden": "Warden",
"Minion": "Minion",
"Ghastly": "Ghastly",
@@ -625,6 +632,7 @@
"JinxInfo": "Reflect attacks onto your attackers",
"PotionMasterInfo": "Use your potions to your advantage",
"NecromancerInfo": "Kill your killer to defy death",
+ "CovenLeaderInfo": "Help your teammates by retraining them",
"WardenInfo": "(Ghost) Alert about danger",
"MinionInfo": "(Ghost) Blind enemies",
"LoversInfo": "Stay alive and win together",
@@ -903,7 +911,7 @@
"VultureInfoLong": "(Neutrals):\nAs the Vulture, report bodies to win!\n\nWhen you report a body, if your eat cooldown is up, you'll eat the body (makes it unreportable).\nIf your eat ability is still on cooldown, then you'll report the body normally.\n\nAdditionally, you'll report bodies normally if the maximum bodies eaten per round is reached.",
"TaskinatorInfoLong": "(Neutrals):\nAs the Taskinator, whenever you finish a task, the task will be bombed. When another player completes the bombed task, the bomb will detonate, and the player will die.\n\nYou win if you survive till the end and Crew doesn't win.\n\n Note: Taskinator bombs ignore all protection.",
"BenefactorInfoLong": "(Crewmates):\nAs the Benefactor, whenever you finish a task, that task will be marked. When another player completes the marked task, they get a temporary shield.\n\n Note: Shield only protects from direct kill attacks.",
- "MedusaInfoLong": "(Neutrals):\nAs the Medusa, you can stone bodies much like cleaning a body.\nStoned bodies cannot be reported.\n\nKill everyone to win.",
+ "MedusaInfoLong": "(Coven):\nAs the Medusa, you can stone bodies much like cleaning a body.\nStoned bodies cannot be reported.\n\nKill everyone to win.",
"SpiritcallerInfoLong": "(Neutrals):\nAs the Spiritcaller, your victims become Evil Spirits after they die. These spirits can help you win by freezing other players briefly or blocking their vision. Alternatively, the spirits can give you a shield that protects you briefly from an attempted kill.",
"AmnesiacInfoLong": "(Neutrals):\nAs the Amnesiac, use your report button to remember a role.\n\nIf the target was an Impostor, you'll become a Refugee.\nIf the target was a crewmate, you'll become the target role if compatible (otherwise you become an Engineer).\nIf the target was a passive neutral or a neutral killer not specified, you'll become the role defined in the settings.\nIf the target was a neutral killer of a select few, you'll become the role they are.",
"ImitatorInfoLong": "(Neutrals):\nAs the Imitator, use your kill button to imitate a player.\n\nYou'll either become a Sheriff, a Refugee, or some Neutral.",
@@ -920,12 +928,13 @@
"RomanticInfoLong": "(Neutrals):\nThe Romantic can pick their lover partner using their kill button (this can be done at any point of the game). Once they've picked their partner, they can use their kill button to give their partner a temporary shield that protects them from attacks. If their lover partner dies, the Romantic's role will change according to the following conditions:\n1. If their partner was an Impostor, the Romantic becomes the Refugee\n2. If their partner was a Neutral Killer, then they become Ruthless Romantic.\n3. If their partner was a Crewmate or a non-killing neutral, the Romantic becomes the Vengeful Romantic. \n\nThe Romantic wins with the winning team if their partner wins.\nNote: If your role changes, your win condition will be changed accordingly",
"RuthlessRomanticInfoLong": "(Neutrals):\nYou change your roles from Romantic if your partner (A neutral killer) is killed. As a Ruthless Romantic, you win if you kill everyone and are the last one standing. If you win, your dead partner will also win with you.",
"VengefulRomanticInfoLong": "(Neutrals):\nYou change your roles from Romantic if your partner (A crew or non-neutral killer) is killed. As a Vengeful Romantic, your goal is to avenge your partner, which means you must kill the killer of your partner. If you succeed, then you and your partner win with the winning team at the end. If you try to kill someone other than your partner's killer, then you will die by misfire.",
- "PoisonerInfoLong": "(Neutrals):\nAs the Poisoner, your kills are delayed.\nKill everyone to win.",
- "HexMasterInfoLong": "(Neutrals):\nAs the Hex Master, you can hex players or kill them.\nHexing a player works the same as spelling as a Witch.",
+ "PoisonerInfoLong": "(Coven):\nAs the Poisoner, your kills are delayed.\nKill everyone to win.",
+ "HexMasterInfoLong": "(Coven):\nAs the Hex Master, you can hex players or kill them.\nHexing a player works the same as spelling as a Witch.",
"WraithInfoLong": "(Neutrals):\nAs the Wraith, you can vent to Vanish temporarily. You will still appear visible on your screen. Vent again to become visible. You win if you are the last player remaining.",
- "JinxInfoLong": "(Neutrals):\nAs the Jinx, whenever you get attacked, you jinx them, resulting in them dying to a jinx.\nThis has limited uses.\n\nKill off everyone to win.",
- "PotionMasterInfoLong": "(Neutrals):\nAs the Potion Master, you have three different potions assigned to three different actions.\n\nSingle click: Reveal role\nDouble click: Kill\nMap: Sabotage\n\nThe reveal potion has a limit.\nWhen you run out, the kill buttons default to killing.",
- "NecromancerInfoLong": "(Neutrals):\nAs the Necromancer, you win when you're the last one standing.\nAdditionally when someone tries to kill you, you will block the kill, and you will teleport to a random vent. You will have a limited time to kill your killer. If you succeed in doing so, you live. If the time runs out before you kill your killer, you die permanently. If you try to kill someone else other than your killer, you will die.",
+ "JinxInfoLong": "(Coven):\nAs the Jinx, whenever you get attacked, you jinx them, resulting in them dying to a jinx.\nThis has limited uses.\n\nKill off everyone to win.",
+ "PotionMasterInfoLong": "(Coven):\nAs the Potion Master, you have three different potions assigned to three different actions.\n\nSingle click: Reveal role\nDouble click: Kill\nMap: Sabotage\n\nThe reveal potion has a limit.\nWhen you run out, the kill buttons default to killing.",
+ "NecromancerInfoLong": "(Coven):\nAs the Necromancer, you win when you're the last one standing.\nAdditionally when someone tries to kill you, you will block the kill, and you will teleport to a random vent. You will have a limited time to kill your killer. If you succeed in doing so, you live. If the time runs out before you kill your killer, you die permanently. If you try to kill someone else other than your killer, you will die.",
+ "CovenLeaderInfoLong": "(Coven): The Coven Leader can use their kill button on a fellow Coven member to retrain them into a random Coven role that isn’t currently in the game. During the next meeting, that Coven member will be notified that the Coven Leader wishes to retrain them. They can vote themselves to accept the retrain, or vote otherwise to deny it. Denying the retrain does not take away an ability usage.
With the Necronomicon, you cannot retrain, and can only kill other players.",
"LastImpostorInfoLong": "(Add-ons):\nThis special effect is given to the last surviving Impostor. It significantly reduces their kill cooldown.",
"OverclockedInfoLong": "(Add-ons):\nAs the Overclocked, your kill cooldown is reduced by a percentage.\n\nThis feature is only assigned to roles with a kill button.",
"LoversInfoLong": "(Add-ons),\nLovers are a combination of two players. The Lovers win when they are the last ones standing, and their victory is shared. When one of the Lovers wins, the other also wins together. Lovers can see the 「♥」 next to each other's name. If one of the Lovers dies, the other will die in love (may not die in love according to the Host's settings). When one of the Lovers is exiled in the meeting, the other will die and become a dead body that cannot be reported.",
@@ -1408,6 +1417,8 @@
"NeutralKillingRolesMaxPlayer": "Maximum amount of Neutral Killers",
"NeutralApocalypseRolesMinPlayer": "Minimum amount of Neutral Apocalypse",
"NeutralApocalypseRolesMaxPlayer": "Maximum amount of Neutral Apocalypse",
+ "CovenRolesMinPlayer": "Minimum amount of Coven",
+ "CovenRolesMaxPlayer": "Maximum amount of Coven",
"TNACanBeGuessed": "Transformed Neutral Apocalypse Roles can be guessed",
"ImpsCanSeeEachOthersRoles": "Impostors know the roles of other Impostors",
"ImpsCanSeeEachOthersAddOns": "Impostors can see each other's Add-ons",
@@ -1844,6 +1855,14 @@
"Troller_YouCausedSabotage": "You caused sabotage",
"Troller_YouFixedSabotage": "You fixed sabotage",
+ "CovenLeaderMaxRetrains": "Max Retrains",
+ "CovenLeaderRetrainCooldown": "Retrain Cooldown",
+ "CovenLeaderAcceptRetrain": "The player you attempted to retrain has accepted your training and is now a [{0}]!",
+ "CovenLeaderDeclineRetrain": "The player you attempted to retrain has declined your offer to retrain them into a [{0}]...",
+ "RetrainNotification": "The Coven Leader has requested to retrain you into a [{0}].
Vote yourself to accept the offer, vote someone else to decline.",
+ "RetrainAcceptOffer": "You have accepted the Coven Leader's retraining and you are now a [{0}]!",
+ "RetrainDeclineOffer": "You declined the Coven Leader's retraining and your role has not been changed...",
+
"LuckyProbability": "Probability of surviving a kill",
"ImpCanBeDoubleShot": "Impostors can have Double Shot",
"CrewCanBeDoubleShot": "Crewmates can have Double Shot",
@@ -2352,6 +2371,7 @@
"TabGroup.ModifierSettings": "Game Modifiers",
"TabGroup.CrewmateRoles": "Crewmate Roles",
"TabGroup.NeutralRoles": "Neutral Roles",
+ "TabGroup.CovenRoles": "Coven Roles",
"TabGroup.ImpostorRoles": "Impostor Roles",
"TabGroup.Addons": "Add-Ons",
"TabMenuDescription_General": "Here you can configure the functions that are in the mod",
@@ -3440,6 +3460,10 @@
"RoleType.NeutralChaos": "★ Neutral Chaos Roles",
"RoleType.NeutralKilling": "★ Neutral Killing Roles",
"RoleType.NeutralApocalypse": "★ Neutral Apocalypse Roles /apocalypseinfo",
+ "RoleType.CovenPower": "★ Coven Power Roles",
+ "RoleType.CovenKilling": "★ Coven Killing Roles",
+ "RoleType.CovenTrickery": "★ Coven Trickery Roles",
+ "RoleType.CovenUtility": "★ Coven Utility Roles",
"RoleType.Harmful": "★ Harmful Add-ons",
"RoleType.Support": "★ Supportive Add-ons",
"RoleType.Helpful": "★ Helpful Add-ons",
diff --git a/Resources/roleColor.json b/Resources/roleColor.json
index bbeb4b157..1663d46e4 100644
--- a/Resources/roleColor.json
+++ b/Resources/roleColor.json
@@ -156,6 +156,7 @@
"Pixie": "#00FF00",
"Imitator": "#B3D94C",
"Doppelganger": "#f6f4a3",
+ "CovenLeader": "#ac42f2",
"GM": "#ff5b70",
"NotAssigned": "#ffffff",
"LastImpostor": "#ff1919",
diff --git a/Roles/Core/AssignManager/RoleAssign.cs b/Roles/Core/AssignManager/RoleAssign.cs
index 395e3d0b3..1035f9b97 100644
--- a/Roles/Core/AssignManager/RoleAssign.cs
+++ b/Roles/Core/AssignManager/RoleAssign.cs
@@ -17,6 +17,7 @@ enum RoleAssignType
NeutralKilling,
NonKillingNeutral,
NeutralApocalypse,
+ Coven,
Crewmate
}
@@ -47,6 +48,15 @@ public static void GetNeutralCounts(int NKmaxOpt, int NKminOpt, int NNKmaxOpt, i
ResultNAnum = rd.Next(NAminOpt, NAmaxOpt + 1);
}
}
+ public static void GetCovenCounts(int CVmaxOpt, int CVminOpt, ref int ResultCVnum)
+ {
+ var rd = IRandom.Instance;
+
+ if (CVmaxOpt > 0 && CVmaxOpt >= CVminOpt)
+ {
+ ResultCVnum = rd.Next(CVminOpt, CVmaxOpt + 1);
+ }
+ }
public static void StartSelect()
{
@@ -68,14 +78,17 @@ public static void StartSelect()
int optNonNeutralKillingNum = 0;
int optNeutralKillingNum = 0;
int optNeutralApocalypseNum = 0;
+ int optCovenNum = 0;
GetNeutralCounts(Options.NeutralKillingRolesMaxPlayer.GetInt(), Options.NeutralKillingRolesMinPlayer.GetInt(), Options.NonNeutralKillingRolesMaxPlayer.GetInt(), Options.NonNeutralKillingRolesMinPlayer.GetInt(), Options.NeutralApocalypseRolesMaxPlayer.GetInt(), Options.NeutralApocalypseRolesMinPlayer.GetInt(), ref optNeutralKillingNum, ref optNonNeutralKillingNum, ref optNeutralApocalypseNum);
+ GetCovenCounts(Options.CovenRolesMaxPlayer.GetInt(), Options.CovenRolesMinPlayer.GetInt(), ref optCovenNum);
int readyRoleNum = 0;
int readyImpNum = 0;
int readyNonNeutralKillingNum = 0;
int readyNeutralKillingNum = 0;
int readyNeutralApocalypseNum = 0;
+ int readyCovenNum = 0;
List FinalRolesList = [];
@@ -85,6 +98,7 @@ public static void StartSelect()
Roles[RoleAssignType.NeutralKilling] = [];
Roles[RoleAssignType.NonKillingNeutral] = [];
Roles[RoleAssignType.NeutralApocalypse] = [];
+ Roles[RoleAssignType.Coven] = [];
Roles[RoleAssignType.Crewmate] = [];
foreach (var id in SetRoles.Keys.Where(id => Utils.GetPlayerById(id) == null).ToArray()) SetRoles.Remove(id);
@@ -129,6 +143,7 @@ public static void StartSelect()
else if (role.IsNK()) Roles[RoleAssignType.NeutralKilling].Add(info);
else if (role.IsNA()) Roles[RoleAssignType.NeutralApocalypse].Add(info);
else if (role.IsNonNK()) Roles[RoleAssignType.NonKillingNeutral].Add(info);
+ else if (role.IsCoven()) Roles[RoleAssignType.Coven].Add(info);
else Roles[RoleAssignType.Crewmate].Add(info);
}
@@ -144,6 +159,7 @@ public static void StartSelect()
Logger.Info(string.Join(", ", Roles[RoleAssignType.NeutralKilling].Select(x => $"{x.Role}: {x.SpawnChance}% - {x.MaxCount}")), "NKRoles");
Logger.Info(string.Join(", ", Roles[RoleAssignType.NeutralApocalypse].Select(x => $"{x.Role}: {x.SpawnChance}% - {x.MaxCount}")), "NARoles");
Logger.Info(string.Join(", ", Roles[RoleAssignType.NonKillingNeutral].Select(x => $"{x.Role}: {x.SpawnChance}% - {x.MaxCount}")), "NonNKRoles");
+ Logger.Info(string.Join(", ", Roles[RoleAssignType.Coven].Select(x => $"{x.Role}: {x.SpawnChance}% - {x.MaxCount}")), "CovenRoles");
Logger.Info(string.Join(", ", Roles[RoleAssignType.Crewmate].Select(x => $"{x.Role}: {x.SpawnChance}% - {x.MaxCount}")), "CrewRoles");
Logger.Msg("=====================================================", "AllActiveRoles");
@@ -151,6 +167,7 @@ public static void StartSelect()
IEnumerable TempAlwaysNKRoles = Roles[RoleAssignType.NeutralKilling].Where(x => x.SpawnChance == 100);
IEnumerable TempAlwaysNARoles = Roles[RoleAssignType.NeutralApocalypse].Where(x => x.SpawnChance == 100);
IEnumerable TempAlwaysNNKRoles = Roles[RoleAssignType.NonKillingNeutral].Where(x => x.SpawnChance == 100);
+ IEnumerable TempAlwaysCovenRoles = Roles[RoleAssignType.Coven].Where(x => x.SpawnChance == 100);
IEnumerable TempAlwaysCrewRoles = Roles[RoleAssignType.Crewmate].Where(x => x.SpawnChance == 100);
// DistinctBy - Removes duplicate roles if there are any
@@ -161,18 +178,21 @@ public static void StartSelect()
Roles[RoleAssignType.NeutralKilling] = Roles[RoleAssignType.NeutralKilling].Shuffle(rd).Take(optNeutralKillingNum).ToList();
Roles[RoleAssignType.NeutralApocalypse] = Roles[RoleAssignType.NeutralApocalypse].Shuffle(rd).Take(optNeutralApocalypseNum).ToList();
Roles[RoleAssignType.NonKillingNeutral] = Roles[RoleAssignType.NonKillingNeutral].Shuffle(rd).Take(optNonNeutralKillingNum).ToList();
+ Roles[RoleAssignType.Coven] = Roles[RoleAssignType.Coven].Shuffle(rd).Take(optCovenNum).ToList();
Roles[RoleAssignType.Crewmate] = Roles[RoleAssignType.Crewmate].Shuffle(rd).Take(playerCount).ToList();
Roles[RoleAssignType.Impostor].AddRange(TempAlwaysImpRoles);
Roles[RoleAssignType.NeutralKilling].AddRange(TempAlwaysNKRoles);
Roles[RoleAssignType.NeutralApocalypse].AddRange(TempAlwaysNARoles);
Roles[RoleAssignType.NonKillingNeutral].AddRange(TempAlwaysNNKRoles);
+ Roles[RoleAssignType.Coven].AddRange(TempAlwaysCovenRoles);
Roles[RoleAssignType.Crewmate].AddRange(TempAlwaysCrewRoles);
Roles[RoleAssignType.Impostor] = Roles[RoleAssignType.Impostor].DistinctBy(x => x.Role).ToList();
Roles[RoleAssignType.NeutralKilling] = Roles[RoleAssignType.NeutralKilling].DistinctBy(x => x.Role).ToList();
Roles[RoleAssignType.NeutralApocalypse] = Roles[RoleAssignType.NeutralApocalypse].DistinctBy(x => x.Role).ToList();
Roles[RoleAssignType.NonKillingNeutral] = Roles[RoleAssignType.NonKillingNeutral].DistinctBy(x => x.Role).ToList();
+ Roles[RoleAssignType.Coven] = Roles[RoleAssignType.Coven].DistinctBy(x => x.Role).ToList();
Roles[RoleAssignType.Crewmate] = Roles[RoleAssignType.Crewmate].DistinctBy(x => x.Role).ToList();
Logger.Msg("======================================================", "SelectedRoles");
@@ -180,6 +200,7 @@ public static void StartSelect()
Logger.Info(string.Join(", ", Roles[RoleAssignType.NeutralKilling].Select(x => x.Role.ToString())), "Selected-NK-Roles");
Logger.Info(string.Join(", ", Roles[RoleAssignType.NeutralApocalypse].Select(x => x.Role.ToString())), "Selected-NA-Roles");
Logger.Info(string.Join(", ", Roles[RoleAssignType.NonKillingNeutral].Select(x => x.Role.ToString())), "Selected-NonNK-Roles");
+ Logger.Info(string.Join(", ", Roles[RoleAssignType.Coven].Select(x => x.Role.ToString())), "Selected-Coven-Roles");
Logger.Info(string.Join(", ", Roles[RoleAssignType.Crewmate].Select(x => x.Role.ToString())), "Selected-Crew-Roles");
Logger.Msg("======================================================", "SelectedRoles");
@@ -222,6 +243,11 @@ public static void StartSelect()
Roles[RoleAssignType.NeutralApocalypse].Where(x => x.Role == item.Value).Do(x => x.AssignedCount++);
readyNeutralApocalypseNum++;
}
+ else if (item.Value.IsCoven())
+ {
+ Roles[RoleAssignType.Coven].Where(x => x.Role == item.Value).Do(x => x.AssignedCount++);
+ readyCovenNum++;
+ }
else if (item.Value.IsNonNK())
{
Roles[RoleAssignType.NonKillingNeutral].Where(x => x.Role == item.Value).Do(x => x.AssignedCount++);
@@ -237,6 +263,7 @@ public static void StartSelect()
RoleAssignInfo[] NNKs = [];
RoleAssignInfo[] NKs = [];
RoleAssignInfo[] NAs = [];
+ RoleAssignInfo[] Covs = [];
RoleAssignInfo[] Crews = [];
// Impostor Roles
@@ -637,7 +664,106 @@ public static void StartSelect()
}
}
}
+ // Coven Roles
+ {
+ {
+ List AlwaysCVRoles = [];
+ List ChanceCVRoles = [];
+ for (int i = 0; i < Roles[RoleAssignType.Coven].Count; i++)
+ {
+ RoleAssignInfo item = Roles[RoleAssignType.Coven][i];
+
+ if (item.SpawnChance == 100)
+ {
+ for (int j = 0; j < item.MaxCount; j++)
+ {
+ // Don't add if Host has assigned this role by using '/up'
+ if (SetRoles.ContainsValue(item.Role))
+ {
+ var playerId = SetRoles.FirstOrDefault(x => x.Value == item.Role).Key;
+ SetRoles.Remove(playerId);
+ continue;
+ }
+
+ AlwaysCVRoles.Add(item.Role);
+ }
+ }
+ else
+ {
+ // Add 'MaxCount' (1) times
+ for (int k = 0; k < item.MaxCount; k++)
+ {
+ // Don't add if Host has assigned this role by using '/up'
+ if (SetRoles.ContainsValue(item.Role))
+ {
+ var playerId = SetRoles.FirstOrDefault(x => x.Value == item.Role).Key;
+ SetRoles.Remove(playerId);
+ continue;
+ }
+ // Make "Spawn Chance ÷ 5 = x" (Example: 65 ÷ 5 = 13)
+ for (int j = 0; j < item.SpawnChance / 5; j++)
+ {
+ // Add coven roles 'x' times (13)
+ ChanceCVRoles.Add(item.Role);
+ }
+ }
+ }
+ }
+
+ RoleAssignInfo[] CVRoleCounts = AlwaysCVRoles.Distinct().Select(GetAssignInfo).ToArray().AddRangeToArray(ChanceCVRoles.Distinct().Select(GetAssignInfo).ToArray());
+ Covs = CVRoleCounts;
+
+ // Assign roles set to 100%
+ if (readyCovenNum < optCovenNum)
+ {
+ while (AlwaysCVRoles.Any() && optCovenNum > 0)
+ {
+ var selected = AlwaysCVRoles[rd.Next(0, AlwaysCVRoles.Count)];
+ var info = CVRoleCounts.FirstOrDefault(x => x.Role == selected);
+ AlwaysCVRoles.Remove(selected);
+ if (info.AssignedCount >= info.MaxCount) continue;
+
+ FinalRolesList.Add(selected);
+ info.AssignedCount++;
+ readyRoleNum++;
+ readyCovenNum++;
+
+ Covs = CVRoleCounts;
+
+ if (readyRoleNum >= playerCount) goto EndOfAssign;
+ if (readyCovenNum >= optCovenNum) break;
+ }
+ }
+
+ // Assign other roles when needed
+ if (readyRoleNum < playerCount && readyCovenNum < optCovenNum)
+ {
+ while (ChanceCVRoles.Any() && optCovenNum > 0)
+ {
+ var selectesItem = rd.Next(0, ChanceCVRoles.Count);
+ var selected = ChanceCVRoles[selectesItem];
+ var info = CVRoleCounts.FirstOrDefault(x => x.Role == selected);
+
+ // Remove 'x' times
+ for (int j = 0; j < info.SpawnChance / 5; j++)
+ ChanceCVRoles.Remove(selected);
+
+ FinalRolesList.Add(selected);
+ info.AssignedCount++;
+ readyRoleNum++;
+ readyCovenNum++;
+
+ Covs = CVRoleCounts;
+
+ if (info.AssignedCount >= info.MaxCount) while (ChanceCVRoles.Contains(selected)) ChanceCVRoles.Remove(selected);
+
+ if (readyRoleNum >= playerCount) goto EndOfAssign;
+ if (readyCovenNum >= optCovenNum) break;
+ }
+ }
+ }
+ }
// Crewmate Roles
{
List AlwaysCrewRoles = [];
@@ -737,6 +863,8 @@ public static void StartSelect()
if (Imps.Any()) Logger.Info(string.Join(", ", Imps.Select(x => $"{x.Role} - {x.AssignedCount}/{x.MaxCount} ({x.SpawnChance}%)")), "ImpRoleResult");
if (NNKs.Any()) Logger.Info(string.Join(", ", NNKs.Select(x => $"{x.Role} - {x.AssignedCount}/{x.MaxCount} ({x.SpawnChance}%)")), "NNKRoleResult");
if (NKs.Any()) Logger.Info(string.Join(", ", NKs.Select(x => $"{x.Role} - {x.AssignedCount}/{x.MaxCount} ({x.SpawnChance}%)")), "NKRoleResult");
+ if (NAs.Any()) Logger.Info(string.Join(", ", NKs.Select(x => $"{x.Role} - {x.AssignedCount}/{x.MaxCount} ({x.SpawnChance}%)")), "NARoleResult");
+ if (Covs.Any()) Logger.Info(string.Join(", ", Covs.Select(x => $"{x.Role} - {x.AssignedCount}/{x.MaxCount} ({x.SpawnChance}%)")), "CovRoleResult");
if (Crews.Any()) Logger.Info(string.Join(", ", Crews.Select(x => $"{x.Role} - {x.AssignedCount}/{x.MaxCount} ({x.SpawnChance}%)")), "CrewRoleResult");
if (Sunnyboy.CheckSpawn() && FinalRolesList.Remove(CustomRoles.Jester)) FinalRolesList.Add(CustomRoles.Sunnyboy);
diff --git a/Roles/Coven/CovenLeader.cs b/Roles/Coven/CovenLeader.cs
new file mode 100644
index 000000000..86d86b6f7
--- /dev/null
+++ b/Roles/Coven/CovenLeader.cs
@@ -0,0 +1,81 @@
+using AmongUs.GameOptions;
+using Hazel;
+using System.Diagnostics.Metrics;
+using System.Text;
+using TOHE.Roles.Core;
+using TOHE.Roles.Crewmate;
+using TOHE.Roles.Double;
+using TOHE.Roles.Neutral;
+using static TOHE.Options;
+using static TOHE.Translator;
+using static TOHE.Utils;
+
+namespace TOHE.Roles.Coven;
+
+internal class CovenLeader : CovenManager
+{
+ //===========================SETUP================================\\
+ private const int Id = 29800;
+ public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.CovenLeader);
+ public override bool IsDesyncRole => true;
+ public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenPower;
+ //==================================================================\\
+
+ private static OptionItem RetrainCooldown;
+ public static OptionItem MaxRetrains;
+
+ public static readonly Dictionary retrainPlayer = [];
+
+ public override void SetupCustomOption()
+ {
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.CovenLeader, 1, zeroOne: false);
+ MaxRetrains = IntegerOptionItem.Create(Id + 10, "CovenLeaderMaxRetrains", new(1, 15, 1), 2, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.CovenLeader])
+ .SetValueFormat(OptionFormat.Times);
+ RetrainCooldown = FloatOptionItem.Create(Id + 11, "CovenLeaderRetrainCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.CovenLeader])
+ .SetValueFormat(OptionFormat.Seconds);
+ }
+ public override void Init()
+ {
+ retrainPlayer.Clear();
+ }
+ public override void Add(byte playerId)
+ {
+ AbilityLimit = MaxRetrains.GetInt();
+ }
+
+ public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
+ {
+ if (killer == null || target == null) return false;
+ if (HasNecronomicon(killer)) return true;
+ if (killer.IsPlayerCoven() && !target.IsPlayerCoven()) return false;
+ var roleList = CustomRolesHelper.AllRoles.Where(role => (role.IsCoven() && (role.IsEnable() && !role.RoleExist(countDead: true)))).ToList();
+ retrainPlayer[target.PlayerId] = roleList.RandomElement();
+ foreach (byte cov in retrainPlayer.Keys)
+ {
+ GetPlayerById(cov).SendMessage(string.Format(GetString("RetrainAcceptOffer"), retrainPlayer[cov].ToColoredString()));
+ }
+ return false;
+ }
+ public override bool CheckVote(PlayerControl voter, PlayerControl target)
+ {
+ PlayerControl CL = CustomRoles.CovenLeader.GetPlayerListByRole().First();
+ if ((voter == target) && retrainPlayer[voter.PlayerId].IsCoven())
+ {
+ voter.RpcSetCustomRole(retrainPlayer[voter.PlayerId]);
+ CL.SendMessage(string.Format(GetString("CovenLeaderAcceptRetrain"), retrainPlayer[voter.PlayerId].ToColoredString()));
+ voter.SendMessage(string.Format(GetString("RetrainAcceptOffer"), retrainPlayer[voter.PlayerId].ToColoredString()));
+ retrainPlayer[voter.PlayerId] = CustomRoles.Crewmate;
+ AbilityLimit--;
+ return true;
+ }
+ if ((voter != target) && retrainPlayer[voter.PlayerId].IsCoven())
+ {
+ CL.SendMessage(string.Format(GetString("CovenLeaderDeclineRetrain"), retrainPlayer[voter.PlayerId].ToColoredString()));
+ voter.SendMessage(GetString("RetrainDeclineOffer"));
+ retrainPlayer[voter.PlayerId] = CustomRoles.Crewmate;
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/Roles/Coven/CovenManager.cs b/Roles/Coven/CovenManager.cs
new file mode 100644
index 000000000..7023599e8
--- /dev/null
+++ b/Roles/Coven/CovenManager.cs
@@ -0,0 +1,29 @@
+using TOHE.Roles.Crewmate;
+using TOHE.Roles.Double;
+using TOHE.Roles.Neutral;
+using static TOHE.Options;
+using static UnityEngine.GraphicsBuffer;
+
+namespace TOHE;
+public abstract class CovenManager : RoleBase
+{
+ public static PlayerControl necroHolder;
+
+ private static
+ public override void SetupCustomOption()
+ {
+ base.SetupCustomOption();
+ }
+ public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
+ public override bool OthersKnowTargetRoleColor(PlayerControl seer, PlayerControl target) => KnowRoleTarget(seer, target);
+ public static void GiveNecronomicon()
+ {
+ var pcList = Main.AllAlivePlayerControls.Where(pc => pc.IsPlayerCoven() && pc.IsAlive()).ToList();
+ if (pcList.Any())
+ {
+ PlayerControl rp = pcList.RandomElement();
+ necroHolder = rp;
+ }
+ }
+ public static bool HasNecronomicon(PlayerControl pc) => necroHolder == pc;
+}
diff --git a/Roles/Neutral/HexMaster.cs b/Roles/Coven/HexMaster.cs
similarity index 94%
rename from Roles/Neutral/HexMaster.cs
rename to Roles/Coven/HexMaster.cs
index ed105bb1c..4676e153d 100644
--- a/Roles/Neutral/HexMaster.cs
+++ b/Roles/Coven/HexMaster.cs
@@ -7,9 +7,9 @@
using static TOHE.Translator;
-namespace TOHE.Roles.Neutral;
+namespace TOHE.Roles.Coven;
-internal class HexMaster : RoleBase
+internal class HexMaster : CovenManager
{
//===========================SETUP================================\\
private const int Id = 16400;
@@ -17,7 +17,7 @@ internal class HexMaster : RoleBase
public static bool HasEnabled => playerIdList.Any();
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
- public override Custom_RoleType ThisRoleType => Custom_RoleType.NeutralKilling;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenPower;
//==================================================================\\
private static OptionItem ModeSwitchAction;
@@ -40,10 +40,10 @@ private enum SwitchTriggerList
public override void SetupCustomOption()
{
- SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.HexMaster, 1, zeroOne: false);
- ModeSwitchAction = StringOptionItem.Create(Id + 10, GeneralOption.ModeSwitchAction, EnumHelper.GetAllNames(), 2, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
- HexesLookLikeSpells = BooleanOptionItem.Create(Id + 11, "HexesLookLikeSpells", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 12, GeneralOption.ImpostorVision, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.HexMaster, 1, zeroOne: false);
+ ModeSwitchAction = StringOptionItem.Create(Id + 10, GeneralOption.ModeSwitchAction, EnumHelper.GetAllNames(), 2, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
+ HexesLookLikeSpells = BooleanOptionItem.Create(Id + 11, "HexesLookLikeSpells", false, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
+ HasImpostorVision = BooleanOptionItem.Create(Id + 12, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
}
public override void Init()
{
@@ -107,6 +107,7 @@ public static void ReceiveRPC(MessageReader reader, bool doHex)
public override bool CanUseKillButton(PlayerControl pc) => true;
public override bool CanUseImpostorVentButton(PlayerControl pc) => true;
+
private static bool IsHexMode(byte playerId)
{
return HexMode.ContainsKey(playerId) && HexMode[playerId];
diff --git a/Roles/Neutral/Jinx.cs b/Roles/Coven/Jinx.cs
similarity index 80%
rename from Roles/Neutral/Jinx.cs
rename to Roles/Coven/Jinx.cs
index 2696e6827..e65fe1602 100644
--- a/Roles/Neutral/Jinx.cs
+++ b/Roles/Coven/Jinx.cs
@@ -3,16 +3,16 @@
using static TOHE.Options;
using TOHE.Roles.Core;
-namespace TOHE.Roles.Neutral;
+namespace TOHE.Roles.Coven;
-internal class Jinx : RoleBase
+internal class Jinx : CovenManager
{
//===========================SETUP================================\\
private const int Id = 16800;
public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.Jinx);
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
- public override Custom_RoleType ThisRoleType => Custom_RoleType.NeutralKilling;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenKilling;
//==================================================================\\
private static OptionItem KillCooldown;
@@ -23,15 +23,15 @@ internal class Jinx : RoleBase
public override void SetupCustomOption()
{
- SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Jinx, 1, zeroOne: false);
- KillCooldown = FloatOptionItem.Create(Id + 10, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx])
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Jinx, 1, zeroOne: false);
+ KillCooldown = FloatOptionItem.Create(Id + 10, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx])
.SetValueFormat(OptionFormat.Seconds);
- CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
- JinxSpellTimes = IntegerOptionItem.Create(Id + 14, "JinxSpellTimes", new(1, 15, 1), 3, TabGroup.NeutralRoles, false)
+ CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
+ HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
+ JinxSpellTimes = IntegerOptionItem.Create(Id + 14, "JinxSpellTimes", new(1, 15, 1), 3, TabGroup.CovenRoles, false)
.SetParent(CustomRoleSpawnChances[CustomRoles.Jinx])
.SetValueFormat(OptionFormat.Times);
- killAttacker = BooleanOptionItem.Create(Id + 15, GeneralOption.KillAttackerWhenAbilityRemaining, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
+ killAttacker = BooleanOptionItem.Create(Id + 15, GeneralOption.KillAttackerWhenAbilityRemaining, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
}
public override void Add(byte playerId)
@@ -65,6 +65,7 @@ public override bool OnCheckMurderAsTarget(PlayerControl killer, PlayerControl t
public override bool CanUseKillButton(PlayerControl pc) => true;
public override bool CanUseImpostorVentButton(PlayerControl player) => CanVent.GetBool();
+
public override string GetProgressText(byte playerId, bool comms)
=> Utils.ColorString(CanJinx(playerId) ? Utils.GetRoleColor(CustomRoles.Gangster).ShadeColor(0.25f) : Color.gray, $"({AbilityLimit})");
diff --git a/Roles/Neutral/Medusa.cs b/Roles/Coven/Medusa.cs
similarity index 80%
rename from Roles/Neutral/Medusa.cs
rename to Roles/Coven/Medusa.cs
index 2770da576..61fb47a7a 100644
--- a/Roles/Neutral/Medusa.cs
+++ b/Roles/Coven/Medusa.cs
@@ -2,9 +2,9 @@
using static TOHE.Translator;
using static TOHE.Options;
-namespace TOHE.Roles.Neutral;
+namespace TOHE.Roles.Coven;
-internal class Medusa : RoleBase
+internal class Medusa : CovenManager
{
//===========================SETUP================================\\
private const int Id = 17000;
@@ -12,7 +12,7 @@ internal class Medusa : RoleBase
public static bool HasEnabled => playerIdList.Any();
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
- public override Custom_RoleType ThisRoleType => Custom_RoleType.NeutralKilling;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenUtility;
//==================================================================\\
private static OptionItem KillCooldown;
@@ -22,13 +22,13 @@ internal class Medusa : RoleBase
public override void SetupCustomOption()
{
- SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Medusa, 1, zeroOne: false);
- KillCooldown = FloatOptionItem.Create(Id + 12, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Medusa, 1, zeroOne: false);
+ KillCooldown = FloatOptionItem.Create(Id + 12, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
.SetValueFormat(OptionFormat.Seconds);
- KillCooldownAfterStoneGazing = FloatOptionItem.Create(Id + 15, "KillCooldownAfterStoneGazing", new(0f, 180f, 2.5f), 40f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
+ KillCooldownAfterStoneGazing = FloatOptionItem.Create(Id + 15, "KillCooldownAfterStoneGazing", new(0f, 180f, 2.5f), 40f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
.SetValueFormat(OptionFormat.Seconds);
- CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
+ CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
+ HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
}
public override void Init()
{
@@ -43,6 +43,7 @@ public override void Add(byte playerId)
public override bool CanUseKillButton(PlayerControl pc) => true;
public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
+
public override bool OnCheckReportDeadBody(PlayerControl reporter, NetworkedPlayerInfo target, PlayerControl killer)
{
if (reporter.Is(CustomRoles.Medusa))
diff --git a/Roles/Neutral/Necromancer.cs b/Roles/Coven/Necromancer.cs
similarity index 84%
rename from Roles/Neutral/Necromancer.cs
rename to Roles/Coven/Necromancer.cs
index 9cd89ea42..d105d7af0 100644
--- a/Roles/Neutral/Necromancer.cs
+++ b/Roles/Coven/Necromancer.cs
@@ -2,9 +2,9 @@
using static TOHE.Options;
using static TOHE.Translator;
-namespace TOHE.Roles.Neutral;
+namespace TOHE.Roles.Coven;
-internal class Necromancer : RoleBase
+internal class Necromancer : CovenManager
{
//===========================SETUP================================\\
private const int Id = 17100;
@@ -12,7 +12,7 @@ internal class Necromancer : RoleBase
public static bool HasEnabled => playerIdList.Any();
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
- public override Custom_RoleType ThisRoleType => Custom_RoleType.NeutralKilling;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenUtility;
//==================================================================\\
private static OptionItem KillCooldown;
@@ -28,13 +28,13 @@ internal class Necromancer : RoleBase
public override void SetupCustomOption()
{
- SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Necromancer, 1, zeroOne: false);
- KillCooldown = FloatOptionItem.Create(Id + 10, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer])
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Necromancer, 1, zeroOne: false);
+ KillCooldown = FloatOptionItem.Create(Id + 10, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer])
.SetValueFormat(OptionFormat.Seconds);
- RevengeTime = IntegerOptionItem.Create(Id + 11, "NecromancerRevengeTime", new(0, 60, 1), 30, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer])
+ RevengeTime = IntegerOptionItem.Create(Id + 11, "NecromancerRevengeTime", new(0, 60, 1), 30, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer])
.SetValueFormat(OptionFormat.Seconds);
- CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]);
+ CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]);
+ HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]);
}
public override void Init()
{
@@ -53,7 +53,8 @@ public override void Add(byte playerId)
public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = KillCooldown.GetFloat();
public override bool CanUseKillButton(PlayerControl pc) => true;
public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
-
+ public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
+
public override bool OnCheckMurderAsTarget(PlayerControl killer, PlayerControl target)
{
if (IsRevenge) return true;
diff --git a/Roles/Neutral/Poisoner.cs b/Roles/Coven/Poisoner.cs
similarity index 87%
rename from Roles/Neutral/Poisoner.cs
rename to Roles/Coven/Poisoner.cs
index 8be8e2c5c..13c6ae441 100644
--- a/Roles/Neutral/Poisoner.cs
+++ b/Roles/Coven/Poisoner.cs
@@ -3,9 +3,9 @@
using TOHE.Roles.AddOns.Common;
using static TOHE.Translator;
-namespace TOHE.Roles.Neutral;
+namespace TOHE.Roles.Coven;
-internal class Poisoner : RoleBase
+internal class Poisoner : CovenManager
{
private class PoisonedInfo(byte poisonerId, float killTimer)
{
@@ -19,7 +19,7 @@ private class PoisonedInfo(byte poisonerId, float killTimer)
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
- public override Custom_RoleType ThisRoleType => Custom_RoleType.NeutralKilling;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenTrickery;
//==================================================================\\
private static OptionItem OptionKillDelay;
@@ -33,13 +33,13 @@ private class PoisonedInfo(byte poisonerId, float killTimer)
public override void SetupCustomOption()
{
- Options.SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Poisoner, 1, zeroOne: false);
- KillCooldown = FloatOptionItem.Create(Id + 10, "PoisonCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner])
+ Options.SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Poisoner, 1, zeroOne: false);
+ KillCooldown = FloatOptionItem.Create(Id + 10, "PoisonCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner])
.SetValueFormat(OptionFormat.Seconds);
- OptionKillDelay = FloatOptionItem.Create(Id + 11, "PoisonerKillDelay", new(1f, 60f, 1f), 10f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner])
+ OptionKillDelay = FloatOptionItem.Create(Id + 11, "PoisonerKillDelay", new(1f, 60f, 1f), 10f, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner])
.SetValueFormat(OptionFormat.Seconds);
- CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]);
+ CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]);
+ HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]);
}
public override void Init()
@@ -58,6 +58,7 @@ public override void Add(byte playerId)
public override bool CanUseKillButton(PlayerControl pc) => true;
public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
+
public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
{
if (target.Is(CustomRoles.Bait)) return true;
diff --git a/Roles/Neutral/PotionMaster.cs b/Roles/Coven/PotionMaster.cs
similarity index 86%
rename from Roles/Neutral/PotionMaster.cs
rename to Roles/Coven/PotionMaster.cs
index db55f619a..122b731f2 100644
--- a/Roles/Neutral/PotionMaster.cs
+++ b/Roles/Coven/PotionMaster.cs
@@ -5,16 +5,16 @@
using UnityEngine;
using static TOHE.Options;
-namespace TOHE.Roles.Neutral;
+namespace TOHE.Roles.Coven;
-internal class PotionMaster : RoleBase
+internal class PotionMaster : CovenManager
{
//===========================SETUP================================\\
private const int Id = 17700;
public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.PotionMaster);
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
- public override Custom_RoleType ThisRoleType => Custom_RoleType.NeutralKilling;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenUtility;
//==================================================================\\
private static OptionItem KillCooldown;
@@ -26,13 +26,13 @@ internal class PotionMaster : RoleBase
public override void SetupCustomOption()
{
- SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.PotionMaster, 1, zeroOne: false);
- KillCooldown = FloatOptionItem.Create(Id + 14, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster])
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.PotionMaster, 1, zeroOne: false);
+ KillCooldown = FloatOptionItem.Create(Id + 14, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster])
.SetValueFormat(OptionFormat.Seconds);
- RitualMaxCount = IntegerOptionItem.Create(Id + 11, "RitualMaxCount", new(1, 15, 1), 5, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster])
+ RitualMaxCount = IntegerOptionItem.Create(Id + 11, "RitualMaxCount", new(1, 15, 1), 5, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster])
.SetValueFormat(OptionFormat.Times);
- CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster]);
+ CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster]);
+ HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster]);
}
public override void Init()
{
@@ -70,6 +70,7 @@ public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
public override bool CanUseSabotage(PlayerControl pc) => true;
+
public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
{
if (AbilityLimit > 0)
diff --git a/main.cs b/main.cs
index 2510b14d0..536ace846 100644
--- a/main.cs
+++ b/main.cs
@@ -797,19 +797,15 @@ public enum CustomRoles
Glitch,
God,
Hater,
- HexMaster,
Huntsman,
Imitator,
Infectious,
Innocent,
Jackal,
Jester,
- Jinx,
Juggernaut,
Lawyer,
Maverick,
- Medusa,
- Necromancer,
Opportunist,
Pelican,
Pestilence,
@@ -818,8 +814,6 @@ public enum CustomRoles
Pixie,
PlagueBearer,
PlagueDoctor,
- Poisoner,
- PotionMaster,
Provocateur,
PunchingBag,
Pursuer,
@@ -853,6 +847,24 @@ public enum CustomRoles
Workaholic,
Wraith,
+ //Coven
+ Conjurer,
+ CovenLeader,
+ Dreamweaver,
+ HexMaster,
+ Illusionist,
+ Jinx,
+ Medusa,
+ MoonDancer,
+ Necromancer,
+ Poisoner,
+ PotionMaster,
+ Ritualist,
+ Sacrifist,
+ Spellcaster,
+ Sorceress,
+ VoodooMaster,
+
//two-way camp
Mini,
From 9b54799de9576c8c282f4208a5f7a0caf2d5f822 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:02:55 -0400
Subject: [PATCH 002/101] more stuff cl should be finished now, rpcs unsure
---
Modules/OptionHolder.cs | 17 ++++++
Patches/MeetingHudPatch.cs | 20 +++++++
Resources/Lang/en_US.json | 26 ++++++---
Roles/Coven/CovenLeader.cs | 55 +++++++++++-------
Roles/Coven/CovenManager.cs | 111 ++++++++++++++++++++++++++++++++++--
Roles/Coven/HexMaster.cs | 8 +--
Roles/Coven/Jinx.cs | 12 ++--
Roles/Coven/Medusa.cs | 12 ++--
Roles/Coven/Poisoner.cs | 12 ++--
Roles/Coven/PotionMaster.cs | 14 ++---
10 files changed, 224 insertions(+), 63 deletions(-)
diff --git a/Modules/OptionHolder.cs b/Modules/OptionHolder.cs
index 3c931268b..c2b917a4b 100644
--- a/Modules/OptionHolder.cs
+++ b/Modules/OptionHolder.cs
@@ -507,6 +507,10 @@ private enum RatesZeroOne
// Coven
public static OptionItem CovenRolesMinPlayer;
public static OptionItem CovenRolesMaxPlayer;
+ public static OptionItem CovenHasImpVis;
+ public static OptionItem CovenImpVisMode;
+ public static OptionItem CovenCanVent;
+ public static OptionItem CovenVentMode;
// Add-on
public static OptionItem NameDisplayAddons;
@@ -718,6 +722,19 @@ private static System.Collections.IEnumerator CoLoadOptions()
CovenRolesMaxPlayer = IntegerOptionItem.Create(60026, "CovenRolesMaxPlayer", new(0, 15, 1), 0, TabGroup.CovenRoles, false)
.SetGameMode(CustomGameMode.Standard)
.SetValueFormat(OptionFormat.Players);
+ CovenHasImpVis = BooleanOptionItem.Create(60027, "CovenHasImpVis", true, TabGroup.CovenRoles, false)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetHeader(true);
+ CovenImpVisMode = StringOptionItem.Create(60028, "CovenImpVisMode", EnumHelper.GetAllNames(), 0, TabGroup.CovenRoles, false)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetParent(CovenHasImpVis);
+ CovenManager.RunSetUpImpVisOptions(160032);
+ CovenCanVent = BooleanOptionItem.Create(60029, "CovenCanVent", true, TabGroup.CovenRoles, false)
+ .SetGameMode(CustomGameMode.Standard);
+ CovenVentMode = StringOptionItem.Create(60030, "CovenVentMode", EnumHelper.GetAllNames(), 0, TabGroup.CovenRoles, false)
+ .SetGameMode(CustomGameMode.Standard)
+ .SetParent(CovenCanVent);
+ CovenManager.RunSetUpVentOptions(260032);
NameDisplayAddons = BooleanOptionItem.Create(60019, "NameDisplayAddons", true, TabGroup.Addons, false)
.SetGameMode(CustomGameMode.Standard)
diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs
index 21d58381a..5c65be7f8 100644
--- a/Patches/MeetingHudPatch.cs
+++ b/Patches/MeetingHudPatch.cs
@@ -681,6 +681,26 @@ public static bool Prefix(MeetingHud __instance, byte srcPlayerId, byte suspectP
}
}
+ // Coven Leader Retraining
+ if (target == voter && CovenLeader.retrainPlayer[voter.PlayerId].IsCoven())
+ {
+ PlayerControl CL = CustomRoles.CovenLeader.GetPlayerListByRole().First();
+ voter.RpcSetCustomRole(CovenLeader.retrainPlayer[voter.PlayerId]);
+ 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);
+ CovenLeader.retrainPlayer.Clear();
+ CustomRoles.CovenLeader.GetStaticRoleClass().AbilityLimit--;
+ __instance.RpcClearVoteDelay(voter.GetClientId());
+ }
+ else if (target != voter && CovenLeader.retrainPlayer[voter.PlayerId].IsCoven())
+ {
+ PlayerControl CL = CustomRoles.CovenLeader.GetPlayerListByRole().First();
+ SendMessage(string.Format(GetString("CovenLeaderDeclineRetrain"), CovenLeader.retrainPlayer[voter.PlayerId].ToColoredString()), CL.PlayerId);
+ SendMessage(string.Format(GetString("RetrainDeclineOffer"), CustomRoles.CovenLeader.ToColoredString()), voter.PlayerId);
+ CovenLeader.retrainPlayer.Clear();
+ __instance.RpcClearVoteDelay(voter.GetClientId());
+ }
+
if (target != null && suspectPlayerId < 253)
{
if (!target.IsAlive() || target.Data.Disconnected)
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index e52e9d571..2776dafd0 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -1417,8 +1417,6 @@
"NeutralKillingRolesMaxPlayer": "Maximum amount of Neutral Killers",
"NeutralApocalypseRolesMinPlayer": "Minimum amount of Neutral Apocalypse",
"NeutralApocalypseRolesMaxPlayer": "Maximum amount of Neutral Apocalypse",
- "CovenRolesMinPlayer": "Minimum amount of Coven",
- "CovenRolesMaxPlayer": "Maximum amount of Coven",
"TNACanBeGuessed": "Transformed Neutral Apocalypse Roles can be guessed",
"ImpsCanSeeEachOthersRoles": "Impostors know the roles of other Impostors",
"ImpsCanSeeEachOthersAddOns": "Impostors can see each other's Add-ons",
@@ -1855,13 +1853,27 @@
"Troller_YouCausedSabotage": "You caused sabotage",
"Troller_YouFixedSabotage": "You fixed sabotage",
+ "CovenRolesMinPlayer": "Minimum amount of Coven",
+ "CovenRolesMaxPlayer": "Maximum amount of Coven",
+ "%role%CanVent": "%role% Can Vent",
+ "%role%HasImpVis": "%role% Has Impostor Vision",
+ "CovenHasImpVis": "Coven Members have Impostor Vision",
+ "CovenImpVisMode": "Impostor Vision Configuration",
+ "CovenCanVent": "Coven Members Can Vent",
+ "CovenVentMode": "Vent Configuration",
+ "CovenPerRole": "Per Role",
+ "NecronomiconNotification": "You have recieved the Necronomicon!
Your powers are now enhanced!",
+
"CovenLeaderMaxRetrains": "Max Retrains",
"CovenLeaderRetrainCooldown": "Retrain Cooldown",
- "CovenLeaderAcceptRetrain": "The player you attempted to retrain has accepted your training and is now a [{0}]!",
- "CovenLeaderDeclineRetrain": "The player you attempted to retrain has declined your offer to retrain them into a [{0}]...",
- "RetrainNotification": "The Coven Leader has requested to retrain you into a [{0}].
Vote yourself to accept the offer, vote someone else to decline.",
- "RetrainAcceptOffer": "You have accepted the Coven Leader's retraining and you are now a [{0}]!",
- "RetrainDeclineOffer": "You declined the Coven Leader's retraining and your role has not been changed...",
+ "CovenLeaderRetrain": "Retrain offered",
+ "CovenLeaderNoRetrain": "You have ran out of Retrains!",
+ "CovenLeaderRetrainNonCoven": "You can't retrain a non-Coven!",
+ "CovenLeaderAcceptRetrain": "The player you attempted to retrain has accepted your training and is now a {0}!",
+ "CovenLeaderDeclineRetrain": "The player you attempted to retrain has declined your offer to retrain them into a {0}...",
+ "RetrainNotification": "The {0} has requested to retrain you into a {1}.
Vote yourself to accept the offer, vote someone else to decline.",
+ "RetrainAcceptOffer": "You have accepted the {0}'s retraining and you are now a {1}!",
+ "RetrainDeclineOffer": "You declined the {0}'s retraining and your role has not been changed...",
"LuckyProbability": "Probability of surviving a kill",
"ImpCanBeDoubleShot": "Impostors can have Double Shot",
diff --git a/Roles/Coven/CovenLeader.cs b/Roles/Coven/CovenLeader.cs
index 86d86b6f7..8ef8c8b11 100644
--- a/Roles/Coven/CovenLeader.cs
+++ b/Roles/Coven/CovenLeader.cs
@@ -1,11 +1,13 @@
using AmongUs.GameOptions;
using Hazel;
+using InnerNet;
using System.Diagnostics.Metrics;
using System.Text;
using TOHE.Roles.Core;
using TOHE.Roles.Crewmate;
using TOHE.Roles.Double;
using TOHE.Roles.Neutral;
+using UnityEngine;
using static TOHE.Options;
using static TOHE.Translator;
using static TOHE.Utils;
@@ -44,38 +46,47 @@ public override void Add(byte playerId)
AbilityLimit = MaxRetrains.GetInt();
}
+ private void SendRPC(byte playerId, byte targetId)
+ {
+ MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SyncRoleSkill, SendOption.Reliable, -1);
+ writer.WriteNetObject(_Player);
+ writer.Write(playerId);
+ writer.Write(AbilityLimit);
+ writer.Write(targetId);
+ AmongUsClient.Instance.FinishRpcImmediately(writer);
+ }
+ public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
+ {
+ byte playerId = reader.ReadByte();
+ AbilityLimit = reader.ReadSingle();
+ }
+ public override bool CanUseKillButton(PlayerControl pc) => pc.IsAlive();
+ public override string GetProgressText(byte playerId, bool comms)
+ => ColorString(AbilityLimit >= 1 ? GetRoleColor(CustomRoles.CovenLeader).ShadeColor(0.25f) : Color.gray, $"({AbilityLimit})");
+ public override void SetKillCooldown(byte id) => RetrainCooldown.GetFloat();
public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
{
if (killer == null || target == null) return false;
if (HasNecronomicon(killer)) return true;
- if (killer.IsPlayerCoven() && !target.IsPlayerCoven()) return false;
- var roleList = CustomRolesHelper.AllRoles.Where(role => (role.IsCoven() && (role.IsEnable() && !role.RoleExist(countDead: true)))).ToList();
- retrainPlayer[target.PlayerId] = roleList.RandomElement();
- foreach (byte cov in retrainPlayer.Keys)
+ if (AbilityLimit <= 0)
{
- GetPlayerById(cov).SendMessage(string.Format(GetString("RetrainAcceptOffer"), retrainPlayer[cov].ToColoredString()));
+ killer.Notify(GetString("CovenLeaderNoRetrain"));
+ return false;
}
- return false;
- }
- public override bool CheckVote(PlayerControl voter, PlayerControl target)
- {
- PlayerControl CL = CustomRoles.CovenLeader.GetPlayerListByRole().First();
- if ((voter == target) && retrainPlayer[voter.PlayerId].IsCoven())
+ if (killer.IsPlayerCoven() && !target.IsPlayerCoven())
{
- voter.RpcSetCustomRole(retrainPlayer[voter.PlayerId]);
- CL.SendMessage(string.Format(GetString("CovenLeaderAcceptRetrain"), retrainPlayer[voter.PlayerId].ToColoredString()));
- voter.SendMessage(string.Format(GetString("RetrainAcceptOffer"), retrainPlayer[voter.PlayerId].ToColoredString()));
- retrainPlayer[voter.PlayerId] = CustomRoles.Crewmate;
- AbilityLimit--;
- return true;
+ killer.Notify(GetString("CovenLeaderRetrainNonCoven"));
+ return false;
}
- if ((voter != target) && retrainPlayer[voter.PlayerId].IsCoven())
+ var roleList = CustomRolesHelper.AllRoles.Where(role => (role.IsCoven() && (role.IsEnable() && !role.RoleExist(countDead: true)))).ToList();
+ retrainPlayer[target.PlayerId] = roleList.RandomElement();
+ foreach (byte cov in retrainPlayer.Keys)
{
- CL.SendMessage(string.Format(GetString("CovenLeaderDeclineRetrain"), retrainPlayer[voter.PlayerId].ToColoredString()));
- voter.SendMessage(GetString("RetrainDeclineOffer"));
- retrainPlayer[voter.PlayerId] = CustomRoles.Crewmate;
- return true;
+ SendMessage(string.Format(GetString("RetrainNotification"), CustomRoles.CovenLeader.ToColoredString(), retrainPlayer[cov].ToColoredString()), cov);
}
+ killer.Notify(GetString("CovenLeaderRetrain"));
+ killer.ResetKillCooldown();
return false;
}
+
}
diff --git a/Roles/Coven/CovenManager.cs b/Roles/Coven/CovenManager.cs
index 7023599e8..3df9a2310 100644
--- a/Roles/Coven/CovenManager.cs
+++ b/Roles/Coven/CovenManager.cs
@@ -1,7 +1,12 @@
-using TOHE.Roles.Crewmate;
+using AmongUs.GameOptions;
+using Hazel;
+using TOHE.Roles.Crewmate;
using TOHE.Roles.Double;
using TOHE.Roles.Neutral;
+using InnerNet;
using static TOHE.Options;
+using static TOHE.Translator;
+using static TOHE.Utils;
using static UnityEngine.GraphicsBuffer;
namespace TOHE;
@@ -9,10 +14,94 @@ public abstract class CovenManager : RoleBase
{
public static PlayerControl necroHolder;
- private static
- public override void SetupCustomOption()
+ public enum VisOptionList
{
- base.SetupCustomOption();
+ On,
+ CovenPerRole
+ }
+ public enum VentOptionList
+ {
+ On,
+ CovenPerRole
+ }
+
+ private static readonly Dictionary CovenImpVisOptions = [];
+ private static readonly Dictionary CovenVentOptions = [];
+ public static void RunSetUpImpVisOptions(int Id)
+ {
+ foreach (var cov in CustomRolesHelper.AllRoles.Where(x => x.IsCoven()).ToArray())
+ {
+ SetUpImpVisOption(cov, Id, true, CovenImpVisMode);
+ Id++;
+ }
+ }
+ public static void RunSetUpVentOptions(int Id)
+ {
+ foreach (var cov in CustomRolesHelper.AllRoles.Where(x => x.IsCoven() && (x is not CustomRoles.Medusa or CustomRoles.PotionMaster /* or CustomRoles.Sacrifist */)).ToArray())
+ {
+ SetUpVentOption(cov, Id, true, CovenVentMode);
+ Id++;
+ }
+ }
+ private static void SetUpImpVisOption(CustomRoles role, int Id, bool defaultValue = true, OptionItem parent = null)
+ {
+ var roleName = GetRoleName(role);
+ Dictionary replacementDic = new() { { "%role%", ColorString(GetRoleColor(role), roleName) } };
+ CovenImpVisOptions[role] = BooleanOptionItem.Create(Id, "%role%HasImpVis", defaultValue, TabGroup.CovenRoles, false).SetParent(CovenImpVisMode);
+ CovenImpVisOptions[role].ReplacementDictionary = replacementDic;
+ }
+ private static void SetUpVentOption(CustomRoles role, int Id, bool defaultValue = true, OptionItem parent = null)
+ {
+ var roleName = GetRoleName(role);
+ Dictionary replacementDic = new() { { "%role%", ColorString(GetRoleColor(role), roleName) } };
+ CovenVentOptions[role] = BooleanOptionItem.Create(Id, "%role%CanVent", defaultValue, TabGroup.CovenRoles, false).SetParent(CovenVentMode);
+ CovenVentOptions[role].ReplacementDictionary = replacementDic;
+ }
+ public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false)
+ => HasNecronomicon(seen) ? ColorString(GetRoleColor(CustomRoles.CovenLeader), "♣") : string.Empty;
+ public override string GetMarkOthers(PlayerControl seer, PlayerControl target, bool isForMeeting = false)
+ {
+ if (!(seer == target) && HasNecronomicon(target) && seer.IsPlayerCoven() && !HasNecronomicon(seer))
+ {
+ return ColorString(GetRoleColor(CustomRoles.CovenLeader), "♣");
+ }
+ return string.Empty;
+ }
+ private void SendRPC(byte playerId)
+ {
+ MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SyncRoleSkill, SendOption.Reliable, -1);
+ writer.WriteNetObject(_Player);
+ writer.Write(necroHolder.PlayerId);
+ AmongUsClient.Instance.FinishRpcImmediately(writer);
+ }
+ public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
+ {
+ byte NecroId = reader.ReadByte();
+ necroHolder = GetPlayerById(NecroId);
+ }
+ public override void ApplyGameOptions(IGameOptions opt, byte playerId)
+ {
+ if (!CovenHasImpVis.GetBool())
+ opt.SetVision(false);
+ else if (CovenImpVisMode.GetValue() == 0)
+ opt.SetVision(true);
+ else
+ {
+ CovenImpVisOptions.TryGetValue(GetPlayerById(playerId).GetCustomRole(), out var option);
+ opt.SetVision(option.GetBool());
+ }
+ }
+ public override bool CanUseImpostorVentButton(PlayerControl pc)
+ {
+ if (!CovenCanVent.GetBool())
+ return false;
+ else if (CovenVentMode.GetValue() == 0)
+ return true;
+ else
+ {
+ CovenVentOptions.TryGetValue(pc.GetCustomRole(), out var option);
+ return option.GetBool();
+ }
}
public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
public override bool OthersKnowTargetRoleColor(PlayerControl seer, PlayerControl target) => KnowRoleTarget(seer, target);
@@ -23,7 +112,19 @@ public static void GiveNecronomicon()
{
PlayerControl rp = pcList.RandomElement();
necroHolder = rp;
+ necroHolder.Notify(GetString("NecronomiconNotification"));
+ }
+ }
+ public override void OnCoEndGame()
+ {
+ necroHolder = null;
+ }
+ public override void OnFixedUpdate(PlayerControl pc)
+ {
+ if (!necroHolder.IsAlive())
+ {
+ GiveNecronomicon();
}
}
- public static bool HasNecronomicon(PlayerControl pc) => necroHolder == pc;
+ public static bool HasNecronomicon(PlayerControl pc) => necroHolder.Equals(pc);
}
diff --git a/Roles/Coven/HexMaster.cs b/Roles/Coven/HexMaster.cs
index 4676e153d..3ae55eaff 100644
--- a/Roles/Coven/HexMaster.cs
+++ b/Roles/Coven/HexMaster.cs
@@ -17,12 +17,12 @@ internal class HexMaster : CovenManager
public static bool HasEnabled => playerIdList.Any();
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
- public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenPower;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenKilling;
//==================================================================\\
private static OptionItem ModeSwitchAction;
private static OptionItem HexesLookLikeSpells;
- private static OptionItem HasImpostorVision;
+ //private static OptionItem HasImpostorVision;
private static readonly Dictionary HexMode = [];
private static readonly Dictionary> HexedPlayer = [];
@@ -43,7 +43,7 @@ public override void SetupCustomOption()
SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.HexMaster, 1, zeroOne: false);
ModeSwitchAction = StringOptionItem.Create(Id + 10, GeneralOption.ModeSwitchAction, EnumHelper.GetAllNames(), 2, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
HexesLookLikeSpells = BooleanOptionItem.Create(Id + 11, "HexesLookLikeSpells", false, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 12, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
+ //HasImpostorVision = BooleanOptionItem.Create(Id + 12, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]);
}
public override void Init()
{
@@ -102,7 +102,7 @@ public static void ReceiveRPC(MessageReader reader, bool doHex)
}
}
- public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
+ //public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
public override bool CanUseKillButton(PlayerControl pc) => true;
public override bool CanUseImpostorVentButton(PlayerControl pc) => true;
diff --git a/Roles/Coven/Jinx.cs b/Roles/Coven/Jinx.cs
index e65fe1602..f4acb5d34 100644
--- a/Roles/Coven/Jinx.cs
+++ b/Roles/Coven/Jinx.cs
@@ -16,8 +16,8 @@ internal class Jinx : CovenManager
//==================================================================\\
private static OptionItem KillCooldown;
- private static OptionItem CanVent;
- private static OptionItem HasImpostorVision;
+ //private static OptionItem CanVent;
+ //private static OptionItem HasImpostorVision;
private static OptionItem JinxSpellTimes;
private static OptionItem killAttacker;
@@ -26,8 +26,8 @@ public override void SetupCustomOption()
SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Jinx, 1, zeroOne: false);
KillCooldown = FloatOptionItem.Create(Id + 10, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx])
.SetValueFormat(OptionFormat.Seconds);
- CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
+ //CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
+ //HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]);
JinxSpellTimes = IntegerOptionItem.Create(Id + 14, "JinxSpellTimes", new(1, 15, 1), 3, TabGroup.CovenRoles, false)
.SetParent(CustomRoleSpawnChances[CustomRoles.Jinx])
.SetValueFormat(OptionFormat.Times);
@@ -59,11 +59,11 @@ public override bool OnCheckMurderAsTarget(PlayerControl killer, PlayerControl t
}
return false;
}
- public override void ApplyGameOptions(IGameOptions opt, byte babushka) => opt.SetVision(HasImpostorVision.GetBool());
+ //public override void ApplyGameOptions(IGameOptions opt, byte babushka) => opt.SetVision(HasImpostorVision.GetBool());
public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = KillCooldown.GetFloat();
public override bool CanUseKillButton(PlayerControl pc) => true;
- public override bool CanUseImpostorVentButton(PlayerControl player) => CanVent.GetBool();
+ //public override bool CanUseImpostorVentButton(PlayerControl player) => CanVent.GetBool();
public override string GetProgressText(byte playerId, bool comms)
diff --git a/Roles/Coven/Medusa.cs b/Roles/Coven/Medusa.cs
index 61fb47a7a..3362afb49 100644
--- a/Roles/Coven/Medusa.cs
+++ b/Roles/Coven/Medusa.cs
@@ -17,8 +17,8 @@ internal class Medusa : CovenManager
private static OptionItem KillCooldown;
private static OptionItem KillCooldownAfterStoneGazing;
- private static OptionItem CanVent;
- private static OptionItem HasImpostorVision;
+ //private static OptionItem CanVent;
+ //private static OptionItem HasImpostorVision;
public override void SetupCustomOption()
{
@@ -27,8 +27,8 @@ public override void SetupCustomOption()
.SetValueFormat(OptionFormat.Seconds);
KillCooldownAfterStoneGazing = FloatOptionItem.Create(Id + 15, "KillCooldownAfterStoneGazing", new(0f, 180f, 2.5f), 40f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
.SetValueFormat(OptionFormat.Seconds);
- CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
+ //CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
+ //HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
}
public override void Init()
{
@@ -39,9 +39,9 @@ public override void Add(byte playerId)
playerIdList.Add(playerId);
}
public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = KillCooldown.GetFloat();
- public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
+ //public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
public override bool CanUseKillButton(PlayerControl pc) => true;
- public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
+ //public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
public override bool OnCheckReportDeadBody(PlayerControl reporter, NetworkedPlayerInfo target, PlayerControl killer)
diff --git a/Roles/Coven/Poisoner.cs b/Roles/Coven/Poisoner.cs
index 13c6ae441..36d94992b 100644
--- a/Roles/Coven/Poisoner.cs
+++ b/Roles/Coven/Poisoner.cs
@@ -23,9 +23,9 @@ private class PoisonedInfo(byte poisonerId, float killTimer)
//==================================================================\\
private static OptionItem OptionKillDelay;
- private static OptionItem CanVent;
+ //private static OptionItem CanVent;
public static OptionItem KillCooldown;
- private static OptionItem HasImpostorVision;
+ //private static OptionItem HasImpostorVision;
private static readonly Dictionary PoisonedPlayers = [];
@@ -38,8 +38,8 @@ public override void SetupCustomOption()
.SetValueFormat(OptionFormat.Seconds);
OptionKillDelay = FloatOptionItem.Create(Id + 11, "PoisonerKillDelay", new(1f, 60f, 1f), 10f, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner])
.SetValueFormat(OptionFormat.Seconds);
- CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]);
+ //CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]);
+ //HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]);
}
public override void Init()
@@ -53,10 +53,10 @@ public override void Add(byte playerId)
{
playerIdList.Add(playerId);
}
- public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
+ //public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = KillCooldown.GetFloat();
public override bool CanUseKillButton(PlayerControl pc) => true;
- public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
+ //public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
diff --git a/Roles/Coven/PotionMaster.cs b/Roles/Coven/PotionMaster.cs
index 122b731f2..082d4eaa7 100644
--- a/Roles/Coven/PotionMaster.cs
+++ b/Roles/Coven/PotionMaster.cs
@@ -19,8 +19,8 @@ internal class PotionMaster : CovenManager
private static OptionItem KillCooldown;
private static OptionItem RitualMaxCount;
- private static OptionItem CanVent;
- private static OptionItem HasImpostorVision;
+ //private static OptionItem CanVent;
+ //private static OptionItem HasImpostorVision;
private static readonly Dictionary> RitualTarget = [];
@@ -31,8 +31,8 @@ public override void SetupCustomOption()
.SetValueFormat(OptionFormat.Seconds);
RitualMaxCount = IntegerOptionItem.Create(Id + 11, "RitualMaxCount", new(1, 15, 1), 5, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster])
.SetValueFormat(OptionFormat.Times);
- CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster]);
+ //CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster]);
+ //HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PotionMaster]);
}
public override void Init()
{
@@ -64,11 +64,11 @@ public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
RitualTarget[playerId].Add(reader.ReadByte());
}
- public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
+ //public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = KillCooldown.GetFloat();
public override bool CanUseKillButton(PlayerControl pc) => true;
- public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
- public override bool CanUseSabotage(PlayerControl pc) => true;
+ public override bool CanUseImpostorVentButton(PlayerControl pc) => true;
+ //public override bool CanUseSabotage(PlayerControl pc) => true;
public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
From 85cf456158a89492f695329241d7e840a36d2170 Mon Sep 17 00:00:00 2001
From: MargaretTheFool
Date: Thu, 12 Sep 2024 15:08:34 -0400
Subject: [PATCH 003/101] rit and role classes
---
Modules/OptionHolder.cs | 2 +-
Modules/RPC.cs | 4 ++
Resources/Lang/en_US.json | 15 +++-
Roles/Coven/Conjurer.cs | 0
Roles/Coven/CovenLeader.cs | 2 -
Roles/Coven/Dreamweaver.cs | 0
Roles/Coven/Illusionist.cs | 0
Roles/Coven/MoonDancer.cs | 0
Roles/Coven/Ritualist.cs | 136 ++++++++++++++++++++++++++++++++++++
Roles/Coven/Sacrifist.cs | 0
Roles/Coven/Sorceress.cs | 0
Roles/Coven/Spellcaster.cs | 0
Roles/Coven/VoodooMaster.cs | 0
main.cs | 1 +
14 files changed, 155 insertions(+), 5 deletions(-)
create mode 100644 Roles/Coven/Conjurer.cs
create mode 100644 Roles/Coven/Dreamweaver.cs
create mode 100644 Roles/Coven/Illusionist.cs
create mode 100644 Roles/Coven/MoonDancer.cs
create mode 100644 Roles/Coven/Ritualist.cs
create mode 100644 Roles/Coven/Sacrifist.cs
create mode 100644 Roles/Coven/Sorceress.cs
create mode 100644 Roles/Coven/Spellcaster.cs
create mode 100644 Roles/Coven/VoodooMaster.cs
diff --git a/Modules/OptionHolder.cs b/Modules/OptionHolder.cs
index c2b917a4b..0de45da4d 100644
--- a/Modules/OptionHolder.cs
+++ b/Modules/OptionHolder.cs
@@ -631,7 +631,7 @@ public static float GetRoleChance(CustomRoles role)
private static System.Collections.IEnumerator CoLoadOptions()
{
//#######################################
- // 29700 last id for roles/add-ons (Next use 29800)
+ // 29900 last id for roles/add-ons (Next use 30000)
// Limit id for roles/add-ons --- "59999"
//#######################################
diff --git a/Modules/RPC.cs b/Modules/RPC.cs
index aacfc5536..a1bb9e389 100644
--- a/Modules/RPC.cs
+++ b/Modules/RPC.cs
@@ -116,6 +116,7 @@ enum CustomRPC : byte // 197/255 USED
SetVultureArrow,
SetRadarArrow,
SyncVultureBodyAmount,
+ BloodRitual,
//SetTrackerTarget,
SpyRedNameSync,
SpyRedNameRemove,
@@ -639,6 +640,9 @@ public static void Postfix(PlayerControl __instance, [HarmonyArgument(0)] byte c
case CustomRPC.SetChameleonTimer:
Chameleon.ReceiveRPC_Custom(reader);
break;
+ case CustomRPC.BloodRitual:
+ Ritualist.ReceiveRPC_Custom(reader, __instance);
+ break;
case CustomRPC.SetAlchemistTimer:
Alchemist.ReceiveRPC(reader);
break;
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index 2776dafd0..fbff7cb12 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -323,6 +323,7 @@
"PotionMaster": "Potion Master",
"Necromancer": "Necromancer",
"CovenLeader": "Coven Leader",
+ "Ritualist": "Ritualist",
"Warden": "Warden",
"Minion": "Minion",
"Ghastly": "Ghastly",
@@ -633,6 +634,7 @@
"PotionMasterInfo": "Use your potions to your advantage",
"NecromancerInfo": "Kill your killer to defy death",
"CovenLeaderInfo": "Help your teammates by retraining them",
+ "RitualistInfo": "Perform Blood Rituals to Enchant other players!",
"WardenInfo": "(Ghost) Alert about danger",
"MinionInfo": "(Ghost) Blind enemies",
"LoversInfo": "Stay alive and win together",
@@ -911,7 +913,6 @@
"VultureInfoLong": "(Neutrals):\nAs the Vulture, report bodies to win!\n\nWhen you report a body, if your eat cooldown is up, you'll eat the body (makes it unreportable).\nIf your eat ability is still on cooldown, then you'll report the body normally.\n\nAdditionally, you'll report bodies normally if the maximum bodies eaten per round is reached.",
"TaskinatorInfoLong": "(Neutrals):\nAs the Taskinator, whenever you finish a task, the task will be bombed. When another player completes the bombed task, the bomb will detonate, and the player will die.\n\nYou win if you survive till the end and Crew doesn't win.\n\n Note: Taskinator bombs ignore all protection.",
"BenefactorInfoLong": "(Crewmates):\nAs the Benefactor, whenever you finish a task, that task will be marked. When another player completes the marked task, they get a temporary shield.\n\n Note: Shield only protects from direct kill attacks.",
- "MedusaInfoLong": "(Coven):\nAs the Medusa, you can stone bodies much like cleaning a body.\nStoned bodies cannot be reported.\n\nKill everyone to win.",
"SpiritcallerInfoLong": "(Neutrals):\nAs the Spiritcaller, your victims become Evil Spirits after they die. These spirits can help you win by freezing other players briefly or blocking their vision. Alternatively, the spirits can give you a shield that protects you briefly from an attempted kill.",
"AmnesiacInfoLong": "(Neutrals):\nAs the Amnesiac, use your report button to remember a role.\n\nIf the target was an Impostor, you'll become a Refugee.\nIf the target was a crewmate, you'll become the target role if compatible (otherwise you become an Engineer).\nIf the target was a passive neutral or a neutral killer not specified, you'll become the role defined in the settings.\nIf the target was a neutral killer of a select few, you'll become the role they are.",
"ImitatorInfoLong": "(Neutrals):\nAs the Imitator, use your kill button to imitate a player.\n\nYou'll either become a Sheriff, a Refugee, or some Neutral.",
@@ -928,13 +929,15 @@
"RomanticInfoLong": "(Neutrals):\nThe Romantic can pick their lover partner using their kill button (this can be done at any point of the game). Once they've picked their partner, they can use their kill button to give their partner a temporary shield that protects them from attacks. If their lover partner dies, the Romantic's role will change according to the following conditions:\n1. If their partner was an Impostor, the Romantic becomes the Refugee\n2. If their partner was a Neutral Killer, then they become Ruthless Romantic.\n3. If their partner was a Crewmate or a non-killing neutral, the Romantic becomes the Vengeful Romantic. \n\nThe Romantic wins with the winning team if their partner wins.\nNote: If your role changes, your win condition will be changed accordingly",
"RuthlessRomanticInfoLong": "(Neutrals):\nYou change your roles from Romantic if your partner (A neutral killer) is killed. As a Ruthless Romantic, you win if you kill everyone and are the last one standing. If you win, your dead partner will also win with you.",
"VengefulRomanticInfoLong": "(Neutrals):\nYou change your roles from Romantic if your partner (A crew or non-neutral killer) is killed. As a Vengeful Romantic, your goal is to avenge your partner, which means you must kill the killer of your partner. If you succeed, then you and your partner win with the winning team at the end. If you try to kill someone other than your partner's killer, then you will die by misfire.",
+ "WraithInfoLong": "(Neutrals):\nAs the Wraith, you can vent to Vanish temporarily. You will still appear visible on your screen. Vent again to become visible. You win if you are the last player remaining.",
"PoisonerInfoLong": "(Coven):\nAs the Poisoner, your kills are delayed.\nKill everyone to win.",
"HexMasterInfoLong": "(Coven):\nAs the Hex Master, you can hex players or kill them.\nHexing a player works the same as spelling as a Witch.",
- "WraithInfoLong": "(Neutrals):\nAs the Wraith, you can vent to Vanish temporarily. You will still appear visible on your screen. Vent again to become visible. You win if you are the last player remaining.",
"JinxInfoLong": "(Coven):\nAs the Jinx, whenever you get attacked, you jinx them, resulting in them dying to a jinx.\nThis has limited uses.\n\nKill off everyone to win.",
+ "MedusaInfoLong": "(Coven):\nAs the Medusa, you can stone bodies much like cleaning a body.\nStoned bodies cannot be reported.\n\nKill everyone to win.",
"PotionMasterInfoLong": "(Coven):\nAs the Potion Master, you have three different potions assigned to three different actions.\n\nSingle click: Reveal role\nDouble click: Kill\nMap: Sabotage\n\nThe reveal potion has a limit.\nWhen you run out, the kill buttons default to killing.",
"NecromancerInfoLong": "(Coven):\nAs the Necromancer, you win when you're the last one standing.\nAdditionally when someone tries to kill you, you will block the kill, and you will teleport to a random vent. You will have a limited time to kill your killer. If you succeed in doing so, you live. If the time runs out before you kill your killer, you die permanently. If you try to kill someone else other than your killer, you will die.",
"CovenLeaderInfoLong": "(Coven): The Coven Leader can use their kill button on a fellow Coven member to retrain them into a random Coven role that isn’t currently in the game. During the next meeting, that Coven member will be notified that the Coven Leader wishes to retrain them. They can vote themselves to accept the retrain, or vote otherwise to deny it. Denying the retrain does not take away an ability usage.
With the Necronomicon, you cannot retrain, and can only kill other players.",
+ "RitualistInfoLong": "During a meeting, the Ritualist can perform a Blood Ritual to guess a player’s exact role. If the Ritualist is correct, that player will be converted to Coven. If the Ritualist is incorrect, they will not die but will be unable to Blood Ritual until the next meeting.
The command is /rt id role.
With the Necronomicon, the Ritualist can kill.",
"LastImpostorInfoLong": "(Add-ons):\nThis special effect is given to the last surviving Impostor. It significantly reduces their kill cooldown.",
"OverclockedInfoLong": "(Add-ons):\nAs the Overclocked, your kill cooldown is reduced by a percentage.\n\nThis feature is only assigned to roles with a kill button.",
"LoversInfoLong": "(Add-ons),\nLovers are a combination of two players. The Lovers win when they are the last ones standing, and their victory is shared. When one of the Lovers wins, the other also wins together. Lovers can see the 「♥」 next to each other's name. If one of the Lovers dies, the other will die in love (may not die in love according to the Host's settings). When one of the Lovers is exiled in the meeting, the other will die and become a dead body that cannot be reported.",
@@ -1875,6 +1878,14 @@
"RetrainAcceptOffer": "You have accepted the {0}'s retraining and you are now a {1}!",
"RetrainDeclineOffer": "You declined the {0}'s retraining and your role has not been changed...",
+ "RitualistMaxRitsPerRound": "Max Blood Rituals per Round",
+ "RitualistRitualSuccess": "You preformed a successful blood ritual on {0} and they are now part of the Coven!",
+ "RitualistRitualFail": "You have failed your blood ritual and may no longer preform any blood rituals this meeting...",
+ "RitualistRitualImpossible": "Your Blood Ritual was successful, however, this player is unenchantable.",
+ "RitualistRitualMax": "You've already used the max amount of Blood Rituals for this meeting.",
+ "RitualistCommandHelp": "Instructions: /rt [Player ID] [Role Name] \nExample: /rt 3 Bait \nYou can see the player IDs before everyone's names \n or use the /id command to list the player IDs"
+ "RitualistConvertNotif": "Your role has been guessed by the {0} and you are now apart of the Coven!",
+
"LuckyProbability": "Probability of surviving a kill",
"ImpCanBeDoubleShot": "Impostors can have Double Shot",
"CrewCanBeDoubleShot": "Crewmates can have Double Shot",
diff --git a/Roles/Coven/Conjurer.cs b/Roles/Coven/Conjurer.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/Roles/Coven/CovenLeader.cs b/Roles/Coven/CovenLeader.cs
index 8ef8c8b11..87abe0122 100644
--- a/Roles/Coven/CovenLeader.cs
+++ b/Roles/Coven/CovenLeader.cs
@@ -4,8 +4,6 @@
using System.Diagnostics.Metrics;
using System.Text;
using TOHE.Roles.Core;
-using TOHE.Roles.Crewmate;
-using TOHE.Roles.Double;
using TOHE.Roles.Neutral;
using UnityEngine;
using static TOHE.Options;
diff --git a/Roles/Coven/Dreamweaver.cs b/Roles/Coven/Dreamweaver.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/Roles/Coven/Illusionist.cs b/Roles/Coven/Illusionist.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/Roles/Coven/MoonDancer.cs b/Roles/Coven/MoonDancer.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/Roles/Coven/Ritualist.cs b/Roles/Coven/Ritualist.cs
new file mode 100644
index 000000000..aca9607af
--- /dev/null
+++ b/Roles/Coven/Ritualist.cs
@@ -0,0 +1,136 @@
+
+namespace TOHE.Roles.Coven;
+
+internal class Ritualist : CovenManager
+{
+ //===========================SETUP================================\\
+ private const int Id = 29900;
+ public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.Ritualist);
+ public override bool IsDesyncRole => true;
+ public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenPower;
+ //==================================================================\\
+
+ public static OptionItem MaxRitsPerRound;
+
+ public override void SetupCustomOption()
+ {
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Ritualist, 1, zeroOne: false);
+ MaxRitsPerRound = IntegerOptionItem.Create(Id + 10, "RitualistMaxRitsPerRound", new(1, 15, 1), 2, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist])
+ .SetValueFormat(OptionFormat.Times);
+ }
+
+ public override void Add(byte PlayerId)
+ {
+ AbilityLimit = MaxRitsPerRound.GetInt();
+ }
+
+ public static void ReceiveRPC_Custom(MessageReader reader, PlayerControl pc)
+ {
+ int PlayerId = reader.ReadByte();
+ RitualistMsgCheck(pc, $"/rt {PlayerId}", true);
+ }
+ public override bool CanUseKillButton(PlayerControl pc) => HasNecronomicon(pc);
+ public override string GetProgressText(byte playerId, bool comms)
+ => ColorString(AbilityLimit >= 1 ? GetRoleColor(CustomRoles.CovenLeader).ShadeColor(0.25f) : Color.gray, $"({AbilityLimit})");
+ public override void OnReportDeadBody(PlayerControl hatsune, NetworkedPlayerInfo miku)
+ {
+ AbilityLimit = MaxRitsPerRound.GetInt();
+ }
+ public static bool RitualistMsgCheck(PlayerControl pc, string msg, bool isUI = false)
+ {
+ if (!AmongUsClient.Instance.AmHost) return false;
+ if (!GameStates.IsInGame || pc == null) return false;
+ if (!pc.Is(CustomRoles.Ritualist)) return false;
+ msg = msg.Trim().ToLower();
+ if (msg.Length < 3 || msg[..4] != "/rt") return false;
+
+
+ if (msg == "/rt")
+ {
+ string text = GetString("PlayerIdList");
+ foreach (var npc in Main.AllAlivePlayerControls)
+ text += "\n" + npc.PlayerId.ToString() + " → " + npc.GetRealName();
+ SendMessage(text, pc.PlayerId);
+ return true;
+ }
+
+
+ if (AbilityLimit <= 0)
+ {
+ pc.ShowInfoMessage(isUI, GetString("RitualistRitualMax"));
+ return true;
+ }
+
+ if (!MsgToPlayerAndRole(msg, out byte targetId, out CustomRoles role, out string error))
+ {
+ pc.ShowInfoMessage(isUI, error);
+ return true;
+ }
+ var target = Utils.GetPlayerById(targetId);
+
+ if (!target.Is(role))
+ {
+ pc.ShowInfoMessage(isUI, GetString("RitualistRitualFail"));
+ AbilityLimit = 0;
+ return true;
+ }
+ if (target.IsTransformedNeutralApocalypse() || (target.Is(CustomRoles.NiceMini) || target.Is(CustomRoles.EvilMini) && Mini.Age < 18) || target.Is(CustomRoles.Solsticer) || !target.IsAlive() || target.Is(CustomRoles.Loyal) || !(target.GetCustomSubRoles().Contains(CustomRoles.Hurried) && !Hurried.CanBeConverted.GetBool())
+ {
+ pc.ShowInfoMessage(isUI, GetString("RitualistRitualImpossible"));
+ return true;
+ }
+
+ Logger.Info($"{pc.GetNameWithRole()} enchant {target.GetNameWithRole()}", "Ritualist");
+
+ string Name = target.GetRealName();
+
+ AbilityLimit--;
+
+ target.RpcSetCustomRole(CustomRoles.Enchanted);
+ SendMessage(string.Format(GetString("RitualistConvertNotif"), CustomRoles.Ritualist.ToColoredString()), target.PlayerId);
+ SendMessage(string.Format(GetString("RitualistRitualSuccess"), target.GetRealName()), pc.PlayerId);
+ return true;
+ }
+ private static bool MsgToPlayerAndRole(string msg, out byte id, out CustomRoles role, out string error)
+ {
+ if (msg.StartsWith("/")) msg = msg.Replace("/", string.Empty);
+
+ Regex r = new("\\d+");
+ MatchCollection mc = r.Matches(msg);
+ string result = string.Empty;
+ for (int i = 0; i < mc.Count; i++)
+ {
+ result += mc[i];//匹配结果是完整的数字，此处可以不做拼接的
+ }
+
+ if (int.TryParse(result, out int num))
+ {
+ id = Convert.ToByte(num);
+ }
+ else
+ {
+ id = byte.MaxValue;
+ error = GetString("RitualistCommandHelp");
+ role = new();
+ return false;
+ }
+
+ PlayerControl target = Utils.GetPlayerById(id);
+ if (target == null || target.Data.IsDead)
+ {
+ error = GetString("GuessNull");
+ role = new();
+ return false;
+ }
+
+ if (!ChatCommands.GetRoleByName(msg, out role))
+ {
+ error = GetString("RitualistCommandHelp");
+ return false;
+ }
+
+ error = string.Empty;
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/Roles/Coven/Sacrifist.cs b/Roles/Coven/Sacrifist.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/Roles/Coven/Sorceress.cs b/Roles/Coven/Sorceress.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/Roles/Coven/Spellcaster.cs b/Roles/Coven/Spellcaster.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/Roles/Coven/VoodooMaster.cs b/Roles/Coven/VoodooMaster.cs
new file mode 100644
index 000000000..e69de29bb
diff --git a/main.cs b/main.cs
index 536ace846..fa9f4df6c 100644
--- a/main.cs
+++ b/main.cs
@@ -896,6 +896,7 @@ public enum CustomRoles
Diseased,
DoubleShot,
Egoist,
+ Enchanted,
Evader,
EvilSpirit,
Flash,
From 897a1d8c7bbcc600787212e9b2fa35abf73145a6 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:58:17 -0400
Subject: [PATCH 004/101] h
---
Modules/AntiBlackout.cs | 19 +++-
Modules/CustomRolesHelper.cs | 12 +--
Modules/CustomWinnerHolder.cs | 5 +-
Modules/ExtendedPlayerControl.cs | 10 ++
Modules/GuessManager.cs | 14 +++
Modules/NameColorManager.cs | 3 +
Modules/OptionHolder.cs | 3 +
Modules/Utils.cs | 6 ++
Patches/ChatCommandPatch.cs | 7 ++
Patches/CheckGameEndPatch.cs | 34 ++++++-
Patches/MeetingHudPatch.cs | 4 +
Patches/OutroPatch.cs | 4 +
Patches/PlayerControlPatch.cs | 4 +
Resources/Lang/en_US.json | 8 +-
Roles/Coven/CovenLeader.cs | 9 --
Roles/Coven/CovenManager.cs | 4 +-
Roles/Coven/Ritualist.cs | 158 ++++++++++++++++++++++---------
main.cs | 13 +++
18 files changed, 245 insertions(+), 72 deletions(-)
diff --git a/Modules/AntiBlackout.cs b/Modules/AntiBlackout.cs
index 720981393..cda1c2721 100644
--- a/Modules/AntiBlackout.cs
+++ b/Modules/AntiBlackout.cs
@@ -9,7 +9,7 @@ namespace TOHE;
public static class AntiBlackout
{
///
- /// Check num alive Impostors & Crewmates & NeutralKillers
+ /// Check num alive Impostors & Crewmates & NeutralKillers & Coven
///
public static bool BlackOutIsActive => !Options.DisableAntiBlackoutProtects.GetBool() && CheckBlackOut();
@@ -21,6 +21,7 @@ public static bool CheckBlackOut()
HashSet Impostors = [];
HashSet Crewmates = [];
HashSet NeutralKillers = [];
+ HashSet Coven = [];
var lastExiled = ExileControllerWrapUpPatch.AntiBlackout_LastExiled;
foreach (var pc in Main.AllAlivePlayerControls)
@@ -36,6 +37,10 @@ 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);
}
@@ -43,10 +48,12 @@ public static bool CheckBlackOut()
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;
@@ -56,12 +63,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;
}
diff --git a/Modules/CustomRolesHelper.cs b/Modules/CustomRolesHelper.cs
index fdf8af3f6..314fe81e4 100644
--- a/Modules/CustomRolesHelper.cs
+++ b/Modules/CustomRolesHelper.cs
@@ -320,7 +320,8 @@ CustomRoles.Recruit or
CustomRoles.Infected or
CustomRoles.Contagious or
CustomRoles.Soulless or
- CustomRoles.Madmate;
+ CustomRoles.Madmate or
+ CustomRoles.Enchanted;
public static bool IsNotKnightable(this CustomRoles role)
{
@@ -363,7 +364,8 @@ or CustomRoles.Recruit
or CustomRoles.Infected
or CustomRoles.Contagious
or CustomRoles.Rascal
- or CustomRoles.Soulless;
+ or CustomRoles.Soulless
+ or CustomRoles.Enchanted;
}
public static bool IsImpOnlyAddon(this CustomRoles role)
@@ -1228,8 +1230,6 @@ var r when r.IsCoven() => CountTypes.Coven,
CustomRoles.Solsticer => CustomWinner.Solsticer,
CustomRoles.Collector => CustomWinner.Collector,
CustomRoles.BloodKnight => CustomWinner.BloodKnight,
- CustomRoles.Poisoner => CustomWinner.Poisoner,
- CustomRoles.HexMaster => CustomWinner.HexMaster,
CustomRoles.Cultist => CustomWinner.Cultist,
CustomRoles.Wraith => CustomWinner.Wraith,
CustomRoles.Bandit => CustomWinner.Bandit,
@@ -1237,20 +1237,16 @@ var r when r.IsCoven() => CountTypes.Coven,
CustomRoles.SerialKiller => CustomWinner.SerialKiller,
CustomRoles.Quizmaster => CustomWinner.Quizmaster,
CustomRoles.Werewolf => CustomWinner.Werewolf,
- CustomRoles.Necromancer => CustomWinner.Necromancer,
CustomRoles.Huntsman => CustomWinner.Huntsman,
CustomRoles.Juggernaut => CustomWinner.Juggernaut,
CustomRoles.Infectious => CustomWinner.Infectious,
CustomRoles.Virus => CustomWinner.Virus,
CustomRoles.Specter => CustomWinner.Specter,
- CustomRoles.Jinx => CustomWinner.Jinx,
CustomRoles.CursedSoul => CustomWinner.CursedSoul,
- CustomRoles.PotionMaster => CustomWinner.PotionMaster,
CustomRoles.Pickpocket => CustomWinner.Pickpocket,
CustomRoles.Traitor => CustomWinner.Traitor,
CustomRoles.Vulture => CustomWinner.Vulture,
CustomRoles.Apocalypse => CustomWinner.Apocalypse,
- CustomRoles.Medusa => CustomWinner.Medusa,
CustomRoles.Spiritcaller => CustomWinner.Spiritcaller,
CustomRoles.Glitch => CustomWinner.Glitch,
CustomRoles.PunchingBag => CustomWinner.PunchingBag,
diff --git a/Modules/CustomWinnerHolder.cs b/Modules/CustomWinnerHolder.cs
index 771bde02d..b24429c1e 100644
--- a/Modules/CustomWinnerHolder.cs
+++ b/Modules/CustomWinnerHolder.cs
@@ -72,7 +72,10 @@ public static bool CheckForConvertedWinner(byte playerId)
ResetAndSetWinner(CustomWinner.Infectious);
return true;
case CustomRoles.Contagious:
- ResetAndSetWinner(CustomWinner.Virus);
+ ResetAndSetWinner(CustomWinner.Virus);
+ return true;
+ case CustomRoles.Enchanted:
+ ResetAndSetWinner(CustomWinner.Coven);
return true;
}
}
diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs
index 84e5d03a7..ab6e03811 100644
--- a/Modules/ExtendedPlayerControl.cs
+++ b/Modules/ExtendedPlayerControl.cs
@@ -948,6 +948,12 @@ public static bool KnowRoleTarget(PlayerControl seer, PlayerControl target, bool
logger.Info($"Imps Can See Each Others Roles");
return true;
}
+ else if (seer.Is(Custom_Team.Coven) && target.Is(Custom_Team.Coven))
+ {
+ if (isVanilla)
+ logger.Info($"Coven Can See Each Others Roles");
+ return true;
+ }
else if (Madmate.MadmateKnowWhosImp.GetBool() && seer.Is(CustomRoles.Madmate) && target.Is(Custom_Team.Impostor))
{
if (isVanilla)
@@ -1074,6 +1080,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) || target.Is(Custom_Team.Coven)) 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;
diff --git a/Modules/GuessManager.cs b/Modules/GuessManager.cs
index 1e4e4b27c..772148b41 100644
--- a/Modules/GuessManager.cs
+++ b/Modules/GuessManager.cs
@@ -145,6 +145,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)
@@ -273,6 +278,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)))
{
@@ -581,6 +593,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);
}
diff --git a/Modules/NameColorManager.cs b/Modules/NameColorManager.cs
index b2d491c83..67a4b3785 100644
--- a/Modules/NameColorManager.cs
+++ b/Modules/NameColorManager.cs
@@ -42,6 +42,9 @@ 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) || seer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) color = Main.roleColors[CustomRoles.Coven];
+
// Cultist
if (Cultist.NameRoleColor(seer, target)) color = Main.roleColors[CustomRoles.Cultist];
diff --git a/Modules/OptionHolder.cs b/Modules/OptionHolder.cs
index 0de45da4d..eb0776524 100644
--- a/Modules/OptionHolder.cs
+++ b/Modules/OptionHolder.cs
@@ -139,6 +139,7 @@ private enum RatesZeroOne
public static OptionItem EnableKillerLeftCommand;
public static OptionItem ShowMadmatesInLeftCommand;
public static OptionItem ShowApocalypseInLeftCommand;
+ public static OptionItem ShowCovenInLeftCommand;
public static OptionItem SeeEjectedRolesInMeeting;
public static OptionItem KickLowLevelPlayer;
@@ -1062,6 +1063,8 @@ private static System.Collections.IEnumerator CoLoadOptions()
.SetParent(EnableKillerLeftCommand);
ShowApocalypseInLeftCommand = BooleanOptionItem.Create(60043, "ShowApocalypseInLeftCommand", true, TabGroup.SystemSettings, false)
.SetParent(EnableKillerLeftCommand);
+ ShowCovenInLeftCommand = BooleanOptionItem.Create(60044, "ShowCovenInLeftCommand", true, TabGroup.SystemSettings, false)
+ .SetParent(EnableKillerLeftCommand);
SeeEjectedRolesInMeeting = BooleanOptionItem.Create(60041, "SeeEjectedRolesInMeeting", true, TabGroup.SystemSettings, false)
.HideInHnS();
diff --git a/Modules/Utils.cs b/Modules/Utils.cs
index d18885f87..803968097 100644
--- a/Modules/Utils.cs
+++ b/Modules/Utils.cs
@@ -425,6 +425,9 @@ public static Color GetTeamColor(PlayerControl player)
case Custom_Team.Neutral:
hexColor = "#7f8c8d";
break;
+ case Custom_Team.Coven:
+ hexColor = "#ac42f2";
+ break;
}
_ = ColorUtility.TryParseHtmlString(hexColor, out Color c);
@@ -2090,6 +2093,9 @@ static int GetInfoSize(string RoleInfo)
if (Options.PassiveNeutralsCanGuess.GetBool() && seer.GetCustomRole().IsNonNK() && !seer.Is(CustomRoles.Doomsayer))
TargetPlayerName = GetTragetId;
+
+ if (Options.CovenCanGuess.GetBool() && seer.GetCustomRole().IsCoven())
+ TargetPlayerName = GetTragetId;
}
}
else // Guesser Mode is Off ID
diff --git a/Patches/ChatCommandPatch.cs b/Patches/ChatCommandPatch.cs
index d8d06c4eb..14bd5ca28 100644
--- a/Patches/ChatCommandPatch.cs
+++ b/Patches/ChatCommandPatch.cs
@@ -8,6 +8,7 @@
using TOHE.Modules.ChatManager;
using TOHE.Roles.Core;
using TOHE.Roles.Core.AssignManager;
+using TOHE.Roles.Coven;
using TOHE.Roles.Crewmate;
using TOHE.Roles.Impostor;
using TOHE.Roles.Neutral;
@@ -66,6 +67,7 @@ public static bool Prefix(ChatController __instance)
if (PlayerControl.LocalPlayer.GetRoleClass() is Councillor cl && cl.MurderMsg(PlayerControl.LocalPlayer, text)) goto Canceled;
if (Nemesis.NemesisMsgCheck(PlayerControl.LocalPlayer, text)) goto Canceled;
if (Retributionist.RetributionistMsgCheck(PlayerControl.LocalPlayer, text)) goto Canceled;
+ if (Ritualist.RitualistMsgCheck(PlayerControl.LocalPlayer, text)) goto Canceled;
if (Medium.MsMsg(PlayerControl.LocalPlayer, text)) goto Canceled;
if (PlayerControl.LocalPlayer.GetRoleClass() is Swapper sw && sw.SwapMsg(PlayerControl.LocalPlayer, text)) goto Canceled;
Directory.CreateDirectory(modTagsFiles);
@@ -358,6 +360,7 @@ public static bool Prefix(ChatController __instance)
int madnum = allAlivePlayers.Count(pc => pc.GetCustomRole().IsMadmate() || pc.Is(CustomRoles.Madmate));
int neutralnum = allAlivePlayers.Count(pc => pc.GetCustomRole().IsNK());
int apocnum = allAlivePlayers.Count(pc => pc.GetCustomRole().IsNA());
+ int covnum = allAlivePlayers.Count(pc => pc.Is(Custom_Team.Coven));
var sub = new StringBuilder();
sub.Append(string.Format(GetString("Remaining.ImpostorCount"), impnum));
@@ -368,6 +371,9 @@ public static bool Prefix(ChatController __instance)
if (Options.ShowApocalypseInLeftCommand.GetBool())
sub.Append(string.Format("\n\r" + GetString("Remaining.ApocalypseCount"), apocnum));
+ if (Options.ShowCovenInLeftCommand.GetBool())
+ sub.Append(string.Format("\n\r" + GetString("Remaining.CovenCount"), covnum));
+
sub.Append(string.Format("\n\r" + GetString("Remaining.NeutralCount"), neutralnum));
Utils.SendMessage(sub.ToString(), PlayerControl.LocalPlayer.PlayerId);
@@ -1888,6 +1894,7 @@ public static void OnReceiveChat(PlayerControl player, string text, out bool can
if (Medium.MsMsg(player, text)) { Logger.Info($"Is Medium command", "OnReceiveChat"); return; }
if (Nemesis.NemesisMsgCheck(player, text)) { Logger.Info($"Is Nemesis Revenge command", "OnReceiveChat"); return; }
if (Retributionist.RetributionistMsgCheck(player, text)) { Logger.Info($"Is Retributionist Revenge command", "OnReceiveChat"); return; }
+ if (Ritualist.RitualistMsgCheck(player, text)) { Logger.Info($"Is Ritualist command", "OnReceiveChat"); return; }
Directory.CreateDirectory(modTagsFiles);
Directory.CreateDirectory(vipTagsFiles);
diff --git a/Patches/CheckGameEndPatch.cs b/Patches/CheckGameEndPatch.cs
index e7cc8d9a4..91f3ee0bb 100644
--- a/Patches/CheckGameEndPatch.cs
+++ b/Patches/CheckGameEndPatch.cs
@@ -101,6 +101,13 @@ public static bool Prefix()
WinnerIds.Add(pc.PlayerId);
}
break;
+ case CustomWinner.Coven:
+ if (((pc.Is(Custom_Team.Coven) || pc.Is(CustomRoles.Enchanted)) && (countType == CountTypes.Coven || pc.Is(CustomRoles.Soulless)))
+ && !WinnerIds.Contains(pc.PlayerId))
+ {
+ WinnerIds.Add(pc.PlayerId);
+ }
+ break;
case CustomWinner.Apocalypse:
if ((pc.IsNeutralApocalypse()) && (countType == CountTypes.Apocalypse || pc.Is(CustomRoles.Soulless))
&& !WinnerIds.Contains(pc.PlayerId))
@@ -356,6 +363,14 @@ public static bool Prefix()
WinnerIds.Add(pc.PlayerId);
}
}
+ if (Main.AllAlivePlayerControls.All(p => p.IsPlayerCoven()))
+ {
+ foreach (var pc in Main.AllPlayerControls.Where(x => x.IsPlayerCoven()))
+ {
+ if (!WinnerIds.Contains(pc.PlayerId))
+ WinnerIds.Add(pc.PlayerId);
+ }
+ }
if (WinnerTeam is CustomWinner.Youtuber)
{
var youTuber = Main.AllPlayerControls.FirstOrDefault(x => x.Is(CustomRoles.Youtuber) && WinnerIds.Contains(x.PlayerId));
@@ -538,7 +553,7 @@ public static bool CheckGameEndByLivingPlayers(out GameOverReason reason)
if (Sunnyboy.HasEnabled && Sunnyboy.CheckGameEnd()) return false;
var neutralRoleCounts = new Dictionary();
var allAlivePlayerList = Main.AllAlivePlayerControls.ToArray();
- int dual = 0, impCount = 0, crewCount = 0;
+ int dual = 0, impCount = 0, crewCount = 0, covenCount = 0;
foreach (var pc in allAlivePlayerList)
{
@@ -559,6 +574,10 @@ public static bool CheckGameEndByLivingPlayers(out GameOverReason reason)
crewCount++;
crewCount += dual;
break;
+ case CountTypes.Coven:
+ covenCount++;
+ covenCount += dual;
+ break;
default:
if (neutralRoleCounts.ContainsKey(countType))
neutralRoleCounts[countType]++;
@@ -571,7 +590,7 @@ public static bool CheckGameEndByLivingPlayers(out GameOverReason reason)
int totalNKAlive = neutralRoleCounts.Sum(kvp => kvp.Value);
- if (crewCount == 0 && impCount == 0 && totalNKAlive == 0) // Everyone is dead
+ if (crewCount == 0 && impCount == 0 && totalNKAlive == 0 && covenCount == 0) // Everyone is dead
{
reason = GameOverReason.ImpostorByKill;
ResetAndSetWinner(CustomWinner.None);
@@ -585,7 +604,8 @@ public static bool CheckGameEndByLivingPlayers(out GameOverReason reason)
return true;
}
- else if (totalNKAlive == 0) // total number of nks alive 0
+
+ else if (totalNKAlive == 0 && covenCount == 0) // total number of nks alive 0
{
if (crewCount <= impCount) // Crew less than or equal to Imps, Imp wins
{
@@ -605,7 +625,15 @@ public static bool CheckGameEndByLivingPlayers(out GameOverReason reason)
else
{
if (impCount >= 1) return false; // Both Imp and NK are alive, the game must continue
+ if (covenCount >= 1) return false; // Both Coven and NK are alive, the game must continue
if (crewCount > totalNKAlive) return false; // Imps are dead, but Crew still outnumbers NK (the game must continue)
+ if (crewCount > totalNKAlive) return false; // Imps are dead, but Crew still outnumbers Coven (the game must continue)
+ if (crewCount <= covenCount && totalNKAlive == 0) // Imps dead, NK dead, Coven <= NK, Coven wins
+ {
+ reason = GameOverReason.ImpostorByKill;
+ ResetAndSetWinner(CustomWinner.Coven);
+ return true;
+ }
else // Imps dead, Crew <= NK, Checking if All nk alive are in 1 team
{
var winners = neutralRoleCounts.Where(kvp => kvp.Value == totalNKAlive).ToArray();
diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs
index 5c65be7f8..195dcbff4 100644
--- a/Patches/MeetingHudPatch.cs
+++ b/Patches/MeetingHudPatch.cs
@@ -690,6 +690,7 @@ public static bool Prefix(MeetingHud __instance, byte srcPlayerId, byte suspectP
SendMessage(string.Format(GetString("RetrainAcceptOffer"), CustomRoles.CovenLeader.ToColoredString(), CovenLeader.retrainPlayer[voter.PlayerId].ToColoredString()), voter.PlayerId);
CovenLeader.retrainPlayer.Clear();
CustomRoles.CovenLeader.GetStaticRoleClass().AbilityLimit--;
+ CustomRoles.CovenLeader.GetStaticRoleClass().SendSkillRPC();
__instance.RpcClearVoteDelay(voter.GetClientId());
}
else if (target != voter && CovenLeader.retrainPlayer[voter.PlayerId].IsCoven())
@@ -1152,6 +1153,9 @@ public static void Postfix(MeetingHud __instance)
if (Options.PassiveNeutralsCanGuess.GetBool() && seer.GetCustomRole().IsNonNK() && !seer.Is(CustomRoles.Doomsayer))
if (!seer.Data.IsDead && !target.Data.IsDead)
pva.NameText.text = ColorString(GetRoleColor(seer.GetCustomRole()), target.PlayerId.ToString()) + " " + pva.NameText.text;
+ if (Options.CovenCanGuess.GetBool() && (seer.GetCustomRole().IsCoven() || seer.Is(CustomRoles.Enchanted)))
+ if (!seer.Data.IsDead && !target.Data.IsDead)
+ pva.NameText.text = ColorString(GetRoleColor(seer.GetCustomRole()), target.PlayerId.ToString()) + " " + pva.NameText.text;
}
diff --git a/Patches/OutroPatch.cs b/Patches/OutroPatch.cs
index 921de6f90..5b328a458 100644
--- a/Patches/OutroPatch.cs
+++ b/Patches/OutroPatch.cs
@@ -223,6 +223,10 @@ public static void Postfix(EndGameManager __instance)
CustomWinnerColor = Utils.GetRoleColorCode(CustomRoles.Egoist);
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.Egoist);
break;
+ case CustomWinner.Coven:
+ CustomWinnerColor = Utils.GetRoleColorCode(CustomRoles.CovenLeader);
+ __instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.CovenLeader);
+ break;
//特殊勝利
case CustomWinner.Terrorist:
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.Terrorist);
diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs
index cc28d54ec..adb61e543 100644
--- a/Patches/PlayerControlPatch.cs
+++ b/Patches/PlayerControlPatch.cs
@@ -18,6 +18,7 @@
using TOHE.Roles.Coven;
using TOHE.Roles.Core;
using static TOHE.Translator;
+using static UnityEngine.ParticleSystem.PlaybackState;
namespace TOHE;
@@ -266,6 +267,9 @@ public static bool RpcCheckAndMurder(PlayerControl killer, PlayerControl target,
if (killer.Is(Custom_Team.Impostor) && !Madmate.ImpCanKillMadmate.GetBool() && target.Is(CustomRoles.Madmate))
return false;
+ // Coven CAN'T kill Coven/Enchanted
+ if ((killer.Is(Custom_Team.Coven) || killer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) return false;
+
Logger.Info($"Start", "OnCheckMurderAsTargetOnOthers");
// Check murder on others targets
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index fbff7cb12..9556808fa 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -376,6 +376,7 @@
"EvilSpirit": "Evil Spirit",
"Recruit": "Recruit",
"Admired": "Admired",
+ "Enchanted": "Enchanted",
"Glow": "Glow",
"Radar": "Radar",
"Diseased": "Diseased",
@@ -676,6 +677,7 @@
"LoyalInfo": "You cannot be recruited",
"EvilSpiritInfo": "You are an evil Spirit",
"RecruitInfo": "Help the Jackal",
+ "EnchantedInfo": "Help the Coven",
"AdmiredInfo": "The Admirer chose you as their love",
"GlowInfo": "You glow in the dark",
"RadarInfo": "Arrow's hue, closest to you!",
@@ -982,6 +984,7 @@
"LoyalInfoLong": "(Add-ons):\nAs the Loyal, you cannot be recruited by roles such as Jackal or Cultist.\n\nCannot be assigned to neutrals.",
"EvilSpiritInfoLong": "(Add-ons):\nAs Evil Spirit, it's your job to help the Spiritcaller to victory. You can use your Haunt button to freeze players and reduce their vision. Alternatively, you can use your Haunt button to give the Spiritcaller a shield against a kill attempt temporarily.",
"RecruitInfoLong": "(Betrayal Add-ons):\nAs a recruit, you are on the Jackal's team and help out the Jackal and their Sidekicks.\n\nYou cannot win with your original team.",
+ "EnchantedInfoLong": "(Betrayal Add-ons):\nThe Enchanted add-on can only be obtained through being converted by the Ritualist.\nOnce Enchanted, you are apart of the Coven team and are no longer apart of your original team.",
"AdmiredInfoLong": "(Betrayal Add-ons):\nAs an admired player, you win with the crew and not your original team.\n\nYou can see the Admirer.",
"GlowInfoLong": "(Add-ons):\nDuring lights out, you and players nearby you will receive a vision boost.",
"RadarInfoLong": "(Add-ons):\nAs Radar, you have arrows pointing towards the closest person at all times.",
@@ -1879,11 +1882,12 @@
"RetrainDeclineOffer": "You declined the {0}'s retraining and your role has not been changed...",
"RitualistMaxRitsPerRound": "Max Blood Rituals per Round",
+ "RitualistTryHideMsg": "Try to hide Ritualist's commands",
"RitualistRitualSuccess": "You preformed a successful blood ritual on {0} and they are now part of the Coven!",
"RitualistRitualFail": "You have failed your blood ritual and may no longer preform any blood rituals this meeting...",
"RitualistRitualImpossible": "Your Blood Ritual was successful, however, this player is unenchantable.",
"RitualistRitualMax": "You've already used the max amount of Blood Rituals for this meeting.",
- "RitualistCommandHelp": "Instructions: /rt [Player ID] [Role Name] \nExample: /rt 3 Bait \nYou can see the player IDs before everyone's names \n or use the /id command to list the player IDs"
+ "RitualistCommandHelp": "Instructions: /rt [Player ID] [Role Name] \nExample: /rt 3 Bait \nYou can see the player IDs before everyone's names \n or use the /id command to list the player IDs",
"RitualistConvertNotif": "Your role has been guessed by the {0} and you are now apart of the Coven!",
"LuckyProbability": "Probability of surviving a kill",
@@ -2061,9 +2065,11 @@
"Remaining.MadmateCount": "Madmates left: {0}",
"Remaining.NeutralCount": "Neutral Killers left: {0}",
"Remaining.ApocalypseCount": "Neutral Apocalypse left: {0}",
+ "Remaining.CovenCount": "Coven left: {0}",
"EnableKillerLeftCommand": "Enable use of /kcount command",
"ShowMadmatesInLeftCommand": "Show Madmates (including add-ons)",
"ShowApocalypseInLeftCommand": "Show Neutral Apocalypse",
+ "ShowCovenInLeftCommand": "Show Coven",
"SeeEjectedRolesInMeeting": "See ejected roles in meetings",
"SkillUsedLeft": "You have activated your skill to call a meeting. \nRemaining amount of uses left:",
diff --git a/Roles/Coven/CovenLeader.cs b/Roles/Coven/CovenLeader.cs
index 87abe0122..9b27bea5f 100644
--- a/Roles/Coven/CovenLeader.cs
+++ b/Roles/Coven/CovenLeader.cs
@@ -44,15 +44,6 @@ public override void Add(byte playerId)
AbilityLimit = MaxRetrains.GetInt();
}
- private void SendRPC(byte playerId, byte targetId)
- {
- MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SyncRoleSkill, SendOption.Reliable, -1);
- writer.WriteNetObject(_Player);
- writer.Write(playerId);
- writer.Write(AbilityLimit);
- writer.Write(targetId);
- AmongUsClient.Instance.FinishRpcImmediately(writer);
- }
public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
{
byte playerId = reader.ReadByte();
diff --git a/Roles/Coven/CovenManager.cs b/Roles/Coven/CovenManager.cs
index 3df9a2310..32f7d2c1a 100644
--- a/Roles/Coven/CovenManager.cs
+++ b/Roles/Coven/CovenManager.cs
@@ -103,8 +103,8 @@ public override bool CanUseImpostorVentButton(PlayerControl pc)
return option.GetBool();
}
}
- public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
- public override bool OthersKnowTargetRoleColor(PlayerControl seer, PlayerControl target) => KnowRoleTarget(seer, target);
+ //public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
+ //public override bool OthersKnowTargetRoleColor(PlayerControl seer, PlayerControl target) => KnowRoleTarget(seer, target);
public static void GiveNecronomicon()
{
var pcList = Main.AllAlivePlayerControls.Where(pc => pc.IsPlayerCoven() && pc.IsAlive()).ToList();
diff --git a/Roles/Coven/Ritualist.cs b/Roles/Coven/Ritualist.cs
index aca9607af..3bdb2d780 100644
--- a/Roles/Coven/Ritualist.cs
+++ b/Roles/Coven/Ritualist.cs
@@ -1,4 +1,18 @@
-
+using Hazel;
+using TOHE.Roles.Core;
+using TOHE.Roles.Double;
+using TOHE.Roles.AddOns.Crewmate;
+using TOHE.Modules;
+using InnerNet;
+using static TOHE.Options;
+using static TOHE.Translator;
+using static TOHE.Utils;
+using System.Text.RegularExpressions;
+using System;
+using TOHE.Modules.ChatManager;
+using UnityEngine;
+using static UnityEngine.GraphicsBuffer;
+
namespace TOHE.Roles.Coven;
internal class Ritualist : CovenManager
@@ -11,86 +25,112 @@ internal class Ritualist : CovenManager
public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenPower;
//==================================================================\\
- public static OptionItem MaxRitsPerRound;
+ private static OptionItem MaxRitsPerRound;
+ public static OptionItem TryHideMsg;
+ private static readonly Dictionary RitualLimit = [];
public override void SetupCustomOption()
{
SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Ritualist, 1, zeroOne: false);
MaxRitsPerRound = IntegerOptionItem.Create(Id + 10, "RitualistMaxRitsPerRound", new(1, 15, 1), 2, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist])
.SetValueFormat(OptionFormat.Times);
+ TryHideMsg = BooleanOptionItem.Create(Id + 11, "RitualistTryHideMsg", true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist])
+ .SetColor(Color.green);
+ }
+ public override void Init()
+ {
+ RitualLimit.Clear();
}
-
public override void Add(byte PlayerId)
{
- AbilityLimit = MaxRitsPerRound.GetInt();
+ RitualLimit.Add(PlayerId, MaxRitsPerRound.GetInt());
+ }
+ public override void Remove(byte playerId)
+ {
+ RitualLimit.Remove(playerId);
}
-
public static void ReceiveRPC_Custom(MessageReader reader, PlayerControl pc)
{
int PlayerId = reader.ReadByte();
RitualistMsgCheck(pc, $"/rt {PlayerId}", true);
}
public override bool CanUseKillButton(PlayerControl pc) => HasNecronomicon(pc);
- public override string GetProgressText(byte playerId, bool comms)
- => ColorString(AbilityLimit >= 1 ? GetRoleColor(CustomRoles.CovenLeader).ShadeColor(0.25f) : Color.gray, $"({AbilityLimit})");
public override void OnReportDeadBody(PlayerControl hatsune, NetworkedPlayerInfo miku)
{
- AbilityLimit = MaxRitsPerRound.GetInt();
+ foreach (var pid in RitualLimit.Keys)
+ {
+ RitualLimit[pid] = MaxRitsPerRound.GetInt();
+ }
}
+ public override string PVANameText(PlayerVoteArea pva, PlayerControl seer, PlayerControl target)
+ => seer.IsAlive() && target.IsAlive() ? ColorString(GetRoleColor(CustomRoles.Ritualist), target.PlayerId.ToString()) + " " + pva.NameText.text : string.Empty;
public static bool RitualistMsgCheck(PlayerControl pc, string msg, bool isUI = false)
{
if (!AmongUsClient.Instance.AmHost) return false;
- if (!GameStates.IsInGame || pc == null) return false;
+ if (!GameStates.IsMeeting || pc == null || GameStates.IsExilling) return false;
if (!pc.Is(CustomRoles.Ritualist)) return false;
- msg = msg.Trim().ToLower();
- if (msg.Length < 3 || msg[..4] != "/rt") return false;
-
-
- if (msg == "/rt")
- {
- string text = GetString("PlayerIdList");
- foreach (var npc in Main.AllAlivePlayerControls)
- text += "\n" + npc.PlayerId.ToString() + " → " + npc.GetRealName();
- SendMessage(text, pc.PlayerId);
- return true;
- }
-
+ int operate = 0; // 1:ID 2:猜测
+ msg = msg.ToLower().TrimStart().TrimEnd();
+ if (CheckCommond(ref msg, "id|guesslist|gl编号|玩家编号|玩家id|id列表|玩家列表|列表|所有id|全部id||編號|玩家編號")) operate = 1;
+ else if (CheckCommond(ref msg, "rt|rit|ritual|bloodritual", false)) operate = 2;
+ else return false;
- if (AbilityLimit <= 0)
+ if (!pc.IsAlive())
{
- pc.ShowInfoMessage(isUI, GetString("RitualistRitualMax"));
+ pc.ShowInfoMessage(isUI, GetString("GuessDead"));
return true;
}
- if (!MsgToPlayerAndRole(msg, out byte targetId, out CustomRoles role, out string error))
+ if (operate == 1)
{
- pc.ShowInfoMessage(isUI, error);
+ SendMessage(GuessManager.GetFormatString(), pc.PlayerId);
return true;
}
- var target = Utils.GetPlayerById(targetId);
- if (!target.Is(role))
+ else if (operate == 2)
{
- pc.ShowInfoMessage(isUI, GetString("RitualistRitualFail"));
- AbilityLimit = 0;
+ if (TryHideMsg.GetBool())
+ {
+ //if (Options.NewHideMsg.GetBool()) ChatManager.SendPreviousMessagesToAll();
+ //else GuessManager.TryHideMsg();
+ GuessManager.TryHideMsg();
+ ChatManager.SendPreviousMessagesToAll();
+ }
+ if (RitualLimit[pc.PlayerId] <= 0)
+ {
+ pc.ShowInfoMessage(isUI, GetString("RitualistRitualMax"));
+ return true;
+ }
+
+ if (!MsgToPlayerAndRole(msg, out byte targetId, out CustomRoles role, out string error))
+ {
+ pc.ShowInfoMessage(isUI, error);
+ return true;
+ }
+ var target = GetPlayerById(targetId);
+
+ if (!target.Is(role))
+ {
+ pc.ShowInfoMessage(isUI, GetString("RitualistRitualFail"));
+ RitualLimit[pc.PlayerId] = 0;
+ return true;
+ }
+ if (!CanBeConverted(target))
+ {
+ pc.ShowInfoMessage(isUI, GetString("RitualistRitualImpossible"));
+ return true;
+ }
+
+ Logger.Info($"{pc.GetNameWithRole()} enchant {target.GetNameWithRole()}", "Ritualist");
+
+ RitualLimit[pc.PlayerId]--;
+
+ target.RpcSetCustomRole(CustomRoles.Enchanted);
+ SendMessage(string.Format(GetString("RitualistConvertNotif"), CustomRoles.Ritualist.ToColoredString()), target.PlayerId);
+ SendMessage(string.Format(GetString("RitualistRitualSuccess"), target.GetRealName()), pc.PlayerId);
return true;
}
- if (target.IsTransformedNeutralApocalypse() || (target.Is(CustomRoles.NiceMini) || target.Is(CustomRoles.EvilMini) && Mini.Age < 18) || target.Is(CustomRoles.Solsticer) || !target.IsAlive() || target.Is(CustomRoles.Loyal) || !(target.GetCustomSubRoles().Contains(CustomRoles.Hurried) && !Hurried.CanBeConverted.GetBool())
- {
- pc.ShowInfoMessage(isUI, GetString("RitualistRitualImpossible"));
- return true;
- }
-
- Logger.Info($"{pc.GetNameWithRole()} enchant {target.GetNameWithRole()}", "Ritualist");
-
- string Name = target.GetRealName();
-
- AbilityLimit--;
-
- target.RpcSetCustomRole(CustomRoles.Enchanted);
- SendMessage(string.Format(GetString("RitualistConvertNotif"), CustomRoles.Ritualist.ToColoredString()), target.PlayerId);
- SendMessage(string.Format(GetString("RitualistRitualSuccess"), target.GetRealName()), pc.PlayerId);
- return true;
+ return false;
}
private static bool MsgToPlayerAndRole(string msg, out byte id, out CustomRoles role, out string error)
{
@@ -133,4 +173,30 @@ private static bool MsgToPlayerAndRole(string msg, out byte id, out CustomRoles
error = string.Empty;
return true;
}
+ public static bool CheckCommond(ref string msg, string command, bool exact = true)
+ {
+ var comList = command.Split('|');
+ foreach (var comm in comList)
+ {
+ if (exact)
+ {
+ if (msg == "/" + comm) return true;
+ }
+ else
+ {
+ if (msg.StartsWith("/" + comm))
+ {
+ msg = msg.Replace("/" + comm, string.Empty);
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ private static bool CanBeConverted(PlayerControl pc)
+ {
+ return pc != null && (!pc.IsPlayerCoven() && !pc.Is(CustomRoles.Enchanted) && !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());
+ }
}
\ No newline at end of file
diff --git a/main.cs b/main.cs
index fa9f4df6c..83de97593 100644
--- a/main.cs
+++ b/main.cs
@@ -352,6 +352,17 @@ public static void LoadRoleColors()
break;
}
}
+ foreach (var role in EnumHelper.GetAllValues())
+ {
+ switch (role.GetCustomRoleTeam())
+ {
+ case Custom_Team.Coven:
+ roleColors.TryAdd(role, "#ac42f2");
+ break;
+ default:
+ break;
+ }
+ }
if (!Directory.Exists(LANGUAGE_FOLDER_NAME)) Directory.CreateDirectory(LANGUAGE_FOLDER_NAME);
CreateTemplateRoleColorFile();
if (File.Exists(@$"./{LANGUAGE_FOLDER_NAME}/RoleColor.dat"))
@@ -848,6 +859,7 @@ public enum CustomRoles
Wraith,
//Coven
+ Coven,
Conjurer,
CovenLeader,
Dreamweaver,
@@ -1021,6 +1033,7 @@ public enum CustomWinner
Doppelganger = CustomRoles.Doppelganger,
Solsticer = CustomRoles.Solsticer,
Apocalypse = CustomRoles.Apocalypse,
+ Coven = CustomRoles.Coven,
}
public enum AdditionalWinners
{
From f2c5e726c2e7deacb7cac3189132336d28130061 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Tue, 17 Sep 2024 17:56:03 -0400
Subject: [PATCH 005/101] i am really good at commit names
---
Modules/ExtendedPlayerControl.cs | 8 +-
Modules/NameColorManager.cs | 2 +-
Resources/Lang/en_US.json | 35 ++++++++-
Resources/roleColor.json | 3 +-
Roles/AddOns/Common/Necroview.cs | 4 +
Roles/Coven/Conjurer.cs | 125 +++++++++++++++++++++++++++++++
Roles/Coven/CovenManager.cs | 13 ++--
Roles/Coven/Necromancer.cs | 12 +--
main.cs | 8 --
9 files changed, 182 insertions(+), 28 deletions(-)
diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs
index ab6e03811..d6bce22db 100644
--- a/Modules/ExtendedPlayerControl.cs
+++ b/Modules/ExtendedPlayerControl.cs
@@ -1080,10 +1080,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) || target.Is(Custom_Team.Coven)) return true;
- }
+ //if (seer.Is(Custom_Team.Coven))
+ //{
+ // if (target.Is(CustomRoles.Enchanted) || target.Is(Custom_Team.Coven)) 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;
diff --git a/Modules/NameColorManager.cs b/Modules/NameColorManager.cs
index 67a4b3785..3e64c8fec 100644
--- a/Modules/NameColorManager.cs
+++ b/Modules/NameColorManager.cs
@@ -43,7 +43,7 @@ private static bool KnowTargetRoleColor(PlayerControl seer, PlayerControl target
if (seer.Is(CustomRoles.Madmate) && target.Is(CustomRoles.Madmate) && Madmate.MadmateKnowWhosMadmate.GetBool()) color = Main.roleColors[CustomRoles.Madmate];
// Coven
- if ((seer.Is(Custom_Team.Coven) || seer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) color = Main.roleColors[CustomRoles.Coven];
+ //if ((seer.Is(Custom_Team.Coven) || seer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) color = Main.roleColors[CustomRoles.Coven];
// Cultist
if (Cultist.NameRoleColor(seer, target)) color = Main.roleColors[CustomRoles.Cultist];
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index 9556808fa..ec0b4f40f 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -324,6 +324,13 @@
"Necromancer": "Necromancer",
"CovenLeader": "Coven Leader",
"Ritualist": "Ritualist",
+ "Spellcaster": "Spellcaster",
+ "Conjurer": "Conjurer",
+ "Dreamweaver": "Dreamweaver",
+ "Illusionist": "Illusionist",
+ "VoodooMaster": "Voodoo Master",
+ "Sacrifist": "Sacrifist",
+ "MoonDancer": "Moon Dancer",
"Warden": "Warden",
"Minion": "Minion",
"Ghastly": "Ghastly",
@@ -636,6 +643,13 @@
"NecromancerInfo": "Kill your killer to defy death",
"CovenLeaderInfo": "Help your teammates by retraining them",
"RitualistInfo": "Perform Blood Rituals to Enchant other players!",
+ "SpellcasterInfo": "Control other players against eachother!",
+ "ConjurerInfo": "Blast away your enemies!",
+ "DreamweaverInfo": "Drive other players to insomnia!",
+ "IllusionistInfo": "Place Illusions on players to spread confusion!",
+ "VoodooMasterInfo": "Craft Voodoo Dolls of other players!",
+ "SacrifistInfo": "Help your team and harm everyone else at your own cost",
+ "MoonDancerInfo": "Use Baton Pass to give out add-ons!",
"WardenInfo": "(Ghost) Alert about danger",
"MinionInfo": "(Ghost) Blind enemies",
"LoversInfo": "Stay alive and win together",
@@ -938,10 +952,17 @@
"MedusaInfoLong": "(Coven):\nAs the Medusa, you can stone bodies much like cleaning a body.\nStoned bodies cannot be reported.\n\nKill everyone to win.",
"PotionMasterInfoLong": "(Coven):\nAs the Potion Master, you have three different potions assigned to three different actions.\n\nSingle click: Reveal role\nDouble click: Kill\nMap: Sabotage\n\nThe reveal potion has a limit.\nWhen you run out, the kill buttons default to killing.",
"NecromancerInfoLong": "(Coven):\nAs the Necromancer, you win when you're the last one standing.\nAdditionally when someone tries to kill you, you will block the kill, and you will teleport to a random vent. You will have a limited time to kill your killer. If you succeed in doing so, you live. If the time runs out before you kill your killer, you die permanently. If you try to kill someone else other than your killer, you will die.",
- "CovenLeaderInfoLong": "(Coven): The Coven Leader can use their kill button on a fellow Coven member to retrain them into a random Coven role that isn’t currently in the game. During the next meeting, that Coven member will be notified that the Coven Leader wishes to retrain them. They can vote themselves to accept the retrain, or vote otherwise to deny it. Denying the retrain does not take away an ability usage.
With the Necronomicon, you cannot retrain, and can only kill other players.",
- "RitualistInfoLong": "During a meeting, the Ritualist can perform a Blood Ritual to guess a player’s exact role. If the Ritualist is correct, that player will be converted to Coven. If the Ritualist is incorrect, they will not die but will be unable to Blood Ritual until the next meeting.
The command is /rt id role.
With the Necronomicon, the Ritualist can kill.",
- "LastImpostorInfoLong": "(Add-ons):\nThis special effect is given to the last surviving Impostor. It significantly reduces their kill cooldown.",
+ "CovenLeaderInfoLong": "(Coven):\nThe Coven Leader can use their kill button on a fellow Coven member to retrain them into a random Coven role that isn’t currently in the game. During the next meeting, that Coven member will be notified that the Coven Leader wishes to retrain them. They can vote themselves to accept the retrain, or vote otherwise to deny it. Denying the retrain does not take away an ability usage.
With the Necronomicon, you cannot retrain, and can only kill other players.",
+ "RitualistInfoLong": "(Coven):\nDuring a meeting, the Ritualist can perform a Blood Ritual to guess a player’s exact role. If the Ritualist is correct, that player will be converted to Coven. If the Ritualist is incorrect, they will not die but will be unable to Blood Ritual until the next meeting.
The command is /rt id role.
With the Necronomicon, the Ritualist can kill.",
+ "SpellcasterInfoLong": "(Coven):\nThe Spellcaster can use their kill button on two players to control the first player into the other. If the first player has a kill button, they will be forced to use their kill button on the second person.\nWith the Necronomicon, you will kill your first target after controlling them.",
+ "ConjurerInfoLong": "(Coven):\nShapeshift once to mark a location.\nShapeshift again to conjure a meteor at the place you marked, killing everyone in the radius.\nWith the Necronomicon, you can kill. You can also mark a player using the Shapeshift menu. When the Conjurer unshapeshifts, all the players in the radius of the marked player will die, including themselves.",
+ "DreamweaverInfoLong": "(Coven):\nThe Dreamweaver can Dreamweave a player. The dreamweaved players will be notified of this during the next meeting. If the Dreamweaver is not voted out, these players will be unable to use their abilities until the Dreamweaver dies.\nWith the Necronomicon, the Dreamweaver can double-click to kill.",
+ "IllusionistInfoLong": "(Coven):\nThe Illusionist can use their kill button on a player to reverse the results of any investigative role. For example, if someone with a kill button is Illusioned, they will appear not to have a kill button to the Investigator, and vice versa.\nWith the Necronomicon, you may double-click to kill. Every kill you make appears as a random death reason.",
+ "VoodooMasterInfoLong": "(Coven):\nThe Voodoo Master can craft a voodoo doll of a player by using their kill button, similar to the Shaman. All the interactions with you using kill button will be deflected to the voodoo doll and the voodoo doll will destroy. Unlike the Shaman, this voodoo will last during the meeting (eg. If the Voodoo Master is judged, then the voodoo'd player will be judged instead).\nWith the Necronomicon, you can double-click to kill. Additionally, the voodoo’d player will be unable to report. The next person to interact with them will die.",
+ "SacrifistInfoLong": "(Coven):\nThe Sacrifist can vent to cause a random debuff to a non-coven member, however, the Sacrifist will also receive this effect.\nDepending on the host’s settings, if the Sacrifist is voted out, some random non-coven who voted the Sacrifist will die too.\nWith the Necronomicon, when you vent, you commit suicide. However, the entire Coven for the rest of the game receives a lowered kill cooldown.",
+ "MoonDancerInfoLong": "(Coven):\nThe Moon Dancer can use their kill button to use their ability, Baton Pass.\nIf used on a Coven member: Gives a helpful add-on at the next meeting.\nIf used on a non-Coven member: Gives a harmful add-on at the next meeting.\nWith the Necronomicon, the Moon Dancer can double-click their kill button to kill. When killing, the player is teleported off the map. They will appear alive on vitals and will not show up in tracefinder's arrows etc. They die when a meeting/body report with the death reason Blasted Off.",
"OverclockedInfoLong": "(Add-ons):\nAs the Overclocked, your kill cooldown is reduced by a percentage.\n\nThis feature is only assigned to roles with a kill button.",
+ "LastImpostorInfoLong": "(Add-ons):\nThis special effect is given to the last surviving Impostor. It significantly reduces their kill cooldown.",
"LoversInfoLong": "(Add-ons),\nLovers are a combination of two players. The Lovers win when they are the last ones standing, and their victory is shared. When one of the Lovers wins, the other also wins together. Lovers can see the 「♥」 next to each other's name. If one of the Lovers dies, the other will die in love (may not die in love according to the Host's settings). When one of the Lovers is exiled in the meeting, the other will die and become a dead body that cannot be reported.",
"MadmateInfoLong": "(Add-ons):\nOnly Crewmates can become Madmate. Madmate's task is to help the Impostors win the game. Madmate will lose if all Impostors are killed/ejected. Madmates may know who are Impostors, and Impostors may know who are Madmates (host settings).\n\nLazy Guy, Celebrity can't become Madmate. Sheriff, Snitch, Nice Guesser, Mayor, and Judge may become Madmate (host settings). Skill changes when the following roles are converted into Madmates:\n\nTime Manager => Doing tasks will reduce meeting time.\nBodyguard => Skill won't activate if the killer is an Impostor.\nGrenadier => Flash bomb will work on Crewmates and Neutrals instead of the Impostors.\nSheriff => Can kill anyone, including Impostors (host settings).\nNice Guesser => Can guess Crewmates and Neutrals\nPsychic => All evil Neutrals and Crewmates' names with the ability to kill will be displayed in Red.\nJudge => Can judge anyone\nPacifist => Their ability only works on Crewmates.",
"WatcherInfoLong": "(Add-ons):\nDuring the meeting, Watcher can see everyone's votes.",
@@ -1890,6 +1911,14 @@
"RitualistCommandHelp": "Instructions: /rt [Player ID] [Role Name] \nExample: /rt 3 Bait \nYou can see the player IDs before everyone's names \n or use the /id command to list the player IDs",
"RitualistConvertNotif": "Your role has been guessed by the {0} and you are now apart of the Coven!",
+ "ConjurerCooldown": "Conjure Cooldown",
+ "ConjurerRadius": "Blast Radius",
+ "ConjurerNecroRadius": "Necronomicon Blast Radius",
+ "ConjurerCovenDies": "Coven can die in blast",
+ "ConjurerMark": "Location marked",
+ "ConjurerMeteor": "Meteor summoned",
+ "ConjurerNecroMark": "Player marked",
+
"LuckyProbability": "Probability of surviving a kill",
"ImpCanBeDoubleShot": "Impostors can have Double Shot",
"CrewCanBeDoubleShot": "Crewmates can have Double Shot",
diff --git a/Resources/roleColor.json b/Resources/roleColor.json
index 1663d46e4..5dfbf1ffe 100644
--- a/Resources/roleColor.json
+++ b/Resources/roleColor.json
@@ -156,7 +156,8 @@
"Pixie": "#00FF00",
"Imitator": "#B3D94C",
"Doppelganger": "#f6f4a3",
- "CovenLeader": "#ac42f2",
+ "Coven": "#ac42f2",
+ "Enchanted": "#ac42f2",
"GM": "#ff5b70",
"NotAssigned": "#ffffff",
"LastImpostor": "#ff1919",
diff --git a/Roles/AddOns/Common/Necroview.cs b/Roles/AddOns/Common/Necroview.cs
index f64e8460f..e14a93a55 100644
--- a/Roles/AddOns/Common/Necroview.cs
+++ b/Roles/AddOns/Common/Necroview.cs
@@ -37,6 +37,10 @@ or CustomRoles.Recruit
return Main.roleColors[CustomRoles.Bait];
}
+ if (customRole.IsCoven() || customRole.Equals(CustomRoles.Enchanted))
+ {
+ return Main.roleColors[CustomRoles.Coven];
+ }
return Main.roleColors[CustomRoles.Knight];
}
}
diff --git a/Roles/Coven/Conjurer.cs b/Roles/Coven/Conjurer.cs
index e69de29bb..3e04823f5 100644
--- a/Roles/Coven/Conjurer.cs
+++ b/Roles/Coven/Conjurer.cs
@@ -0,0 +1,125 @@
+using Hazel;
+using TOHE.Roles.Core;
+using TOHE.Roles.Double;
+using TOHE.Roles.AddOns.Crewmate;
+using TOHE.Modules;
+using InnerNet;
+using static TOHE.Options;
+using static TOHE.Translator;
+using static TOHE.Utils;
+using System.Text.RegularExpressions;
+using System;
+using TOHE.Modules.ChatManager;
+using UnityEngine;
+using static UnityEngine.GraphicsBuffer;
+
+namespace TOHE.Roles.Coven;
+
+internal class Conjurer : CovenManager
+{
+ private enum ConjState
+ {
+ NormalMark,
+ NormalBomb,
+ NecroMark,
+ NecroBomb
+ }
+ //===========================SETUP================================\\
+ private const int Id = 30000;
+ public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.Conjurer);
+ public override bool IsDesyncRole => true;
+ public override CustomRoles ThisRoleBase => CustomRoles.Shapeshifter;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenKilling;
+ //==================================================================\\
+ private static OptionItem ConjureCooldown;
+ private static OptionItem ConjureRadius;
+ private static OptionItem NecroRadius;
+ private static OptionItem CovenDiesInBlast;
+
+ public static byte NecroBombHolder = byte.MaxValue;
+ private static readonly Dictionary> ConjPosition = [];
+ private static readonly Dictionary state = [];
+
+
+ public override void SetupCustomOption()
+ {
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Conjurer, 1, zeroOne: false);
+ ConjureCooldown = FloatOptionItem.Create(Id + 10, "ConjurerCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Conjurer])
+ .SetValueFormat(OptionFormat.Seconds);
+ ConjureRadius = FloatOptionItem.Create(Id + 11, "ConjurerRadius", new(0.5f, 100f, 0.5f), 2f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Conjurer])
+ .SetValueFormat(OptionFormat.Multiplier);
+ NecroRadius = FloatOptionItem.Create(Id + 12, "ConjurerNecroRadius", new(0.5f, 100f, 0.5f), 3f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Conjurer])
+ .SetValueFormat(OptionFormat.Multiplier);
+ CovenDiesInBlast = BooleanOptionItem.Create(Id + 13, "ConjurerCovenDies", false, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Conjurer]);
+ }
+ public override void Init()
+ {
+ NecroBombHolder = byte.MaxValue;
+ ConjPosition.Clear();
+ }
+ public override void Add(byte playerId)
+ {
+ ConjPosition[playerId] = [];
+ state.TryAdd(playerId, ConjState.NormalMark);
+ }
+ public override bool CanUseKillButton(PlayerControl pc) => HasNecronomicon(pc);
+
+ public override bool OnCheckShapeshift(PlayerControl shapeshifter, PlayerControl target, ref bool resetCooldown, ref bool shouldAnimate)
+ {
+ Logger.Info($"Conjurer ShapeShift", "Conjurer");
+ if (shapeshifter.PlayerId == target.PlayerId) return false;
+ state[shapeshifter.PlayerId] = HasNecronomicon(shapeshifter) ? ConjState.NecroMark : ConjState.NormalMark;
+ switch (state[shapeshifter.PlayerId])
+ {
+ case ConjState.NormalMark:
+ ConjPosition[shapeshifter.PlayerId].Add(shapeshifter.transform.position);
+ state[shapeshifter.PlayerId] = ConjState.NormalBomb;
+ shapeshifter.Notify(GetString("ConjurerMark"));
+ break;
+
+ case ConjState.NormalBomb:
+ foreach (var player in Main.AllAlivePlayerControls)
+ {
+ foreach (var pos in ConjPosition[shapeshifter.PlayerId].ToArray())
+ {
+ var dis = GetDistance(pos, player.transform.position);
+ if (dis > ConjureRadius.GetFloat()) continue;
+ if (player.IsPlayerCoven() && !CovenDiesInBlast.GetBool()) continue;
+ else
+ {
+ player.SetDeathReason(PlayerState.DeathReason.Bombed);
+ player.RpcMurderPlayer(player);
+ player.SetRealKiller(shapeshifter);
+ }
+ }
+ }
+ shapeshifter.Notify(GetString("ConjurerMeteor"));
+ state[shapeshifter.PlayerId] = ConjState.NormalMark;
+ break;
+ case ConjState.NecroMark:
+ NecroBombHolder = target.PlayerId;
+ state[shapeshifter.PlayerId] = ConjState.NecroBomb;
+ shapeshifter.Notify(GetString("ConjurerNecroMark"));
+ break;
+ case ConjState.NecroBomb:
+ foreach (var player in Main.AllAlivePlayerControls)
+ {
+ var dis = GetDistance(GetPlayerById(NecroBombHolder).transform.position, player.transform.position);
+ if (dis > NecroRadius.GetFloat()) continue;
+ if (player.IsPlayerCoven() && !CovenDiesInBlast.GetBool()) continue;
+ else
+ {
+ player.SetDeathReason(PlayerState.DeathReason.Bombed);
+ player.RpcMurderPlayer(player);
+ player.SetRealKiller(shapeshifter);
+ }
+
+ }
+ shapeshifter.Notify(GetString("ConjurerMeteor"));
+ state[shapeshifter.PlayerId] = ConjState.NecroMark;
+ NecroBombHolder = byte.MaxValue;
+ break;
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/Roles/Coven/CovenManager.cs b/Roles/Coven/CovenManager.cs
index 32f7d2c1a..5319f8cdf 100644
--- a/Roles/Coven/CovenManager.cs
+++ b/Roles/Coven/CovenManager.cs
@@ -67,11 +67,11 @@ public override string GetMarkOthers(PlayerControl seer, PlayerControl target, b
}
return string.Empty;
}
- private void SendRPC(byte playerId)
+ private static void SendRPC(byte playerId)
{
MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SyncRoleSkill, SendOption.Reliable, -1);
- writer.WriteNetObject(_Player);
- writer.Write(necroHolder.PlayerId);
+ writer.WriteNetObject(GetPlayerById(playerId));
+ writer.Write(playerId);
AmongUsClient.Instance.FinishRpcImmediately(writer);
}
public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
@@ -103,17 +103,20 @@ public override bool CanUseImpostorVentButton(PlayerControl pc)
return option.GetBool();
}
}
- //public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
- //public override bool OthersKnowTargetRoleColor(PlayerControl seer, PlayerControl target) => KnowRoleTarget(seer, target);
+ public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
+ public override bool OthersKnowTargetRoleColor(PlayerControl seer, PlayerControl target) => KnowRoleTarget(seer, target);
public static void GiveNecronomicon()
{
+
var pcList = Main.AllAlivePlayerControls.Where(pc => pc.IsPlayerCoven() && pc.IsAlive()).ToList();
if (pcList.Any())
{
PlayerControl rp = pcList.RandomElement();
necroHolder = rp;
necroHolder.Notify(GetString("NecronomiconNotification"));
+ SendRPC(necroHolder.PlayerId);
}
+
}
public override void OnCoEndGame()
{
diff --git a/Roles/Coven/Necromancer.cs b/Roles/Coven/Necromancer.cs
index d105d7af0..38d9b01f5 100644
--- a/Roles/Coven/Necromancer.cs
+++ b/Roles/Coven/Necromancer.cs
@@ -16,8 +16,8 @@ internal class Necromancer : CovenManager
//==================================================================\\
private static OptionItem KillCooldown;
- private static OptionItem CanVent;
- private static OptionItem HasImpostorVision;
+ //private static OptionItem CanVent;
+ //private static OptionItem HasImpostorVision;
private static OptionItem RevengeTime;
public static PlayerControl Killer = null;
@@ -33,8 +33,8 @@ public override void SetupCustomOption()
.SetValueFormat(OptionFormat.Seconds);
RevengeTime = IntegerOptionItem.Create(Id + 11, "NecromancerRevengeTime", new(0, 60, 1), 30, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer])
.SetValueFormat(OptionFormat.Seconds);
- CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]);
- HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]);
+ //CanVent = BooleanOptionItem.Create(Id + 12, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]);
+ //HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]);
}
public override void Init()
{
@@ -49,10 +49,10 @@ public override void Add(byte playerId)
playerIdList.Add(playerId);
Timer = RevengeTime.GetInt();
}
- public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
+ //public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = KillCooldown.GetFloat();
public override bool CanUseKillButton(PlayerControl pc) => true;
- public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
+ //public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
public override bool OnCheckMurderAsTarget(PlayerControl killer, PlayerControl target)
diff --git a/main.cs b/main.cs
index 83de97593..f9561924e 100644
--- a/main.cs
+++ b/main.cs
@@ -348,14 +348,6 @@ public static void LoadRoleColors()
case Custom_Team.Impostor:
roleColors.TryAdd(role, "#ff1919");
break;
- default:
- break;
- }
- }
- foreach (var role in EnumHelper.GetAllValues())
- {
- switch (role.GetCustomRoleTeam())
- {
case Custom_Team.Coven:
roleColors.TryAdd(role, "#ac42f2");
break;
From 79af27ed910b3824d6b5a720a936e36827f22fc5 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:47:01 -0400
Subject: [PATCH 006/101] conj fix
---
Roles/Coven/Conjurer.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Roles/Coven/Conjurer.cs b/Roles/Coven/Conjurer.cs
index 3e04823f5..beea25724 100644
--- a/Roles/Coven/Conjurer.cs
+++ b/Roles/Coven/Conjurer.cs
@@ -68,7 +68,8 @@ public override bool OnCheckShapeshift(PlayerControl shapeshifter, PlayerControl
{
Logger.Info($"Conjurer ShapeShift", "Conjurer");
if (shapeshifter.PlayerId == target.PlayerId) return false;
- state[shapeshifter.PlayerId] = HasNecronomicon(shapeshifter) ? ConjState.NecroMark : ConjState.NormalMark;
+ if (state[shapeshifter.PlayerId] != ConjState.NecroBomb && state[shapeshifter.PlayerId] != ConjState.NormalBomb)
+ state[shapeshifter.PlayerId] = HasNecronomicon(shapeshifter) ? ConjState.NecroMark : ConjState.NormalMark;
switch (state[shapeshifter.PlayerId])
{
case ConjState.NormalMark:
From 71b55908e2490eeb63ab5fbcd32959b67d809046 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:47:37 -0400
Subject: [PATCH 007/101] push so i can merge and bug fix
---
Roles/Coven/Illusionist.cs | 97 ++++++++++++++++++++++++++++++++++
Roles/Crewmate/Investigator.cs | 4 +-
2 files changed, 100 insertions(+), 1 deletion(-)
diff --git a/Roles/Coven/Illusionist.cs b/Roles/Coven/Illusionist.cs
index e69de29bb..eea65a246 100644
--- a/Roles/Coven/Illusionist.cs
+++ b/Roles/Coven/Illusionist.cs
@@ -0,0 +1,97 @@
+
+using Hazel;
+using TOHE.Roles.Core;
+using TOHE.Roles.AddOns.Impostor;
+using TOHE.Modules;
+using InnerNet;
+using static TOHE.Options;
+using static TOHE.Translator;
+using static TOHE.Utils;
+using System.Text.RegularExpressions;
+using System;
+using TOHE.Modules.ChatManager;
+using UnityEngine;
+using static UnityEngine.GraphicsBuffer;
+
+namespace TOHE.Roles.Coven;
+
+internal class Illusionist : CovenManager
+{
+ //===========================SETUP================================\\
+ private const int Id = 30100;
+ public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.Illusionist);
+ public override bool IsDesyncRole => true;
+ public override CustomRoles ThisRoleBase => CustomRoles.Shapeshifter;
+ public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenTrickery;
+ //==================================================================\\
+
+ private static OptionItem IllusionCooldown;
+ private static OptionItem MaxIllusions;
+ private static OptionItem SnitchCanIllusioned;
+
+ private static readonly Dictionary> IllusionedPlayers = [];
+
+
+ public override void SetupCustomOption()
+ {
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Conjurer, 1, zeroOne: false);
+ IllusionCooldown = FloatOptionItem.Create(Id + 10, "IllusionCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Conjurer])
+ .SetValueFormat(OptionFormat.Seconds);
+ MaxIllusions = IntegerOptionItem.Create(Id + 11, "IllusionistMaxIllusions", new(1, 15, 1), 5, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist])
+ .SetValueFormat(OptionFormat.Times);
+ SnitchCanIllusioned = BooleanOptionItem.Create(Id + 12, "IllusionistSnitchAffected", false, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Conjurer]);
+ }
+
+ public override void Init()
+ {
+ IllusionedPlayers.Clear();
+ }
+ public override void Add(byte playerId)
+ {
+ IllusionedPlayers[playerId] = [];
+ GetPlayerById(playerId)?.AddDoubleTrigger();
+ }
+ public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
+ {
+ if (killer.CheckDoubleTrigger(target, () =>
+ {
+ killer.SetKillCooldown();
+
+ if (!IllusionedPlayers[killer.PlayerId].Contains(target.PlayerId))
+ {
+ IllusionedPlayers[killer.PlayerId].Add(target.PlayerId);
+ }
+ })
+ ) //this looks so ugly
+ {
+ var randomDeathReason = ChangeRandomDeath();
+ Main.PlayerStates[target.PlayerId].deathReason = randomDeathReason;
+ Main.PlayerStates[target.PlayerId].SetDead();
+ return true;
+ }
+ return false;
+ }
+ private static PlayerState.DeathReason ChangeRandomDeath()
+ {
+ PlayerState.DeathReason[] deathReasons = EnumHelper.GetAllValues().ToArray();
+ if (deathReasons.Length == 0 || !deathReasons.Contains(PlayerState.DeathReason.Kill)) deathReasons.AddItem(PlayerState.DeathReason.Kill);
+ var random = IRandom.Instance;
+ int randomIndex = random.Next(deathReasons.Length);
+ return deathReasons[randomIndex];
+ }
+ public static bool IsNonCovIllusioned(byte target)
+ {
+ byte pc = Utils.GetPlayerListByRole(CustomRoles.Illusionist).First().PlayerId;
+ return IllusionedPlayers[pc].Contains(target) && !GetPlayerById(target).IsPlayerCoven();
+ }
+ public static bool IsCovIllusioned(byte target)
+ {
+ byte pc = Utils.GetPlayerListByRole(CustomRoles.Illusionist).First().PlayerId;
+ return IllusionedPlayers[pc].Contains(target) && GetPlayerById(target).IsPlayerCoven();
+ }
+ public override void AfterMeetingTasks()
+ {
+ IllusionedPlayers.Clear();
+ }
+ public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false) => IllusionedPlayers[seer.PlayerId].Contains(seen.PlayerId) ? ColorString(GetRoleColor(CustomRoles.Illusionist), "") : string.Empty;
+}
\ No newline at end of file
diff --git a/Roles/Crewmate/Investigator.cs b/Roles/Crewmate/Investigator.cs
index a2845fe44..fdf5d0a31 100644
--- a/Roles/Crewmate/Investigator.cs
+++ b/Roles/Crewmate/Investigator.cs
@@ -1,6 +1,7 @@
using AmongUs.GameOptions;
using Hazel;
using UnityEngine;
+using TOHE.Roles.Coven;
using static TOHE.Options;
namespace TOHE.Roles.Crewmate;
@@ -142,7 +143,8 @@ public override string PlayerKnowTargetColor(PlayerControl seer, PlayerControl t
if (!InvestigatedList.TryGetValue(seer.PlayerId, out var targetList)) return string.Empty;
if (!targetList.Contains(target.PlayerId)) return string.Empty;
- if (target.HasKillButton() || CopyCat.playerIdList.Contains(target.PlayerId)) return "#FF1919";
+ if (Illusionist.IsCovIllusioned(target.PlayerId)) return "#8CFFFF";
+ if (Illusionist.IsNonCovIllusioned(target.PlayerId) || target.HasKillButton() || CopyCat.playerIdList.Contains(target.PlayerId)) return "#FF1919";
else return "#8CFFFF";
}
public override void OnReportDeadBody(PlayerControl reporter, NetworkedPlayerInfo target)
From fbbead2c834b8a8d5439d1fe782882356538dc11 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:11:19 -0400
Subject: [PATCH 008/101] a
---
Modules/ExtendedPlayerControl.cs | 3 +++
Modules/NameColorManager.cs | 2 +-
Resources/Lang/en_US.json | 4 ++++
Roles/Coven/Conjurer.cs | 9 +++++++--
Roles/Coven/CovenLeader.cs | 2 +-
Roles/Coven/CovenManager.cs | 8 +++++---
Roles/Coven/Illusionist.cs | 13 ++++++++-----
7 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs
index 8fa697f14..7405382a9 100644
--- a/Modules/ExtendedPlayerControl.cs
+++ b/Modules/ExtendedPlayerControl.cs
@@ -1241,6 +1241,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 (target.Is(CustomRoles.Enchanted) && seer.Is(Custom_Team.Coven)) return true;
+ else if (seer.Is(CustomRoles.Enchanted) && target.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;
diff --git a/Modules/NameColorManager.cs b/Modules/NameColorManager.cs
index 6d6d79917..8bc5ec004 100644
--- a/Modules/NameColorManager.cs
+++ b/Modules/NameColorManager.cs
@@ -50,7 +50,7 @@ private static bool KnowTargetRoleColor(PlayerControl seer, PlayerControl target
if (seer.Is(CustomRoles.Madmate) && target.Is(CustomRoles.Madmate) && Madmate.MadmateKnowWhosMadmate.GetBool()) color = Main.roleColors[CustomRoles.Madmate];
// Coven
- //if ((seer.Is(Custom_Team.Coven) || seer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) color = Main.roleColors[CustomRoles.Coven];
+ if ((seer.Is(Custom_Team.Coven) || seer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) color = Main.roleColors[CustomRoles.Coven];
// Cultist
if (Cultist.NameRoleColor(seer, target)) color = Main.roleColors[CustomRoles.Cultist];
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index b705acc78..3e3ab19a9 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -1971,6 +1971,10 @@
"ConjurerMeteor": "Meteor summoned",
"ConjurerNecroMark": "Player marked",
+ "IllusionCooldown": "Illusion Cooldown",
+ "IllusionistMaxIllusions": "Max Illusions",
+ "IllusionistSnitchAffected": "Snitch is Affected by Illusions",
+
"LuckyProbability": "Probability of surviving a kill",
"ImpCanBeDoubleShot": "Impostors can have Double Shot",
"CrewCanBeDoubleShot": "Crewmates can have Double Shot",
diff --git a/Roles/Coven/Conjurer.cs b/Roles/Coven/Conjurer.cs
index beea25724..5817014ec 100644
--- a/Roles/Coven/Conjurer.cs
+++ b/Roles/Coven/Conjurer.cs
@@ -12,6 +12,7 @@
using TOHE.Modules.ChatManager;
using UnityEngine;
using static UnityEngine.GraphicsBuffer;
+using AmongUs.GameOptions;
namespace TOHE.Roles.Coven;
@@ -25,7 +26,7 @@ private enum ConjState
NecroBomb
}
//===========================SETUP================================\\
- private const int Id = 30000;
+ private const int Id = 30300;
public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.Conjurer);
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Shapeshifter;
@@ -63,9 +64,13 @@ public override void Add(byte playerId)
state.TryAdd(playerId, ConjState.NormalMark);
}
public override bool CanUseKillButton(PlayerControl pc) => HasNecronomicon(pc);
-
+ public override void ApplyGameOptions(IGameOptions opt, byte playerId)
+ {
+ AURoleOptions.ShapeshifterCooldown = ConjureCooldown.GetFloat();
+ }
public override bool OnCheckShapeshift(PlayerControl shapeshifter, PlayerControl target, ref bool resetCooldown, ref bool shouldAnimate)
{
+ resetCooldown = true;
Logger.Info($"Conjurer ShapeShift", "Conjurer");
if (shapeshifter.PlayerId == target.PlayerId) return false;
if (state[shapeshifter.PlayerId] != ConjState.NecroBomb && state[shapeshifter.PlayerId] != ConjState.NormalBomb)
diff --git a/Roles/Coven/CovenLeader.cs b/Roles/Coven/CovenLeader.cs
index 9b27bea5f..2bd49e328 100644
--- a/Roles/Coven/CovenLeader.cs
+++ b/Roles/Coven/CovenLeader.cs
@@ -15,7 +15,7 @@ namespace TOHE.Roles.Coven;
internal class CovenLeader : CovenManager
{
//===========================SETUP================================\\
- private const int Id = 29800;
+ private const int Id = 30200;
public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.CovenLeader);
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
diff --git a/Roles/Coven/CovenManager.cs b/Roles/Coven/CovenManager.cs
index 5319f8cdf..a71faa99c 100644
--- a/Roles/Coven/CovenManager.cs
+++ b/Roles/Coven/CovenManager.cs
@@ -47,14 +47,14 @@ private static void SetUpImpVisOption(CustomRoles role, int Id, bool defaultValu
{
var roleName = GetRoleName(role);
Dictionary replacementDic = new() { { "%role%", ColorString(GetRoleColor(role), roleName) } };
- CovenImpVisOptions[role] = BooleanOptionItem.Create(Id, "%role%HasImpVis", defaultValue, TabGroup.CovenRoles, false).SetParent(CovenImpVisMode);
+ CovenImpVisOptions[role] = BooleanOptionItem.Create(Id, "%role%HasImpVis", defaultValue, TabGroup.CovenRoles, false).SetParent(parent);
CovenImpVisOptions[role].ReplacementDictionary = replacementDic;
}
private static void SetUpVentOption(CustomRoles role, int Id, bool defaultValue = true, OptionItem parent = null)
{
var roleName = GetRoleName(role);
Dictionary replacementDic = new() { { "%role%", ColorString(GetRoleColor(role), roleName) } };
- CovenVentOptions[role] = BooleanOptionItem.Create(Id, "%role%CanVent", defaultValue, TabGroup.CovenRoles, false).SetParent(CovenVentMode);
+ CovenVentOptions[role] = BooleanOptionItem.Create(Id, "%role%CanVent", defaultValue, TabGroup.CovenRoles, false).SetParent(parent);
CovenVentOptions[role].ReplacementDictionary = replacementDic;
}
public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false)
@@ -103,8 +103,10 @@ public override bool CanUseImpostorVentButton(PlayerControl pc)
return option.GetBool();
}
}
+ /*
public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
public override bool OthersKnowTargetRoleColor(PlayerControl seer, PlayerControl target) => KnowRoleTarget(seer, target);
+ */
public static void GiveNecronomicon()
{
@@ -122,7 +124,7 @@ public override void OnCoEndGame()
{
necroHolder = null;
}
- public override void OnFixedUpdate(PlayerControl pc)
+ public override void OnFixedUpdate(PlayerControl player, bool lowLoad, long nowTime)
{
if (!necroHolder.IsAlive())
{
diff --git a/Roles/Coven/Illusionist.cs b/Roles/Coven/Illusionist.cs
index eea65a246..64590a7f5 100644
--- a/Roles/Coven/Illusionist.cs
+++ b/Roles/Coven/Illusionist.cs
@@ -12,13 +12,14 @@
using TOHE.Modules.ChatManager;
using UnityEngine;
using static UnityEngine.GraphicsBuffer;
+using AmongUs.GameOptions;
namespace TOHE.Roles.Coven;
internal class Illusionist : CovenManager
{
//===========================SETUP================================\\
- private const int Id = 30100;
+ private const int Id = 30400;
public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.Illusionist);
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Shapeshifter;
@@ -34,12 +35,12 @@ internal class Illusionist : CovenManager
public override void SetupCustomOption()
{
- SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Conjurer, 1, zeroOne: false);
- IllusionCooldown = FloatOptionItem.Create(Id + 10, "IllusionCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Conjurer])
+ SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Illusionist, 1, zeroOne: false);
+ IllusionCooldown = FloatOptionItem.Create(Id + 10, "IllusionCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Illusionist])
.SetValueFormat(OptionFormat.Seconds);
- MaxIllusions = IntegerOptionItem.Create(Id + 11, "IllusionistMaxIllusions", new(1, 15, 1), 5, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist])
+ MaxIllusions = IntegerOptionItem.Create(Id + 11, "IllusionistMaxIllusions", new(1, 15, 1), 5, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Illusionist])
.SetValueFormat(OptionFormat.Times);
- SnitchCanIllusioned = BooleanOptionItem.Create(Id + 12, "IllusionistSnitchAffected", false, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Conjurer]);
+ SnitchCanIllusioned = BooleanOptionItem.Create(Id + 12, "IllusionistSnitchAffected", false, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Illusionist]);
}
public override void Init()
@@ -48,6 +49,7 @@ public override void Init()
}
public override void Add(byte playerId)
{
+ AbilityLimit = MaxIllusions.GetInt();
IllusionedPlayers[playerId] = [];
GetPlayerById(playerId)?.AddDoubleTrigger();
}
@@ -71,6 +73,7 @@ public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl t
}
return false;
}
+ public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = IllusionCooldown.GetFloat();
private static PlayerState.DeathReason ChangeRandomDeath()
{
PlayerState.DeathReason[] deathReasons = EnumHelper.GetAllValues().ToArray();
From 6b541bf89717188809930a925e9f7a759e1062a7 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Sun, 29 Sep 2024 12:47:30 -0400
Subject: [PATCH 009/101] push then merge because alpha 15 is bugged as hell
---
Modules/ExtendedPlayerControl.cs | 4 +-
Modules/NameColorManager.cs | 3 +-
Patches/CheckGameEndPatch.cs | 8 +--
Patches/PlayerControlPatch.cs | 2 +-
Resources/Lang/en_US.json | 11 ++-
Roles/Core/CustomRoleManager.cs | 2 +
Roles/Coven/Conjurer.cs | 6 --
Roles/Coven/CovenLeader.cs | 3 -
Roles/Coven/CovenManager.cs | 34 ++++-----
Roles/Coven/Illusionist.cs | 63 ++++++++++-------
Roles/Coven/Medusa.cs | 114 +++++++++++++++++++++++++++----
Roles/Coven/Ritualist.cs | 27 ++++++--
Roles/Crewmate/Inspector.cs | 18 +++--
Roles/Crewmate/Oracle.cs | 4 ++
Roles/Crewmate/Psychic.cs | 3 +-
Roles/Crewmate/Snitch.cs | 3 +-
Roles/Crewmate/Witness.cs | 4 +-
17 files changed, 221 insertions(+), 88 deletions(-)
diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs
index 7405382a9..607f11138 100644
--- a/Modules/ExtendedPlayerControl.cs
+++ b/Modules/ExtendedPlayerControl.cs
@@ -1241,8 +1241,8 @@ 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 (target.Is(CustomRoles.Enchanted) && seer.Is(Custom_Team.Coven)) return true;
- else if (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 (seer.Is(CustomRoles.Enchanted) && target.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;
diff --git a/Modules/NameColorManager.cs b/Modules/NameColorManager.cs
index 8bc5ec004..7b34a7e8b 100644
--- a/Modules/NameColorManager.cs
+++ b/Modules/NameColorManager.cs
@@ -49,8 +49,9 @@ 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
+ /* Coven
if ((seer.Is(Custom_Team.Coven) || seer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) color = Main.roleColors[CustomRoles.Coven];
+ */
// Cultist
if (Cultist.NameRoleColor(seer, target)) color = Main.roleColors[CustomRoles.Cultist];
diff --git a/Patches/CheckGameEndPatch.cs b/Patches/CheckGameEndPatch.cs
index 6ab1a90f2..c6653bb36 100644
--- a/Patches/CheckGameEndPatch.cs
+++ b/Patches/CheckGameEndPatch.cs
@@ -643,15 +643,15 @@ public static bool CheckGameEndByLivingPlayers(out GameOverReason reason)
else
{
if (impCount >= 1) return false; // Both Imp and NK are alive, the game must continue
- if (covenCount >= 1) return false; // Both Coven and NK are alive, the game must continue
- if (crewCount > totalNKAlive) return false; // Imps are dead, but Crew still outnumbers NK (the game must continue)
- if (crewCount > totalNKAlive) return false; // Imps are dead, but Crew still outnumbers Coven (the game must continue)
- if (crewCount <= covenCount && totalNKAlive == 0) // Imps dead, NK dead, Coven <= NK, Coven wins
+ if (crewCount <= covenCount && totalNKAlive == 0) // Imps dead, NK dead, Crew <= Coven, Coven wins
{
reason = GameOverReason.ImpostorByKill;
ResetAndSetWinner(CustomWinner.Coven);
return true;
}
+ if (covenCount >= 1) return false; // Both Coven and NK are alive, the game must continue
+ if (crewCount > totalNKAlive) return false; // Imps are dead, but Crew still outnumbers NK (the game must continue)
+ if (crewCount > covenCount) return false; // Imps are dead, but Crew still outnumbers Coven (the game must continue)
else // Imps dead, Crew <= NK, Checking if All nk alive are in 1 team
{
var winners = neutralRoleCounts.Where(kvp => kvp.Value == totalNKAlive).ToArray();
diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs
index a1b78e6ae..db4a043dd 100644
--- a/Patches/PlayerControlPatch.cs
+++ b/Patches/PlayerControlPatch.cs
@@ -276,7 +276,7 @@ public static bool RpcCheckAndMurder(PlayerControl killer, PlayerControl target,
return false;
// Coven CAN'T kill Coven/Enchanted
- if ((killer.Is(Custom_Team.Coven) || killer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) return false;
+ // if ((killer.Is(Custom_Team.Coven) || killer.Is(CustomRoles.Enchanted)) && (target.Is(Custom_Team.Coven) || target.Is(CustomRoles.Enchanted))) return false;
Logger.Info($"Start", "OnCheckMurderAsTargetOnOthers");
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index 3e3ab19a9..b086c68fb 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -621,7 +621,7 @@
"VultureInfo": "Eat bodies by reporting to win",
"TaskinatorInfo": "Silent tasks, deadly blasts",
"BenefactorInfo": "Task complete, shield elite!",
- "MedusaInfo": "Stone bodies by reporting them",
+ "MedusaInfo": "Stop players in their tracks by Stoning them",
"SpiritcallerInfo": "Turn Players into Evil Spirits",
"AmnesiacInfo": "Remember the role of a dead body",
"ImitatorInfo": "Imitate a player's role",
@@ -958,7 +958,7 @@
"PoisonerInfoLong": "(Coven):\nAs the Poisoner, your kills are delayed.\nKill everyone to win.",
"HexMasterInfoLong": "(Coven):\nAs the Hex Master, you can hex players or kill them.\nHexing a player works the same as spelling as a Witch.",
"JinxInfoLong": "(Coven):\nAs the Jinx, whenever you get attacked, you jinx them, resulting in them dying to a jinx.\nThis has limited uses.\n\nKill off everyone to win.",
- "MedusaInfoLong": "(Coven):\nAs the Medusa, you can stone bodies much like cleaning a body.\nStoned bodies cannot be reported.\n\nKill everyone to win.",
+ "MedusaInfoLong": "(Coven):\nThe Medusa can use their kill button on players to mark them as Stoned. When the Medusa vents, all Stoned players will be unable to move and will have reduced vision for a configurable amount of time. With the Necronomicon, killed players will be unreportable.",
"PotionMasterInfoLong": "(Coven):\nAs the Potion Master, you have three different potions assigned to three different actions.\n\nSingle click: Reveal role\nDouble click: Kill\nMap: Sabotage\n\nThe reveal potion has a limit.\nWhen you run out, the kill buttons default to killing.",
"NecromancerInfoLong": "(Coven):\nAs the Necromancer, you win when you're the last one standing.\nAdditionally when someone tries to kill you, you will block the kill, and you will teleport to a random vent. You will have a limited time to kill your killer. If you succeed in doing so, you live. If the time runs out before you kill your killer, you die permanently. If you try to kill someone else other than your killer, you will die.",
"CovenLeaderInfoLong": "(Coven):\nThe Coven Leader can use their kill button on a fellow Coven member to retrain them into a random Coven role that isn’t currently in the game. During the next meeting, that Coven member will be notified that the Coven Leader wishes to retrain them. They can vote themselves to accept the retrain, or vote otherwise to deny it. Denying the retrain does not take away an ability usage.
With the Necronomicon, you cannot retrain, and can only kill other players.",
@@ -966,7 +966,7 @@
"SpellcasterInfoLong": "(Coven):\nThe Spellcaster can use their kill button on two players to control the first player into the other. If the first player has a kill button, they will be forced to use their kill button on the second person.\nWith the Necronomicon, you will kill your first target after controlling them.",
"ConjurerInfoLong": "(Coven):\nShapeshift once to mark a location.\nShapeshift again to conjure a meteor at the place you marked, killing everyone in the radius.\nWith the Necronomicon, you can kill. You can also mark a player using the Shapeshift menu. When the Conjurer unshapeshifts, all the players in the radius of the marked player will die, including themselves.",
"DreamweaverInfoLong": "(Coven):\nThe Dreamweaver can Dreamweave a player. The dreamweaved players will be notified of this during the next meeting. If the Dreamweaver is not voted out, these players will be unable to use their abilities until the Dreamweaver dies.\nWith the Necronomicon, the Dreamweaver can double-click to kill.",
- "IllusionistInfoLong": "(Coven):\nThe Illusionist can use their kill button on a player to reverse the results of any investigative role. For example, if someone with a kill button is Illusioned, they will appear not to have a kill button to the Investigator, and vice versa.\nWith the Necronomicon, you may double-click to kill. Every kill you make appears as a random death reason.",
+ "IllusionistInfoLong": "(Coven):\nThe Illusionist can use their kill button on a player to reverse the results of any investigative role. For example, if someone with a kill button is Illusioned, they will appear not to have a kill button to the Investigator, and vice versa.\nIllusions wear off after meetings.\nWith the Necronomicon, you may double-click to kill. Every kill you make appears as a random death reason.",
"VoodooMasterInfoLong": "(Coven):\nThe Voodoo Master can craft a voodoo doll of a player by using their kill button, similar to the Shaman. All the interactions with you using kill button will be deflected to the voodoo doll and the voodoo doll will destroy. Unlike the Shaman, this voodoo will last during the meeting (eg. If the Voodoo Master is judged, then the voodoo'd player will be judged instead).\nWith the Necronomicon, you can double-click to kill. Additionally, the voodoo’d player will be unable to report. The next person to interact with them will die.",
"SacrifistInfoLong": "(Coven):\nThe Sacrifist can vent to cause a random debuff to a non-coven member, however, the Sacrifist will also receive this effect.\nDepending on the host’s settings, if the Sacrifist is voted out, some random non-coven who voted the Sacrifist will die too.\nWith the Necronomicon, when you vent, you commit suicide. However, the entire Coven for the rest of the game receives a lowered kill cooldown.",
"MoonDancerInfoLong": "(Coven):\nThe Moon Dancer can use their kill button to use their ability, Baton Pass.\nIf used on a Coven member: Gives a helpful add-on at the next meeting.\nIf used on a non-Coven member: Gives a harmful add-on at the next meeting.\nWith the Necronomicon, the Moon Dancer can double-click their kill button to kill. When killing, the player is teleported off the map. They will appear alive on vitals and will not show up in tracefinder's arrows etc. They die when a meeting/body report with the death reason Blasted Off.",
@@ -1975,6 +1975,10 @@
"IllusionistMaxIllusions": "Max Illusions",
"IllusionistSnitchAffected": "Snitch is Affected by Illusions",
+ "MedusaStoneCooldown": "Stone Cooldown",
+ "MedusaStoneDuration": "Stone Duration",
+ "MedusaStoneVision": "Stoned Vision",
+
"LuckyProbability": "Probability of surviving a kill",
"ImpCanBeDoubleShot": "Impostors can have Double Shot",
"CrewCanBeDoubleShot": "Crewmates can have Double Shot",
@@ -3599,6 +3603,7 @@
"WinnerRoleText.Impostor": "Impostors Win!",
"WinnerRoleText.Crewmate": "Crewmates Win!",
"WinnerRoleText.Apocalypse": "Apocalypse Wins!",
+ "WinnerRoleText.Coven": "Coven Wins!",
"WinnerRoleText.Terrorist": "Terrorist Wins!",
"WinnerRoleText.Jester": "Jester Wins!",
"WinnerRoleText.Lovers": "Lovers Win!",
diff --git a/Roles/Core/CustomRoleManager.cs b/Roles/Core/CustomRoleManager.cs
index 4385eafe3..c116b3f2a 100644
--- a/Roles/Core/CustomRoleManager.cs
+++ b/Roles/Core/CustomRoleManager.cs
@@ -8,6 +8,7 @@
using TOHE.Roles.Crewmate;
using TOHE.Roles.Impostor;
using TOHE.Roles.Neutral;
+using TOHE.Roles.Coven;
using TOHE.Roles.Vanilla;
namespace TOHE.Roles.Core;
@@ -104,6 +105,7 @@ public static void BuildCustomGameOptions(this PlayerControl player, ref IGameOp
if (Deathpact.HasEnabled) Deathpact.SetDeathpactVision(player, opt);
if (Spiritcaller.HasEnabled) Spiritcaller.ReduceVision(opt, player);
if (Pitfall.HasEnabled) Pitfall.SetPitfallTrapVision(opt, player);
+ if (Medusa.HasEnabled) Medusa.SetStoned(player, opt);
var playerSubRoles = player.GetCustomSubRoles();
diff --git a/Roles/Coven/Conjurer.cs b/Roles/Coven/Conjurer.cs
index 5817014ec..04326371f 100644
--- a/Roles/Coven/Conjurer.cs
+++ b/Roles/Coven/Conjurer.cs
@@ -1,17 +1,11 @@
using Hazel;
using TOHE.Roles.Core;
-using TOHE.Roles.Double;
-using TOHE.Roles.AddOns.Crewmate;
-using TOHE.Modules;
using InnerNet;
using static TOHE.Options;
using static TOHE.Translator;
using static TOHE.Utils;
-using System.Text.RegularExpressions;
using System;
-using TOHE.Modules.ChatManager;
using UnityEngine;
-using static UnityEngine.GraphicsBuffer;
using AmongUs.GameOptions;
namespace TOHE.Roles.Coven;
diff --git a/Roles/Coven/CovenLeader.cs b/Roles/Coven/CovenLeader.cs
index 2bd49e328..60120aa70 100644
--- a/Roles/Coven/CovenLeader.cs
+++ b/Roles/Coven/CovenLeader.cs
@@ -1,10 +1,7 @@
using AmongUs.GameOptions;
using Hazel;
using InnerNet;
-using System.Diagnostics.Metrics;
-using System.Text;
using TOHE.Roles.Core;
-using TOHE.Roles.Neutral;
using UnityEngine;
using static TOHE.Options;
using static TOHE.Translator;
diff --git a/Roles/Coven/CovenManager.cs b/Roles/Coven/CovenManager.cs
index a71faa99c..08dc5017e 100644
--- a/Roles/Coven/CovenManager.cs
+++ b/Roles/Coven/CovenManager.cs
@@ -1,18 +1,14 @@
using AmongUs.GameOptions;
using Hazel;
-using TOHE.Roles.Crewmate;
-using TOHE.Roles.Double;
-using TOHE.Roles.Neutral;
using InnerNet;
using static TOHE.Options;
using static TOHE.Translator;
using static TOHE.Utils;
-using static UnityEngine.GraphicsBuffer;
namespace TOHE;
public abstract class CovenManager : RoleBase
{
- public static PlayerControl necroHolder;
+ public static byte necroHolder;
public enum VisOptionList
{
@@ -61,7 +57,7 @@ public override string GetMark(PlayerControl seer, PlayerControl seen = null, bo
=> HasNecronomicon(seen) ? ColorString(GetRoleColor(CustomRoles.CovenLeader), "♣") : string.Empty;
public override string GetMarkOthers(PlayerControl seer, PlayerControl target, bool isForMeeting = false)
{
- if (!(seer == target) && HasNecronomicon(target) && seer.IsPlayerCoven() && !HasNecronomicon(seer))
+ if ((seer != target) && HasNecronomicon(target) && seer.IsPlayerCoven())
{
return ColorString(GetRoleColor(CustomRoles.CovenLeader), "♣");
}
@@ -77,7 +73,7 @@ private static void SendRPC(byte playerId)
public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
{
byte NecroId = reader.ReadByte();
- necroHolder = GetPlayerById(NecroId);
+ necroHolder = NecroId;
}
public override void ApplyGameOptions(IGameOptions opt, byte playerId)
{
@@ -103,33 +99,37 @@ public override bool CanUseImpostorVentButton(PlayerControl pc)
return option.GetBool();
}
}
- /*
+
public override bool KnowRoleTarget(PlayerControl seer, PlayerControl target) => target.IsPlayerCoven() && seer.IsPlayerCoven();
public override bool OthersKnowTargetRoleColor(PlayerControl seer, PlayerControl target) => KnowRoleTarget(seer, target);
- */
+
public static void GiveNecronomicon()
{
-
var pcList = Main.AllAlivePlayerControls.Where(pc => pc.IsPlayerCoven() && pc.IsAlive()).ToList();
if (pcList.Any())
{
- PlayerControl rp = pcList.RandomElement();
+ byte rp = pcList.RandomElement().PlayerId;
necroHolder = rp;
- necroHolder.Notify(GetString("NecronomiconNotification"));
- SendRPC(necroHolder.PlayerId);
+ GetPlayerById(necroHolder).Notify(GetString("NecronomiconNotification"));
+ SendRPC(necroHolder);
}
-
+ }
+ public static void GiveNecronomicon(byte target)
+ {
+ necroHolder = target;
+ GetPlayerById(necroHolder).Notify(GetString("NecronomiconNotification"));
+ SendRPC(necroHolder);
}
public override void OnCoEndGame()
{
- necroHolder = null;
+ necroHolder = byte.MaxValue;
}
public override void OnFixedUpdate(PlayerControl player, bool lowLoad, long nowTime)
{
- if (!necroHolder.IsAlive())
+ if (necroHolder == byte.MaxValue || !GetPlayerById(necroHolder).IsAlive())
{
GiveNecronomicon();
}
}
- public static bool HasNecronomicon(PlayerControl pc) => necroHolder.Equals(pc);
+ public static bool HasNecronomicon(PlayerControl pc) => necroHolder == pc.PlayerId;
}
diff --git a/Roles/Coven/Illusionist.cs b/Roles/Coven/Illusionist.cs
index 64590a7f5..7afa4ba08 100644
--- a/Roles/Coven/Illusionist.cs
+++ b/Roles/Coven/Illusionist.cs
@@ -1,18 +1,12 @@
using Hazel;
using TOHE.Roles.Core;
-using TOHE.Roles.AddOns.Impostor;
-using TOHE.Modules;
using InnerNet;
using static TOHE.Options;
using static TOHE.Translator;
using static TOHE.Utils;
-using System.Text.RegularExpressions;
using System;
-using TOHE.Modules.ChatManager;
using UnityEngine;
-using static UnityEngine.GraphicsBuffer;
-using AmongUs.GameOptions;
namespace TOHE.Roles.Coven;
@@ -22,13 +16,13 @@ internal class Illusionist : CovenManager
private const int Id = 30400;
public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.Illusionist);
public override bool IsDesyncRole => true;
- public override CustomRoles ThisRoleBase => CustomRoles.Shapeshifter;
+ public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenTrickery;
//==================================================================\\
private static OptionItem IllusionCooldown;
private static OptionItem MaxIllusions;
- private static OptionItem SnitchCanIllusioned;
+ public static OptionItem SnitchCanIllusioned;
private static readonly Dictionary> IllusionedPlayers = [];
@@ -38,7 +32,7 @@ public override void SetupCustomOption()
SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Illusionist, 1, zeroOne: false);
IllusionCooldown = FloatOptionItem.Create(Id + 10, "IllusionCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Illusionist])
.SetValueFormat(OptionFormat.Seconds);
- MaxIllusions = IntegerOptionItem.Create(Id + 11, "IllusionistMaxIllusions", new(1, 15, 1), 5, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Illusionist])
+ MaxIllusions = IntegerOptionItem.Create(Id + 11, "IllusionistMaxIllusions", new(1, 100, 1), 5, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Illusionist])
.SetValueFormat(OptionFormat.Times);
SnitchCanIllusioned = BooleanOptionItem.Create(Id + 12, "IllusionistSnitchAffected", false, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Illusionist]);
}
@@ -53,27 +47,47 @@ public override void Add(byte playerId)
IllusionedPlayers[playerId] = [];
GetPlayerById(playerId)?.AddDoubleTrigger();
}
- public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
+ public void SendRPC(PlayerControl player, PlayerControl target)
+ {
+ MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SyncRoleSkill, SendOption.Reliable, -1);
+ writer.WriteNetObject(_Player);
+ writer.Write(player.PlayerId);
+ writer.Write(AbilityLimit);
+ writer.Write(target.PlayerId);
+ AmongUsClient.Instance.FinishRpcImmediately(writer);
+ }
+ public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
{
- if (killer.CheckDoubleTrigger(target, () =>
- {
- killer.SetKillCooldown();
+ byte playerId = reader.ReadByte();
- if (!IllusionedPlayers[killer.PlayerId].Contains(target.PlayerId))
- {
- IllusionedPlayers[killer.PlayerId].Add(target.PlayerId);
- }
- })
- ) //this looks so ugly
+ AbilityLimit = reader.ReadSingle();
+ IllusionedPlayers[playerId].Add(reader.ReadByte());
+ }
+ public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
+ {
+ if (killer.CheckDoubleTrigger(target, () => { IllusionedPlayers[killer.PlayerId].Add(target.PlayerId); }))
+ {
+ if (HasNecronomicon(killer)) {
+ var randomDeathReason = ChangeRandomDeath();
+ Main.PlayerStates[target.PlayerId].deathReason = randomDeathReason;
+ Main.PlayerStates[target.PlayerId].SetDead();
+ return true;
+ }
+ return false;
+ }
+ else
{
- var randomDeathReason = ChangeRandomDeath();
- Main.PlayerStates[target.PlayerId].deathReason = randomDeathReason;
- Main.PlayerStates[target.PlayerId].SetDead();
- return true;
+ AbilityLimit--;
+ SendRPC(killer, target);
+ killer.ResetKillCooldown();
+ killer.SetKillCooldown();
+ return false;
}
- return false;
}
public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = IllusionCooldown.GetFloat();
+ public override bool CanUseKillButton(PlayerControl pc) => true;
+ public override string GetProgressText(byte playerId, bool comms)
+ => ColorString(AbilityLimit >= 1 ? GetRoleColor(CustomRoles.Ritualist).ShadeColor(0.25f) : Color.gray, $"({AbilityLimit})");
private static PlayerState.DeathReason ChangeRandomDeath()
{
PlayerState.DeathReason[] deathReasons = EnumHelper.GetAllValues().ToArray();
@@ -82,6 +96,7 @@ private static PlayerState.DeathReason ChangeRandomDeath()
int randomIndex = random.Next(deathReasons.Length);
return deathReasons[randomIndex];
}
+ // Affects the following roles: Snitch, Witness, Psychic, Inspector, Oracle, Investigator
public static bool IsNonCovIllusioned(byte target)
{
byte pc = Utils.GetPlayerListByRole(CustomRoles.Illusionist).First().PlayerId;
diff --git a/Roles/Coven/Medusa.cs b/Roles/Coven/Medusa.cs
index 3362afb49..c994e32dd 100644
--- a/Roles/Coven/Medusa.cs
+++ b/Roles/Coven/Medusa.cs
@@ -1,6 +1,11 @@
-using AmongUs.GameOptions;
+using AmongUs.GameOptions;
using static TOHE.Translator;
using static TOHE.Options;
+using static TOHE.Utils;
+using TOHE.Roles.Core;
+using static UnityEngine.GraphicsBuffer;
+using Hazel;
+using InnerNet;
namespace TOHE.Roles.Coven;
@@ -8,42 +13,76 @@ internal class Medusa : CovenManager
{
//===========================SETUP================================\\
private const int Id = 17000;
- private static readonly HashSet playerIdList = [];
- public static bool HasEnabled => playerIdList.Any();
+ public static bool HasEnabled => CustomRoleManager.HasEnabled(CustomRoles.Medusa);
public override bool IsDesyncRole => true;
public override CustomRoles ThisRoleBase => CustomRoles.Impostor;
public override Custom_RoleType ThisRoleType => Custom_RoleType.CovenUtility;
//==================================================================\\
- private static OptionItem KillCooldown;
- private static OptionItem KillCooldownAfterStoneGazing;
+ private static OptionItem StoneCooldown;
+ private static OptionItem StoneDuration;
+ private static OptionItem StoneVision;
+ //private static OptionItem KillCooldownAfterStoneGazing;
//private static OptionItem CanVent;
//private static OptionItem HasImpostorVision;
+ private static readonly Dictionary> StonedPlayers = [];
+ private static readonly Dictionary> PreStonedPlayers = [];
+ private static readonly Dictionary originalSpeed = [];
+
+
+
public override void SetupCustomOption()
{
SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Medusa, 1, zeroOne: false);
- KillCooldown = FloatOptionItem.Create(Id + 12, GeneralOption.KillCooldown, new(0f, 180f, 2.5f), 20f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
+ StoneCooldown = FloatOptionItem.Create(Id + 12, "MedusaStoneCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
+ .SetValueFormat(OptionFormat.Seconds);
+ StoneDuration = FloatOptionItem.Create(Id + 14, "MedusaStoneDuration", new(0f, 180f, 2.5f), 15f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
.SetValueFormat(OptionFormat.Seconds);
+ StoneVision = FloatOptionItem.Create(Id + 16, "MedusaStoneVision", new(0f, 5f, 0.25f), 0.5f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
+ .SetValueFormat(OptionFormat.Multiplier);
+ /*
KillCooldownAfterStoneGazing = FloatOptionItem.Create(Id + 15, "KillCooldownAfterStoneGazing", new(0f, 180f, 2.5f), 40f, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa])
.SetValueFormat(OptionFormat.Seconds);
- //CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
- //HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
+ CanVent = BooleanOptionItem.Create(Id + 11, GeneralOption.CanVent, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
+ HasImpostorVision = BooleanOptionItem.Create(Id + 13, GeneralOption.ImpostorVision, true, TabGroup.CovenRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]);
+ */
}
public override void Init()
{
- playerIdList.Clear();
+ StonedPlayers.Clear();
+ originalSpeed.Clear();
+ PreStonedPlayers.Clear();
}
public override void Add(byte playerId)
{
- playerIdList.Add(playerId);
+ StonedPlayers[playerId] = [];
+ PreStonedPlayers[playerId] = [];
+ }
+
+ public void SendRPC(PlayerControl player, PlayerControl target)
+ {
+ MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SyncRoleSkill, SendOption.Reliable, -1);
+ writer.WriteNetObject(_Player);
+ writer.Write(player.PlayerId);
+ writer.Write(AbilityLimit);
+ writer.Write(target.PlayerId);
+ AmongUsClient.Instance.FinishRpcImmediately(writer);
}
- public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = KillCooldown.GetFloat();
+ public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
+ {
+ byte playerId = reader.ReadByte();
+
+ AbilityLimit = reader.ReadSingle();
+ PreStonedPlayers[playerId].Add(reader.ReadByte());
+ }
+ public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = StoneCooldown.GetFloat();
//public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
public override bool CanUseKillButton(PlayerControl pc) => true;
+ public override bool CanUseImpostorVentButton(PlayerControl pc) => true;
//public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool();
-
+ /*
public override bool OnCheckReportDeadBody(PlayerControl reporter, NetworkedPlayerInfo target, PlayerControl killer)
{
if (reporter.Is(CustomRoles.Medusa))
@@ -57,6 +96,57 @@ public override bool OnCheckReportDeadBody(PlayerControl reporter, NetworkedPlay
}
return true;
}
+ */
+ public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
+ {
+ if (killer == null || target == null) return false;
+ if (HasNecronomicon(killer) || !target.IsPlayerCoven()) {
+ killer.RpcMurderPlayer(target);
+ killer.ResetKillCooldown();
+ Main.UnreportableBodies.Add(target.PlayerId);
+ return false;
+ }
+ else
+ {
+ PreStonedPlayers[killer.PlayerId].Add(target.PlayerId);
+ killer.Notify(GetString("MedusaStonedPlayer"));
+ return false;
+ }
+ }
+ public override void OnEnterVent(PlayerControl pc, Vent vent)
+ {
+ foreach (var player in PreStonedPlayers[pc.PlayerId])
+ {
+ StonedPlayers[pc.PlayerId].Add(player);
+ PreStonedPlayers[pc.PlayerId].Remove(player);
+ }
+ foreach (var player in StonedPlayers[pc.PlayerId])
+ {
+ originalSpeed.Remove(player);
+ originalSpeed.Add(player, Main.AllPlayerSpeed[player]);
+ Main.AllPlayerSpeed[player] = 0f;
+ ReportDeadBodyPatch.CanReport[player] = false;
+ GetPlayerById(player).MarkDirtySettings();
+ _ = new LateTask(() =>
+ {
+ Main.AllPlayerSpeed[player] = originalSpeed[player];
+ GetPlayerById(player).SyncSettings();
+ originalSpeed.Remove(player);
+ StonedPlayers[pc.PlayerId].Remove(player);
+ }, StoneDuration.GetFloat(), "Medusa Revert Stone");
+ }
+ }
+ public static void SetStoned(PlayerControl player, IGameOptions opt)
+ {
+ if (StonedPlayers.Any(a => a.Value.Contains(player.PlayerId) &&
+ Main.AllAlivePlayerControls.Any(b => b.PlayerId == a.Key)))
+ {
+ opt.SetVision(false);
+ opt.SetFloat(FloatOptionNames.CrewLightMod, StoneDuration.GetFloat());
+ opt.SetFloat(FloatOptionNames.ImpostorLightMod, StoneDuration.GetFloat());
+ }
+ }
+ public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false) => PreStonedPlayers[seer.PlayerId].Contains(seen.PlayerId) ? ColorString(GetRoleColor(CustomRoles.Medusa), "♻") : string.Empty;
public override void SetAbilityButtonText(HudManager hud, byte playerId)
{
hud.ReportButton.OverrideText(GetString("MedusaReportButtonText"));
diff --git a/Roles/Coven/Ritualist.cs b/Roles/Coven/Ritualist.cs
index 3bdb2d780..ea94bde0c 100644
--- a/Roles/Coven/Ritualist.cs
+++ b/Roles/Coven/Ritualist.cs
@@ -2,7 +2,6 @@
using TOHE.Roles.Core;
using TOHE.Roles.Double;
using TOHE.Roles.AddOns.Crewmate;
-using TOHE.Modules;
using InnerNet;
using static TOHE.Options;
using static TOHE.Translator;
@@ -11,7 +10,6 @@
using System;
using TOHE.Modules.ChatManager;
using UnityEngine;
-using static UnityEngine.GraphicsBuffer;
namespace TOHE.Roles.Coven;
@@ -29,6 +27,8 @@ internal class Ritualist : CovenManager
public static OptionItem TryHideMsg;
private static readonly Dictionary RitualLimit = [];
+ private static readonly Dictionary> EnchantedPlayers = [];
+
public override void SetupCustomOption()
{
SetupSingleRoleOptions(Id, TabGroup.CovenRoles, CustomRoles.Ritualist, 1, zeroOne: false);
@@ -40,14 +40,18 @@ public override void SetupCustomOption()
public override void Init()
{
RitualLimit.Clear();
+ EnchantedPlayers.Clear();
}
public override void Add(byte PlayerId)
{
+ EnchantedPlayers[PlayerId] = [];
RitualLimit.Add(PlayerId, MaxRitsPerRound.GetInt());
}
- public override void Remove(byte playerId)
+ private static void SendRPC(byte playerId)
{
- RitualLimit.Remove(playerId);
+ MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.BloodRitual, SendOption.Reliable, -1);
+ writer.Write(playerId);
+ AmongUsClient.Instance.FinishRpcImmediately(writer);
}
public static void ReceiveRPC_Custom(MessageReader reader, PlayerControl pc)
{
@@ -62,8 +66,10 @@ public override void OnReportDeadBody(PlayerControl hatsune, NetworkedPlayerInfo
RitualLimit[pid] = MaxRitsPerRound.GetInt();
}
}
+ public override string NotifyPlayerName(PlayerControl seer, PlayerControl target, string TargetPlayerName = "", bool IsForMeeting = false)
+ => IsForMeeting && seer.IsAlive() && target.IsAlive() ? ColorString(GetRoleColor(CustomRoles.Ritualist), target.PlayerId.ToString()) + " " + TargetPlayerName : "";
public override string PVANameText(PlayerVoteArea pva, PlayerControl seer, PlayerControl target)
- => seer.IsAlive() && target.IsAlive() ? ColorString(GetRoleColor(CustomRoles.Ritualist), target.PlayerId.ToString()) + " " + pva.NameText.text : string.Empty;
+ => seer.IsAlive() && target.IsAlive() ? ColorString(GetRoleColor(CustomRoles.Ritualist), target.PlayerId.ToString()) + " " + pva.NameText.text : "";
public static bool RitualistMsgCheck(PlayerControl pc, string msg, bool isUI = false)
{
if (!AmongUsClient.Instance.AmHost) return false;
@@ -125,13 +131,22 @@ public static bool RitualistMsgCheck(PlayerControl pc, string msg, bool isUI = f
RitualLimit[pc.PlayerId]--;
- target.RpcSetCustomRole(CustomRoles.Enchanted);
+ EnchantedPlayers[pc.PlayerId].Add(target.PlayerId);
SendMessage(string.Format(GetString("RitualistConvertNotif"), CustomRoles.Ritualist.ToColoredString()), target.PlayerId);
SendMessage(string.Format(GetString("RitualistRitualSuccess"), target.GetRealName()), pc.PlayerId);
return true;
}
return false;
}
+ public override void AfterMeetingTasks()
+ {
+ var rit = Utils.GetPlayerListByRole(CustomRoles.Ritualist).First();
+ foreach (var pc in EnchantedPlayers[rit.PlayerId])
+ {
+ GetPlayerById(pc).RpcSetCustomRole(CustomRoles.Enchanted);
+ }
+ EnchantedPlayers[rit.PlayerId].Clear();
+ }
private static bool MsgToPlayerAndRole(string msg, out byte id, out CustomRoles role, out string error)
{
if (msg.StartsWith("/")) msg = msg.Replace("/", string.Empty);
diff --git a/Roles/Crewmate/Inspector.cs b/Roles/Crewmate/Inspector.cs
index 6094cf138..b85f5f6ed 100644
--- a/Roles/Crewmate/Inspector.cs
+++ b/Roles/Crewmate/Inspector.cs
@@ -4,6 +4,7 @@
using TOHE.Modules.ChatManager;
using TOHE.Roles.AddOns.Common;
using TOHE.Roles.Core;
+using TOHE.Roles.Coven;
using UnityEngine;
using static TOHE.Options;
using static TOHE.Translator;
@@ -216,21 +217,26 @@ public static bool InspectCheckMsg(PlayerControl pc, string msg, bool isUI = fal
if
(
(
- (target1.GetCustomRole().IsImpostorTeamV2() || target1.IsAnySubRole(role => role.IsImpostorTeamV2())) && !target1.Is(CustomRoles.Admired)
+ ((target1.IsPlayerCoven() || target1.Is(CustomRoles.Enchanted) || Illusionist.IsNonCovIllusioned(target1.PlayerId)))
+ && (target2.IsPlayerCoven() || target2.Is(CustomRoles.Enchanted) || Illusionist.IsNonCovIllusioned(target2.PlayerId))
+ )
+ ||
+ (
+ (Illusionist.IsCovIllusioned(target1.PlayerId) || (target1.GetCustomRole().IsCrewmateTeamV2() && (target1.GetCustomSubRoles().All(role => role.IsCrewmateTeamV2()) || target1.GetCustomSubRoles().Count == 0)) || target1.Is(CustomRoles.Admired))
&&
- (target2.GetCustomRole().IsImpostorTeamV2() || target2.IsAnySubRole(role => role.IsImpostorTeamV2()) && !target2.Is(CustomRoles.Admired))
+ (Illusionist.IsCovIllusioned(target2.PlayerId) || (target2.GetCustomRole().IsCrewmateTeamV2() && (target2.GetCustomSubRoles().All(role => role.IsCrewmateTeamV2()) || target2.GetCustomSubRoles().Count == 0)) || target2.Is(CustomRoles.Admired))
)
||
(
- (target1.GetCustomRole().IsNeutralTeamV2() || target1.IsAnySubRole(role => role.IsNeutralTeamV2())) && !target1.Is(CustomRoles.Admired)
+ (target1.GetCustomRole().IsImpostorTeamV2() || target1.IsAnySubRole(role => role.IsImpostorTeamV2())) && !target1.Is(CustomRoles.Admired)
&&
- (target2.GetCustomRole().IsNeutralTeamV2() || target2.IsAnySubRole(role => role.IsNeutralTeamV2())) && !target2.Is(CustomRoles.Admired)
+ (target2.GetCustomRole().IsImpostorTeamV2() || target2.IsAnySubRole(role => role.IsImpostorTeamV2()) && !target2.Is(CustomRoles.Admired))
)
||
(
- ((target1.GetCustomRole().IsCrewmateTeamV2() && (target1.GetCustomSubRoles().All(role => role.IsCrewmateTeamV2()) || target1.GetCustomSubRoles().Count == 0)) || target1.Is(CustomRoles.Admired))
+ (target1.GetCustomRole().IsNeutralTeamV2() || target1.IsAnySubRole(role => role.IsNeutralTeamV2())) && !target1.Is(CustomRoles.Admired)
&&
- ((target2.GetCustomRole().IsCrewmateTeamV2() && (target2.GetCustomSubRoles().All(role => role.IsCrewmateTeamV2()) || target2.GetCustomSubRoles().Count == 0)) || target2.Is(CustomRoles.Admired))
+ (target2.GetCustomRole().IsNeutralTeamV2() || target2.IsAnySubRole(role => role.IsNeutralTeamV2())) && !target2.Is(CustomRoles.Admired)
)
)
{
diff --git a/Roles/Crewmate/Oracle.cs b/Roles/Crewmate/Oracle.cs
index 76990d760..e2ca1000d 100644
--- a/Roles/Crewmate/Oracle.cs
+++ b/Roles/Crewmate/Oracle.cs
@@ -7,6 +7,7 @@
using static TOHE.Translator;
using static TOHE.Utils;
using InnerNet;
+using TOHE.Roles.Coven;
namespace TOHE.Roles.Crewmate;
@@ -106,8 +107,11 @@ public override bool CheckVote(PlayerControl player, PlayerControl target)
if (ChangeRecruitTeam.GetBool())
{
if (target.Is(CustomRoles.Admired)) text = "Crewmate";
+ else if (Illusionist.IsCovIllusioned(target.PlayerId)) text = "Crewmate";
+ else if (Illusionist.IsNonCovIllusioned(target.PlayerId)) text = "Coven";
else if (target.GetCustomRole().IsImpostorTeamV2() || target.GetCustomSubRoles().Any(role => role.IsImpostorTeamV2())) text = "Impostor";
else if (target.GetCustomRole().IsNeutralTeamV2() || target.GetCustomSubRoles().Any(role => role.IsNeutralTeamV2())) text = "Neutral";
+ else if (target.IsPlayerCoven() || target.Is(CustomRoles.Enchanted)) text = "Coven";
else if (target.GetCustomRole().IsCrewmateTeamV2() && (target.GetCustomSubRoles().Any(role => role.IsCrewmateTeamV2()) || (target.GetCustomSubRoles().Count == 0))) text = "Crewmate";
}
else
diff --git a/Roles/Crewmate/Psychic.cs b/Roles/Crewmate/Psychic.cs
index be3f25e46..864460b09 100644
--- a/Roles/Crewmate/Psychic.cs
+++ b/Roles/Crewmate/Psychic.cs
@@ -1,6 +1,7 @@
using Hazel;
using InnerNet;
using TOHE.Roles.Core;
+using TOHE.Roles.Coven;
using static TOHE.Options;
using static TOHE.Utils;
@@ -84,7 +85,7 @@ private void GetRedName()
{
if (!_Player.IsAlive() || !AmongUsClient.Instance.AmHost) return;
- List BadListPc = Main.AllAlivePlayerControls.Where(x =>
+ List BadListPc = Main.AllAlivePlayerControls.Where(x => Illusionist.IsNonCovIllusioned(x.PlayerId) ||
(x.Is(Custom_Team.Impostor) && !x.Is(CustomRoles.Trickster) && !x.Is(CustomRoles.Admired)) ||
x.IsAnySubRole(x => x.IsConverted()) ||
(x.GetCustomRole().IsCrewKiller() && CkshowEvil.GetBool()) ||
diff --git a/Roles/Crewmate/Snitch.cs b/Roles/Crewmate/Snitch.cs
index e8343a780..3a620841c 100644
--- a/Roles/Crewmate/Snitch.cs
+++ b/Roles/Crewmate/Snitch.cs
@@ -3,6 +3,7 @@
using static TOHE.Translator;
using static TOHE.Options;
using InnerNet;
+using TOHE.Roles.Coven;
namespace TOHE.Roles.Crewmate;
@@ -174,7 +175,7 @@ public override void ReceiveRPC(MessageReader reader, PlayerControl pc)
{
foreach (var target in Main.AllAlivePlayerControls)
{
- if (!IsSnitchTarget(target)) continue;
+ if (!IsSnitchTarget(target) || (!Illusionist.IsNonCovIllusioned(target.PlayerId) && Illusionist.SnitchCanIllusioned.GetBool())) continue;
var targetId = target.PlayerId;
diff --git a/Roles/Crewmate/Witness.cs b/Roles/Crewmate/Witness.cs
index d47ed8396..fa1133782 100644
--- a/Roles/Crewmate/Witness.cs
+++ b/Roles/Crewmate/Witness.cs
@@ -1,8 +1,10 @@
using AmongUs.GameOptions;
using TOHE.Roles.Core;
+using TOHE.Roles.Coven;
using UnityEngine;
using static TOHE.Options;
using static TOHE.Translator;
+using static UnityEngine.GraphicsBuffer;
namespace TOHE.Roles.Crewmate;
@@ -54,7 +56,7 @@ public override void SetAbilityButtonText(HudManager hud, byte id)
public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
{
killer.SetKillCooldown();
- if (Main.AllKillers.ContainsKey(target.PlayerId))
+ if (Illusionist.IsNonCovIllusioned(target.PlayerId) || (Main.AllKillers.ContainsKey(target.PlayerId) && !Illusionist.IsCovIllusioned(target.PlayerId)))
killer.Notify(GetString("WitnessFoundKiller"));
else
killer.Notify(GetString("WitnessFoundInnocent"));
From 94b2aee14b235764e0205b0084546bc6527ede9f Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Sun, 29 Sep 2024 12:51:32 -0400
Subject: [PATCH 010/101] update strings
---
Resources/Lang/en_US.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index b5f647ad8..572876a5d 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -957,14 +957,14 @@
"WraithInfoLong": "(Neutrals):\nAs the Wraith, you can vent to Vanish temporarily. You will still appear visible on your screen. Vent again to become visible. You win if you are the last player remaining.",
"PoisonerInfoLong": "(Coven):\nAs the Poisoner, your kills are delayed.\nKill everyone to win.",
"HexMasterInfoLong": "(Coven):\nAs the Hex Master, you can hex players or kill them.\nHexing a player works the same as spelling as a Witch.",
- "JinxInfoLong": "(Coven):\nAs the Jinx, whenever you get attacked, you jinx them, resulting in them dying to a jinx.\nThis has limited uses.\n\nKill off everyone to win.",
- "MedusaInfoLong": "(Coven):\nThe Medusa can use their kill button on players to mark them as Stoned. When the Medusa vents, all Stoned players will be unable to move and will have reduced vision for a configurable amount of time. With the Necronomicon, killed players will be unreportable.",
+ "JinxInfoLong": "(Coven):\nAs the Jinx, whenever you get attacked, you jinx them, resulting in them dying to a jinx.\nThis has limited uses.",
+ "MedusaInfoLong": "(Coven):\nThe Medusa can use their kill button on players to mark them as Stoned. When the Medusa vents, all Stoned players will be unable to move and will have reduced vision for a configurable amount of time.\nWith the Necronomicon, killed players will be unreportable.",
"PotionMasterInfoLong": "(Coven):\nAs the Potion Master, you have three different potions assigned to three different actions.\n\nSingle click: Reveal role\nDouble click: Kill\nMap: Sabotage\n\nThe reveal potion has a limit.\nWhen you run out, the kill buttons default to killing.",
- "NecromancerInfoLong": "(Coven):\nAs the Necromancer, you win when you're the last one standing.\nAdditionally when someone tries to kill you, you will block the kill, and you will teleport to a random vent. You will have a limited time to kill your killer. If you succeed in doing so, you live. If the time runs out before you kill your killer, you die permanently. If you try to kill someone else other than your killer, you will die.",
- "CovenLeaderInfoLong": "(Coven):\nThe Coven Leader can use their kill button on a fellow Coven member to retrain them into a random Coven role that isn’t currently in the game. During the next meeting, that Coven member will be notified that the Coven Leader wishes to retrain them. They can vote themselves to accept the retrain, or vote otherwise to deny it. Denying the retrain does not take away an ability usage.
With the Necronomicon, you cannot retrain, and can only kill other players.",
- "RitualistInfoLong": "(Coven):\nDuring a meeting, the Ritualist can perform a Blood Ritual to guess a player’s exact role. If the Ritualist is correct, that player will be converted to Coven. If the Ritualist is incorrect, they will not die but will be unable to Blood Ritual until the next meeting.
The command is /rt id role.
With the Necronomicon, the Ritualist can kill.",
+ "NecromancerInfoLong": "(Coven):\nAs the Necromancer, when someone tries to kill you, you will block the kill, and you will teleport to a random vent. You will have a limited time to kill your killer. If you succeed in doing so, you live. If the time runs out before you kill your killer, you die permanently. If you try to kill someone else other than your killer, you will die.",
+ "CovenLeaderInfoLong": "(Coven):\nThe Coven Leader can use their kill button on a fellow Coven member to retrain them into a random Coven role that isn’t currently in the game. During the next meeting, that Coven member will be notified that the Coven Leader wishes to retrain them. They can vote themselves to accept the retrain, or vote otherwise to deny it. Denying the retrain does not take away an ability usage.\nWith the Necronomicon, you cannot retrain, and can only kill other players.",
+ "RitualistInfoLong": "(Coven):\nDuring a meeting, the Ritualist can perform a Blood Ritual to guess a player’s exact role. If the Ritualist is correct, that player will be converted to Coven. If the Ritualist is incorrect, they will not die but will be unable to Blood Ritual until the next meeting.\nhe command is /rt id role.\nWith the Necronomicon, the Ritualist can kill.",
"SpellcasterInfoLong": "(Coven):\nThe Spellcaster can use their kill button on two players to control the first player into the other. If the first player has a kill button, they will be forced to use their kill button on the second person.\nWith the Necronomicon, you will kill your first target after controlling them.",
- "ConjurerInfoLong": "(Coven):\nShapeshift once to mark a location.\nShapeshift again to conjure a meteor at the place you marked, killing everyone in the radius.\nWith the Necronomicon, you can kill. You can also mark a player using the Shapeshift menu. When the Conjurer unshapeshifts, all the players in the radius of the marked player will die, including themselves.",
+ "ConjurerInfoLong": "(Coven):\nShapeshift once to mark a location.\nShapeshift again to conjure a meteor at the place you marked, killing everyone in the radius.\nWith the Necronomicon, you can kill. You can also mark a player using the Shapeshift menu. When the Conjurer unshapeshifts, all the players in the radius of the marked player will die, including the marked player.",
"DreamweaverInfoLong": "(Coven):\nThe Dreamweaver can Dreamweave a player. The dreamweaved players will be notified of this during the next meeting. If the Dreamweaver is not voted out, these players will be unable to use their abilities until the Dreamweaver dies.\nWith the Necronomicon, the Dreamweaver can double-click to kill.",
"IllusionistInfoLong": "(Coven):\nThe Illusionist can use their kill button on a player to reverse the results of any investigative role. For example, if someone with a kill button is Illusioned, they will appear not to have a kill button to the Investigator, and vice versa.\nIllusions wear off after meetings.\nWith the Necronomicon, you may double-click to kill. Every kill you make appears as a random death reason.",
"VoodooMasterInfoLong": "(Coven):\nThe Voodoo Master can craft a voodoo doll of a player by using their kill button, similar to the Shaman. All the interactions with you using kill button will be deflected to the voodoo doll and the voodoo doll will destroy. Unlike the Shaman, this voodoo will last during the meeting (eg. If the Voodoo Master is judged, then the voodoo'd player will be judged instead).\nWith the Necronomicon, you can double-click to kill. Additionally, the voodoo’d player will be unable to report. The next person to interact with them will die.",
From 752a4d09e672e2b8b8f3f53c638399ad4801fabf Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Sat, 5 Oct 2024 17:39:46 -0400
Subject: [PATCH 011/101] medusa fix
i think i broke necronomicon's rpc with this but im hoping that was an alpha 16 issue cuz i heard a lot of rpc issues about alpha 16
---
Modules/RPC.cs | 4 ++++
Resources/Lang/en_US.json | 4 ++++
Roles/Coven/CovenManager.cs | 6 +++---
Roles/Coven/Medusa.cs | 40 +++++++++++++++++--------------------
4 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/Modules/RPC.cs b/Modules/RPC.cs
index bc31b63a9..c9c5ae6a9 100644
--- a/Modules/RPC.cs
+++ b/Modules/RPC.cs
@@ -115,6 +115,7 @@ enum CustomRPC : byte // 185/255 USED
//FFA
SyncFFAPlayer,
SyncFFANameNotify,
+ Necronomicon,
}
public enum Sounds
{
@@ -697,6 +698,9 @@ public static void Postfix(PlayerControl __instance, [HarmonyArgument(0)] byte c
Main.FirstDied = reader.ReadString();
Main.FirstDiedPrevious = reader.ReadString();
break;
+ case CustomRPC.Necronomicon:
+ CovenManager.ReceiveNecroRPC(reader);
+ break;
}
}
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index 572876a5d..e00a75a1b 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -1980,6 +1980,10 @@
"MedusaStoneCooldown": "Stone Cooldown",
"MedusaStoneDuration": "Stone Duration",
"MedusaStoneVision": "Stoned Vision",
+ "MedusaStonedPlayer": "{0} has been Stoned",
+ "MedusaStoningStart": "Stoning in progress",
+ "MedusaStoningEnd": "Stoning has ended",
+
"LuckyProbability": "Probability of surviving a kill",
"ImpCanBeDoubleShot": "Impostors can have Double Shot",
diff --git a/Roles/Coven/CovenManager.cs b/Roles/Coven/CovenManager.cs
index 08dc5017e..263deea5d 100644
--- a/Roles/Coven/CovenManager.cs
+++ b/Roles/Coven/CovenManager.cs
@@ -65,12 +65,12 @@ public override string GetMarkOthers(PlayerControl seer, PlayerControl target, b
}
private static void SendRPC(byte playerId)
{
- MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SyncRoleSkill, SendOption.Reliable, -1);
+ MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.Necronomicon, SendOption.Reliable, -1);
writer.WriteNetObject(GetPlayerById(playerId));
writer.Write(playerId);
AmongUsClient.Instance.FinishRpcImmediately(writer);
}
- public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
+ public static void ReceiveNecroRPC(MessageReader reader)
{
byte NecroId = reader.ReadByte();
necroHolder = NecroId;
@@ -126,7 +126,7 @@ public override void OnCoEndGame()
}
public override void OnFixedUpdate(PlayerControl player, bool lowLoad, long nowTime)
{
- if (necroHolder == byte.MaxValue || !GetPlayerById(necroHolder).IsAlive())
+ if (necroHolder == byte.MaxValue || !GetPlayerById(necroHolder).IsAlive() || !GetPlayerById(necroHolder).IsPlayerCoven())
{
GiveNecronomicon();
}
diff --git a/Roles/Coven/Medusa.cs b/Roles/Coven/Medusa.cs
index c994e32dd..aa9fea1ee 100644
--- a/Roles/Coven/Medusa.cs
+++ b/Roles/Coven/Medusa.cs
@@ -27,8 +27,8 @@ internal class Medusa : CovenManager
//private static OptionItem HasImpostorVision;
private static readonly Dictionary> StonedPlayers = [];
- private static readonly Dictionary> PreStonedPlayers = [];
private static readonly Dictionary originalSpeed = [];
+ private static bool isStoning;
@@ -52,12 +52,11 @@ public override void Init()
{
StonedPlayers.Clear();
originalSpeed.Clear();
- PreStonedPlayers.Clear();
}
public override void Add(byte playerId)
{
StonedPlayers[playerId] = [];
- PreStonedPlayers[playerId] = [];
+ isStoning = false;
}
public void SendRPC(PlayerControl player, PlayerControl target)
@@ -65,16 +64,13 @@ public void SendRPC(PlayerControl player, PlayerControl target)
MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SyncRoleSkill, SendOption.Reliable, -1);
writer.WriteNetObject(_Player);
writer.Write(player.PlayerId);
- writer.Write(AbilityLimit);
writer.Write(target.PlayerId);
AmongUsClient.Instance.FinishRpcImmediately(writer);
}
public override void ReceiveRPC(MessageReader reader, PlayerControl NaN)
{
byte playerId = reader.ReadByte();
-
- AbilityLimit = reader.ReadSingle();
- PreStonedPlayers[playerId].Add(reader.ReadByte());
+ StonedPlayers[playerId].Add(reader.ReadByte());
}
public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = StoneCooldown.GetFloat();
//public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool());
@@ -100,7 +96,7 @@ public override bool OnCheckReportDeadBody(PlayerControl reporter, NetworkedPlay
public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
{
if (killer == null || target == null) return false;
- if (HasNecronomicon(killer) || !target.IsPlayerCoven()) {
+ if (HasNecronomicon(killer) && !target.IsPlayerCoven()) {
killer.RpcMurderPlayer(target);
killer.ResetKillCooldown();
Main.UnreportableBodies.Add(target.PlayerId);
@@ -108,20 +104,18 @@ public override bool OnCheckMurderAsKiller(PlayerControl killer, PlayerControl t
}
else
{
- PreStonedPlayers[killer.PlayerId].Add(target.PlayerId);
- killer.Notify(GetString("MedusaStonedPlayer"));
+ StonedPlayers[killer.PlayerId].Add(target.PlayerId);
+ killer.Notify(string.Format(GetString("MedusaStonedPlayer"), target.GetRealName()));
return false;
}
}
- public override void OnEnterVent(PlayerControl pc, Vent vent)
+ public override void OnCoEnterVent(PlayerPhysics physics, int ventId)
{
- foreach (var player in PreStonedPlayers[pc.PlayerId])
- {
- StonedPlayers[pc.PlayerId].Add(player);
- PreStonedPlayers[pc.PlayerId].Remove(player);
- }
- foreach (var player in StonedPlayers[pc.PlayerId])
+ var dusa = physics.myPlayer;
+ foreach (var player in StonedPlayers[dusa.PlayerId])
{
+ dusa.Notify(GetString("MedusaStoningStart"), StoneDuration.GetFloat());
+ isStoning = true;
originalSpeed.Remove(player);
originalSpeed.Add(player, Main.AllPlayerSpeed[player]);
Main.AllPlayerSpeed[player] = 0f;
@@ -129,24 +123,26 @@ public override void OnEnterVent(PlayerControl pc, Vent vent)
GetPlayerById(player).MarkDirtySettings();
_ = new LateTask(() =>
{
+ dusa.Notify(GetString("MedusaStoningEnd"));
+ isStoning = false;
Main.AllPlayerSpeed[player] = originalSpeed[player];
GetPlayerById(player).SyncSettings();
originalSpeed.Remove(player);
- StonedPlayers[pc.PlayerId].Remove(player);
+ StonedPlayers[dusa.PlayerId].Remove(player);
}, StoneDuration.GetFloat(), "Medusa Revert Stone");
}
}
public static void SetStoned(PlayerControl player, IGameOptions opt)
{
if (StonedPlayers.Any(a => a.Value.Contains(player.PlayerId) &&
- Main.AllAlivePlayerControls.Any(b => b.PlayerId == a.Key)))
+ Main.AllAlivePlayerControls.Any(b => b.PlayerId == a.Key)) && isStoning)
{
opt.SetVision(false);
- opt.SetFloat(FloatOptionNames.CrewLightMod, StoneDuration.GetFloat());
- opt.SetFloat(FloatOptionNames.ImpostorLightMod, StoneDuration.GetFloat());
+ opt.SetFloat(FloatOptionNames.CrewLightMod, StoneVision.GetFloat());
+ opt.SetFloat(FloatOptionNames.ImpostorLightMod, StoneVision.GetFloat());
}
}
- public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false) => PreStonedPlayers[seer.PlayerId].Contains(seen.PlayerId) ? ColorString(GetRoleColor(CustomRoles.Medusa), "♻") : string.Empty;
+ public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false) => StonedPlayers[seer.PlayerId].Contains(seen.PlayerId) ? ColorString(GetRoleColor(CustomRoles.Medusa), "♻") : string.Empty;
public override void SetAbilityButtonText(HudManager hud, byte playerId)
{
hud.ReportButton.OverrideText(GetString("MedusaReportButtonText"));
From 696b0ef978b999423770c05bc3b6965650e904d2 Mon Sep 17 00:00:00 2001
From: Marg <51059123+MargaretTheFool@users.noreply.github.com>
Date: Sun, 6 Oct 2024 13:44:09 -0400
Subject: [PATCH 012/101] moon dancer
---
Modules/GameState.cs | 1 +
Modules/Utils.cs | 1 +
Resources/Lang/en_US.json | 10 ++
Resources/Sounds/BlastOff.wav | Bin 0 -> 299446 bytes
Roles/Coven/CovenManager.cs | 2 +-
Roles/Coven/MoonDancer.cs | 268 ++++++++++++++++++++++++++++++++++
6 files changed, 281 insertions(+), 1 deletion(-)
create mode 100644 Resources/Sounds/BlastOff.wav
diff --git a/Modules/GameState.cs b/Modules/GameState.cs
index 15cf691d8..c8c7017ca 100644
--- a/Modules/GameState.cs
+++ b/Modules/GameState.cs
@@ -306,6 +306,7 @@ public enum DeathReason
Starved,
Armageddon,
Sacrificed,
+ BlastedOff,
//Please add all new roles with deathreason & new deathreason in Utils.DeathReasonIsEnable();
etc = -1,
diff --git a/Modules/Utils.cs b/Modules/Utils.cs
index b4964e35b..d773a5246 100644
--- a/Modules/Utils.cs
+++ b/Modules/Utils.cs
@@ -2356,6 +2356,7 @@ var Breason when BannedReason(Breason) => false,
PlayerState.DeathReason.BloodLet => CustomRoles.Bloodmoon.IsEnable(),
PlayerState.DeathReason.Starved => CustomRoles.Baker.IsEnable(),
PlayerState.DeathReason.Sacrificed => CustomRoles.Altruist.IsEnable(),
+ PlayerState.DeathReason.BlastedOff => CustomRoles.MoonDancer.IsEnable(),
PlayerState.DeathReason.Kill => true,
_ => true,
};
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index e00a75a1b..99f268a43 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -1984,6 +1984,15 @@
"MedusaStoningStart": "Stoning in progress",
"MedusaStoningEnd": "Stoning has ended",
+ "MoonDancerBatonPassCooldown": "Baton Pass Cooldown",
+ "MoonDancerBlastOffChance": "Chance to Blast Off",
+ "MoonDancerPassEnabledAddons": "Can only Baton Pass enabled Add-ons",
+ "MoonDancerCantBlastOff": "Target can not be Blasted Off",
+ "MoonDancerNormalKill": "Killed normally",
+ "MoonDancerGiveHelpfulAddon": "Target will be given Helpful Add-on during meeting",
+ "MoonDancerGiveHarmfulAddon": "Target will be given Harmful Add-on during meeting",
+ "MoonDancerNoAddons": "No Add-ons to Baton Pass",
+
"LuckyProbability": "Probability of surviving a kill",
"ImpCanBeDoubleShot": "Impostors can have Double Shot",
@@ -2080,6 +2089,7 @@
"DeathReason.Starved": "Starved",
"DeathReason.Equilibrium": "Equilibrium",
"DeathReason.Sacrificed": "Sacrificed",
+ "DeathReason.BlastedOff": "Blasted Off",
"OnlyEnabledDeathReasons": "Only Enabled Death Reasons",
"Alive": "Alive",
"Disconnected": "Disconnected",
diff --git a/Resources/Sounds/BlastOff.wav b/Resources/Sounds/BlastOff.wav
new file mode 100644
index 0000000000000000000000000000000000000000..4418f82e6ebc8cfbaf545f08a1fec0e9126817ad
GIT binary patch
literal 299446
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