Merge remote-tracking branch 'origin/main'

.gitignore

@@ -379,11 +379,6 @@ FodyWeavers.xml
 
 # VS Code files for those working on multiple tools
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
 
 # Local History for Visual Studio Code
 .history/
@@ -399,4 +394,7 @@ FodyWeavers.xml
 *.sln.iml
 /.idea/.idea.EHR/.idea
 
-/Resources/Config/URL.txt
+/Resources/Config/URL.txt
+
+# Local variables
+local.props

EHR.csproj

@@ -1,4 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup> 
+        <AmongUsPath>D:\SteamLibrary\steamapps\common\Among Us</AmongUsPath> 
+    </PropertyGroup>
+    <Import Project="local.props" Condition="Exists('local.props')" /> 
     <PropertyGroup>
         <TargetFramework Condition="'$(Configuration)' == 'Android'">net8.0</TargetFramework>
         <TargetFramework Condition="'$(Configuration)' != 'Android'">net6.0</TargetFramework>
@@ -8,7 +13,7 @@
         <Description>EHR</Description>
         <Authors>Gurge44</Authors>
         <LangVersion>preview</LangVersion>
-        <AmongUs>D:\SteamLibrary\steamapps\common\Among Us</AmongUs>
+        <AmongUs>$(AmongUsPath)</AmongUs>
         <!--<AmongUs>C:\Program Files\Epic Games\AmongUs</AmongUs>-->
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Optimize>True</Optimize>

Gamemodes/BedWars.cs

@@ -4,10 +4,11 @@ using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
 using EHR.Modules;
+using EHR.Roles;
 using Hazel;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class BedWars
 {

Gamemodes/CaptureTheFlag.cs

@@ -4,10 +4,11 @@ using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
 using EHR.Modules;
+using EHR.Roles;
 using Hazel;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class CaptureTheFlag
 {

Gamemodes/CustomHnS.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using AmongUs.GameOptions;
-using EHR.GameMode.HideAndSeekRoles;
+using EHR.Roles;
 using EHR.Modules;
 using HarmonyLib;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 internal static class CustomHnS
 {

Gamemodes/Deathrace.cs

@@ -3,9 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
 using EHR.Modules;
+using EHR.Roles;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class Deathrace
 {

Gamemodes/FreeForAll.cs

@@ -6,7 +6,7 @@ using EHR.Modules;
 using UnityEngine;
 using static EHR.Translator;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 internal static class FreeForAll
 {

Gamemodes/HotPotato.cs

@@ -6,7 +6,7 @@ using EHR.Modules;
 using Hazel;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 internal static class HotPotato
 {

Gamemodes/KingOfTheZones.cs

@@ -8,7 +8,7 @@ using Hazel;
 using UnityEngine;
 using static EHR.Translator;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class KingOfTheZones
 {

Gamemodes/Mingle.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using AmongUs.GameOptions;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class Mingle
 {

Gamemodes/NaturalDisasters.cs

@@ -5,12 +5,12 @@ using System.Linq;
 using System.Reflection;
 using AmongUs.GameOptions;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 [SuppressMessage("ReSharper", "UnusedType.Local")]
 [SuppressMessage("ReSharper", "UnusedType.Global")]

Gamemodes/Quiz.cs

@@ -8,7 +8,7 @@ using Hazel;
 using UnityEngine;
 using static EHR.Translator;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class Quiz
 {

Gamemodes/RoomRush.cs

@@ -5,10 +5,11 @@ using System.Diagnostics;
 using System.Linq;
 using AmongUs.GameOptions;
 using EHR.Modules;
+using EHR.Roles;
 using Hazel;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class RoomRush
 {

Gamemodes/Snowdown.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using EHR.Roles;
 using Hazel;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class Snowdown
 {

Gamemodes/SoloPVP.cs

@@ -6,7 +6,7 @@ using Hazel;
 using UnityEngine;
 using static EHR.RandomSpawn;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 internal static class SoloPVP
 {

Gamemodes/Speedrun.cs

@@ -1,10 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using EHR.Modules;
+using EHR.Roles;
 using Hazel;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class Speedrun
 {

Gamemodes/StopAndGo.cs

@@ -6,7 +6,7 @@ using EHR.Modules;
 using UnityEngine;
 using static EHR.Translator;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public class Counter(int totalGreenTime, int totalRedTime, long startTimeStamp, char symbol, bool isRed, Func<char, int> randomRedTimeFunc, Func<char, int> randomGreenTimeFunc, bool isYellow = false)
 {

Gamemodes/TheMindGame.cs

@@ -3,11 +3,12 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using EHR.Modules;
+using EHR.Roles;
 using Hazel;
 using InnerNet;
 using UnityEngine;
 
-namespace EHR;
+namespace EHR.Gamemodes;
 
 public static class TheMindGame
 {

Main.cs

@@ -14,7 +14,7 @@ using BepInEx.Unity.IL2CPP;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
 using EHR;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using Il2CppInterop.Runtime.Injection;
 using UnityEngine;

Modules/AutoHaunt.cs

@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.GameMode.HideAndSeekRoles;
+using EHR.Gamemodes;
+using EHR.Roles;
 using UnityEngine;
 
 namespace EHR.Modules;

Modules/Camouflage.cs

@@ -1,10 +1,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using AmongUs.Data;
-using EHR.AddOns.Common;
-using EHR.Impostor;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using Hazel;
 
 namespace EHR;

Modules/CustomNetObject.cs

@@ -2,14 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.InnerNet.GameDataMessages;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Gamemodes;
 using EHR.Modules;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using InnerNet;
 using UnityEngine;
-using Tree = EHR.Crewmate.Tree;
 
 // Credit: https://github.com/Rabek009/MoreGamemodes/blob/e054eb498094dfca0a365fc6b6fea8d17f9974d7/Modules/AllObjects
 // Huge thanks to Rabek009 for this code!
@@ -897,7 +896,7 @@ namespace EHR
     {
         public FallenTree(Vector2 position)
         {
-            CreateNetObject(Tree.FallenSprite, position);
+            CreateNetObject(EHR.Roles.Tree.FallenSprite, position);
         }
     }
 

Modules/CustomRoleSelector.cs

@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.Impostor;
-using EHR.Neutral;
+using EHR.Gamemodes;
+using EHR.Roles;
 
 namespace EHR.Modules;
 

Modules/CustomRolesHelper.cs

@@ -3,12 +3,10 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using UnityEngine;
+using EHR.Gamemodes;
 
 namespace EHR;
 

Modules/CustomRpcSender.cs

@@ -6,7 +6,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using AmongUs.GameOptions;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using Hazel;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using InnerNet;

Modules/DisableDevice.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;

Modules/ExtendedPlayerControl.cs

@@ -5,20 +5,15 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.Impostor;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using Hazel;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using InnerNet;
 using UnityEngine;
 using static EHR.Translator;
 using static EHR.Utils;
+using EHR.Gamemodes;
 
 namespace EHR;
 

Modules/FixedUpdateCaller.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EHR.Crewmate;
+using EHR.Gamemodes;
 using EHR.Patches;
 using HarmonyLib;
 using InnerNet;

Modules/GameOptionsSender/PlayerGameOptionsSender.cs

@@ -1,18 +1,12 @@
 using System;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.GhostRoles;
-using EHR.AddOns.Impostor;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.Impostor;
-using EHR.Neutral;
+using EHR.Roles;
 using Hazel;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using InnerNet;
 using Mathf = UnityEngine.Mathf;
+using EHR.Gamemodes;
 
 // ReSharper disable ForCanBeConvertedToForeach
 

Modules/GameState.cs

@@ -2,14 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.GhostRoles;
-using EHR.Coven;
-using EHR.Crewmate;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using InnerNet;
+using EHR.Gamemodes;
 
 namespace EHR;
 

Modules/GhostRolesManager.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using AmongUs.GameOptions;
-using EHR.AddOns.GhostRoles;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using UnityEngine;
 

Modules/GuessManager.cs

@@ -5,18 +5,15 @@ using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using HarmonyLib;
 using Hazel;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
 using static EHR.Translator;
+using EHR.Gamemodes;
 
 namespace EHR;
 

Modules/MeetingTimeManager.cs

@@ -1,8 +1,6 @@
 using System;
 using AmongUs.GameOptions;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Roles;
 using HarmonyLib;
 
 namespace EHR.Modules;

Modules/NameColorManager.cs

@@ -1,13 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using EHR.AddOns.Common;
-using EHR.AddOns.GhostRoles;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using Hazel;
+using EHR.Gamemodes;
 
 namespace EHR;
 

Modules/OptionHolder.cs

@@ -6,9 +6,9 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json;
-using EHR.AddOns;
-using EHR.AddOns.GhostRoles;
+using EHR.Gamemodes;
 using EHR.Modules;
+using EHR.Roles;
 using HarmonyLib;
 using UnityEngine;
 

Modules/RPC.cs

@@ -4,13 +4,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.Impostor;
-using EHR.Crewmate;
-using EHR.Impostor;
-using EHR.Neutral;
+using EHR.Gamemodes;
 using EHR.Patches;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using InnerNet;
@@ -710,7 +706,7 @@ internal static class RPCHandlerPatch
                 case CustomRPC.SyncSentry:
                 {
                     byte id = reader.ReadByte();
-                    if (Main.PlayerStates[id].Role is not Crewmate.Sentry sentry) break;
+                    if (Main.PlayerStates[id].Role is not Roles.Sentry sentry) break;
 
                     sentry.MonitoredRoom = Utils.GetPlayerById(id).GetPlainShipRoom();
                     break;
@@ -1030,7 +1026,7 @@ internal static class RPCHandlerPatch
                 }
                 case CustomRPC.SetGhostPlayer:
                 {
-                    Impostor.Lightning.ReceiveRPC(reader);
+                    Roles.Lightning.ReceiveRPC(reader);
                     break;
                 }
                 case CustomRPC.SetStalkerKillCount:

Modules/Statistics.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EHR.AddOns.Common;
-using EHR.Crewmate;
-using EHR.Neutral;
+using EHR.Gamemodes;
+using EHR.Roles;
 
 namespace EHR.Modules;
 

Modules/Translator.cs

@@ -7,6 +7,8 @@ using System.Reflection;
 using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
+using EHR.Gamemodes;
+
 #if !ANDROID
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 #endif

Modules/Utils.cs

@@ -13,15 +13,8 @@ using AmongUs.Data;
 using AmongUs.GameOptions;
 using AmongUs.InnerNet.GameDataMessages;
 using BepInEx;
-using EHR.AddOns.Common;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.GhostRoles;
-using EHR.AddOns.Impostor;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using EHR.Patches;
 using HarmonyLib;
 using Hazel;
@@ -31,7 +24,8 @@ using InnerNet;
 using Newtonsoft.Json;
 using UnityEngine;
 using static EHR.Translator;
-using Tree = EHR.Crewmate.Tree;
+using Tree = EHR.Roles.Tree;
+using EHR.Gamemodes;
 
 namespace EHR;
 /*
@@ -2504,7 +2498,7 @@ public static class Utils
                 SelfMark.Append(Snitch.GetWarningArrow(seer));
                 if (Main.LoversPlayers.Exists(x => x.PlayerId == seer.PlayerId)) SelfMark.Append(ColorString(GetRoleColor(CustomRoles.Lovers), " ♥"));
 
-                if (Impostor.Lightning.IsGhost(seer)) SelfMark.Append(ColorString(GetRoleColor(CustomRoles.Lightning), "■"));
+                if (Roles.Lightning.IsGhost(seer)) SelfMark.Append(ColorString(GetRoleColor(CustomRoles.Lightning), "■"));
 
                 SelfMark.Append(Medic.GetMark(seer, seer));
                 SelfMark.Append(Gaslighter.GetMark(seer, seer, forMeeting));
@@ -2802,7 +2796,7 @@ public static class Utils
                             if (target.Is(CustomRoles.SuperStar) && Options.EveryOneKnowSuperStar.GetBool())
                                 TargetMark.Append(ColorString(GetRoleColor(CustomRoles.SuperStar), "★"));
 
-                            if (Impostor.Lightning.IsGhost(target)) TargetMark.Append(ColorString(GetRoleColor(CustomRoles.Lightning), "■"));
+                            if (Roles.Lightning.IsGhost(target)) TargetMark.Append(ColorString(GetRoleColor(CustomRoles.Lightning), "■"));
 
                             TargetMark.Append(Snitch.GetWarningMark(seer, target));
 
@@ -3401,7 +3395,7 @@ public static class Utils
             CustomRoles.Sentinel => Sentinel.PatrolCooldown.GetInt(),
             CustomRoles.Druid => Druid.VentCooldown.GetInt(),
             CustomRoles.Catcher => Catcher.AbilityCooldown.GetInt(),
-            CustomRoles.Sentry => Crewmate.Sentry.ShowInfoCooldown.GetInt(),
+            CustomRoles.Sentry => EHR.Roles.Sentry.ShowInfoCooldown.GetInt(),
             CustomRoles.ToiletMaster => ToiletMaster.AbilityCooldown.GetInt(),
             CustomRoles.Ambusher => Ambusher.AbilityCooldown.GetInt(),
             CustomRoles.AntiAdminer => AntiAdminer.AbilityCooldown.GetInt(),
@@ -3727,7 +3721,7 @@ public static class Utils
                 Amnesiac.OnAnyoneDead(target);
                 Scout.OnPlayerDeath(target);
                 Dad.OnAnyoneDeath(target);
-                Crewmate.Sentry.OnAnyoneMurder(target);
+                EHR.Roles.Sentry.OnAnyoneMurder(target);
                 Soothsayer.OnAnyoneDeath(targetRealKiller);
 
                 TargetDies(targetRealKiller, target);

Patches/ChatCommandPatch.cs

@@ -7,12 +7,10 @@ using System.Text;
 using System.Text.RegularExpressions;
 using AmongUs.GameOptions;
 using Assets.CoreScripts;
-using EHR.AddOns.Common;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Gamemodes;
 using EHR.Modules;
-using EHR.Neutral;
 using EHR.Patches;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using InnerNet;

Patches/ChatControlPatch.cs

@@ -2,13 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.Data;
-using EHR.Coven;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Patches;
 using HarmonyLib;
 using Hazel;
 using InnerNet;
 using UnityEngine;
+using EHR.Gamemodes;
 
 namespace EHR;
 

Patches/CheckGameEndPatch.cs

@@ -4,11 +4,9 @@ using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
-using EHR.AddOns.Common;
-using EHR.AddOns.GhostRoles;
-using EHR.Impostor;
+using EHR.Gamemodes;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using InnerNet;

Patches/ExilePatch.cs

@@ -2,12 +2,8 @@ using System;
 using System.Diagnostics;
 using System.Linq;
 using AmongUs.Data;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.Impostor;
-using EHR.Crewmate;
-using EHR.Impostor;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 
 namespace EHR.Patches;

Patches/GameOptionsMenuPatch.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections;
 using System.Linq;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
-using EHR.AddOns.GhostRoles;
 using EHR.Modules;
 using EHR.Patches;
 using HarmonyLib;
@@ -10,6 +9,11 @@ using Hazel;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
+using EHR.Roles;
+using EHR.Gamemodes;
+
+
+
 
 #if ANDROID
 using System.Collections.Generic;

Patches/GameStartManagerPatch.cs

@@ -2,9 +2,8 @@ using System;
 using System.Linq;
 using AmongUs.Data;
 using AmongUs.GameOptions;
-using EHR.GameMode.HideAndSeekRoles;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using EHR.Patches;
 using HarmonyLib;
 using Hazel;
@@ -13,6 +12,7 @@ using InnerNet;
 using TMPro;
 using UnityEngine;
 using static EHR.Translator;
+using EHR.Gamemodes;
 
 namespace EHR;
 

Patches/HudPatch.cs

@@ -4,10 +4,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.Crewmate;
+using EHR.Gamemodes;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using TMPro;
 using UnityEngine;

Patches/HudSpritePatch.cs

@@ -1,9 +1,8 @@
 using System;
 using AmongUs.GameOptions;
-using EHR.Crewmate;
-using EHR.Impostor;
-using EHR.Neutral;
+using EHR.Gamemodes;
 using EHR.Patches;
+using EHR.Roles;
 using UnityEngine;
 
 namespace EHR;

Patches/IntroPatch.cs

@@ -3,10 +3,10 @@ using System.Collections;
 using System.Linq;
 using AmongUs.GameOptions;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
-using EHR.AddOns.Common;
+using EHR.Gamemodes;
 using EHR.Modules;
-using EHR.Neutral;
 using EHR.Patches;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using Il2CppSystem.Collections.Generic;

Patches/MeetingHudPatch.cs

@@ -2,17 +2,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using HarmonyLib;
 using Hazel;
 using TMPro;
 using UnityEngine;
 using static EHR.Translator;
+using EHR.Gamemodes;
 
 namespace EHR.Patches;
 
@@ -1116,7 +1113,7 @@ internal static class MeetingHudStartPatch
             if (target.Is(CustomRoles.SuperStar) && Options.EveryOneKnowSuperStar.GetBool())
                 sb.Append(Utils.ColorString(Utils.GetRoleColor(CustomRoles.SuperStar), "★"));
 
-            if (Impostor.Lightning.IsGhost(target))
+            if (Roles.Lightning.IsGhost(target))
                 sb.Append(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Lightning), "■"));
 
             if (seer.PlayerId == target.PlayerId && (Medic.InProtect(seer.PlayerId) || Medic.TempMarkProtectedList.Contains(seer.PlayerId)) && Medic.WhoCanSeeProtect.GetInt() is 0 or 2)
@@ -1146,7 +1143,7 @@ internal static class MeetingHudStartPatch
 
         // -------------------------------------------------------------------------------------------
 
-        Coven.Coven.CovenMeetingStartPatch.Postfix();
+        CovenBase.CovenMeetingStartPatch.Postfix();
         GuessManager.StartMeetingPatch.Postfix(__instance);
         Inspector.StartMeetingPatch.Postfix(__instance);
         Judge.StartMeetingPatch.Postfix(__instance);

Patches/OnGameStartedPatch.cs

@@ -6,14 +6,10 @@ using AmongUs.Data;
 using AmongUs.GameOptions;
 using Assets.CoreScripts;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
-using EHR.AddOns.Common;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.Impostor;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Gamemodes;
 using EHR.Modules;
-using EHR.Neutral;
 using EHR.Patches;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using InnerNet;
@@ -304,7 +300,7 @@ internal static class ChangeRoleSettings
             ShipStatusFixedUpdatePatch.CanUseClosestVent = [];
 
             RandomSpawn.CustomNetworkTransformHandleRpcPatch.HasSpawned = [];
-            Coven.Coven.CovenMeetingStartPatch.MeetingNum = 0;
+            CovenBase.CovenMeetingStartPatch.MeetingNum = 0;
 
             AFKDetector.ShieldedPlayers.Clear();
             Main.Invisible.Clear();

Patches/OutroPatch.cs

@@ -3,10 +3,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
-using EHR.AddOns.GhostRoles;
-using EHR.Crewmate;
+using EHR.Gamemodes;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using TMPro;

Patches/PetActionsPatch.cs

@@ -2,10 +2,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Gamemodes;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using UnityEngine;

Patches/PhantomRolePatch.cs

@@ -1,7 +1,6 @@
 using System;
 using AmongUs.GameOptions;
-using EHR.Crewmate;
-using EHR.Impostor;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;

Patches/PlayerControlPatch.cs

@@ -4,16 +4,8 @@ using System.Linq;
 using System.Reflection;
 using AmongUs.Data;
 using AmongUs.GameOptions;
-using EHR.AddOns.Common;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.GhostRoles;
-using EHR.AddOns.Impostor;
-using EHR.Coven;
-using EHR.Crewmate;
-using EHR.GameMode.HideAndSeekRoles;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Modules;
-using EHR.Neutral;
 using EHR.Patches;
 using HarmonyLib;
 using Hazel;
@@ -22,7 +14,8 @@ using TMPro;
 using UnityEngine;
 using static EHR.Translator;
 using static EHR.Utils;
-using Tree = EHR.Crewmate.Tree;
+using Tree = EHR.Roles.Tree;
+using EHR.Gamemodes;
 
 namespace EHR;
 
@@ -704,7 +697,7 @@ internal static class MurderPlayerPatch
             switch (target.GetCustomRole())
             {
                 case CustomRoles.Lightning when killer != target:
-                    Impostor.Lightning.MurderPlayer(killer, target);
+                    Roles.Lightning.MurderPlayer(killer, target);
                     break;
                 case CustomRoles.Bane when killer != target:
                     Bane.OnKilled(killer);
@@ -945,7 +938,7 @@ internal static class ShapeshiftPatch
                 case Adventurer av when shapeshifting:
                     Adventurer.OnAnyoneShapeshiftLoop(av, __instance);
                     break;
-                case Crewmate.Sentry st:
+                case EHR.Roles.Sentry st:
                     st.OnAnyoneShapeshiftLoop(__instance, target);
                     break;
             }
@@ -1911,7 +1904,7 @@ internal static class FixedUpdatePatch
 
             if (target.AmOwner) Mark.Append(Sniper.GetShotNotify(target.PlayerId));
 
-            if (Impostor.Lightning.IsGhost(target)) Mark.Append(ColorString(GetRoleColor(CustomRoles.Lightning), "■"));
+            if (Roles.Lightning.IsGhost(target)) Mark.Append(ColorString(GetRoleColor(CustomRoles.Lightning), "■"));
 
             Mark.Append(Medic.GetMark(seer, target));
             Mark.Append(Gaslighter.GetMark(seer, target));
@@ -2108,7 +2101,7 @@ internal static class EnterVentPatch
 
         Drainer.OnAnyoneEnterVent(pc, __instance);
         Analyst.OnAnyoneEnterVent(pc);
-        Crewmate.Sentry.OnAnyoneEnterVent(pc);
+        Roles.Sentry.OnAnyoneEnterVent(pc);
 
         switch (pc.GetCustomRole())
         {

Patches/PlayerJoinAndLeftPatch.cs

@@ -7,11 +7,10 @@ using System.Text.RegularExpressions;
 using AmongUs.Data;
 using AmongUs.GameOptions;
 using AmongUs.InnerNet.GameDataMessages;
-using EHR.AddOns.Common;
-using EHR.Crewmate;
+using EHR.Gamemodes;
 using EHR.Modules;
-using EHR.Neutral;
 using EHR.Patches;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using InnerNet;

Patches/RandomSpawnPatch.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EHR.Impostor;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 using UnityEngine;

Patches/SabotageSystemPatch.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.Crewmate;
-using EHR.Impostor;
 using EHR.Modules;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using Hazel;
 

Patches/ShipStatusPatch.cs

@@ -3,14 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
 using BepInEx;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.Impostor;
-using EHR.Crewmate;
-using EHR.Neutral;
+using EHR.Roles;
 using EHR.Patches;
 using HarmonyLib;
 using Hazel;
 using UnityEngine;
+using EHR.Gamemodes;
 
 namespace EHR;
 

Patches/TaskAssignPatch.cs

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.GhostRoles;
-using EHR.Impostor;
+using EHR.Roles;
 using EHR.Modules;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;

Patches/UsablesPatch.cs

@@ -1,6 +1,5 @@
 using AmongUs.GameOptions;
-using EHR.Crewmate;
-using EHR.Neutral;
+using EHR.Roles;
 using HarmonyLib;
 using UnityEngine;
 

Roles/HideAndSeek/Agent.cs

@@ -1,4 +1,4 @@
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 public class Agent : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Dasher.cs

@@ -1,6 +1,7 @@
 using AmongUs.GameOptions;
+using EHR.Gamemodes;
 
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 public class Dasher : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Detector.cs

@@ -1,6 +1,7 @@
 using System.Linq;
+using EHR.Gamemodes;
 
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 public class Detector : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Fox.cs

@@ -1,4 +1,4 @@
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 internal class Fox : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Hider.cs

@@ -1,4 +1,6 @@
-namespace EHR.GameMode.HideAndSeekRoles;
+using EHR.Gamemodes;
+
+namespace EHR.Roles;
 
 internal class Hider : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/IHideAndSeekRole.cs

@@ -1,4 +1,4 @@
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 internal interface IHideAndSeekRole
 {

Roles/HideAndSeek/Jet.cs

@@ -1,6 +1,6 @@
 using AmongUs.GameOptions;
 
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 public class Jet : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Jumper.cs

@@ -1,6 +1,6 @@
 using AmongUs.GameOptions;
 
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 public class Jumper : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Locator.cs

@@ -1,6 +1,7 @@
 using System.Linq;
+using EHR.Gamemodes;
 
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 public class Locator : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Seeker.cs

@@ -1,4 +1,6 @@
-namespace EHR.GameMode.HideAndSeekRoles;
+using EHR.Gamemodes;
+
+namespace EHR.Roles;
 
 internal class Seeker : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Taskinator.cs

@@ -1,4 +1,6 @@
-namespace EHR.GameMode.HideAndSeekRoles;
+using EHR.Gamemodes;
+
+namespace EHR.Roles;
 
 public class Taskinator : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Troll.cs

@@ -1,4 +1,4 @@
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 internal class Troll : RoleBase, IHideAndSeekRole
 {

Roles/HideAndSeek/Venter.cs

@@ -1,4 +1,4 @@
-namespace EHR.GameMode.HideAndSeekRoles;
+namespace EHR.Roles;
 
 public class Venter : RoleBase, IHideAndSeekRole
 {

Roles/RoleBase.cs

@@ -11,12 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using AmongUs.GameOptions;
-using EHR.AddOns.Crewmate;
-using EHR.AddOns.Impostor;
-using EHR.Crewmate;
-
-
-namespace EHR;
+namespace EHR.Roles;
 
 public abstract class RoleBase : IComparable<RoleBase>
 {

Roles/Standard/Addons/Common/Allergic.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using EHR.Modules;
 using Hazel;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Allergic : IAddon
 {

Roles/Standard/Addons/Common/Anchor.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Anchor : IAddon
 {

Roles/Standard/Addons/Common/AntiTP.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class AntiTP : IAddon
 {

Roles/Standard/Addons/Common/Antidote.cs

@@ -1,6 +1,6 @@
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Antidote : IAddon
 {

Roles/Standard/Addons/Common/Asthmatic.cs

@@ -1,11 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
+using EHR.Gamemodes;
 using EHR.Modules;
 using Hazel;
 using UnityEngine;
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Asthmatic : IAddon
 {

Roles/Standard/Addons/Common/Autopsy.cs

@@ -1,6 +1,6 @@
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Autopsy : IAddon
 {

Roles/Standard/Addons/Common/Avenger.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Avenger : IAddon
 {

Roles/Standard/Addons/Common/Bait.cs

@@ -1,6 +1,6 @@
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Bait : IAddon
 {

Roles/Standard/Addons/Common/BananaMan.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class BananaMan : IAddon
 {

Roles/Standard/Addons/Common/Beartrap.cs

@@ -1,6 +1,6 @@
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Beartrap : IAddon
 {

Roles/Standard/Addons/Common/Bewilder.cs

@@ -1,6 +1,6 @@
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Bewilder : IAddon
 {

Roles/Standard/Addons/Common/Blind.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Blind : IAddon
 {

Roles/Standard/Addons/Common/Blocked.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Blocked : IAddon
 {

Roles/Standard/Addons/Common/Busy.cs

@@ -1,6 +1,6 @@
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Busy : IAddon
 {

Roles/Standard/Addons/Common/Clumsy.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Clumsy : IAddon
 {

Roles/Standard/Addons/Common/Commited.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Commited : IAddon
 {

Roles/Standard/Addons/Common/Compelled.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns;
+namespace EHR.Roles;
 
 public class Compelled : IAddon
 {

Roles/Standard/Addons/Common/Composter.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Composter : IAddon
 {

Roles/Standard/Addons/Common/Deadlined.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
-
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Deadlined : IAddon
 {

Roles/Standard/Addons/Common/Disco.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Disco : IAddon
 {

Roles/Standard/Addons/Common/Diseased.cs

@@ -1,6 +1,6 @@
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Diseased : IAddon
 {

Roles/Standard/Addons/Common/Disregarded.cs

@@ -1,6 +1,6 @@
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Disregarded : IAddon
 {

Roles/Standard/Addons/Common/DoubleShot.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using EHR.Modules;
 using static EHR.Options;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class DoubleShot : IAddon
 {

Roles/Standard/Addons/Common/Dynamo.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Dynamo : IAddon
 {

Roles/Standard/Addons/Common/Energetic.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 public class Energetic : IAddon
 {

Roles/Standard/Addons/Common/Flash.cs

@@ -1,4 +1,4 @@
-namespace EHR.AddOns.Common;
+namespace EHR.Roles;
 
 internal class Flash : IAddon
 {