diff --git a/GameMode/BedWars.cs b/Gamemodes/BedWars.cs similarity index 99% rename from GameMode/BedWars.cs rename to Gamemodes/BedWars.cs index ab1fadb20..a3d60a528 100644 --- a/GameMode/BedWars.cs +++ b/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 { diff --git a/GameMode/CaptureTheFlag.cs b/Gamemodes/CaptureTheFlag.cs similarity index 99% rename from GameMode/CaptureTheFlag.cs rename to Gamemodes/CaptureTheFlag.cs index e27b9a41c..225d7ca11 100644 --- a/GameMode/CaptureTheFlag.cs +++ b/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 { diff --git a/GameMode/CustomHnS.cs b/Gamemodes/CustomHnS.cs similarity index 99% rename from GameMode/CustomHnS.cs rename to Gamemodes/CustomHnS.cs index 8e3954a59..adb199d33 100644 --- a/GameMode/CustomHnS.cs +++ b/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 { diff --git a/GameMode/Deathrace.cs b/Gamemodes/Deathrace.cs similarity index 99% rename from GameMode/Deathrace.cs rename to Gamemodes/Deathrace.cs index 730ea4042..8cb414648 100644 --- a/GameMode/Deathrace.cs +++ b/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 { diff --git a/GameMode/FreeForAll.cs b/Gamemodes/FreeForAll.cs similarity index 99% rename from GameMode/FreeForAll.cs rename to Gamemodes/FreeForAll.cs index 4fb41f0b0..e353fa01d 100644 --- a/GameMode/FreeForAll.cs +++ b/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 { diff --git a/GameMode/HotPotato.cs b/Gamemodes/HotPotato.cs similarity index 99% rename from GameMode/HotPotato.cs rename to Gamemodes/HotPotato.cs index 705e5cd2c..a4d20fbce 100644 --- a/GameMode/HotPotato.cs +++ b/Gamemodes/HotPotato.cs @@ -6,7 +6,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR; +namespace EHR.Gamemodes; internal static class HotPotato { diff --git a/GameMode/KingOfTheZones.cs b/Gamemodes/KingOfTheZones.cs similarity index 99% rename from GameMode/KingOfTheZones.cs rename to Gamemodes/KingOfTheZones.cs index fe1f7e39f..ba629e13d 100644 --- a/GameMode/KingOfTheZones.cs +++ b/Gamemodes/KingOfTheZones.cs @@ -8,7 +8,7 @@ using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR; +namespace EHR.Gamemodes; public static class KingOfTheZones { diff --git a/GameMode/Mingle.cs b/Gamemodes/Mingle.cs similarity index 99% rename from GameMode/Mingle.cs rename to Gamemodes/Mingle.cs index 051f5ee53..556301153 100644 --- a/GameMode/Mingle.cs +++ b/Gamemodes/Mingle.cs @@ -4,7 +4,7 @@ using System.Linq; using AmongUs.GameOptions; using UnityEngine; -namespace EHR; +namespace EHR.Gamemodes; public static class Mingle { diff --git a/GameMode/NaturalDisasters.cs b/Gamemodes/NaturalDisasters.cs similarity index 99% rename from GameMode/NaturalDisasters.cs rename to Gamemodes/NaturalDisasters.cs index 08b65d49a..99bbddb56 100644 --- a/GameMode/NaturalDisasters.cs +++ b/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")] diff --git a/GameMode/Quiz.cs b/Gamemodes/Quiz.cs similarity index 99% rename from GameMode/Quiz.cs rename to Gamemodes/Quiz.cs index 27744e616..b2be6a858 100644 --- a/GameMode/Quiz.cs +++ b/Gamemodes/Quiz.cs @@ -8,7 +8,7 @@ using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR; +namespace EHR.Gamemodes; public static class Quiz { diff --git a/GameMode/RoomRush.cs b/Gamemodes/RoomRush.cs similarity index 99% rename from GameMode/RoomRush.cs rename to Gamemodes/RoomRush.cs index dade5c72d..036a8c77b 100644 --- a/GameMode/RoomRush.cs +++ b/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 { diff --git a/GameMode/Snowdown.cs b/Gamemodes/Snowdown.cs similarity index 99% rename from GameMode/Snowdown.cs rename to Gamemodes/Snowdown.cs index f4d0a5de4..3e62077a5 100644 --- a/GameMode/Snowdown.cs +++ b/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 { diff --git a/GameMode/SoloPVP.cs b/Gamemodes/SoloPVP.cs similarity index 99% rename from GameMode/SoloPVP.cs rename to Gamemodes/SoloPVP.cs index e4a34fd61..50f948dbb 100644 --- a/GameMode/SoloPVP.cs +++ b/Gamemodes/SoloPVP.cs @@ -6,7 +6,7 @@ using Hazel; using UnityEngine; using static EHR.RandomSpawn; -namespace EHR; +namespace EHR.Gamemodes; internal static class SoloPVP { diff --git a/GameMode/Speedrun.cs b/Gamemodes/Speedrun.cs similarity index 99% rename from GameMode/Speedrun.cs rename to Gamemodes/Speedrun.cs index 4086a1c3b..cbea47675 100644 --- a/GameMode/Speedrun.cs +++ b/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 { diff --git a/GameMode/StopAndGo.cs b/Gamemodes/StopAndGo.cs similarity index 99% rename from GameMode/StopAndGo.cs rename to Gamemodes/StopAndGo.cs index 489d776f1..f84d4d53b 100644 --- a/GameMode/StopAndGo.cs +++ b/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 randomRedTimeFunc, Func randomGreenTimeFunc, bool isYellow = false) { diff --git a/GameMode/TheMindGame.cs b/Gamemodes/TheMindGame.cs similarity index 99% rename from GameMode/TheMindGame.cs rename to Gamemodes/TheMindGame.cs index 893d3ee49..1adc74f80 100644 --- a/GameMode/TheMindGame.cs +++ b/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 { diff --git a/Main.cs b/Main.cs index ff4eb2f5d..392572355 100644 --- a/Main.cs +++ b/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; diff --git a/Modules/AutoHaunt.cs b/Modules/AutoHaunt.cs index 69960983c..3ec2df505 100644 --- a/Modules/AutoHaunt.cs +++ b/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; diff --git a/Modules/Camouflague.cs b/Modules/Camouflage.cs similarity index 96% rename from Modules/Camouflague.cs rename to Modules/Camouflage.cs index fb717cd45..9c559a27a 100644 --- a/Modules/Camouflague.cs +++ b/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; diff --git a/Modules/CustomNetObject.cs b/Modules/CustomNetObject.cs index 150e784ec..41703904f 100644 --- a/Modules/CustomNetObject.cs +++ b/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); } } diff --git a/Modules/CustomRoleSelector.cs b/Modules/CustomRoleSelector.cs index eb99be8ae..bdcf6819d 100644 --- a/Modules/CustomRoleSelector.cs +++ b/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; diff --git a/Modules/CustomRolesHelper.cs b/Modules/CustomRolesHelper.cs index 70a0272e3..b89fa8a46 100644 --- a/Modules/CustomRolesHelper.cs +++ b/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; diff --git a/Modules/CustomRpcSender.cs b/Modules/CustomRpcSender.cs index 45e82f1b1..e93e1c5c3 100644 --- a/Modules/CustomRpcSender.cs +++ b/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; diff --git a/Modules/DisableDevice.cs b/Modules/DisableDevice.cs index 9e7330c1c..7b8f26f01 100644 --- a/Modules/DisableDevice.cs +++ b/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; diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs index c544317c8..29954e6e4 100644 --- a/Modules/ExtendedPlayerControl.cs +++ b/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; diff --git a/Modules/FixedUpdateCaller.cs b/Modules/FixedUpdateCaller.cs index f9f464aaa..f28d0e371 100644 --- a/Modules/FixedUpdateCaller.cs +++ b/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; diff --git a/Modules/GameOptionsSender/PlayerGameOptionsSender.cs b/Modules/GameOptionsSender/PlayerGameOptionsSender.cs index 3a4305ca5..84328123f 100644 --- a/Modules/GameOptionsSender/PlayerGameOptionsSender.cs +++ b/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 diff --git a/Modules/GameState.cs b/Modules/GameState.cs index 3ee86fa3e..bd05b6184 100644 --- a/Modules/GameState.cs +++ b/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; diff --git a/Modules/GhostRolesManager.cs b/Modules/GhostRolesManager.cs index d6c835f99..8ddeb7801 100644 --- a/Modules/GhostRolesManager.cs +++ b/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; diff --git a/Modules/GuessManager.cs b/Modules/GuessManager.cs index b39541739..a0b74cf64 100644 --- a/Modules/GuessManager.cs +++ b/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; diff --git a/Modules/MeetingTimeManager.cs b/Modules/MeetingTimeManager.cs index 67caeac1c..c305a9e91 100644 --- a/Modules/MeetingTimeManager.cs +++ b/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; diff --git a/Modules/NameColorManager.cs b/Modules/NameColorManager.cs index e8a2552ab..2306f4653 100644 --- a/Modules/NameColorManager.cs +++ b/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; diff --git a/Modules/OptionHolder.cs b/Modules/OptionHolder.cs index 1bfc40e4a..41a31543c 100644 --- a/Modules/OptionHolder.cs +++ b/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; diff --git a/Modules/RPC.cs b/Modules/RPC.cs index d8ab5285f..a3a71c84f 100644 --- a/Modules/RPC.cs +++ b/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: diff --git a/Modules/Statistics.cs b/Modules/Statistics.cs index 612429664..80b07ca29 100644 --- a/Modules/Statistics.cs +++ b/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; diff --git a/Modules/Translator.cs b/Modules/Translator.cs index 2bb5ff90c..a5782fbaa 100644 --- a/Modules/Translator.cs +++ b/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 diff --git a/Modules/Utils.cs b/Modules/Utils.cs index 65e70fe36..5318ddeab 100644 --- a/Modules/Utils.cs +++ b/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); diff --git a/Patches/ChatCommandPatch.cs b/Patches/ChatCommandPatch.cs index 8a2c28554..ad4709f97 100644 --- a/Patches/ChatCommandPatch.cs +++ b/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; diff --git a/Patches/ChatControlPatch.cs b/Patches/ChatControlPatch.cs index 511f976c7..4efc0f00b 100644 --- a/Patches/ChatControlPatch.cs +++ b/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; diff --git a/Patches/CheckGameEndPatch.cs b/Patches/CheckGameEndPatch.cs index 005cb2ad9..8d90fcba0 100644 --- a/Patches/CheckGameEndPatch.cs +++ b/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; diff --git a/Patches/ExilePatch.cs b/Patches/ExilePatch.cs index b645eff4e..6400608be 100644 --- a/Patches/ExilePatch.cs +++ b/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; diff --git a/Patches/GameOptionsMenuPatch.cs b/Patches/GameOptionsMenuPatch.cs index cba17dc7a..701f042bc 100644 --- a/Patches/GameOptionsMenuPatch.cs +++ b/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; diff --git a/Patches/GameStartManagerPatch.cs b/Patches/GameStartManagerPatch.cs index 4dab81bc6..17b67c849 100644 --- a/Patches/GameStartManagerPatch.cs +++ b/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; diff --git a/Patches/HudPatch.cs b/Patches/HudPatch.cs index 6a3a45f6a..3079a4792 100644 --- a/Patches/HudPatch.cs +++ b/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; diff --git a/Patches/HudSpritePatch.cs b/Patches/HudSpritePatch.cs index 893989525..349752e49 100644 --- a/Patches/HudSpritePatch.cs +++ b/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; diff --git a/Patches/IntroPatch.cs b/Patches/IntroPatch.cs index 6067dc602..13f7f483d 100644 --- a/Patches/IntroPatch.cs +++ b/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; diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs index 910a33293..391668de2 100644 --- a/Patches/MeetingHudPatch.cs +++ b/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); diff --git a/Patches/OnGameStartedPatch.cs b/Patches/OnGameStartedPatch.cs index bc08f13c6..0c7b15257 100644 --- a/Patches/OnGameStartedPatch.cs +++ b/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(); diff --git a/Patches/OutroPatch.cs b/Patches/OutroPatch.cs index b0c80700e..74a1f47dd 100644 --- a/Patches/OutroPatch.cs +++ b/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; diff --git a/Patches/PetActionsPatch.cs b/Patches/PetActionsPatch.cs index 2f91adc0a..5ba521995 100644 --- a/Patches/PetActionsPatch.cs +++ b/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; diff --git a/Patches/PhantomRolePatch.cs b/Patches/PhantomRolePatch.cs index e2260154d..a802b8bf5 100644 --- a/Patches/PhantomRolePatch.cs +++ b/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; diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs index ac09ae86f..03b6ac395 100644 --- a/Patches/PlayerControlPatch.cs +++ b/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()) { diff --git a/Patches/PlayerJoinAndLeftPatch.cs b/Patches/PlayerJoinAndLeftPatch.cs index 6b0614474..3e259093f 100644 --- a/Patches/PlayerJoinAndLeftPatch.cs +++ b/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; diff --git a/Patches/RandomSpawnPatch.cs b/Patches/RandomSpawnPatch.cs index 726c87b15..51a2b7677 100644 --- a/Patches/RandomSpawnPatch.cs +++ b/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; diff --git a/Patches/SabotageSystemPatch.cs b/Patches/SabotageSystemPatch.cs index c9348ac71..1dbd1eab9 100644 --- a/Patches/SabotageSystemPatch.cs +++ b/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; diff --git a/Patches/ShipStatusPatch.cs b/Patches/ShipStatusPatch.cs index 79c781e7b..b6d95b893 100644 --- a/Patches/ShipStatusPatch.cs +++ b/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; diff --git a/Patches/TaskAssignPatch.cs b/Patches/TaskAssignPatch.cs index 34551706d..dbe81aecf 100644 --- a/Patches/TaskAssignPatch.cs +++ b/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; diff --git a/Patches/UsablesPatch.cs b/Patches/UsablesPatch.cs index f92d53d13..7359c6a68 100644 --- a/Patches/UsablesPatch.cs +++ b/Patches/UsablesPatch.cs @@ -1,6 +1,5 @@ using AmongUs.GameOptions; -using EHR.Crewmate; -using EHR.Neutral; +using EHR.Roles; using HarmonyLib; using UnityEngine; diff --git a/GameMode/HideAndSeekRoles/Agent.cs b/Roles/HideAndSeek/Agent.cs similarity index 97% rename from GameMode/HideAndSeekRoles/Agent.cs rename to Roles/HideAndSeek/Agent.cs index ccb05f90f..3f2449856 100644 --- a/GameMode/HideAndSeekRoles/Agent.cs +++ b/Roles/HideAndSeek/Agent.cs @@ -1,4 +1,4 @@ -namespace EHR.GameMode.HideAndSeekRoles; +namespace EHR.Roles; public class Agent : RoleBase, IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/Dasher.cs b/Roles/HideAndSeek/Dasher.cs similarity index 99% rename from GameMode/HideAndSeekRoles/Dasher.cs rename to Roles/HideAndSeek/Dasher.cs index 1e4759456..adb4e7bdd 100644 --- a/GameMode/HideAndSeekRoles/Dasher.cs +++ b/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 { diff --git a/GameMode/HideAndSeekRoles/Detector.cs b/Roles/HideAndSeek/Detector.cs similarity index 98% rename from GameMode/HideAndSeekRoles/Detector.cs rename to Roles/HideAndSeek/Detector.cs index 36f686ae3..f8a1dd27a 100644 --- a/GameMode/HideAndSeekRoles/Detector.cs +++ b/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 { diff --git a/GameMode/HideAndSeekRoles/Fox.cs b/Roles/HideAndSeek/Fox.cs similarity index 97% rename from GameMode/HideAndSeekRoles/Fox.cs rename to Roles/HideAndSeek/Fox.cs index 658a3a096..c198cf0e8 100644 --- a/GameMode/HideAndSeekRoles/Fox.cs +++ b/Roles/HideAndSeek/Fox.cs @@ -1,4 +1,4 @@ -namespace EHR.GameMode.HideAndSeekRoles; +namespace EHR.Roles; internal class Fox : RoleBase, IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/Hider.cs b/Roles/HideAndSeek/Hider.cs similarity index 98% rename from GameMode/HideAndSeekRoles/Hider.cs rename to Roles/HideAndSeek/Hider.cs index 7c2df66ec..e6e2a481b 100644 --- a/GameMode/HideAndSeekRoles/Hider.cs +++ b/Roles/HideAndSeek/Hider.cs @@ -1,4 +1,6 @@ -namespace EHR.GameMode.HideAndSeekRoles; +using EHR.Gamemodes; + +namespace EHR.Roles; internal class Hider : RoleBase, IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/IHideAndSeekRole.cs b/Roles/HideAndSeek/IHideAndSeekRole.cs similarity index 90% rename from GameMode/HideAndSeekRoles/IHideAndSeekRole.cs rename to Roles/HideAndSeek/IHideAndSeekRole.cs index 89d343c49..9c8c8329a 100644 --- a/GameMode/HideAndSeekRoles/IHideAndSeekRole.cs +++ b/Roles/HideAndSeek/IHideAndSeekRole.cs @@ -1,4 +1,4 @@ -namespace EHR.GameMode.HideAndSeekRoles; +namespace EHR.Roles; internal interface IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/Jet.cs b/Roles/HideAndSeek/Jet.cs similarity index 99% rename from GameMode/HideAndSeekRoles/Jet.cs rename to Roles/HideAndSeek/Jet.cs index c086d4858..30b6a8e50 100644 --- a/GameMode/HideAndSeekRoles/Jet.cs +++ b/Roles/HideAndSeek/Jet.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.GameMode.HideAndSeekRoles; +namespace EHR.Roles; public class Jet : RoleBase, IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/Jumper.cs b/Roles/HideAndSeek/Jumper.cs similarity index 98% rename from GameMode/HideAndSeekRoles/Jumper.cs rename to Roles/HideAndSeek/Jumper.cs index 5a7e6d293..995c71f4f 100644 --- a/GameMode/HideAndSeekRoles/Jumper.cs +++ b/Roles/HideAndSeek/Jumper.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.GameMode.HideAndSeekRoles; +namespace EHR.Roles; public class Jumper : RoleBase, IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/Locator.cs b/Roles/HideAndSeek/Locator.cs similarity index 99% rename from GameMode/HideAndSeekRoles/Locator.cs rename to Roles/HideAndSeek/Locator.cs index 416e13d89..fdd44e868 100644 --- a/GameMode/HideAndSeekRoles/Locator.cs +++ b/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 { diff --git a/GameMode/HideAndSeekRoles/Seeker.cs b/Roles/HideAndSeek/Seeker.cs similarity index 98% rename from GameMode/HideAndSeekRoles/Seeker.cs rename to Roles/HideAndSeek/Seeker.cs index 49a98f874..e5c071dad 100644 --- a/GameMode/HideAndSeekRoles/Seeker.cs +++ b/Roles/HideAndSeek/Seeker.cs @@ -1,4 +1,6 @@ -namespace EHR.GameMode.HideAndSeekRoles; +using EHR.Gamemodes; + +namespace EHR.Roles; internal class Seeker : RoleBase, IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/Taskinator.cs b/Roles/HideAndSeek/Taskinator.cs similarity index 98% rename from GameMode/HideAndSeekRoles/Taskinator.cs rename to Roles/HideAndSeek/Taskinator.cs index cf08b2e83..62fe7dddf 100644 --- a/GameMode/HideAndSeekRoles/Taskinator.cs +++ b/Roles/HideAndSeek/Taskinator.cs @@ -1,4 +1,6 @@ -namespace EHR.GameMode.HideAndSeekRoles; +using EHR.Gamemodes; + +namespace EHR.Roles; public class Taskinator : RoleBase, IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/Troll.cs b/Roles/HideAndSeek/Troll.cs similarity index 97% rename from GameMode/HideAndSeekRoles/Troll.cs rename to Roles/HideAndSeek/Troll.cs index b222024c7..cb13d8909 100644 --- a/GameMode/HideAndSeekRoles/Troll.cs +++ b/Roles/HideAndSeek/Troll.cs @@ -1,4 +1,4 @@ -namespace EHR.GameMode.HideAndSeekRoles; +namespace EHR.Roles; internal class Troll : RoleBase, IHideAndSeekRole { diff --git a/GameMode/HideAndSeekRoles/Venter.cs b/Roles/HideAndSeek/Venter.cs similarity index 98% rename from GameMode/HideAndSeekRoles/Venter.cs rename to Roles/HideAndSeek/Venter.cs index fd338af84..84ff2e739 100644 --- a/GameMode/HideAndSeekRoles/Venter.cs +++ b/Roles/HideAndSeek/Venter.cs @@ -1,4 +1,4 @@ -namespace EHR.GameMode.HideAndSeekRoles; +namespace EHR.Roles; public class Venter : RoleBase, IHideAndSeekRole { diff --git a/Roles/RoleBase.cs b/Roles/RoleBase.cs index 8b80ab9b0..d03b18c13 100644 --- a/Roles/RoleBase.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Allergic.cs b/Roles/Standard/Addons/Common/Allergic.cs similarity index 99% rename from Roles/AddOns/Common/Allergic.cs rename to Roles/Standard/Addons/Common/Allergic.cs index 5191b4264..c4efca714 100644 --- a/Roles/AddOns/Common/Allergic.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Anchor.cs b/Roles/Standard/Addons/Common/Anchor.cs similarity index 88% rename from Roles/AddOns/Common/Anchor.cs rename to Roles/Standard/Addons/Common/Anchor.cs index 167665278..06ee034aa 100644 --- a/Roles/AddOns/Common/Anchor.cs +++ b/Roles/Standard/Addons/Common/Anchor.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Anchor : IAddon { diff --git a/Roles/AddOns/Common/AntiTP.cs b/Roles/Standard/Addons/Common/AntiTP.cs similarity index 88% rename from Roles/AddOns/Common/AntiTP.cs rename to Roles/Standard/Addons/Common/AntiTP.cs index b841657cd..75f08355e 100644 --- a/Roles/AddOns/Common/AntiTP.cs +++ b/Roles/Standard/Addons/Common/AntiTP.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class AntiTP : IAddon { diff --git a/Roles/AddOns/Common/Antidote.cs b/Roles/Standard/Addons/Common/Antidote.cs similarity index 95% rename from Roles/AddOns/Common/Antidote.cs rename to Roles/Standard/Addons/Common/Antidote.cs index 94f21b6e7..3082fd55e 100644 --- a/Roles/AddOns/Common/Antidote.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Asthmatic.cs b/Roles/Standard/Addons/Common/Asthmatic.cs similarity index 99% rename from Roles/AddOns/Common/Asthmatic.cs rename to Roles/Standard/Addons/Common/Asthmatic.cs index a1c76d39e..7b72f1a89 100644 --- a/Roles/AddOns/Common/Asthmatic.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Autopsy.cs b/Roles/Standard/Addons/Common/Autopsy.cs similarity index 90% rename from Roles/AddOns/Common/Autopsy.cs rename to Roles/Standard/Addons/Common/Autopsy.cs index 6cfbd4a8d..c464998f0 100644 --- a/Roles/AddOns/Common/Autopsy.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Avenger.cs b/Roles/Standard/Addons/Common/Avenger.cs similarity index 88% rename from Roles/AddOns/Common/Avenger.cs rename to Roles/Standard/Addons/Common/Avenger.cs index 4d1004c4b..d64eb6f70 100644 --- a/Roles/AddOns/Common/Avenger.cs +++ b/Roles/Standard/Addons/Common/Avenger.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Avenger : IAddon { diff --git a/Roles/AddOns/Common/Bait.cs b/Roles/Standard/Addons/Common/Bait.cs similarity index 97% rename from Roles/AddOns/Common/Bait.cs rename to Roles/Standard/Addons/Common/Bait.cs index c5ddf5ca4..4a6949392 100644 --- a/Roles/AddOns/Common/Bait.cs +++ b/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 { diff --git a/Roles/AddOns/Common/BananaMan.cs b/Roles/Standard/Addons/Common/BananaMan.cs similarity index 93% rename from Roles/AddOns/Common/BananaMan.cs rename to Roles/Standard/Addons/Common/BananaMan.cs index 0c1af38ee..43f6eb2d4 100644 --- a/Roles/AddOns/Common/BananaMan.cs +++ b/Roles/Standard/Addons/Common/BananaMan.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class BananaMan : IAddon { diff --git a/Roles/AddOns/Common/Beartrap.cs b/Roles/Standard/Addons/Common/Beartrap.cs similarity index 94% rename from Roles/AddOns/Common/Beartrap.cs rename to Roles/Standard/Addons/Common/Beartrap.cs index 8b492d99c..9311b05d6 100644 --- a/Roles/AddOns/Common/Beartrap.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Bewilder.cs b/Roles/Standard/Addons/Common/Bewilder.cs similarity index 94% rename from Roles/AddOns/Common/Bewilder.cs rename to Roles/Standard/Addons/Common/Bewilder.cs index b5c47ca98..ab228052d 100644 --- a/Roles/AddOns/Common/Bewilder.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Blind.cs b/Roles/Standard/Addons/Common/Blind.cs similarity index 88% rename from Roles/AddOns/Common/Blind.cs rename to Roles/Standard/Addons/Common/Blind.cs index b954e5d72..659846703 100644 --- a/Roles/AddOns/Common/Blind.cs +++ b/Roles/Standard/Addons/Common/Blind.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Blind : IAddon { diff --git a/Roles/AddOns/Common/Blocked.cs b/Roles/Standard/Addons/Common/Blocked.cs similarity index 88% rename from Roles/AddOns/Common/Blocked.cs rename to Roles/Standard/Addons/Common/Blocked.cs index 6155e87ee..bf5bb405c 100644 --- a/Roles/AddOns/Common/Blocked.cs +++ b/Roles/Standard/Addons/Common/Blocked.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Blocked : IAddon { diff --git a/Roles/AddOns/Common/Busy.cs b/Roles/Standard/Addons/Common/Busy.cs similarity index 95% rename from Roles/AddOns/Common/Busy.cs rename to Roles/Standard/Addons/Common/Busy.cs index 778b7a558..6153b71b1 100644 --- a/Roles/AddOns/Common/Busy.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Clumsy.cs b/Roles/Standard/Addons/Common/Clumsy.cs similarity index 96% rename from Roles/AddOns/Common/Clumsy.cs rename to Roles/Standard/Addons/Common/Clumsy.cs index 3593b7ade..a141d4efc 100644 --- a/Roles/AddOns/Common/Clumsy.cs +++ b/Roles/Standard/Addons/Common/Clumsy.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Clumsy : IAddon { diff --git a/Roles/AddOns/Common/Commited.cs b/Roles/Standard/Addons/Common/Commited.cs similarity index 98% rename from Roles/AddOns/Common/Commited.cs rename to Roles/Standard/Addons/Common/Commited.cs index f1d13efdb..2d75fa9d2 100644 --- a/Roles/AddOns/Common/Commited.cs +++ b/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 { diff --git a/Roles/AddOns/Compelled.cs b/Roles/Standard/Addons/Common/Compelled.cs similarity index 90% rename from Roles/AddOns/Compelled.cs rename to Roles/Standard/Addons/Common/Compelled.cs index d6ea1089b..f2ee27d64 100644 --- a/Roles/AddOns/Compelled.cs +++ b/Roles/Standard/Addons/Common/Compelled.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns; +namespace EHR.Roles; public class Compelled : IAddon { diff --git a/Roles/AddOns/Common/Composter.cs b/Roles/Standard/Addons/Common/Composter.cs similarity index 94% rename from Roles/AddOns/Common/Composter.cs rename to Roles/Standard/Addons/Common/Composter.cs index 79bdddd1a..dbece014c 100644 --- a/Roles/AddOns/Common/Composter.cs +++ b/Roles/Standard/Addons/Common/Composter.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Composter : IAddon { diff --git a/Roles/AddOns/Common/Deadlined.cs b/Roles/Standard/Addons/Common/Deadlined.cs similarity index 98% rename from Roles/AddOns/Common/Deadlined.cs rename to Roles/Standard/Addons/Common/Deadlined.cs index 26f95d6fb..d8dd1da27 100644 --- a/Roles/AddOns/Common/Deadlined.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Disco.cs b/Roles/Standard/Addons/Common/Disco.cs similarity index 98% rename from Roles/AddOns/Common/Disco.cs rename to Roles/Standard/Addons/Common/Disco.cs index c3bcc7b37..2b2fb1c1a 100644 --- a/Roles/AddOns/Common/Disco.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Diseased.cs b/Roles/Standard/Addons/Common/Diseased.cs similarity index 95% rename from Roles/AddOns/Common/Diseased.cs rename to Roles/Standard/Addons/Common/Diseased.cs index 19d468458..ebb2a2385 100644 --- a/Roles/AddOns/Common/Diseased.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Disregarded.cs b/Roles/Standard/Addons/Common/Disregarded.cs similarity index 90% rename from Roles/AddOns/Common/Disregarded.cs rename to Roles/Standard/Addons/Common/Disregarded.cs index ad2cf7b01..573b232fc 100644 --- a/Roles/AddOns/Common/Disregarded.cs +++ b/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 { diff --git a/Roles/AddOns/Common/DoubleShot.cs b/Roles/Standard/Addons/Common/DoubleShot.cs similarity index 94% rename from Roles/AddOns/Common/DoubleShot.cs rename to Roles/Standard/Addons/Common/DoubleShot.cs index aa2a6353a..4c99d7cd5 100644 --- a/Roles/AddOns/Common/DoubleShot.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Dynamo.cs b/Roles/Standard/Addons/Common/Dynamo.cs similarity index 99% rename from Roles/AddOns/Common/Dynamo.cs rename to Roles/Standard/Addons/Common/Dynamo.cs index 4679d0376..0530ee303 100644 --- a/Roles/AddOns/Common/Dynamo.cs +++ b/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 { diff --git a/Roles/AddOns/Common/Energetic.cs b/Roles/Standard/Addons/Common/Energetic.cs similarity index 88% rename from Roles/AddOns/Common/Energetic.cs rename to Roles/Standard/Addons/Common/Energetic.cs index 9bea923ab..2bb4d771a 100644 --- a/Roles/AddOns/Common/Energetic.cs +++ b/Roles/Standard/Addons/Common/Energetic.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Energetic : IAddon { diff --git a/Roles/AddOns/Common/Flash.cs b/Roles/Standard/Addons/Common/Flash.cs similarity index 94% rename from Roles/AddOns/Common/Flash.cs rename to Roles/Standard/Addons/Common/Flash.cs index 30197e83a..151b827d1 100644 --- a/Roles/AddOns/Common/Flash.cs +++ b/Roles/Standard/Addons/Common/Flash.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Flash : IAddon { diff --git a/Roles/AddOns/Common/Fool.cs b/Roles/Standard/Addons/Common/Fool.cs similarity index 89% rename from Roles/AddOns/Common/Fool.cs rename to Roles/Standard/Addons/Common/Fool.cs index 2779fc1a2..c3db70b7f 100644 --- a/Roles/AddOns/Common/Fool.cs +++ b/Roles/Standard/Addons/Common/Fool.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Fool : IAddon { diff --git a/Roles/AddOns/Common/Fragile.cs b/Roles/Standard/Addons/Common/Fragile.cs similarity index 88% rename from Roles/AddOns/Common/Fragile.cs rename to Roles/Standard/Addons/Common/Fragile.cs index 666ef14b0..862d7982d 100644 --- a/Roles/AddOns/Common/Fragile.cs +++ b/Roles/Standard/Addons/Common/Fragile.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Fragile : IAddon { diff --git a/Roles/AddOns/Common/Giant.cs b/Roles/Standard/Addons/Common/Giant.cs similarity index 94% rename from Roles/AddOns/Common/Giant.cs rename to Roles/Standard/Addons/Common/Giant.cs index 5adc092e5..6245307a0 100644 --- a/Roles/AddOns/Common/Giant.cs +++ b/Roles/Standard/Addons/Common/Giant.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Giant : IAddon { diff --git a/Roles/AddOns/Common/Glow.cs b/Roles/Standard/Addons/Common/Glow.cs similarity index 89% rename from Roles/AddOns/Common/Glow.cs rename to Roles/Standard/Addons/Common/Glow.cs index 1339c9949..f79767b2c 100644 --- a/Roles/AddOns/Common/Glow.cs +++ b/Roles/Standard/Addons/Common/Glow.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Glow : IAddon { diff --git a/Roles/AddOns/Common/Gravestone.cs b/Roles/Standard/Addons/Common/Gravestone.cs similarity index 90% rename from Roles/AddOns/Common/Gravestone.cs rename to Roles/Standard/Addons/Common/Gravestone.cs index 1cd8f5f5a..32b4dea40 100644 --- a/Roles/AddOns/Common/Gravestone.cs +++ b/Roles/Standard/Addons/Common/Gravestone.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Gravestone : IAddon { diff --git a/Roles/AddOns/Common/Guesser.cs b/Roles/Standard/Addons/Common/Guesser.cs similarity index 96% rename from Roles/AddOns/Common/Guesser.cs rename to Roles/Standard/Addons/Common/Guesser.cs index 504d3ab5f..b791c919f 100644 --- a/Roles/AddOns/Common/Guesser.cs +++ b/Roles/Standard/Addons/Common/Guesser.cs @@ -1,7 +1,7 @@ using UnityEngine; using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Guesser : IAddon { diff --git a/Roles/AddOns/Common/Haste.cs b/Roles/Standard/Addons/Common/Haste.cs similarity index 88% rename from Roles/AddOns/Common/Haste.cs rename to Roles/Standard/Addons/Common/Haste.cs index 5a1f97c88..4721b5df5 100644 --- a/Roles/AddOns/Common/Haste.cs +++ b/Roles/Standard/Addons/Common/Haste.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Haste : IAddon { diff --git a/Roles/AddOns/Common/Hidden.cs b/Roles/Standard/Addons/Common/Hidden.cs similarity index 88% rename from Roles/AddOns/Common/Hidden.cs rename to Roles/Standard/Addons/Common/Hidden.cs index 38c21e2fb..6aba98ba3 100644 --- a/Roles/AddOns/Common/Hidden.cs +++ b/Roles/Standard/Addons/Common/Hidden.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Hidden : IAddon { diff --git a/Roles/AddOns/Common/Introvert.cs b/Roles/Standard/Addons/Common/Introvert.cs similarity index 99% rename from Roles/AddOns/Common/Introvert.cs rename to Roles/Standard/Addons/Common/Introvert.cs index 33db36064..ba3493b40 100644 --- a/Roles/AddOns/Common/Introvert.cs +++ b/Roles/Standard/Addons/Common/Introvert.cs @@ -3,7 +3,7 @@ using System.Linq; using EHR.Modules; using Hazel; -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Introvert : IAddon { diff --git a/Roles/AddOns/Common/Lazy.cs b/Roles/Standard/Addons/Common/Lazy.cs similarity index 92% rename from Roles/AddOns/Common/Lazy.cs rename to Roles/Standard/Addons/Common/Lazy.cs index 3a77b373e..ce5464d6c 100644 --- a/Roles/AddOns/Common/Lazy.cs +++ b/Roles/Standard/Addons/Common/Lazy.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Lazy : IAddon { diff --git a/Roles/AddOns/Common/Listener.cs b/Roles/Standard/Addons/Common/Listener.cs similarity index 96% rename from Roles/AddOns/Common/Listener.cs rename to Roles/Standard/Addons/Common/Listener.cs index d8bb0a6e4..109d02063 100644 --- a/Roles/AddOns/Common/Listener.cs +++ b/Roles/Standard/Addons/Common/Listener.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Listener : IAddon { diff --git a/Roles/AddOns/Common/Looter.cs b/Roles/Standard/Addons/Common/Looter.cs similarity index 88% rename from Roles/AddOns/Common/Looter.cs rename to Roles/Standard/Addons/Common/Looter.cs index a564604bc..4557fe1ba 100644 --- a/Roles/AddOns/Common/Looter.cs +++ b/Roles/Standard/Addons/Common/Looter.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Looter : IAddon { diff --git a/Roles/AddOns/Common/Lovers.cs b/Roles/Standard/Addons/Common/Lovers.cs similarity index 99% rename from Roles/AddOns/Common/Lovers.cs rename to Roles/Standard/Addons/Common/Lovers.cs index e789853b5..7fec74af3 100644 --- a/Roles/AddOns/Common/Lovers.cs +++ b/Roles/Standard/Addons/Common/Lovers.cs @@ -1,8 +1,9 @@ using System; using System.Linq; +using EHR.Gamemodes; using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Lovers : IAddon { diff --git a/Roles/AddOns/Common/Loyal.cs b/Roles/Standard/Addons/Common/Loyal.cs similarity index 95% rename from Roles/AddOns/Common/Loyal.cs rename to Roles/Standard/Addons/Common/Loyal.cs index fd5c10640..3563920e1 100644 --- a/Roles/AddOns/Common/Loyal.cs +++ b/Roles/Standard/Addons/Common/Loyal.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Loyal : IAddon { diff --git a/Roles/AddOns/Common/Lucky.cs b/Roles/Standard/Addons/Common/Lucky.cs similarity index 94% rename from Roles/AddOns/Common/Lucky.cs rename to Roles/Standard/Addons/Common/Lucky.cs index 4410aaa5c..07f4c8410 100644 --- a/Roles/AddOns/Common/Lucky.cs +++ b/Roles/Standard/Addons/Common/Lucky.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Lucky : IAddon { diff --git a/Roles/AddOns/Common/Magnet.cs b/Roles/Standard/Addons/Common/Magnet.cs similarity index 88% rename from Roles/AddOns/Common/Magnet.cs rename to Roles/Standard/Addons/Common/Magnet.cs index 0b4a0a2d6..fae0b49cd 100644 --- a/Roles/AddOns/Common/Magnet.cs +++ b/Roles/Standard/Addons/Common/Magnet.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Magnet : IAddon { diff --git a/Roles/AddOns/Common/Messenger.cs b/Roles/Standard/Addons/Common/Messenger.cs similarity index 91% rename from Roles/AddOns/Common/Messenger.cs rename to Roles/Standard/Addons/Common/Messenger.cs index 0cfa0eb2b..7f0a3be83 100644 --- a/Roles/AddOns/Common/Messenger.cs +++ b/Roles/Standard/Addons/Common/Messenger.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; - -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Messenger : IAddon { diff --git a/Roles/AddOns/Common/Mischievous.cs b/Roles/Standard/Addons/Common/Mischievous.cs similarity index 87% rename from Roles/AddOns/Common/Mischievous.cs rename to Roles/Standard/Addons/Common/Mischievous.cs index 8ecf56f43..2a0742b39 100644 --- a/Roles/AddOns/Common/Mischievous.cs +++ b/Roles/Standard/Addons/Common/Mischievous.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Mischievous : IAddon { diff --git a/Roles/AddOns/Common/Necroview.cs b/Roles/Standard/Addons/Common/Necroview.cs similarity index 90% rename from Roles/AddOns/Common/Necroview.cs rename to Roles/Standard/Addons/Common/Necroview.cs index 6a733f22d..977ee0585 100644 --- a/Roles/AddOns/Common/Necroview.cs +++ b/Roles/Standard/Addons/Common/Necroview.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Necroview : IAddon { diff --git a/Roles/AddOns/Common/Oblivious.cs b/Roles/Standard/Addons/Common/Oblivious.cs similarity index 93% rename from Roles/AddOns/Common/Oblivious.cs rename to Roles/Standard/Addons/Common/Oblivious.cs index ee6a65ad2..efab52f36 100644 --- a/Roles/AddOns/Common/Oblivious.cs +++ b/Roles/Standard/Addons/Common/Oblivious.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Oblivious : IAddon { diff --git a/Roles/AddOns/Common/Onbound.cs b/Roles/Standard/Addons/Common/Onbound.cs similarity index 94% rename from Roles/AddOns/Common/Onbound.cs rename to Roles/Standard/Addons/Common/Onbound.cs index f26cecdbb..6c7b5c8fb 100644 --- a/Roles/AddOns/Common/Onbound.cs +++ b/Roles/Standard/Addons/Common/Onbound.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Onbound : IAddon { diff --git a/Roles/AddOns/Common/Rascal.cs b/Roles/Standard/Addons/Common/Rascal.cs similarity index 94% rename from Roles/AddOns/Common/Rascal.cs rename to Roles/Standard/Addons/Common/Rascal.cs index 5876de8dd..bcf0188d3 100644 --- a/Roles/AddOns/Common/Rascal.cs +++ b/Roles/Standard/Addons/Common/Rascal.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Rascal : IAddon { diff --git a/Roles/AddOns/Common/Reach.cs b/Roles/Standard/Addons/Common/Reach.cs similarity index 88% rename from Roles/AddOns/Common/Reach.cs rename to Roles/Standard/Addons/Common/Reach.cs index e794ab0f2..71c3f5533 100644 --- a/Roles/AddOns/Common/Reach.cs +++ b/Roles/Standard/Addons/Common/Reach.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Reach : IAddon { diff --git a/Roles/AddOns/Common/Rookie.cs b/Roles/Standard/Addons/Common/Rookie.cs similarity index 88% rename from Roles/AddOns/Common/Rookie.cs rename to Roles/Standard/Addons/Common/Rookie.cs index e5043ec4a..b8c2156a2 100644 --- a/Roles/AddOns/Common/Rookie.cs +++ b/Roles/Standard/Addons/Common/Rookie.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Rookie : IAddon { diff --git a/Roles/AddOns/Common/Schizophrenic.cs b/Roles/Standard/Addons/Common/Schizophrenic.cs similarity index 93% rename from Roles/AddOns/Common/Schizophrenic.cs rename to Roles/Standard/Addons/Common/Schizophrenic.cs index c78fcb07f..e01b43b65 100644 --- a/Roles/AddOns/Common/Schizophrenic.cs +++ b/Roles/Standard/Addons/Common/Schizophrenic.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Schizophrenic : IAddon { diff --git a/Roles/AddOns/Common/Seer.cs b/Roles/Standard/Addons/Common/Seer.cs similarity index 89% rename from Roles/AddOns/Common/Seer.cs rename to Roles/Standard/Addons/Common/Seer.cs index d7c2e2e07..38ebaabdd 100644 --- a/Roles/AddOns/Common/Seer.cs +++ b/Roles/Standard/Addons/Common/Seer.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Seer : IAddon { diff --git a/Roles/AddOns/Common/Shy.cs b/Roles/Standard/Addons/Common/Shy.cs similarity index 87% rename from Roles/AddOns/Common/Shy.cs rename to Roles/Standard/Addons/Common/Shy.cs index 93d54ee66..8feaa51ce 100644 --- a/Roles/AddOns/Common/Shy.cs +++ b/Roles/Standard/Addons/Common/Shy.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Shy : IAddon { diff --git a/Roles/AddOns/Common/Sleep.cs b/Roles/Standard/Addons/Common/Sleep.cs similarity index 96% rename from Roles/AddOns/Common/Sleep.cs rename to Roles/Standard/Addons/Common/Sleep.cs index fe7e43d6e..fcb341208 100644 --- a/Roles/AddOns/Common/Sleep.cs +++ b/Roles/Standard/Addons/Common/Sleep.cs @@ -1,7 +1,6 @@ using System.Linq; using EHR.Modules; - -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Sleep : IAddon { diff --git a/Roles/AddOns/Common/Sleuth.cs b/Roles/Standard/Addons/Common/Sleuth.cs similarity index 88% rename from Roles/AddOns/Common/Sleuth.cs rename to Roles/Standard/Addons/Common/Sleuth.cs index 0dd980649..b51aa9400 100644 --- a/Roles/AddOns/Common/Sleuth.cs +++ b/Roles/Standard/Addons/Common/Sleuth.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Sleuth : IAddon { diff --git a/Roles/AddOns/Common/Sonar.cs b/Roles/Standard/Addons/Common/Sonar.cs similarity index 98% rename from Roles/AddOns/Common/Sonar.cs rename to Roles/Standard/Addons/Common/Sonar.cs index 89380d3be..69762e246 100644 --- a/Roles/AddOns/Common/Sonar.cs +++ b/Roles/Standard/Addons/Common/Sonar.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; - -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Sonar : IAddon { diff --git a/Roles/AddOns/Common/Spurt.cs b/Roles/Standard/Addons/Common/Spurt.cs similarity index 99% rename from Roles/AddOns/Common/Spurt.cs rename to Roles/Standard/Addons/Common/Spurt.cs index a5322ac9a..fd0b94c0b 100644 --- a/Roles/AddOns/Common/Spurt.cs +++ b/Roles/Standard/Addons/Common/Spurt.cs @@ -3,7 +3,7 @@ using System.Linq; using UnityEngine; using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Spurt : IAddon { diff --git a/Roles/AddOns/Common/Stained.cs b/Roles/Standard/Addons/Common/Stained.cs similarity index 96% rename from Roles/AddOns/Common/Stained.cs rename to Roles/Standard/Addons/Common/Stained.cs index 3a74a10d5..2d970f786 100644 --- a/Roles/AddOns/Common/Stained.cs +++ b/Roles/Standard/Addons/Common/Stained.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; - -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Stained : IAddon { diff --git a/Roles/AddOns/Common/Sunglasses.cs b/Roles/Standard/Addons/Common/Sunglasses.cs similarity index 94% rename from Roles/AddOns/Common/Sunglasses.cs rename to Roles/Standard/Addons/Common/Sunglasses.cs index bb23a2d2f..13ff58493 100644 --- a/Roles/AddOns/Common/Sunglasses.cs +++ b/Roles/Standard/Addons/Common/Sunglasses.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Sunglasses : IAddon { diff --git a/Roles/AddOns/Common/Tiebreaker.cs b/Roles/Standard/Addons/Common/Tiebreaker.cs similarity index 90% rename from Roles/AddOns/Common/Tiebreaker.cs rename to Roles/Standard/Addons/Common/Tiebreaker.cs index d03108df8..d2e74f3bb 100644 --- a/Roles/AddOns/Common/Tiebreaker.cs +++ b/Roles/Standard/Addons/Common/Tiebreaker.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Tiebreaker : IAddon { diff --git a/Roles/AddOns/Common/Torch.cs b/Roles/Standard/Addons/Common/Torch.cs similarity index 95% rename from Roles/AddOns/Common/Torch.cs rename to Roles/Standard/Addons/Common/Torch.cs index e94b8d728..2876944ad 100644 --- a/Roles/AddOns/Common/Torch.cs +++ b/Roles/Standard/Addons/Common/Torch.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Torch : IAddon { diff --git a/Roles/AddOns/Common/Trainee.cs b/Roles/Standard/Addons/Common/Trainee.cs similarity index 88% rename from Roles/AddOns/Common/Trainee.cs rename to Roles/Standard/Addons/Common/Trainee.cs index b18bd45c1..7ddf99d12 100644 --- a/Roles/AddOns/Common/Trainee.cs +++ b/Roles/Standard/Addons/Common/Trainee.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Trainee : IAddon { diff --git a/Roles/AddOns/Common/Truant.cs b/Roles/Standard/Addons/Common/Truant.cs similarity index 94% rename from Roles/AddOns/Common/Truant.cs rename to Roles/Standard/Addons/Common/Truant.cs index b910c86f1..a2aa397e4 100644 --- a/Roles/AddOns/Common/Truant.cs +++ b/Roles/Standard/Addons/Common/Truant.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Truant : IAddon { diff --git a/Roles/AddOns/Common/Unbound.cs b/Roles/Standard/Addons/Common/Unbound.cs similarity index 88% rename from Roles/AddOns/Common/Unbound.cs rename to Roles/Standard/Addons/Common/Unbound.cs index 18c44f1c3..9129dd5f9 100644 --- a/Roles/AddOns/Common/Unbound.cs +++ b/Roles/Standard/Addons/Common/Unbound.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; public class Unbound : IAddon { diff --git a/Roles/AddOns/Common/Unlucky.cs b/Roles/Standard/Addons/Common/Unlucky.cs similarity index 98% rename from Roles/AddOns/Common/Unlucky.cs rename to Roles/Standard/Addons/Common/Unlucky.cs index d569befc7..7ff75bbe3 100644 --- a/Roles/AddOns/Common/Unlucky.cs +++ b/Roles/Standard/Addons/Common/Unlucky.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Unlucky : IAddon { diff --git a/Roles/AddOns/Common/Watcher.cs b/Roles/Standard/Addons/Common/Watcher.cs similarity index 90% rename from Roles/AddOns/Common/Watcher.cs rename to Roles/Standard/Addons/Common/Watcher.cs index 35b522ecc..c02ca499e 100644 --- a/Roles/AddOns/Common/Watcher.cs +++ b/Roles/Standard/Addons/Common/Watcher.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class Watcher : IAddon { diff --git a/Roles/AddOns/Common/YouTuber.cs b/Roles/Standard/Addons/Common/YouTuber.cs similarity index 89% rename from Roles/AddOns/Common/YouTuber.cs rename to Roles/Standard/Addons/Common/YouTuber.cs index 5de44a00b..df721f465 100644 --- a/Roles/AddOns/Common/YouTuber.cs +++ b/Roles/Standard/Addons/Common/YouTuber.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Common; +namespace EHR.Roles; internal class YouTuber : IAddon { diff --git a/Roles/AddOns/Crewmate/Bloodlust.cs b/Roles/Standard/Addons/Crewmate/Bloodlust.cs similarity index 96% rename from Roles/AddOns/Crewmate/Bloodlust.cs rename to Roles/Standard/Addons/Crewmate/Bloodlust.cs index f2e56f0b6..8ea99ce8b 100644 --- a/Roles/AddOns/Crewmate/Bloodlust.cs +++ b/Roles/Standard/Addons/Crewmate/Bloodlust.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; internal class Bloodlust : IAddon { diff --git a/Roles/AddOns/Crewmate/Examiner.cs b/Roles/Standard/Addons/Crewmate/Examiner.cs similarity index 94% rename from Roles/AddOns/Crewmate/Examiner.cs rename to Roles/Standard/Addons/Crewmate/Examiner.cs index e98fd1c38..2e4cde648 100644 --- a/Roles/AddOns/Crewmate/Examiner.cs +++ b/Roles/Standard/Addons/Crewmate/Examiner.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; public class Examiner : IAddon { diff --git a/Roles/AddOns/Crewmate/Finder.cs b/Roles/Standard/Addons/Crewmate/Finder.cs similarity index 96% rename from Roles/AddOns/Crewmate/Finder.cs rename to Roles/Standard/Addons/Crewmate/Finder.cs index 9981b9ff3..7389355be 100644 --- a/Roles/AddOns/Crewmate/Finder.cs +++ b/Roles/Standard/Addons/Crewmate/Finder.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; public class Finder : IAddon { diff --git a/Roles/AddOns/Crewmate/Nimble.cs b/Roles/Standard/Addons/Crewmate/Nimble.cs similarity index 96% rename from Roles/AddOns/Crewmate/Nimble.cs rename to Roles/Standard/Addons/Crewmate/Nimble.cs index 2670e9021..d8e4b8678 100644 --- a/Roles/AddOns/Crewmate/Nimble.cs +++ b/Roles/Standard/Addons/Crewmate/Nimble.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; internal class Nimble : IAddon { diff --git a/Roles/AddOns/Crewmate/Noisy.cs b/Roles/Standard/Addons/Crewmate/Noisy.cs similarity index 95% rename from Roles/AddOns/Crewmate/Noisy.cs rename to Roles/Standard/Addons/Crewmate/Noisy.cs index a4c30a827..0542618d5 100644 --- a/Roles/AddOns/Crewmate/Noisy.cs +++ b/Roles/Standard/Addons/Crewmate/Noisy.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; public class Noisy : IAddon { diff --git a/Roles/AddOns/Crewmate/Physicist.cs b/Roles/Standard/Addons/Crewmate/Physicist.cs similarity index 96% rename from Roles/AddOns/Crewmate/Physicist.cs rename to Roles/Standard/Addons/Crewmate/Physicist.cs index 0f12955f7..4f7911b5f 100644 --- a/Roles/AddOns/Crewmate/Physicist.cs +++ b/Roles/Standard/Addons/Crewmate/Physicist.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; internal class Physicist : IAddon { diff --git a/Roles/AddOns/Crewmate/Stressed.cs b/Roles/Standard/Addons/Crewmate/Stressed.cs similarity index 99% rename from Roles/AddOns/Crewmate/Stressed.cs rename to Roles/Standard/Addons/Crewmate/Stressed.cs index cae68f9c4..418afe73e 100644 --- a/Roles/AddOns/Crewmate/Stressed.cs +++ b/Roles/Standard/Addons/Crewmate/Stressed.cs @@ -5,7 +5,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; public class Stressed : IAddon { diff --git a/Roles/AddOns/Crewmate/TaskMaster.cs b/Roles/Standard/Addons/Crewmate/TaskMaster.cs similarity index 97% rename from Roles/AddOns/Crewmate/TaskMaster.cs rename to Roles/Standard/Addons/Crewmate/TaskMaster.cs index e8a0658eb..1a7d3ff78 100644 --- a/Roles/AddOns/Crewmate/TaskMaster.cs +++ b/Roles/Standard/Addons/Crewmate/TaskMaster.cs @@ -2,7 +2,7 @@ using Il2CppSystem; using Exception = System.Exception; -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; public class TaskMaster : IAddon { diff --git a/Roles/AddOns/Crewmate/Workhorse.cs b/Roles/Standard/Addons/Crewmate/Workhorse.cs similarity index 96% rename from Roles/AddOns/Crewmate/Workhorse.cs rename to Roles/Standard/Addons/Crewmate/Workhorse.cs index 525904bd0..b79c0d172 100644 --- a/Roles/AddOns/Crewmate/Workhorse.cs +++ b/Roles/Standard/Addons/Crewmate/Workhorse.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; using static EHR.Options; -namespace EHR.AddOns.Crewmate; +namespace EHR.Roles; public class Workhorse : IAddon { diff --git a/Roles/AddOns/IAddon.cs b/Roles/Standard/Addons/IAddon.cs similarity index 80% rename from Roles/AddOns/IAddon.cs rename to Roles/Standard/Addons/IAddon.cs index 97545e35c..7184146e9 100644 --- a/Roles/AddOns/IAddon.cs +++ b/Roles/Standard/Addons/IAddon.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns; +namespace EHR.Roles; internal interface IAddon { diff --git a/Roles/AddOns/Impostor/Aide.cs b/Roles/Standard/Addons/Impostor/Aide.cs similarity index 86% rename from Roles/AddOns/Impostor/Aide.cs rename to Roles/Standard/Addons/Impostor/Aide.cs index 141eaee30..afd21da5e 100644 --- a/Roles/AddOns/Impostor/Aide.cs +++ b/Roles/Standard/Addons/Impostor/Aide.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; public class Aide : IAddon { diff --git a/Roles/AddOns/Impostor/Circumvent.cs b/Roles/Standard/Addons/Impostor/Circumvent.cs similarity index 98% rename from Roles/AddOns/Impostor/Circumvent.cs rename to Roles/Standard/Addons/Impostor/Circumvent.cs index 9d7d82b33..037f1f7d0 100644 --- a/Roles/AddOns/Impostor/Circumvent.cs +++ b/Roles/Standard/Addons/Impostor/Circumvent.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; - -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class Circumvent : IAddon { diff --git a/Roles/AddOns/Impostor/Concealer.cs b/Roles/Standard/Addons/Impostor/Concealer.cs similarity index 86% rename from Roles/AddOns/Impostor/Concealer.cs rename to Roles/Standard/Addons/Impostor/Concealer.cs index fdc61b34a..7ba2243bd 100644 --- a/Roles/AddOns/Impostor/Concealer.cs +++ b/Roles/Standard/Addons/Impostor/Concealer.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; public class Concealer : IAddon { diff --git a/Roles/AddOns/Impostor/Damocles.cs b/Roles/Standard/Addons/Impostor/Damocles.cs similarity index 99% rename from Roles/AddOns/Impostor/Damocles.cs rename to Roles/Standard/Addons/Impostor/Damocles.cs index 3228e7b00..5633b0418 100644 --- a/Roles/AddOns/Impostor/Damocles.cs +++ b/Roles/Standard/Addons/Impostor/Damocles.cs @@ -5,7 +5,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; public class Damocles : IAddon { diff --git a/Roles/AddOns/Impostor/DeadlyQuota.cs b/Roles/Standard/Addons/Impostor/DeadlyQuota.cs similarity index 92% rename from Roles/AddOns/Impostor/DeadlyQuota.cs rename to Roles/Standard/Addons/Impostor/DeadlyQuota.cs index aa1dfbe77..87fb0172f 100644 --- a/Roles/AddOns/Impostor/DeadlyQuota.cs +++ b/Roles/Standard/Addons/Impostor/DeadlyQuota.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class DeadlyQuota : IAddon { diff --git a/Roles/AddOns/Impostor/Egoist.cs b/Roles/Standard/Addons/Impostor/Egoist.cs similarity index 92% rename from Roles/AddOns/Impostor/Egoist.cs rename to Roles/Standard/Addons/Impostor/Egoist.cs index f6b065032..86e0a2749 100644 --- a/Roles/AddOns/Impostor/Egoist.cs +++ b/Roles/Standard/Addons/Impostor/Egoist.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class Egoist : IAddon { diff --git a/Roles/AddOns/Impostor/LastImpostor.cs b/Roles/Standard/Addons/Impostor/LastImpostor.cs similarity index 96% rename from Roles/AddOns/Impostor/LastImpostor.cs rename to Roles/Standard/Addons/Impostor/LastImpostor.cs index 6ac9f16d8..3ca614d01 100644 --- a/Roles/AddOns/Impostor/LastImpostor.cs +++ b/Roles/Standard/Addons/Impostor/LastImpostor.cs @@ -1,6 +1,6 @@ using Hazel; -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; public class LastImpostor : IAddon { diff --git a/Roles/AddOns/Impostor/Madmate.cs b/Roles/Standard/Addons/Impostor/Madmate.cs similarity index 98% rename from Roles/AddOns/Impostor/Madmate.cs rename to Roles/Standard/Addons/Impostor/Madmate.cs index d5ee994d8..7549759ca 100644 --- a/Roles/AddOns/Impostor/Madmate.cs +++ b/Roles/Standard/Addons/Impostor/Madmate.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class Madmate : IAddon { diff --git a/Roles/AddOns/Impostor/Mare.cs b/Roles/Standard/Addons/Impostor/Mare.cs similarity index 97% rename from Roles/AddOns/Impostor/Mare.cs rename to Roles/Standard/Addons/Impostor/Mare.cs index b7f1526e9..060a09169 100644 --- a/Roles/AddOns/Impostor/Mare.cs +++ b/Roles/Standard/Addons/Impostor/Mare.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class Mare : IAddon { diff --git a/Roles/AddOns/Impostor/Mimic.cs b/Roles/Standard/Addons/Impostor/Mimic.cs similarity index 92% rename from Roles/AddOns/Impostor/Mimic.cs rename to Roles/Standard/Addons/Impostor/Mimic.cs index 978c445ff..f81ca5c8f 100644 --- a/Roles/AddOns/Impostor/Mimic.cs +++ b/Roles/Standard/Addons/Impostor/Mimic.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class Mimic : IAddon { diff --git a/Roles/AddOns/Impostor/Stealer.cs b/Roles/Standard/Addons/Impostor/Stealer.cs similarity index 92% rename from Roles/AddOns/Impostor/Stealer.cs rename to Roles/Standard/Addons/Impostor/Stealer.cs index b9a2a86da..78440e10d 100644 --- a/Roles/AddOns/Impostor/Stealer.cs +++ b/Roles/Standard/Addons/Impostor/Stealer.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class Stealer : IAddon { diff --git a/Roles/AddOns/Impostor/Swift.cs b/Roles/Standard/Addons/Impostor/Swift.cs similarity index 87% rename from Roles/AddOns/Impostor/Swift.cs rename to Roles/Standard/Addons/Impostor/Swift.cs index 9f1fbee56..decac296b 100644 --- a/Roles/AddOns/Impostor/Swift.cs +++ b/Roles/Standard/Addons/Impostor/Swift.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class Swift : IAddon { diff --git a/Roles/AddOns/Impostor/Taskcounter.cs b/Roles/Standard/Addons/Impostor/Taskcounter.cs similarity index 86% rename from Roles/AddOns/Impostor/Taskcounter.cs rename to Roles/Standard/Addons/Impostor/Taskcounter.cs index 299151b19..22eba7b81 100644 --- a/Roles/AddOns/Impostor/Taskcounter.cs +++ b/Roles/Standard/Addons/Impostor/Taskcounter.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; internal class Taskcounter : IAddon { diff --git a/Roles/AddOns/Impostor/Tired.cs b/Roles/Standard/Addons/Impostor/Tired.cs similarity index 97% rename from Roles/AddOns/Impostor/Tired.cs rename to Roles/Standard/Addons/Impostor/Tired.cs index 5129605cd..454eb6618 100644 --- a/Roles/AddOns/Impostor/Tired.cs +++ b/Roles/Standard/Addons/Impostor/Tired.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; - -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; public class Tired : IAddon { diff --git a/Roles/AddOns/Impostor/Underdog.cs b/Roles/Standard/Addons/Impostor/Underdog.cs similarity index 97% rename from Roles/AddOns/Impostor/Underdog.cs rename to Roles/Standard/Addons/Impostor/Underdog.cs index eafe3ca42..956324a3d 100644 --- a/Roles/AddOns/Impostor/Underdog.cs +++ b/Roles/Standard/Addons/Impostor/Underdog.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; public class Underdog : IAddon { diff --git a/Roles/AddOns/Impostor/Venom.cs b/Roles/Standard/Addons/Impostor/Venom.cs similarity index 93% rename from Roles/AddOns/Impostor/Venom.cs rename to Roles/Standard/Addons/Impostor/Venom.cs index 331b98bbe..b15fe8773 100644 --- a/Roles/AddOns/Impostor/Venom.cs +++ b/Roles/Standard/Addons/Impostor/Venom.cs @@ -1,4 +1,4 @@ -namespace EHR.AddOns.Impostor; +namespace EHR.Roles; public class Venom : IAddon { diff --git a/Roles/Coven/Augur.cs b/Roles/Standard/Coven/Augur.cs similarity index 96% rename from Roles/Coven/Augur.cs rename to Roles/Standard/Coven/Augur.cs index 80d3c5736..5fb245635 100644 --- a/Roles/Coven/Augur.cs +++ b/Roles/Standard/Coven/Augur.cs @@ -1,8 +1,8 @@ using AmongUs.GameOptions; -namespace EHR.Coven; +namespace EHR.Roles; -public class Augur : Coven +public class Augur : CovenBase { public static bool On; diff --git a/Roles/Coven/Banshee.cs b/Roles/Standard/Coven/Banshee.cs similarity index 98% rename from Roles/Coven/Banshee.cs rename to Roles/Standard/Coven/Banshee.cs index 002648f74..9c1c077f4 100644 --- a/Roles/Coven/Banshee.cs +++ b/Roles/Standard/Coven/Banshee.cs @@ -4,9 +4,9 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public class Banshee : Coven +public class Banshee : CovenBase { public static bool On; public static List Instances = []; diff --git a/Roles/Coven/Coven.cs b/Roles/Standard/Coven/CovenBase.cs similarity index 78% rename from Roles/Coven/Coven.cs rename to Roles/Standard/Coven/CovenBase.cs index bc48281d9..8c83bd749 100644 --- a/Roles/Coven/Coven.cs +++ b/Roles/Standard/Coven/CovenBase.cs @@ -2,9 +2,9 @@ using System.Linq; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public abstract class Coven : RoleBase +public abstract class CovenBase : RoleBase { public enum NecronomiconReceivePriorities { @@ -21,19 +21,19 @@ public abstract class Coven : RoleBase private static void GiveNecronomicon() { - Dictionary psDict = Main.PlayerStates.Where(x => x.Value.Role is Coven { HasNecronomicon: false } coven && coven.NecronomiconReceivePriority != NecronomiconReceivePriorities.Never).ToDictionary(x => x.Key, x => x.Value); + Dictionary psDict = Main.PlayerStates.Where(x => x.Value.Role is CovenBase { HasNecronomicon: false } coven && coven.NecronomiconReceivePriority != NecronomiconReceivePriorities.Never).ToDictionary(x => x.Key, x => x.Value); if (psDict.Count == 0) return; - KeyValuePair receiver = psDict.Shuffle().OrderBy(x => ((Coven)x.Value.Role).NecronomiconReceivePriority).ThenByDescending(x => !x.Value.IsDead).First(); + KeyValuePair receiver = psDict.Shuffle().OrderBy(x => ((CovenBase)x.Value.Role).NecronomiconReceivePriority).ThenByDescending(x => !x.Value.IsDead).First(); - var covenRole = (Coven)receiver.Value.Role; + var covenRole = (CovenBase)receiver.Value.Role; covenRole.HasNecronomicon = true; covenRole.OnReceiveNecronomicon(); LateTask.New(() => { var sender = CustomRpcSender.Create("CovenGiveNecronomicon", SendOption.Reliable); - string[] holders = Main.PlayerStates.Where(s => s.Value.Role is Coven { HasNecronomicon: true }).Select(s => s.Key.ColoredPlayerName()).ToArray(); + string[] holders = Main.PlayerStates.Where(s => s.Value.Role is CovenBase { HasNecronomicon: true }).Select(s => s.Key.ColoredPlayerName()).ToArray(); Main.AllPlayerControls.Where(x => x.Is(Team.Coven)).Select(x => x.PlayerId).Without(receiver.Key).Do(x => sender = Utils.SendMessage("\n", x, string.Format(Translator.GetString("PlayerReceivedTheNecronomicon"), receiver.Key.ColoredPlayerName(), Main.CovenColor, holders.Length, string.Join(", ", holders)), writer: sender, multiple: true)); sender = Utils.SendMessage("\n", receiver.Key, string.Format(Translator.GetString("YouReceivedTheNecronomicon"), Main.CovenColor), writer: sender, multiple: true); sender.SendMessage(dispose: sender.stream.Length <= 3); diff --git a/Roles/Coven/CovenLeader.cs b/Roles/Standard/Coven/CovenLeader.cs similarity index 96% rename from Roles/Coven/CovenLeader.cs rename to Roles/Standard/Coven/CovenLeader.cs index 916c7616e..858822376 100644 --- a/Roles/Coven/CovenLeader.cs +++ b/Roles/Standard/Coven/CovenLeader.cs @@ -1,8 +1,8 @@ using AmongUs.GameOptions; -namespace EHR.Coven; +namespace EHR.Roles; -public class CovenLeader : Coven +public class CovenLeader : CovenBase { public static bool On; diff --git a/Roles/Coven/CovenMember.cs b/Roles/Standard/Coven/CovenMember.cs similarity index 93% rename from Roles/Coven/CovenMember.cs rename to Roles/Standard/Coven/CovenMember.cs index 790c8ef63..35e11c936 100644 --- a/Roles/Coven/CovenMember.cs +++ b/Roles/Standard/Coven/CovenMember.cs @@ -1,6 +1,6 @@ -namespace EHR.Coven; +namespace EHR.Roles; -public class CovenMember : Coven +public class CovenMember : CovenBase { public static bool On; diff --git a/Roles/Coven/Dreamweaver.cs b/Roles/Standard/Coven/Dreamweaver.cs similarity index 98% rename from Roles/Coven/Dreamweaver.cs rename to Roles/Standard/Coven/Dreamweaver.cs index 4cddb8006..73ea547db 100644 --- a/Roles/Coven/Dreamweaver.cs +++ b/Roles/Standard/Coven/Dreamweaver.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Neutral; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public class Dreamweaver : Coven +public class Dreamweaver : CovenBase { public static bool On; diff --git a/Roles/Coven/Enchanter.cs b/Roles/Standard/Coven/Enchanter.cs similarity index 97% rename from Roles/Coven/Enchanter.cs rename to Roles/Standard/Coven/Enchanter.cs index 82920d752..05e494406 100644 --- a/Roles/Coven/Enchanter.cs +++ b/Roles/Standard/Coven/Enchanter.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using EHR.Modules; -namespace EHR.Coven; +namespace EHR.Roles; -public class Enchanter : Coven +public class Enchanter : CovenBase { public static bool On; diff --git a/Roles/Coven/Goddess.cs b/Roles/Standard/Coven/Goddess.cs similarity index 98% rename from Roles/Coven/Goddess.cs rename to Roles/Standard/Coven/Goddess.cs index 7c7eada30..1df4da0fb 100644 --- a/Roles/Coven/Goddess.cs +++ b/Roles/Standard/Coven/Goddess.cs @@ -2,9 +2,9 @@ using EHR.Modules; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public class Goddess : Coven +public class Goddess : CovenBase { public static bool On; diff --git a/Roles/Coven/Illusionist.cs b/Roles/Standard/Coven/Illusionist.cs similarity index 98% rename from Roles/Coven/Illusionist.cs rename to Roles/Standard/Coven/Illusionist.cs index 4e9edf061..b2447f2e0 100644 --- a/Roles/Coven/Illusionist.cs +++ b/Roles/Standard/Coven/Illusionist.cs @@ -3,9 +3,9 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public class Illusionist : Coven +public class Illusionist : CovenBase { public static bool On; diff --git a/Roles/Coven/MoonDancer.cs b/Roles/Standard/Coven/MoonDancer.cs similarity index 98% rename from Roles/Coven/MoonDancer.cs rename to Roles/Standard/Coven/MoonDancer.cs index 756428572..b4e633361 100644 --- a/Roles/Coven/MoonDancer.cs +++ b/Roles/Standard/Coven/MoonDancer.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -namespace EHR.Coven; +namespace EHR.Roles; -public class MoonDancer : Coven +public class MoonDancer : CovenBase { public static bool On; diff --git a/Roles/Coven/Poache.cs b/Roles/Standard/Coven/Poache.cs similarity index 98% rename from Roles/Coven/Poache.cs rename to Roles/Standard/Coven/Poache.cs index b1a024af6..7c702785b 100644 --- a/Roles/Coven/Poache.cs +++ b/Roles/Standard/Coven/Poache.cs @@ -2,9 +2,9 @@ using EHR.Modules; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public class Poache : Coven +public class Poache : CovenBase { public static bool On; diff --git a/Roles/Coven/PotionMaster.cs b/Roles/Standard/Coven/PotionMaster.cs similarity index 98% rename from Roles/Coven/PotionMaster.cs rename to Roles/Standard/Coven/PotionMaster.cs index b526ff0e8..f33744058 100644 --- a/Roles/Coven/PotionMaster.cs +++ b/Roles/Standard/Coven/PotionMaster.cs @@ -3,9 +3,9 @@ using System.Linq; using EHR.Modules; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public class PotionMaster : Coven +public class PotionMaster : CovenBase { public static bool On; private static List Instances = []; diff --git a/Roles/Coven/Reaper.cs b/Roles/Standard/Coven/Reaper.cs similarity index 97% rename from Roles/Coven/Reaper.cs rename to Roles/Standard/Coven/Reaper.cs index e6a0203b3..cd3d379a9 100644 --- a/Roles/Coven/Reaper.cs +++ b/Roles/Standard/Coven/Reaper.cs @@ -3,9 +3,9 @@ using System.Linq; using EHR.Modules; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public class Reaper : Coven +public class Reaper : CovenBase { public static bool On; private static List Instances = []; @@ -107,7 +107,7 @@ public class Reaper : Coven } } -public class Death : Coven +public class Death : CovenBase { public static bool On; diff --git a/Roles/Coven/Siren.cs b/Roles/Standard/Coven/Siren.cs similarity index 99% rename from Roles/Coven/Siren.cs rename to Roles/Standard/Coven/Siren.cs index c652a89c7..136ff6526 100644 --- a/Roles/Coven/Siren.cs +++ b/Roles/Standard/Coven/Siren.cs @@ -2,9 +2,9 @@ using System.Linq; using AmongUs.GameOptions; -namespace EHR.Coven; +namespace EHR.Roles; -public class Siren : Coven +public class Siren : CovenBase { public static bool On; private static List Instances = []; diff --git a/Roles/Coven/SpellCaster.cs b/Roles/Standard/Coven/SpellCaster.cs similarity index 98% rename from Roles/Coven/SpellCaster.cs rename to Roles/Standard/Coven/SpellCaster.cs index 878ff9a3c..022ca6283 100644 --- a/Roles/Coven/SpellCaster.cs +++ b/Roles/Standard/Coven/SpellCaster.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using EHR.Patches; -namespace EHR.Coven; +namespace EHR.Roles; -public class SpellCaster : Coven +public class SpellCaster : CovenBase { public static bool On; diff --git a/Roles/Coven/Timelord.cs b/Roles/Standard/Coven/Timelord.cs similarity index 97% rename from Roles/Coven/Timelord.cs rename to Roles/Standard/Coven/Timelord.cs index a5a9781b3..089f17b0e 100644 --- a/Roles/Coven/Timelord.cs +++ b/Roles/Standard/Coven/Timelord.cs @@ -1,8 +1,8 @@ using System.Linq; -namespace EHR.Coven; +namespace EHR.Roles; -public class Timelord : Coven +public class Timelord : CovenBase { public static bool On; diff --git a/Roles/Coven/VoodooMaster.cs b/Roles/Standard/Coven/VoodooMaster.cs similarity index 96% rename from Roles/Coven/VoodooMaster.cs rename to Roles/Standard/Coven/VoodooMaster.cs index f70dd503b..b38c9b580 100644 --- a/Roles/Coven/VoodooMaster.cs +++ b/Roles/Standard/Coven/VoodooMaster.cs @@ -1,9 +1,7 @@ using System; -using EHR.Neutral; +namespace EHR.Roles; -namespace EHR.Coven; - -public class VoodooMaster : Coven +public class VoodooMaster : CovenBase { public static bool On; diff --git a/Roles/Coven/Wyrd.cs b/Roles/Standard/Coven/Wyrd.cs similarity index 98% rename from Roles/Coven/Wyrd.cs rename to Roles/Standard/Coven/Wyrd.cs index 76c410ff7..2c8896240 100644 --- a/Roles/Coven/Wyrd.cs +++ b/Roles/Standard/Coven/Wyrd.cs @@ -2,14 +2,12 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; -using EHR.Impostor; using EHR.Modules; using Hazel; -namespace EHR.Coven; +namespace EHR.Roles; -public class Wyrd : Coven +public class Wyrd : CovenBase { public enum Action { diff --git a/Roles/Crewmate/Ankylosaurus.cs b/Roles/Standard/Crewmate/Chaos/Ankylosaurus.cs similarity index 98% rename from Roles/Crewmate/Ankylosaurus.cs rename to Roles/Standard/Crewmate/Chaos/Ankylosaurus.cs index e9adc41c7..b416a9ba6 100644 --- a/Roles/Crewmate/Ankylosaurus.cs +++ b/Roles/Standard/Crewmate/Chaos/Ankylosaurus.cs @@ -2,7 +2,7 @@ using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Ankylosaurus : RoleBase { diff --git a/Roles/Crewmate/Car.cs b/Roles/Standard/Crewmate/Chaos/Car.cs similarity index 99% rename from Roles/Crewmate/Car.cs rename to Roles/Standard/Crewmate/Chaos/Car.cs index 2f2b4e091..1f22ba1f6 100644 --- a/Roles/Crewmate/Car.cs +++ b/Roles/Standard/Crewmate/Chaos/Car.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using EHR.Modules; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Car : RoleBase { diff --git a/Roles/Crewmate/Dad.cs b/Roles/Standard/Crewmate/Chaos/Dad.cs similarity index 99% rename from Roles/Crewmate/Dad.cs rename to Roles/Standard/Crewmate/Chaos/Dad.cs index 7974005a3..ad53551cf 100644 --- a/Roles/Crewmate/Dad.cs +++ b/Roles/Standard/Crewmate/Chaos/Dad.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; +using EHR.Gamemodes; using EHR.Modules; -using EHR.Neutral; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Dad : RoleBase { diff --git a/Roles/Crewmate/Goose.cs b/Roles/Standard/Crewmate/Chaos/Goose.cs similarity index 98% rename from Roles/Crewmate/Goose.cs rename to Roles/Standard/Crewmate/Chaos/Goose.cs index 8e12897c5..7e1ff6236 100644 --- a/Roles/Crewmate/Goose.cs +++ b/Roles/Standard/Crewmate/Chaos/Goose.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; public class Goose : RoleBase { diff --git a/Roles/Crewmate/Randomizer.cs b/Roles/Standard/Crewmate/Chaos/Randomizer.cs similarity index 99% rename from Roles/Crewmate/Randomizer.cs rename to Roles/Standard/Crewmate/Chaos/Randomizer.cs index 9a1df74fd..794f76b03 100644 --- a/Roles/Crewmate/Randomizer.cs +++ b/Roles/Standard/Crewmate/Chaos/Randomizer.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using EHR.Impostor; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; -using static EHR.Crewmate.Randomizer; +using static EHR.Roles.Randomizer; -namespace EHR.Crewmate; +namespace EHR.Roles; internal static class EffectExtenstions { @@ -350,7 +348,7 @@ internal static class EffectExtenstions if (allPc.Length == 0) break; PlayerControl target = allPc.RandomElement(); - Impostor.Lightning.CheckLightningMurder(killer, target, true); + Roles.Lightning.CheckLightningMurder(killer, target, true); NotifyAboutRNG(target); } diff --git a/Roles/Crewmate/ToiletMaster.cs b/Roles/Standard/Crewmate/Chaos/ToiletMaster.cs similarity index 99% rename from Roles/Crewmate/ToiletMaster.cs rename to Roles/Standard/Crewmate/Chaos/ToiletMaster.cs index 3e8ab1009..740d24182 100644 --- a/Roles/Crewmate/ToiletMaster.cs +++ b/Roles/Standard/Crewmate/Chaos/ToiletMaster.cs @@ -6,7 +6,7 @@ using EHR.Modules; using UnityEngine; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class ToiletMaster : RoleBase { diff --git a/Roles/Crewmate/Tornado.cs b/Roles/Standard/Crewmate/Chaos/Tornado.cs similarity index 99% rename from Roles/Crewmate/Tornado.cs rename to Roles/Standard/Crewmate/Chaos/Tornado.cs index 4390f27a7..4bc127a57 100644 --- a/Roles/Crewmate/Tornado.cs +++ b/Roles/Standard/Crewmate/Chaos/Tornado.cs @@ -7,7 +7,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Tornado : RoleBase { diff --git a/Roles/Crewmate/Tree.cs b/Roles/Standard/Crewmate/Chaos/Tree.cs similarity index 99% rename from Roles/Crewmate/Tree.cs rename to Roles/Standard/Crewmate/Chaos/Tree.cs index 8359432f4..b8507be5e 100644 --- a/Roles/Crewmate/Tree.cs +++ b/Roles/Standard/Crewmate/Chaos/Tree.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Tree : RoleBase { diff --git a/Roles/Crewmate/Analyst.cs b/Roles/Standard/Crewmate/Investigate/Analyst.cs similarity index 99% rename from Roles/Crewmate/Analyst.cs rename to Roles/Standard/Crewmate/Investigate/Analyst.cs index 6d3234b1f..d77a9e124 100644 --- a/Roles/Crewmate/Analyst.cs +++ b/Roles/Standard/Crewmate/Investigate/Analyst.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Analyst : RoleBase { diff --git a/Roles/Crewmate/Captain.cs b/Roles/Standard/Crewmate/Investigate/Captain.cs similarity index 98% rename from Roles/Crewmate/Captain.cs rename to Roles/Standard/Crewmate/Investigate/Captain.cs index 3ff2bec42..e6a26fbbc 100644 --- a/Roles/Crewmate/Captain.cs +++ b/Roles/Standard/Crewmate/Investigate/Captain.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Neutral; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Captain : RoleBase { diff --git a/Roles/Crewmate/Catcher.cs b/Roles/Standard/Crewmate/Investigate/Catcher.cs similarity index 99% rename from Roles/Crewmate/Catcher.cs rename to Roles/Standard/Crewmate/Investigate/Catcher.cs index 1feb332c3..a4fe9e7d8 100644 --- a/Roles/Crewmate/Catcher.cs +++ b/Roles/Standard/Crewmate/Investigate/Catcher.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Catcher : RoleBase { diff --git a/Roles/Crewmate/Chameleon.cs b/Roles/Standard/Crewmate/Investigate/Chameleon.cs similarity index 96% rename from Roles/Crewmate/Chameleon.cs rename to Roles/Standard/Crewmate/Investigate/Chameleon.cs index ac855761a..358c654b2 100644 --- a/Roles/Crewmate/Chameleon.cs +++ b/Roles/Standard/Crewmate/Investigate/Chameleon.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Chameleon : RoleBase { diff --git a/Roles/Crewmate/Clairvoyant.cs b/Roles/Standard/Crewmate/Investigate/Clairvoyant.cs similarity index 98% rename from Roles/Crewmate/Clairvoyant.cs rename to Roles/Standard/Crewmate/Investigate/Clairvoyant.cs index c27ce45c4..5c47601c7 100644 --- a/Roles/Crewmate/Clairvoyant.cs +++ b/Roles/Standard/Crewmate/Investigate/Clairvoyant.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Clairvoyant : RoleBase { diff --git a/Roles/Crewmate/Coroner.cs b/Roles/Standard/Crewmate/Investigate/Coroner.cs similarity index 99% rename from Roles/Crewmate/Coroner.cs rename to Roles/Standard/Crewmate/Investigate/Coroner.cs index 967b1454a..f143aed46 100644 --- a/Roles/Crewmate/Coroner.cs +++ b/Roles/Standard/Crewmate/Investigate/Coroner.cs @@ -2,7 +2,7 @@ using System.Linq; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; using static Translator; diff --git a/Roles/Crewmate/Doctor.cs b/Roles/Standard/Crewmate/Investigate/Doctor.cs similarity index 97% rename from Roles/Crewmate/Doctor.cs rename to Roles/Standard/Crewmate/Investigate/Doctor.cs index 1dbbd736d..cf38844bd 100644 --- a/Roles/Crewmate/Doctor.cs +++ b/Roles/Standard/Crewmate/Investigate/Doctor.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Doctor : RoleBase { diff --git a/Roles/Crewmate/DoubleAgent.cs b/Roles/Standard/Crewmate/Investigate/DoubleAgent.cs similarity index 98% rename from Roles/Crewmate/DoubleAgent.cs rename to Roles/Standard/Crewmate/Investigate/DoubleAgent.cs index 6fe9980fd..70771902b 100644 --- a/Roles/Crewmate/DoubleAgent.cs +++ b/Roles/Standard/Crewmate/Investigate/DoubleAgent.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class DoubleAgent : RoleBase { diff --git a/Roles/Crewmate/Druid.cs b/Roles/Standard/Crewmate/Investigate/Druid.cs similarity index 99% rename from Roles/Crewmate/Druid.cs rename to Roles/Standard/Crewmate/Investigate/Druid.cs index 95afd640b..5d1a9a10b 100644 --- a/Roles/Crewmate/Druid.cs +++ b/Roles/Standard/Crewmate/Investigate/Druid.cs @@ -7,7 +7,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Druid : RoleBase { diff --git a/Roles/Crewmate/Enigma.cs b/Roles/Standard/Crewmate/Investigate/Enigma.cs similarity index 99% rename from Roles/Crewmate/Enigma.cs rename to Roles/Standard/Crewmate/Investigate/Enigma.cs index a90016c62..4ecea11e3 100644 --- a/Roles/Crewmate/Enigma.cs +++ b/Roles/Standard/Crewmate/Investigate/Enigma.cs @@ -3,7 +3,7 @@ using System.Linq; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Enigma : RoleBase { diff --git a/Roles/Crewmate/Forensic.cs b/Roles/Standard/Crewmate/Investigate/Forensic.cs similarity index 99% rename from Roles/Crewmate/Forensic.cs rename to Roles/Standard/Crewmate/Investigate/Forensic.cs index 04e05c518..f886460ab 100644 --- a/Roles/Crewmate/Forensic.cs +++ b/Roles/Standard/Crewmate/Investigate/Forensic.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Forensic : RoleBase { diff --git a/Roles/Crewmate/FortuneTeller.cs b/Roles/Standard/Crewmate/Investigate/FortuneTeller.cs similarity index 99% rename from Roles/Crewmate/FortuneTeller.cs rename to Roles/Standard/Crewmate/Investigate/FortuneTeller.cs index 1020e948d..ea57e61f5 100644 --- a/Roles/Crewmate/FortuneTeller.cs +++ b/Roles/Standard/Crewmate/Investigate/FortuneTeller.cs @@ -2,12 +2,11 @@ using System; using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Neutral; using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class FortuneTeller : RoleBase { diff --git a/Roles/Crewmate/Hacker.cs b/Roles/Standard/Crewmate/Investigate/Hacker.cs similarity index 99% rename from Roles/Crewmate/Hacker.cs rename to Roles/Standard/Crewmate/Investigate/Hacker.cs index 11c582510..ec8e957f2 100644 --- a/Roles/Crewmate/Hacker.cs +++ b/Roles/Standard/Crewmate/Investigate/Hacker.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; using static Translator; diff --git a/Roles/Crewmate/Ignitor.cs b/Roles/Standard/Crewmate/Investigate/Ignitor.cs similarity index 99% rename from Roles/Crewmate/Ignitor.cs rename to Roles/Standard/Crewmate/Investigate/Ignitor.cs index 8559c2c86..177b49bff 100644 --- a/Roles/Crewmate/Ignitor.cs +++ b/Roles/Standard/Crewmate/Investigate/Ignitor.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; diff --git a/Roles/Crewmate/Imitator.cs b/Roles/Standard/Crewmate/Investigate/Imitator.cs similarity index 99% rename from Roles/Crewmate/Imitator.cs rename to Roles/Standard/Crewmate/Investigate/Imitator.cs index 084192017..236da3bf3 100644 --- a/Roles/Crewmate/Imitator.cs +++ b/Roles/Standard/Crewmate/Investigate/Imitator.cs @@ -2,11 +2,10 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Imitator : RoleBase { diff --git a/Roles/Crewmate/Inquirer.cs b/Roles/Standard/Crewmate/Investigate/Inquirer.cs similarity index 98% rename from Roles/Crewmate/Inquirer.cs rename to Roles/Standard/Crewmate/Investigate/Inquirer.cs index c6e12f534..287b0c4ca 100644 --- a/Roles/Crewmate/Inquirer.cs +++ b/Roles/Standard/Crewmate/Investigate/Inquirer.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; public class Inquirer : RoleBase { diff --git a/Roles/Crewmate/Inquisitor.cs b/Roles/Standard/Crewmate/Investigate/Inquisitor.cs similarity index 98% rename from Roles/Crewmate/Inquisitor.cs rename to Roles/Standard/Crewmate/Investigate/Inquisitor.cs index 5a7e4bc55..366e2dc5a 100644 --- a/Roles/Crewmate/Inquisitor.cs +++ b/Roles/Standard/Crewmate/Investigate/Inquisitor.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using EHR.Neutral; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Inquisitor : RoleBase { diff --git a/Roles/Crewmate/Insight.cs b/Roles/Standard/Crewmate/Investigate/Insight.cs similarity index 98% rename from Roles/Crewmate/Insight.cs rename to Roles/Standard/Crewmate/Investigate/Insight.cs index 4b9fa1c9d..929eb6b3b 100644 --- a/Roles/Crewmate/Insight.cs +++ b/Roles/Standard/Crewmate/Investigate/Insight.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Insight : RoleBase { diff --git a/Roles/Crewmate/Inspector.cs b/Roles/Standard/Crewmate/Investigate/Inspector.cs similarity index 99% rename from Roles/Crewmate/Inspector.cs rename to Roles/Standard/Crewmate/Investigate/Inspector.cs index b82ccda19..d06f6164e 100644 --- a/Roles/Crewmate/Inspector.cs +++ b/Roles/Standard/Crewmate/Investigate/Inspector.cs @@ -2,13 +2,12 @@ using System; using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Inspector : RoleBase { diff --git a/Roles/Crewmate/Investigator.cs b/Roles/Standard/Crewmate/Investigate/Investigator.cs similarity index 99% rename from Roles/Crewmate/Investigator.cs rename to Roles/Standard/Crewmate/Investigate/Investigator.cs index 3b11b1ec3..c3e4777c4 100644 --- a/Roles/Crewmate/Investigator.cs +++ b/Roles/Standard/Crewmate/Investigate/Investigator.cs @@ -2,15 +2,13 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Impostor; using EHR.Modules; -using EHR.Neutral; using UnityEngine; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Investigator : RoleBase { diff --git a/Roles/Crewmate/Leery.cs b/Roles/Standard/Crewmate/Investigate/Leery.cs similarity index 99% rename from Roles/Crewmate/Leery.cs rename to Roles/Standard/Crewmate/Investigate/Leery.cs index eac0f4700..3dc3efa1b 100644 --- a/Roles/Crewmate/Leery.cs +++ b/Roles/Standard/Crewmate/Investigate/Leery.cs @@ -3,7 +3,7 @@ using System.Linq; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Leery : RoleBase { diff --git a/Roles/Crewmate/Lighter.cs b/Roles/Standard/Crewmate/Investigate/Lighter.cs similarity index 99% rename from Roles/Crewmate/Lighter.cs rename to Roles/Standard/Crewmate/Investigate/Lighter.cs index b01c4f225..ba06abf01 100644 --- a/Roles/Crewmate/Lighter.cs +++ b/Roles/Standard/Crewmate/Investigate/Lighter.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Lighter : RoleBase { diff --git a/Roles/Crewmate/Lookout.cs b/Roles/Standard/Crewmate/Investigate/Lookout.cs similarity index 98% rename from Roles/Crewmate/Lookout.cs rename to Roles/Standard/Crewmate/Investigate/Lookout.cs index ecb5ba6e8..22d19af8f 100644 --- a/Roles/Crewmate/Lookout.cs +++ b/Roles/Standard/Crewmate/Investigate/Lookout.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Lookout : RoleBase { diff --git a/Roles/Crewmate/Markseeker.cs b/Roles/Standard/Crewmate/Investigate/Markseeker.cs similarity index 97% rename from Roles/Crewmate/Markseeker.cs rename to Roles/Standard/Crewmate/Investigate/Markseeker.cs index 775696d6d..80a66a68b 100644 --- a/Roles/Crewmate/Markseeker.cs +++ b/Roles/Standard/Crewmate/Investigate/Markseeker.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using EHR.Neutral; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Markseeker : RoleBase { diff --git a/Roles/Crewmate/Medium.cs b/Roles/Standard/Crewmate/Investigate/Medium.cs similarity index 99% rename from Roles/Crewmate/Medium.cs rename to Roles/Standard/Crewmate/Investigate/Medium.cs index 373d221d2..b5e2e7911 100644 --- a/Roles/Crewmate/Medium.cs +++ b/Roles/Standard/Crewmate/Investigate/Medium.cs @@ -2,7 +2,7 @@ using System.Linq; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Medium : RoleBase { diff --git a/Roles/Crewmate/MeetingManager.cs b/Roles/Standard/Crewmate/Investigate/MeetingManager.cs similarity index 99% rename from Roles/Crewmate/MeetingManager.cs rename to Roles/Standard/Crewmate/Investigate/MeetingManager.cs index 4817d2037..652b88b75 100644 --- a/Roles/Crewmate/MeetingManager.cs +++ b/Roles/Standard/Crewmate/Investigate/MeetingManager.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class MeetingManager : RoleBase { diff --git a/Roles/Crewmate/Mortician.cs b/Roles/Standard/Crewmate/Investigate/Mortician.cs similarity index 96% rename from Roles/Crewmate/Mortician.cs rename to Roles/Standard/Crewmate/Investigate/Mortician.cs index e01496fea..3a027bdf4 100644 --- a/Roles/Crewmate/Mortician.cs +++ b/Roles/Standard/Crewmate/Investigate/Mortician.cs @@ -2,7 +2,7 @@ using UnityEngine; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Mortician : RoleBase { diff --git a/Roles/Crewmate/Observer.cs b/Roles/Standard/Crewmate/Investigate/Observer.cs similarity index 92% rename from Roles/Crewmate/Observer.cs rename to Roles/Standard/Crewmate/Investigate/Observer.cs index a624fb640..2cd89cae1 100644 --- a/Roles/Crewmate/Observer.cs +++ b/Roles/Standard/Crewmate/Investigate/Observer.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Observer : RoleBase { diff --git a/Roles/Crewmate/Oracle.cs b/Roles/Standard/Crewmate/Investigate/Oracle.cs similarity index 96% rename from Roles/Crewmate/Oracle.cs rename to Roles/Standard/Crewmate/Investigate/Oracle.cs index a8120ab66..00fc4d5d9 100644 --- a/Roles/Crewmate/Oracle.cs +++ b/Roles/Standard/Crewmate/Investigate/Oracle.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using EHR.Neutral; using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Oracle : RoleBase { diff --git a/Roles/Crewmate/Perceiver.cs b/Roles/Standard/Crewmate/Investigate/Perceiver.cs similarity index 99% rename from Roles/Crewmate/Perceiver.cs rename to Roles/Standard/Crewmate/Investigate/Perceiver.cs index 288ddc484..42493722b 100644 --- a/Roles/Crewmate/Perceiver.cs +++ b/Roles/Standard/Crewmate/Investigate/Perceiver.cs @@ -3,7 +3,7 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Perceiver : RoleBase { diff --git a/Roles/Crewmate/Psychic.cs b/Roles/Standard/Crewmate/Investigate/Psychic.cs similarity index 96% rename from Roles/Crewmate/Psychic.cs rename to Roles/Standard/Crewmate/Investigate/Psychic.cs index 26a7ceb70..6bc6c9c7f 100644 --- a/Roles/Crewmate/Psychic.cs +++ b/Roles/Standard/Crewmate/Investigate/Psychic.cs @@ -1,13 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using EHR.Coven; -using EHR.Impostor; using EHR.Modules; using Hazel; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Psychic : RoleBase { diff --git a/Roles/Crewmate/Rabbit.cs b/Roles/Standard/Crewmate/Investigate/Rabbit.cs similarity index 99% rename from Roles/Crewmate/Rabbit.cs rename to Roles/Standard/Crewmate/Investigate/Rabbit.cs index 7cccc3fc5..f2f4da0af 100644 --- a/Roles/Crewmate/Rabbit.cs +++ b/Roles/Standard/Crewmate/Investigate/Rabbit.cs @@ -3,7 +3,7 @@ using System.Linq; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Rabbit : RoleBase { diff --git a/Roles/Crewmate/Scout.cs b/Roles/Standard/Crewmate/Investigate/Scout.cs similarity index 99% rename from Roles/Crewmate/Scout.cs rename to Roles/Standard/Crewmate/Investigate/Scout.cs index 31cddf0d3..597850deb 100644 --- a/Roles/Crewmate/Scout.cs +++ b/Roles/Standard/Crewmate/Investigate/Scout.cs @@ -1,13 +1,12 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Scout : RoleBase { diff --git a/Roles/Crewmate/Sensor.cs b/Roles/Standard/Crewmate/Investigate/Sensor.cs similarity index 98% rename from Roles/Crewmate/Sensor.cs rename to Roles/Standard/Crewmate/Investigate/Sensor.cs index 00690e569..d73fdcd17 100644 --- a/Roles/Crewmate/Sensor.cs +++ b/Roles/Standard/Crewmate/Investigate/Sensor.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; public class Sensor : RoleBase { diff --git a/Roles/Crewmate/Sentry.cs b/Roles/Standard/Crewmate/Investigate/Sentry.cs similarity index 99% rename from Roles/Crewmate/Sentry.cs rename to Roles/Standard/Crewmate/Investigate/Sentry.cs index 1b5cc6494..d2235c433 100644 --- a/Roles/Crewmate/Sentry.cs +++ b/Roles/Standard/Crewmate/Investigate/Sentry.cs @@ -4,7 +4,7 @@ using System.Linq; using EHR.Modules; using HarmonyLib; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Sentry : RoleBase { diff --git a/Roles/Crewmate/Shiftguard.cs b/Roles/Standard/Crewmate/Investigate/Shiftguard.cs similarity index 92% rename from Roles/Crewmate/Shiftguard.cs rename to Roles/Standard/Crewmate/Investigate/Shiftguard.cs index f9148e759..88a953594 100644 --- a/Roles/Crewmate/Shiftguard.cs +++ b/Roles/Standard/Crewmate/Investigate/Shiftguard.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Shiftguard : RoleBase { diff --git a/Roles/Crewmate/Snitch.cs b/Roles/Standard/Crewmate/Investigate/Snitch.cs similarity index 97% rename from Roles/Crewmate/Snitch.cs rename to Roles/Standard/Crewmate/Investigate/Snitch.cs index 38258d4ef..37f1e19f8 100644 --- a/Roles/Crewmate/Snitch.cs +++ b/Roles/Standard/Crewmate/Investigate/Snitch.cs @@ -3,7 +3,7 @@ using System.Linq; using UnityEngine; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Snitch : RoleBase { diff --git a/Roles/Crewmate/Socialite.cs b/Roles/Standard/Crewmate/Investigate/Socialite.cs similarity index 99% rename from Roles/Crewmate/Socialite.cs rename to Roles/Standard/Crewmate/Investigate/Socialite.cs index 00cf4fb86..1c2bee6b8 100644 --- a/Roles/Crewmate/Socialite.cs +++ b/Roles/Standard/Crewmate/Investigate/Socialite.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Socialite : RoleBase { diff --git a/Roles/Crewmate/Soothsayer.cs b/Roles/Standard/Crewmate/Investigate/Soothsayer.cs similarity index 97% rename from Roles/Crewmate/Soothsayer.cs rename to Roles/Standard/Crewmate/Investigate/Soothsayer.cs index 15594f154..151666af9 100644 --- a/Roles/Crewmate/Soothsayer.cs +++ b/Roles/Standard/Crewmate/Investigate/Soothsayer.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using EHR.Neutral; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Soothsayer : RoleBase { diff --git a/Roles/Crewmate/Spiritualist.cs b/Roles/Standard/Crewmate/Investigate/Spiritualist.cs similarity index 96% rename from Roles/Crewmate/Spiritualist.cs rename to Roles/Standard/Crewmate/Investigate/Spiritualist.cs index 4bd425278..5917cc5b6 100644 --- a/Roles/Crewmate/Spiritualist.cs +++ b/Roles/Standard/Crewmate/Investigate/Spiritualist.cs @@ -4,7 +4,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Spiritualist : RoleBase { diff --git a/Roles/Crewmate/Spy.cs b/Roles/Standard/Crewmate/Investigate/Spy.cs similarity index 99% rename from Roles/Crewmate/Spy.cs rename to Roles/Standard/Crewmate/Investigate/Spy.cs index b8430eea1..5f572db59 100644 --- a/Roles/Crewmate/Spy.cs +++ b/Roles/Standard/Crewmate/Investigate/Spy.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; using static Utils; diff --git a/Roles/Crewmate/TaskManager.cs b/Roles/Standard/Crewmate/Investigate/TaskManager.cs similarity index 97% rename from Roles/Crewmate/TaskManager.cs rename to Roles/Standard/Crewmate/Investigate/TaskManager.cs index f6541be5c..8a8384e58 100644 --- a/Roles/Crewmate/TaskManager.cs +++ b/Roles/Standard/Crewmate/Investigate/TaskManager.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class TaskManager : RoleBase { diff --git a/Roles/Crewmate/Telecommunication.cs b/Roles/Standard/Crewmate/Investigate/Telecommunication.cs similarity index 98% rename from Roles/Crewmate/Telecommunication.cs rename to Roles/Standard/Crewmate/Investigate/Telecommunication.cs index 6f9720c26..856f93a8c 100644 --- a/Roles/Crewmate/Telecommunication.cs +++ b/Roles/Standard/Crewmate/Investigate/Telecommunication.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Telecommunication : RoleBase { diff --git a/Roles/Crewmate/Whisperer.cs b/Roles/Standard/Crewmate/Investigate/Whisperer.cs similarity index 99% rename from Roles/Crewmate/Whisperer.cs rename to Roles/Standard/Crewmate/Investigate/Whisperer.cs index 12b595563..99c3ad4ce 100644 --- a/Roles/Crewmate/Whisperer.cs +++ b/Roles/Standard/Crewmate/Investigate/Whisperer.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Whisperer : RoleBase { diff --git a/Roles/Crewmate/Witness.cs b/Roles/Standard/Crewmate/Investigate/Witness.cs similarity index 98% rename from Roles/Crewmate/Witness.cs rename to Roles/Standard/Crewmate/Investigate/Witness.cs index 7e1bab7ae..db054d943 100644 --- a/Roles/Crewmate/Witness.cs +++ b/Roles/Standard/Crewmate/Investigate/Witness.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Witness : RoleBase { diff --git a/Roles/Crewmate/Drainer.cs b/Roles/Standard/Crewmate/Killing/Drainer.cs similarity index 99% rename from Roles/Crewmate/Drainer.cs rename to Roles/Standard/Crewmate/Killing/Drainer.cs index eb4168bae..6211ab0b1 100644 --- a/Roles/Crewmate/Drainer.cs +++ b/Roles/Standard/Crewmate/Killing/Drainer.cs @@ -3,7 +3,7 @@ using System.Linq; using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Drainer : RoleBase { diff --git a/Roles/Crewmate/Judge.cs b/Roles/Standard/Crewmate/Killing/Judge.cs similarity index 97% rename from Roles/Crewmate/Judge.cs rename to Roles/Standard/Crewmate/Killing/Judge.cs index 1e99468a8..4a3e7dcb4 100644 --- a/Roles/Crewmate/Judge.cs +++ b/Roles/Standard/Crewmate/Killing/Judge.cs @@ -3,12 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Judge : RoleBase { diff --git a/Roles/Crewmate/NiceGuesser.cs b/Roles/Standard/Crewmate/Killing/NiceGuesser.cs similarity index 98% rename from Roles/Crewmate/NiceGuesser.cs rename to Roles/Standard/Crewmate/Killing/NiceGuesser.cs index 320269895..92f90eeac 100644 --- a/Roles/Crewmate/NiceGuesser.cs +++ b/Roles/Standard/Crewmate/Killing/NiceGuesser.cs @@ -1,7 +1,7 @@ using UnityEngine; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class NiceGuesser : RoleBase { diff --git a/Roles/Crewmate/Retributionist.cs b/Roles/Standard/Crewmate/Killing/Retributionist.cs similarity index 99% rename from Roles/Crewmate/Retributionist.cs rename to Roles/Standard/Crewmate/Killing/Retributionist.cs index 35f1d6ff5..6f05ca6c1 100644 --- a/Roles/Crewmate/Retributionist.cs +++ b/Roles/Standard/Crewmate/Killing/Retributionist.cs @@ -2,11 +2,10 @@ using System; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Retributionist : RoleBase { diff --git a/Roles/Crewmate/Sentinel.cs b/Roles/Standard/Crewmate/Killing/Sentinel.cs similarity index 99% rename from Roles/Crewmate/Sentinel.cs rename to Roles/Standard/Crewmate/Killing/Sentinel.cs index a34462b14..c513f2f89 100644 --- a/Roles/Crewmate/Sentinel.cs +++ b/Roles/Standard/Crewmate/Killing/Sentinel.cs @@ -5,7 +5,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Crewmate; +namespace EHR.Roles; public class PatrollingState(byte sentinelId, int patrolDuration, float patrolRadius, PlayerControl sentinel = null, bool isPatrolling = false, Vector2? startingPosition = null, long patrolStartTimeStamp = 0) { diff --git a/Roles/Crewmate/Sheriff.cs b/Roles/Standard/Crewmate/Killing/Sheriff.cs similarity index 97% rename from Roles/Crewmate/Sheriff.cs rename to Roles/Standard/Crewmate/Killing/Sheriff.cs index 9ac46cced..201f86b2f 100644 --- a/Roles/Crewmate/Sheriff.cs +++ b/Roles/Standard/Crewmate/Killing/Sheriff.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Sheriff : RoleBase { diff --git a/Roles/Crewmate/Veteran.cs b/Roles/Standard/Crewmate/Killing/Veteran.cs similarity index 99% rename from Roles/Crewmate/Veteran.cs rename to Roles/Standard/Crewmate/Killing/Veteran.cs index 12b370678..34d7e0803 100644 --- a/Roles/Crewmate/Veteran.cs +++ b/Roles/Standard/Crewmate/Killing/Veteran.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using EHR.Modules; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Veteran : RoleBase { diff --git a/Roles/Crewmate/Vigilante.cs b/Roles/Standard/Crewmate/Killing/Vigilante.cs similarity index 99% rename from Roles/Crewmate/Vigilante.cs rename to Roles/Standard/Crewmate/Killing/Vigilante.cs index 5a56caa2b..ad2ef21c4 100644 --- a/Roles/Crewmate/Vigilante.cs +++ b/Roles/Standard/Crewmate/Killing/Vigilante.cs @@ -4,7 +4,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Vigilante : RoleBase { diff --git a/Roles/Crewmate/Addict.cs b/Roles/Standard/Crewmate/Miscellaneous/Addict.cs similarity index 96% rename from Roles/Crewmate/Addict.cs rename to Roles/Standard/Crewmate/Miscellaneous/Addict.cs index 50f5aa736..0977e0cb2 100644 --- a/Roles/Crewmate/Addict.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Addict.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; diff --git a/Roles/Crewmate/CameraMan.cs b/Roles/Standard/Crewmate/Miscellaneous/CameraMan.cs similarity index 99% rename from Roles/Crewmate/CameraMan.cs rename to Roles/Standard/Crewmate/Miscellaneous/CameraMan.cs index 534814efc..911ed7ab8 100644 --- a/Roles/Crewmate/CameraMan.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/CameraMan.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; diff --git a/Roles/Crewmate/Carrier.cs b/Roles/Standard/Crewmate/Miscellaneous/Carrier.cs similarity index 99% rename from Roles/Crewmate/Carrier.cs rename to Roles/Standard/Crewmate/Miscellaneous/Carrier.cs index 0bf9e7a97..1bc6ce394 100644 --- a/Roles/Crewmate/Carrier.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Carrier.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Carrier : RoleBase { diff --git a/Roles/Crewmate/Demolitionist.cs b/Roles/Standard/Crewmate/Miscellaneous/Demolitionist.cs similarity index 98% rename from Roles/Crewmate/Demolitionist.cs rename to Roles/Standard/Crewmate/Miscellaneous/Demolitionist.cs index 09e1b596a..4b846dfd2 100644 --- a/Roles/Crewmate/Demolitionist.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Demolitionist.cs @@ -2,7 +2,7 @@ using UnityEngine; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Demolitionist : RoleBase { diff --git a/Roles/Crewmate/Express.cs b/Roles/Standard/Crewmate/Miscellaneous/Express.cs similarity index 98% rename from Roles/Crewmate/Express.cs rename to Roles/Standard/Crewmate/Miscellaneous/Express.cs index fca37094f..a210fb740 100644 --- a/Roles/Crewmate/Express.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Express.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Express : RoleBase { diff --git a/Roles/Crewmate/Journalist.cs b/Roles/Standard/Crewmate/Miscellaneous/Journalist.cs similarity index 99% rename from Roles/Crewmate/Journalist.cs rename to Roles/Standard/Crewmate/Miscellaneous/Journalist.cs index 5aa5e1762..564613bb9 100644 --- a/Roles/Crewmate/Journalist.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Journalist.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Journalist : RoleBase { diff --git a/Roles/Crewmate/LazyGuy.cs b/Roles/Standard/Crewmate/Miscellaneous/LazyGuy.cs similarity index 92% rename from Roles/Crewmate/LazyGuy.cs rename to Roles/Standard/Crewmate/Miscellaneous/LazyGuy.cs index ff253280a..c6843f6c9 100644 --- a/Roles/Crewmate/LazyGuy.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/LazyGuy.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class LazyGuy : RoleBase { diff --git a/Roles/Crewmate/Luckey.cs b/Roles/Standard/Crewmate/Miscellaneous/Luckey.cs similarity index 97% rename from Roles/Crewmate/Luckey.cs rename to Roles/Standard/Crewmate/Miscellaneous/Luckey.cs index 60f0fbdde..f25743b19 100644 --- a/Roles/Crewmate/Luckey.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Luckey.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Luckey : RoleBase { diff --git a/Roles/Crewmate/Mole.cs b/Roles/Standard/Crewmate/Miscellaneous/Mole.cs similarity index 98% rename from Roles/Crewmate/Mole.cs rename to Roles/Standard/Crewmate/Miscellaneous/Mole.cs index 473271353..21ec039c1 100644 --- a/Roles/Crewmate/Mole.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Mole.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Mole : RoleBase { diff --git a/Roles/Crewmate/Nightmare.cs b/Roles/Standard/Crewmate/Miscellaneous/Nightmare.cs similarity index 95% rename from Roles/Crewmate/Nightmare.cs rename to Roles/Standard/Crewmate/Miscellaneous/Nightmare.cs index 1ce181e87..7a53635df 100644 --- a/Roles/Crewmate/Nightmare.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Nightmare.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; public class Nightmare : RoleBase { diff --git a/Roles/Crewmate/Paranoid.cs b/Roles/Standard/Crewmate/Miscellaneous/Paranoid.cs similarity index 99% rename from Roles/Crewmate/Paranoid.cs rename to Roles/Standard/Crewmate/Miscellaneous/Paranoid.cs index 3da9f062d..4958008a1 100644 --- a/Roles/Crewmate/Paranoid.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Paranoid.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Paranoid : RoleBase { diff --git a/Roles/Crewmate/PortalMaker.cs b/Roles/Standard/Crewmate/Miscellaneous/PortalMaker.cs similarity index 98% rename from Roles/Crewmate/PortalMaker.cs rename to Roles/Standard/Crewmate/Miscellaneous/PortalMaker.cs index 4036d19f9..e6857cd1c 100644 --- a/Roles/Crewmate/PortalMaker.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/PortalMaker.cs @@ -4,7 +4,7 @@ using EHR.Modules; using Hazel; using Color = UnityEngine.Color; -namespace EHR.Crewmate; +namespace EHR.Roles; public class PortalMaker : RoleBase { diff --git a/Roles/Crewmate/Ricochet.cs b/Roles/Standard/Crewmate/Miscellaneous/Ricochet.cs similarity index 99% rename from Roles/Crewmate/Ricochet.cs rename to Roles/Standard/Crewmate/Miscellaneous/Ricochet.cs index a2bcdc629..f281e9623 100644 --- a/Roles/Crewmate/Ricochet.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Ricochet.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using EHR.Modules; -using EHR.Neutral; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; diff --git a/Roles/Crewmate/Safeguard.cs b/Roles/Standard/Crewmate/Miscellaneous/Safeguard.cs similarity index 99% rename from Roles/Crewmate/Safeguard.cs rename to Roles/Standard/Crewmate/Miscellaneous/Safeguard.cs index bc1a82300..407f5e03d 100644 --- a/Roles/Crewmate/Safeguard.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Safeguard.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Safeguard : RoleBase { diff --git a/Roles/Crewmate/SuperStar.cs b/Roles/Standard/Crewmate/Miscellaneous/SuperStar.cs similarity index 98% rename from Roles/Crewmate/SuperStar.cs rename to Roles/Standard/Crewmate/Miscellaneous/SuperStar.cs index 66dbf7276..04f074312 100644 --- a/Roles/Crewmate/SuperStar.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/SuperStar.cs @@ -1,7 +1,7 @@ using System.Linq; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class SuperStar : RoleBase { diff --git a/Roles/Crewmate/Tether.cs b/Roles/Standard/Crewmate/Miscellaneous/Tether.cs similarity index 99% rename from Roles/Crewmate/Tether.cs rename to Roles/Standard/Crewmate/Miscellaneous/Tether.cs index 95fbf6c2a..a2802c46e 100644 --- a/Roles/Crewmate/Tether.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Tether.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; diff --git a/Roles/Crewmate/Tracefinder.cs b/Roles/Standard/Crewmate/Miscellaneous/Tracefinder.cs similarity index 96% rename from Roles/Crewmate/Tracefinder.cs rename to Roles/Standard/Crewmate/Miscellaneous/Tracefinder.cs index 959d4ee38..af62612a9 100644 --- a/Roles/Crewmate/Tracefinder.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Tracefinder.cs @@ -5,7 +5,7 @@ using AmongUs.GameOptions; using UnityEngine; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Tracefinder : RoleBase { diff --git a/Roles/Crewmate/Transmitter.cs b/Roles/Standard/Crewmate/Miscellaneous/Transmitter.cs similarity index 96% rename from Roles/Crewmate/Transmitter.cs rename to Roles/Standard/Crewmate/Miscellaneous/Transmitter.cs index fb59cceba..06e36c5fb 100644 --- a/Roles/Crewmate/Transmitter.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Transmitter.cs @@ -1,6 +1,6 @@ using System.Linq; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Transmitter : RoleBase { diff --git a/Roles/Crewmate/Tunneler.cs b/Roles/Standard/Crewmate/Miscellaneous/Tunneler.cs similarity index 97% rename from Roles/Crewmate/Tunneler.cs rename to Roles/Standard/Crewmate/Miscellaneous/Tunneler.cs index b71ca8dcb..14fd08777 100644 --- a/Roles/Crewmate/Tunneler.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Tunneler.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Tunneler : RoleBase { diff --git a/Roles/Crewmate/Vacuum.cs b/Roles/Standard/Crewmate/Miscellaneous/Vacuum.cs similarity index 99% rename from Roles/Crewmate/Vacuum.cs rename to Roles/Standard/Crewmate/Miscellaneous/Vacuum.cs index 95a891693..6785eb3f2 100644 --- a/Roles/Crewmate/Vacuum.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Vacuum.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Vacuum : RoleBase { diff --git a/Roles/Crewmate/Adrenaline.cs b/Roles/Standard/Crewmate/Power/Adrenaline.cs similarity index 99% rename from Roles/Crewmate/Adrenaline.cs rename to Roles/Standard/Crewmate/Power/Adrenaline.cs index 29f303d45..2cf353726 100644 --- a/Roles/Crewmate/Adrenaline.cs +++ b/Roles/Standard/Crewmate/Power/Adrenaline.cs @@ -1,7 +1,7 @@ using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Adrenaline : RoleBase { diff --git a/Roles/Crewmate/Adventurer.cs b/Roles/Standard/Crewmate/Power/Adventurer.cs similarity index 99% rename from Roles/Crewmate/Adventurer.cs rename to Roles/Standard/Crewmate/Power/Adventurer.cs index a662497bc..b9e89ad1b 100644 --- a/Roles/Crewmate/Adventurer.cs +++ b/Roles/Standard/Crewmate/Power/Adventurer.cs @@ -7,7 +7,7 @@ using EHR.Patches; using Hazel; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Adventurer : RoleBase { diff --git a/Roles/Crewmate/Alchemist.cs b/Roles/Standard/Crewmate/Power/Alchemist.cs similarity index 97% rename from Roles/Crewmate/Alchemist.cs rename to Roles/Standard/Crewmate/Power/Alchemist.cs index a1afdcf0c..85ba99fe1 100644 --- a/Roles/Crewmate/Alchemist.cs +++ b/Roles/Standard/Crewmate/Power/Alchemist.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; using static Options; using static Translator; diff --git a/Roles/Crewmate/Astral.cs b/Roles/Standard/Crewmate/Power/Astral.cs similarity index 99% rename from Roles/Crewmate/Astral.cs rename to Roles/Standard/Crewmate/Power/Astral.cs index 9c3f8bfe7..2fdda777b 100644 --- a/Roles/Crewmate/Astral.cs +++ b/Roles/Standard/Crewmate/Power/Astral.cs @@ -4,7 +4,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Astral : RoleBase { diff --git a/Roles/Crewmate/CopyCat.cs b/Roles/Standard/Crewmate/Power/CopyCat.cs similarity index 97% rename from Roles/Crewmate/CopyCat.cs rename to Roles/Standard/Crewmate/Power/CopyCat.cs index 1b83be20b..49e311dde 100644 --- a/Roles/Crewmate/CopyCat.cs +++ b/Roles/Standard/Crewmate/Power/CopyCat.cs @@ -2,7 +2,7 @@ using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class CopyCat : RoleBase { diff --git a/Roles/Crewmate/Decryptor.cs b/Roles/Standard/Crewmate/Power/Decryptor.cs similarity index 99% rename from Roles/Crewmate/Decryptor.cs rename to Roles/Standard/Crewmate/Power/Decryptor.cs index 0f423e90e..6cdc3dd7e 100644 --- a/Roles/Crewmate/Decryptor.cs +++ b/Roles/Standard/Crewmate/Power/Decryptor.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Decryptor : RoleBase { diff --git a/Roles/Crewmate/Detour.cs b/Roles/Standard/Crewmate/Power/Detour.cs similarity index 93% rename from Roles/Crewmate/Detour.cs rename to Roles/Standard/Crewmate/Power/Detour.cs index 7d03b1395..558b993b7 100644 --- a/Roles/Crewmate/Detour.cs +++ b/Roles/Standard/Crewmate/Power/Detour.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Detour : RoleBase { diff --git a/Roles/Crewmate/Dictator.cs b/Roles/Standard/Crewmate/Power/Dictator.cs similarity index 97% rename from Roles/Crewmate/Dictator.cs rename to Roles/Standard/Crewmate/Power/Dictator.cs index f476203e3..255d244bd 100644 --- a/Roles/Crewmate/Dictator.cs +++ b/Roles/Standard/Crewmate/Power/Dictator.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Dictator : RoleBase { diff --git a/Roles/Crewmate/Guardian.cs b/Roles/Standard/Crewmate/Power/Guardian.cs similarity index 95% rename from Roles/Crewmate/Guardian.cs rename to Roles/Standard/Crewmate/Power/Guardian.cs index 8c2d747a8..5d5d800ef 100644 --- a/Roles/Crewmate/Guardian.cs +++ b/Roles/Standard/Crewmate/Power/Guardian.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Guardian : RoleBase { diff --git a/Roles/Crewmate/Marshall.cs b/Roles/Standard/Crewmate/Power/Marshall.cs similarity index 96% rename from Roles/Crewmate/Marshall.cs rename to Roles/Standard/Crewmate/Power/Marshall.cs index fc685c7c4..522698b80 100644 --- a/Roles/Crewmate/Marshall.cs +++ b/Roles/Standard/Crewmate/Power/Marshall.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Marshall : RoleBase { diff --git a/Roles/Crewmate/Mayor.cs b/Roles/Standard/Crewmate/Power/Mayor.cs similarity index 99% rename from Roles/Crewmate/Mayor.cs rename to Roles/Standard/Crewmate/Power/Mayor.cs index 56fc11c17..9733896f0 100644 --- a/Roles/Crewmate/Mayor.cs +++ b/Roles/Standard/Crewmate/Power/Mayor.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Mayor : RoleBase { diff --git a/Roles/Crewmate/NiceEraser.cs b/Roles/Standard/Crewmate/Power/NiceEraser.cs similarity index 96% rename from Roles/Crewmate/NiceEraser.cs rename to Roles/Standard/Crewmate/Power/NiceEraser.cs index 9f2d3defc..39418667b 100644 --- a/Roles/Crewmate/NiceEraser.cs +++ b/Roles/Standard/Crewmate/Power/NiceEraser.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using EHR.Neutral; using Hazel; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class NiceEraser : RoleBase { diff --git a/Roles/Crewmate/Oxyman.cs b/Roles/Standard/Crewmate/Power/Oxyman.cs similarity index 99% rename from Roles/Crewmate/Oxyman.cs rename to Roles/Standard/Crewmate/Power/Oxyman.cs index 2ff5001b1..081533328 100644 --- a/Roles/Crewmate/Oxyman.cs +++ b/Roles/Standard/Crewmate/Power/Oxyman.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Oxyman : RoleBase { diff --git a/Roles/Crewmate/President.cs b/Roles/Standard/Crewmate/Power/President.cs similarity index 99% rename from Roles/Crewmate/President.cs rename to Roles/Standard/Crewmate/Power/President.cs index e52ab1fbb..49c3cf119 100644 --- a/Roles/Crewmate/President.cs +++ b/Roles/Standard/Crewmate/Power/President.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Neutral; using EHR.Patches; -namespace EHR.Crewmate; +namespace EHR.Roles; internal static class DecreeExtension { diff --git a/Roles/Crewmate/Speedrunner.cs b/Roles/Standard/Crewmate/Power/Speedrunner.cs similarity index 99% rename from Roles/Crewmate/Speedrunner.cs rename to Roles/Standard/Crewmate/Power/Speedrunner.cs index 08519f947..85c55d033 100644 --- a/Roles/Crewmate/Speedrunner.cs +++ b/Roles/Standard/Crewmate/Power/Speedrunner.cs @@ -2,7 +2,7 @@ using EHR.Modules; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Speedrunner : RoleBase { diff --git a/Roles/Crewmate/Swapper.cs b/Roles/Standard/Crewmate/Power/Swapper.cs similarity index 99% rename from Roles/Crewmate/Swapper.cs rename to Roles/Standard/Crewmate/Power/Swapper.cs index 31a9f073a..20a9cb99b 100644 --- a/Roles/Crewmate/Swapper.cs +++ b/Roles/Standard/Crewmate/Power/Swapper.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Swapper : RoleBase { diff --git a/Roles/Crewmate/Telekinetic.cs b/Roles/Standard/Crewmate/Power/Telekinetic.cs similarity index 99% rename from Roles/Crewmate/Telekinetic.cs rename to Roles/Standard/Crewmate/Power/Telekinetic.cs index 338867c85..f3fa7e973 100644 --- a/Roles/Crewmate/Telekinetic.cs +++ b/Roles/Standard/Crewmate/Power/Telekinetic.cs @@ -1,11 +1,10 @@ using System; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using EHR.Patches; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Telekinetic : RoleBase { diff --git a/Roles/Crewmate/Aid.cs b/Roles/Standard/Crewmate/Support/Aid.cs similarity index 99% rename from Roles/Crewmate/Aid.cs rename to Roles/Standard/Crewmate/Support/Aid.cs index 1de15fbb4..a8bd387b3 100644 --- a/Roles/Crewmate/Aid.cs +++ b/Roles/Standard/Crewmate/Support/Aid.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Aid : RoleBase { diff --git a/Roles/Crewmate/Altruist.cs b/Roles/Standard/Crewmate/Support/Altruist.cs similarity index 99% rename from Roles/Crewmate/Altruist.cs rename to Roles/Standard/Crewmate/Support/Altruist.cs index 615b875d5..d49ba5f8e 100644 --- a/Roles/Crewmate/Altruist.cs +++ b/Roles/Standard/Crewmate/Support/Altruist.cs @@ -5,7 +5,7 @@ using EHR.Modules; // ReSharper disable ConvertIfStatementToReturnStatement -namespace EHR.Crewmate; +namespace EHR.Roles; public class Altruist : RoleBase { diff --git a/Roles/Crewmate/Autocrat.cs b/Roles/Standard/Crewmate/Support/Autocrat.cs similarity index 96% rename from Roles/Crewmate/Autocrat.cs rename to Roles/Standard/Crewmate/Support/Autocrat.cs index 838a1e454..35f830205 100644 --- a/Roles/Crewmate/Autocrat.cs +++ b/Roles/Standard/Crewmate/Support/Autocrat.cs @@ -1,6 +1,6 @@ using System.Linq; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Autocrat : RoleBase { diff --git a/Roles/Crewmate/Bane.cs b/Roles/Standard/Crewmate/Support/Bane.cs similarity index 96% rename from Roles/Crewmate/Bane.cs rename to Roles/Standard/Crewmate/Support/Bane.cs index d6e87bc45..28abf0e9d 100644 --- a/Roles/Crewmate/Bane.cs +++ b/Roles/Standard/Crewmate/Support/Bane.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; public class Bane : RoleBase { diff --git a/Roles/Crewmate/Battery.cs b/Roles/Standard/Crewmate/Support/Battery.cs similarity index 97% rename from Roles/Crewmate/Battery.cs rename to Roles/Standard/Crewmate/Support/Battery.cs index 8b218ec2e..d1cb665ef 100644 --- a/Roles/Crewmate/Battery.cs +++ b/Roles/Standard/Crewmate/Support/Battery.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; public class Battery : RoleBase { diff --git a/Roles/Crewmate/Beacon.cs b/Roles/Standard/Crewmate/Support/Beacon.cs similarity index 99% rename from Roles/Crewmate/Beacon.cs rename to Roles/Standard/Crewmate/Support/Beacon.cs index e051b53f0..8db623684 100644 --- a/Roles/Crewmate/Beacon.cs +++ b/Roles/Standard/Crewmate/Support/Beacon.cs @@ -2,7 +2,7 @@ using System.Linq; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Beacon : RoleBase { diff --git a/Roles/Crewmate/Benefactor.cs b/Roles/Standard/Crewmate/Support/Benefactor.cs similarity index 99% rename from Roles/Crewmate/Benefactor.cs rename to Roles/Standard/Crewmate/Support/Benefactor.cs index 4e75f1ff6..083559a36 100644 --- a/Roles/Crewmate/Benefactor.cs +++ b/Roles/Standard/Crewmate/Support/Benefactor.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Benefactor : RoleBase { diff --git a/Roles/Crewmate/Bestower.cs b/Roles/Standard/Crewmate/Support/Bestower.cs similarity index 98% rename from Roles/Crewmate/Bestower.cs rename to Roles/Standard/Crewmate/Support/Bestower.cs index 884d12d59..a304aff21 100644 --- a/Roles/Crewmate/Bestower.cs +++ b/Roles/Standard/Crewmate/Support/Bestower.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Bestower : RoleBase { diff --git a/Roles/Crewmate/Bodyguard.cs b/Roles/Standard/Crewmate/Support/Bodyguard.cs similarity index 99% rename from Roles/Crewmate/Bodyguard.cs rename to Roles/Standard/Crewmate/Support/Bodyguard.cs index df02bc1e0..f9db5c10f 100644 --- a/Roles/Crewmate/Bodyguard.cs +++ b/Roles/Standard/Crewmate/Support/Bodyguard.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using EHR.Modules; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Bodyguard : RoleBase { diff --git a/Roles/Crewmate/Chef.cs b/Roles/Standard/Crewmate/Support/Chef.cs similarity index 99% rename from Roles/Crewmate/Chef.cs rename to Roles/Standard/Crewmate/Support/Chef.cs index 3e87aa248..36d8d3df4 100644 --- a/Roles/Crewmate/Chef.cs +++ b/Roles/Standard/Crewmate/Support/Chef.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Chef : RoleBase { diff --git a/Roles/Crewmate/Cleanser.cs b/Roles/Standard/Crewmate/Support/Cleanser.cs similarity index 96% rename from Roles/Crewmate/Cleanser.cs rename to Roles/Standard/Crewmate/Support/Cleanser.cs index c04d8fd48..a335d0797 100644 --- a/Roles/Crewmate/Cleanser.cs +++ b/Roles/Standard/Crewmate/Support/Cleanser.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using EHR.Modules; -using EHR.Neutral; using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Cleanser : RoleBase { diff --git a/Roles/Crewmate/Convener.cs b/Roles/Standard/Crewmate/Support/Convener.cs similarity index 99% rename from Roles/Crewmate/Convener.cs rename to Roles/Standard/Crewmate/Support/Convener.cs index 595459997..94335e8bc 100644 --- a/Roles/Crewmate/Convener.cs +++ b/Roles/Standard/Crewmate/Support/Convener.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Convener : RoleBase { diff --git a/Roles/Crewmate/Crusader.cs b/Roles/Standard/Crewmate/Support/Crusader.cs similarity index 96% rename from Roles/Crewmate/Crusader.cs rename to Roles/Standard/Crewmate/Support/Crusader.cs index 51490e67c..05a659652 100644 --- a/Roles/Crewmate/Crusader.cs +++ b/Roles/Standard/Crewmate/Support/Crusader.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Crusader : RoleBase { diff --git a/Roles/Crewmate/Deputy.cs b/Roles/Standard/Crewmate/Support/Deputy.cs similarity index 96% rename from Roles/Crewmate/Deputy.cs rename to Roles/Standard/Crewmate/Support/Deputy.cs index 48775e731..e878519bc 100644 --- a/Roles/Crewmate/Deputy.cs +++ b/Roles/Standard/Crewmate/Support/Deputy.cs @@ -4,7 +4,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Deputy : RoleBase { diff --git a/Roles/Crewmate/DonutDelivery.cs b/Roles/Standard/Crewmate/Support/DonutDelivery.cs similarity index 99% rename from Roles/Crewmate/DonutDelivery.cs rename to Roles/Standard/Crewmate/Support/DonutDelivery.cs index 845e8c3f5..a988b5da8 100644 --- a/Roles/Crewmate/DonutDelivery.cs +++ b/Roles/Standard/Crewmate/Support/DonutDelivery.cs @@ -5,7 +5,7 @@ using EHR.Modules; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class DonutDelivery : RoleBase { diff --git a/Roles/Crewmate/Doorjammer.cs b/Roles/Standard/Crewmate/Support/Doorjammer.cs similarity index 99% rename from Roles/Crewmate/Doorjammer.cs rename to Roles/Standard/Crewmate/Support/Doorjammer.cs index cb428d328..e9cced17e 100644 --- a/Roles/Crewmate/Doorjammer.cs +++ b/Roles/Standard/Crewmate/Support/Doorjammer.cs @@ -2,7 +2,7 @@ using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Doorjammer : RoleBase { diff --git a/Roles/Crewmate/Electric.cs b/Roles/Standard/Crewmate/Support/Electric.cs similarity index 98% rename from Roles/Crewmate/Electric.cs rename to Roles/Standard/Crewmate/Support/Electric.cs index e5fc86ab7..d85685e73 100644 --- a/Roles/Crewmate/Electric.cs +++ b/Roles/Standard/Crewmate/Support/Electric.cs @@ -3,7 +3,7 @@ using System.Linq; using EHR.Modules; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Electric : RoleBase { diff --git a/Roles/Crewmate/Escort.cs b/Roles/Standard/Crewmate/Support/Escort.cs similarity index 99% rename from Roles/Crewmate/Escort.cs rename to Roles/Standard/Crewmate/Support/Escort.cs index e053a4123..d3fc7144a 100644 --- a/Roles/Crewmate/Escort.cs +++ b/Roles/Standard/Crewmate/Support/Escort.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Escort : RoleBase { diff --git a/Roles/Crewmate/Farmer.cs b/Roles/Standard/Crewmate/Support/Farmer.cs similarity index 99% rename from Roles/Crewmate/Farmer.cs rename to Roles/Standard/Crewmate/Support/Farmer.cs index ac5f51e1c..b37366558 100644 --- a/Roles/Crewmate/Farmer.cs +++ b/Roles/Standard/Crewmate/Support/Farmer.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Farmer : RoleBase { diff --git a/Roles/Crewmate/Gardener.cs b/Roles/Standard/Crewmate/Support/Gardener.cs similarity index 99% rename from Roles/Crewmate/Gardener.cs rename to Roles/Standard/Crewmate/Support/Gardener.cs index 30a857dc4..82b36720f 100644 --- a/Roles/Crewmate/Gardener.cs +++ b/Roles/Standard/Crewmate/Support/Gardener.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Gardener : RoleBase { diff --git a/Roles/Crewmate/Gaulois.cs b/Roles/Standard/Crewmate/Support/Gaulois.cs similarity index 99% rename from Roles/Crewmate/Gaulois.cs rename to Roles/Standard/Crewmate/Support/Gaulois.cs index b1bca442d..70a4713e0 100644 --- a/Roles/Crewmate/Gaulois.cs +++ b/Roles/Standard/Crewmate/Support/Gaulois.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Gaulois : RoleBase { diff --git a/Roles/Crewmate/Grappler.cs b/Roles/Standard/Crewmate/Support/Grappler.cs similarity index 99% rename from Roles/Crewmate/Grappler.cs rename to Roles/Standard/Crewmate/Support/Grappler.cs index 32c8fd647..721d13700 100644 --- a/Roles/Crewmate/Grappler.cs +++ b/Roles/Standard/Crewmate/Support/Grappler.cs @@ -2,7 +2,7 @@ using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Grappler : RoleBase { diff --git a/Roles/Crewmate/Grenadier.cs b/Roles/Standard/Crewmate/Support/Grenadier.cs similarity index 99% rename from Roles/Crewmate/Grenadier.cs rename to Roles/Standard/Crewmate/Support/Grenadier.cs index e85ef8178..0d6e0e6b6 100644 --- a/Roles/Crewmate/Grenadier.cs +++ b/Roles/Standard/Crewmate/Support/Grenadier.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Grenadier : RoleBase { diff --git a/Roles/Crewmate/Helper.cs b/Roles/Standard/Crewmate/Support/Helper.cs similarity index 98% rename from Roles/Crewmate/Helper.cs rename to Roles/Standard/Crewmate/Support/Helper.cs index f29f61ac5..a6106846f 100644 --- a/Roles/Crewmate/Helper.cs +++ b/Roles/Standard/Crewmate/Support/Helper.cs @@ -2,7 +2,7 @@ using EHR.Modules; using Il2CppSystem; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Helper : RoleBase { diff --git a/Roles/Crewmate/Jailor.cs b/Roles/Standard/Crewmate/Support/Jailor.cs similarity index 99% rename from Roles/Crewmate/Jailor.cs rename to Roles/Standard/Crewmate/Support/Jailor.cs index 15611e135..af4f356c3 100644 --- a/Roles/Crewmate/Jailor.cs +++ b/Roles/Standard/Crewmate/Support/Jailor.cs @@ -5,7 +5,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Jailor : RoleBase { diff --git a/Roles/Crewmate/Mathematician.cs b/Roles/Standard/Crewmate/Support/Mathematician.cs similarity index 99% rename from Roles/Crewmate/Mathematician.cs rename to Roles/Standard/Crewmate/Support/Mathematician.cs index fafc7c8a8..c97887532 100644 --- a/Roles/Crewmate/Mathematician.cs +++ b/Roles/Standard/Crewmate/Support/Mathematician.cs @@ -1,7 +1,7 @@ using System; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Mathematician : RoleBase { diff --git a/Roles/Crewmate/Mechanic.cs b/Roles/Standard/Crewmate/Support/Mechanic.cs similarity index 99% rename from Roles/Crewmate/Mechanic.cs rename to Roles/Standard/Crewmate/Support/Mechanic.cs index 3d87a4e50..66169ef80 100644 --- a/Roles/Crewmate/Mechanic.cs +++ b/Roles/Standard/Crewmate/Support/Mechanic.cs @@ -6,7 +6,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Mechanic : RoleBase { diff --git a/Roles/Crewmate/Medic.cs b/Roles/Standard/Crewmate/Support/Medic.cs similarity index 97% rename from Roles/Crewmate/Medic.cs rename to Roles/Standard/Crewmate/Support/Medic.cs index b81172a29..28f5ea658 100644 --- a/Roles/Crewmate/Medic.cs +++ b/Roles/Standard/Crewmate/Support/Medic.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Medic : RoleBase { diff --git a/Roles/Crewmate/Merchant.cs b/Roles/Standard/Crewmate/Support/Merchant.cs similarity index 97% rename from Roles/Crewmate/Merchant.cs rename to Roles/Standard/Crewmate/Support/Merchant.cs index b4c907640..34f5e60c3 100644 --- a/Roles/Crewmate/Merchant.cs +++ b/Roles/Standard/Crewmate/Support/Merchant.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using System.Linq; -using EHR.Neutral; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Merchant : RoleBase { diff --git a/Roles/Crewmate/Monarch.cs b/Roles/Standard/Crewmate/Support/Monarch.cs similarity index 96% rename from Roles/Crewmate/Monarch.cs rename to Roles/Standard/Crewmate/Support/Monarch.cs index 830558868..3ae826591 100644 --- a/Roles/Crewmate/Monarch.cs +++ b/Roles/Standard/Crewmate/Support/Monarch.cs @@ -4,7 +4,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Monarch : RoleBase { diff --git a/Roles/Crewmate/Negotiator.cs b/Roles/Standard/Crewmate/Support/Negotiator.cs similarity index 99% rename from Roles/Crewmate/Negotiator.cs rename to Roles/Standard/Crewmate/Support/Negotiator.cs index 6666efb20..170d495cd 100644 --- a/Roles/Crewmate/Negotiator.cs +++ b/Roles/Standard/Crewmate/Support/Negotiator.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Negotiator : RoleBase { diff --git a/Roles/Crewmate/Pacifist.cs b/Roles/Standard/Crewmate/Support/Pacifist.cs similarity index 98% rename from Roles/Crewmate/Pacifist.cs rename to Roles/Standard/Crewmate/Support/Pacifist.cs index 54541f978..2059428ef 100644 --- a/Roles/Crewmate/Pacifist.cs +++ b/Roles/Standard/Crewmate/Support/Pacifist.cs @@ -1,10 +1,9 @@ using System.Linq; using AmongUs.GameOptions; -using EHR.Impostor; using EHR.Modules; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Pacifist : RoleBase { diff --git a/Roles/Crewmate/Rhapsode.cs b/Roles/Standard/Crewmate/Support/Rhapsode.cs similarity index 99% rename from Roles/Crewmate/Rhapsode.cs rename to Roles/Standard/Crewmate/Support/Rhapsode.cs index c3547ebee..e94da9587 100644 --- a/Roles/Crewmate/Rhapsode.cs +++ b/Roles/Standard/Crewmate/Support/Rhapsode.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Rhapsode : RoleBase { diff --git a/Roles/Crewmate/SecurityGuard.cs b/Roles/Standard/Crewmate/Support/SecurityGuard.cs similarity index 99% rename from Roles/Crewmate/SecurityGuard.cs rename to Roles/Standard/Crewmate/Support/SecurityGuard.cs index 915e3ea82..316707e7d 100644 --- a/Roles/Crewmate/SecurityGuard.cs +++ b/Roles/Standard/Crewmate/Support/SecurityGuard.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class SecurityGuard : RoleBase { diff --git a/Roles/Crewmate/SpeedBooster.cs b/Roles/Standard/Crewmate/Support/SpeedBooster.cs similarity index 97% rename from Roles/Crewmate/SpeedBooster.cs rename to Roles/Standard/Crewmate/Support/SpeedBooster.cs index af1d3a649..be6c1d8ab 100644 --- a/Roles/Crewmate/SpeedBooster.cs +++ b/Roles/Standard/Crewmate/Support/SpeedBooster.cs @@ -1,4 +1,4 @@ -namespace EHR.Crewmate; +namespace EHR.Roles; internal class SpeedBooster : RoleBase { diff --git a/Roles/Crewmate/TimeManager.cs b/Roles/Standard/Crewmate/Support/TimeManager.cs similarity index 96% rename from Roles/Crewmate/TimeManager.cs rename to Roles/Standard/Crewmate/Support/TimeManager.cs index 154edbfb7..dcefa8e7b 100644 --- a/Roles/Crewmate/TimeManager.cs +++ b/Roles/Standard/Crewmate/Support/TimeManager.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EHR.Crewmate; +namespace EHR.Roles; public class TimeManager : RoleBase { diff --git a/Roles/Crewmate/TimeMaster.cs b/Roles/Standard/Crewmate/Support/TimeMaster.cs similarity index 99% rename from Roles/Crewmate/TimeMaster.cs rename to Roles/Standard/Crewmate/Support/TimeMaster.cs index 03911a0d3..ab9d06f35 100644 --- a/Roles/Crewmate/TimeMaster.cs +++ b/Roles/Standard/Crewmate/Support/TimeMaster.cs @@ -8,7 +8,7 @@ using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class TimeMaster : RoleBase { diff --git a/Roles/Crewmate/Transporter.cs b/Roles/Standard/Crewmate/Support/Transporter.cs similarity index 99% rename from Roles/Crewmate/Transporter.cs rename to Roles/Standard/Crewmate/Support/Transporter.cs index bc71d8762..6e18478f2 100644 --- a/Roles/Crewmate/Transporter.cs +++ b/Roles/Standard/Crewmate/Support/Transporter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Transporter : RoleBase { diff --git a/Roles/Crewmate/Ventguard.cs b/Roles/Standard/Crewmate/Support/Ventguard.cs similarity index 99% rename from Roles/Crewmate/Ventguard.cs rename to Roles/Standard/Crewmate/Support/Ventguard.cs index 9f46cc8f8..d590841da 100644 --- a/Roles/Crewmate/Ventguard.cs +++ b/Roles/Standard/Crewmate/Support/Ventguard.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class Ventguard : RoleBase { diff --git a/Roles/Crewmate/Wizard.cs b/Roles/Standard/Crewmate/Support/Wizard.cs similarity index 99% rename from Roles/Crewmate/Wizard.cs rename to Roles/Standard/Crewmate/Support/Wizard.cs index 8dee25456..001418fa5 100644 --- a/Roles/Crewmate/Wizard.cs +++ b/Roles/Standard/Crewmate/Support/Wizard.cs @@ -5,7 +5,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Crewmate; +namespace EHR.Roles; public class Wizard : RoleBase { diff --git a/Roles/Crewmate/CrewmateVanillaRoles.cs b/Roles/Standard/Crewmate/Vanilla/CrewmateVanillaRoles.cs similarity index 99% rename from Roles/Crewmate/CrewmateVanillaRoles.cs rename to Roles/Standard/Crewmate/Vanilla/CrewmateVanillaRoles.cs index 05a72cf76..7fa166271 100644 --- a/Roles/Crewmate/CrewmateVanillaRoles.cs +++ b/Roles/Standard/Crewmate/Vanilla/CrewmateVanillaRoles.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Crewmate; +namespace EHR.Roles; internal class CrewmateVanillaRoles : IVanillaSettingHolder { diff --git a/Roles/AddOns/GhostRoles/Bloodmoon.cs b/Roles/Standard/Ghost/Bloodmoon.cs similarity index 99% rename from Roles/AddOns/GhostRoles/Bloodmoon.cs rename to Roles/Standard/Ghost/Bloodmoon.cs index 5af40645b..04495566a 100644 --- a/Roles/AddOns/GhostRoles/Bloodmoon.cs +++ b/Roles/Standard/Ghost/Bloodmoon.cs @@ -3,7 +3,7 @@ using System.Linq; using AmongUs.GameOptions; using Hazel; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; internal class Bloodmoon : IGhostRole { diff --git a/Roles/AddOns/GhostRoles/Facilitator.cs b/Roles/Standard/Ghost/Facilitator.cs similarity index 89% rename from Roles/AddOns/GhostRoles/Facilitator.cs rename to Roles/Standard/Ghost/Facilitator.cs index e795a13c7..a5098c4f4 100644 --- a/Roles/AddOns/GhostRoles/Facilitator.cs +++ b/Roles/Standard/Ghost/Facilitator.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; public class Facilitator : IGhostRole { @@ -12,7 +12,7 @@ public class Facilitator : IGhostRole public void OnProtect(PlayerControl pc, PlayerControl target) { - if (!Main.PlayerStates.TryGetValue(target.PlayerId, out PlayerState state) || state.Role is not Coven.Coven covenRole) return; + if (!Main.PlayerStates.TryGetValue(target.PlayerId, out PlayerState state) || state.Role is not CovenBase covenRole) return; covenRole.HasNecronomicon = true; covenRole.OnReceiveNecronomicon(); diff --git a/Roles/AddOns/GhostRoles/GA.cs b/Roles/Standard/Ghost/GA.cs similarity index 97% rename from Roles/AddOns/GhostRoles/GA.cs rename to Roles/Standard/Ghost/GA.cs index b48df1024..41f8a9b8b 100644 --- a/Roles/AddOns/GhostRoles/GA.cs +++ b/Roles/Standard/Ghost/GA.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; internal class GA : IGhostRole { diff --git a/Roles/AddOns/GhostRoles/Haunter.cs b/Roles/Standard/Ghost/Haunter.cs similarity index 99% rename from Roles/AddOns/GhostRoles/Haunter.cs rename to Roles/Standard/Ghost/Haunter.cs index f01465947..d33c3df6d 100644 --- a/Roles/AddOns/GhostRoles/Haunter.cs +++ b/Roles/Standard/Ghost/Haunter.cs @@ -3,7 +3,7 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; internal class Haunter : IGhostRole { diff --git a/Roles/AddOns/GhostRoles/IGhostRole.cs b/Roles/Standard/Ghost/IGhostRole.cs similarity index 90% rename from Roles/AddOns/GhostRoles/IGhostRole.cs rename to Roles/Standard/Ghost/IGhostRole.cs index b4e0a77f6..a111e9b9c 100644 --- a/Roles/AddOns/GhostRoles/IGhostRole.cs +++ b/Roles/Standard/Ghost/IGhostRole.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; public interface IGhostRole { diff --git a/Roles/AddOns/GhostRoles/Minion.cs b/Roles/Standard/Ghost/Minion.cs similarity index 97% rename from Roles/AddOns/GhostRoles/Minion.cs rename to Roles/Standard/Ghost/Minion.cs index 6dda8c7d6..422d575dc 100644 --- a/Roles/AddOns/GhostRoles/Minion.cs +++ b/Roles/Standard/Ghost/Minion.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; internal class Minion : IGhostRole { diff --git a/Roles/AddOns/GhostRoles/Phantasm.cs b/Roles/Standard/Ghost/Phantasm.cs similarity index 98% rename from Roles/AddOns/GhostRoles/Phantasm.cs rename to Roles/Standard/Ghost/Phantasm.cs index 001b36518..34c42508e 100644 --- a/Roles/AddOns/GhostRoles/Phantasm.cs +++ b/Roles/Standard/Ghost/Phantasm.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; // TOU Phantom internal class Phantasm : IGhostRole diff --git a/Roles/AddOns/GhostRoles/Shade.cs b/Roles/Standard/Ghost/Shade.cs similarity index 96% rename from Roles/AddOns/GhostRoles/Shade.cs rename to Roles/Standard/Ghost/Shade.cs index 53edb8ef0..6d504d135 100644 --- a/Roles/AddOns/GhostRoles/Shade.cs +++ b/Roles/Standard/Ghost/Shade.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; public class Shade : IGhostRole { diff --git a/Roles/AddOns/GhostRoles/Warden.cs b/Roles/Standard/Ghost/Warden.cs similarity index 98% rename from Roles/AddOns/GhostRoles/Warden.cs rename to Roles/Standard/Ghost/Warden.cs index e8471a272..84f52f13a 100644 --- a/Roles/AddOns/GhostRoles/Warden.cs +++ b/Roles/Standard/Ghost/Warden.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; -namespace EHR.AddOns.GhostRoles; +namespace EHR.Roles; internal class Warden : IGhostRole { diff --git a/Roles/Impostor/Ambusher.cs b/Roles/Standard/Impostor/Concealing/Ambusher.cs similarity index 99% rename from Roles/Impostor/Ambusher.cs rename to Roles/Standard/Impostor/Concealing/Ambusher.cs index e8fc24ad1..92c1facb9 100644 --- a/Roles/Impostor/Ambusher.cs +++ b/Roles/Standard/Impostor/Concealing/Ambusher.cs @@ -6,7 +6,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Ambusher : RoleBase { diff --git a/Roles/Impostor/Anonymous.cs b/Roles/Standard/Impostor/Concealing/Anonymous.cs similarity index 98% rename from Roles/Impostor/Anonymous.cs rename to Roles/Standard/Impostor/Concealing/Anonymous.cs index 72f00500e..092634727 100644 --- a/Roles/Impostor/Anonymous.cs +++ b/Roles/Standard/Impostor/Concealing/Anonymous.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Neutral; using static EHR.Options; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Anonymous : RoleBase { diff --git a/Roles/Impostor/Duellist.cs b/Roles/Standard/Impostor/Concealing/Duellist.cs similarity index 98% rename from Roles/Impostor/Duellist.cs rename to Roles/Standard/Impostor/Concealing/Duellist.cs index 76b0bbf60..9185df330 100644 --- a/Roles/Impostor/Duellist.cs +++ b/Roles/Standard/Impostor/Concealing/Duellist.cs @@ -1,13 +1,11 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Duellist : RoleBase { diff --git a/Roles/Impostor/Echo.cs b/Roles/Standard/Impostor/Concealing/Echo.cs similarity index 99% rename from Roles/Impostor/Echo.cs rename to Roles/Standard/Impostor/Concealing/Echo.cs index 2be132550..681ba857d 100644 --- a/Roles/Impostor/Echo.cs +++ b/Roles/Standard/Impostor/Concealing/Echo.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; -namespace EHR.Impostor; +namespace EHR.Roles; public class Echo : RoleBase { diff --git a/Roles/Impostor/Escapist.cs b/Roles/Standard/Impostor/Concealing/Escapist.cs similarity index 99% rename from Roles/Impostor/Escapist.cs rename to Roles/Standard/Impostor/Concealing/Escapist.cs index 667ce9acb..1ca328cdf 100644 --- a/Roles/Impostor/Escapist.cs +++ b/Roles/Standard/Impostor/Concealing/Escapist.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Escapist : RoleBase { diff --git a/Roles/Impostor/Exclusionary.cs b/Roles/Standard/Impostor/Concealing/Exclusionary.cs similarity index 99% rename from Roles/Impostor/Exclusionary.cs rename to Roles/Standard/Impostor/Concealing/Exclusionary.cs index 8a2559f40..d227dbfe1 100644 --- a/Roles/Impostor/Exclusionary.cs +++ b/Roles/Standard/Impostor/Concealing/Exclusionary.cs @@ -2,7 +2,7 @@ using EHR.Modules; using Hazel; -namespace EHR.Impostor; +namespace EHR.Roles; public class Exclusionary : RoleBase { diff --git a/Roles/Impostor/Fabricator.cs b/Roles/Standard/Impostor/Concealing/Fabricator.cs similarity index 98% rename from Roles/Impostor/Fabricator.cs rename to Roles/Standard/Impostor/Concealing/Fabricator.cs index cc299468c..522c7a23e 100644 --- a/Roles/Impostor/Fabricator.cs +++ b/Roles/Standard/Impostor/Concealing/Fabricator.cs @@ -1,6 +1,6 @@ using EHR.Modules; -namespace EHR.Impostor; +namespace EHR.Roles; public class Fabricator : RoleBase { diff --git a/Roles/Impostor/Forger.cs b/Roles/Standard/Impostor/Concealing/Forger.cs similarity index 97% rename from Roles/Impostor/Forger.cs rename to Roles/Standard/Impostor/Concealing/Forger.cs index 4712d786c..f050efe30 100644 --- a/Roles/Impostor/Forger.cs +++ b/Roles/Standard/Impostor/Concealing/Forger.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EHR.Impostor; +namespace EHR.Roles; public class Forger : RoleBase { diff --git a/Roles/Impostor/Hangman.cs b/Roles/Standard/Impostor/Concealing/Hangman.cs similarity index 96% rename from Roles/Impostor/Hangman.cs rename to Roles/Standard/Impostor/Concealing/Hangman.cs index bf5ecc0d4..2e674cfcd 100644 --- a/Roles/Impostor/Hangman.cs +++ b/Roles/Standard/Impostor/Concealing/Hangman.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Hangman : RoleBase { diff --git a/Roles/Impostor/Kidnapper.cs b/Roles/Standard/Impostor/Concealing/Kidnapper.cs similarity index 98% rename from Roles/Impostor/Kidnapper.cs rename to Roles/Standard/Impostor/Concealing/Kidnapper.cs index 31d75ccea..b9ce884f7 100644 --- a/Roles/Impostor/Kidnapper.cs +++ b/Roles/Standard/Impostor/Concealing/Kidnapper.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Kidnapper : RoleBase { diff --git a/Roles/Impostor/Lightning.cs b/Roles/Standard/Impostor/Concealing/Lightning.cs similarity index 99% rename from Roles/Impostor/Lightning.cs rename to Roles/Standard/Impostor/Concealing/Lightning.cs index 696ad9f90..a61b6148f 100644 --- a/Roles/Impostor/Lightning.cs +++ b/Roles/Standard/Impostor/Concealing/Lightning.cs @@ -1,13 +1,11 @@ using System.Collections.Generic; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using EHR.Patches; using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Lightning : RoleBase { diff --git a/Roles/Impostor/Mastermind.cs b/Roles/Standard/Impostor/Concealing/Mastermind.cs similarity index 99% rename from Roles/Impostor/Mastermind.cs rename to Roles/Standard/Impostor/Concealing/Mastermind.cs index 51f9be6ee..3349e2f6f 100644 --- a/Roles/Impostor/Mastermind.cs +++ b/Roles/Standard/Impostor/Concealing/Mastermind.cs @@ -1,12 +1,10 @@ using System.Collections.Generic; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Mastermind : RoleBase { diff --git a/Roles/Impostor/Miner.cs b/Roles/Standard/Impostor/Concealing/Miner.cs similarity index 98% rename from Roles/Impostor/Miner.cs rename to Roles/Standard/Impostor/Concealing/Miner.cs index 70a239565..cca2ffb81 100644 --- a/Roles/Impostor/Miner.cs +++ b/Roles/Standard/Impostor/Concealing/Miner.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Miner : RoleBase { diff --git a/Roles/Impostor/Morphling.cs b/Roles/Standard/Impostor/Concealing/Morphling.cs similarity index 95% rename from Roles/Impostor/Morphling.cs rename to Roles/Standard/Impostor/Concealing/Morphling.cs index 5ef425c46..db8ff371f 100644 --- a/Roles/Impostor/Morphling.cs +++ b/Roles/Standard/Impostor/Concealing/Morphling.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Morphling : RoleBase { diff --git a/Roles/Impostor/Penguin.cs b/Roles/Standard/Impostor/Concealing/Penguin.cs similarity index 99% rename from Roles/Impostor/Penguin.cs rename to Roles/Standard/Impostor/Concealing/Penguin.cs index 71551eb17..da18ba4ad 100644 --- a/Roles/Impostor/Penguin.cs +++ b/Roles/Standard/Impostor/Concealing/Penguin.cs @@ -1,13 +1,11 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Penguin : RoleBase { diff --git a/Roles/Impostor/Postponer.cs b/Roles/Standard/Impostor/Concealing/Postponer.cs similarity index 98% rename from Roles/Impostor/Postponer.cs rename to Roles/Standard/Impostor/Concealing/Postponer.cs index 9748096a3..69d538875 100644 --- a/Roles/Impostor/Postponer.cs +++ b/Roles/Standard/Impostor/Concealing/Postponer.cs @@ -1,7 +1,7 @@ using EHR.Modules; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Postponer : RoleBase { diff --git a/Roles/Impostor/Puppeteer.cs b/Roles/Standard/Impostor/Concealing/Puppeteer.cs similarity index 99% rename from Roles/Impostor/Puppeteer.cs rename to Roles/Standard/Impostor/Concealing/Puppeteer.cs index 2e7eec79b..0cbfd05e4 100644 --- a/Roles/Impostor/Puppeteer.cs +++ b/Roles/Standard/Impostor/Concealing/Puppeteer.cs @@ -1,13 +1,11 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using UnityEngine; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Puppeteer : RoleBase { diff --git a/Roles/Impostor/RiftMaker.cs b/Roles/Standard/Impostor/Concealing/RiftMaker.cs similarity index 99% rename from Roles/Impostor/RiftMaker.cs rename to Roles/Standard/Impostor/Concealing/RiftMaker.cs index f4640a753..dd8aa66d3 100644 --- a/Roles/Impostor/RiftMaker.cs +++ b/Roles/Standard/Impostor/Concealing/RiftMaker.cs @@ -1,13 +1,12 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class RiftMaker : RoleBase { diff --git a/Roles/Impostor/Scavenger.cs b/Roles/Standard/Impostor/Concealing/Scavenger.cs similarity index 98% rename from Roles/Impostor/Scavenger.cs rename to Roles/Standard/Impostor/Concealing/Scavenger.cs index a2821cb7a..2b264786d 100644 --- a/Roles/Impostor/Scavenger.cs +++ b/Roles/Standard/Impostor/Concealing/Scavenger.cs @@ -1,9 +1,8 @@ using EHR.Modules; -using EHR.Neutral; using UnityEngine; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Scavenger : RoleBase { diff --git a/Roles/Impostor/SoulCatcher.cs b/Roles/Standard/Impostor/Concealing/SoulCatcher.cs similarity index 98% rename from Roles/Impostor/SoulCatcher.cs rename to Roles/Standard/Impostor/Concealing/SoulCatcher.cs index f71c26035..170f55373 100644 --- a/Roles/Impostor/SoulCatcher.cs +++ b/Roles/Standard/Impostor/Concealing/SoulCatcher.cs @@ -2,7 +2,7 @@ using EHR.Modules; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class SoulCatcher : RoleBase { diff --git a/Roles/Impostor/Stasis.cs b/Roles/Standard/Impostor/Concealing/Stasis.cs similarity index 99% rename from Roles/Impostor/Stasis.cs rename to Roles/Standard/Impostor/Concealing/Stasis.cs index 5d50923cf..09ca677cd 100644 --- a/Roles/Impostor/Stasis.cs +++ b/Roles/Standard/Impostor/Concealing/Stasis.cs @@ -5,7 +5,7 @@ using System.Linq; using AmongUs.GameOptions; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Stasis : RoleBase { diff --git a/Roles/Impostor/Stealth.cs b/Roles/Standard/Impostor/Concealing/Stealth.cs similarity index 99% rename from Roles/Impostor/Stealth.cs rename to Roles/Standard/Impostor/Concealing/Stealth.cs index 769301a72..46c793d3a 100644 --- a/Roles/Impostor/Stealth.cs +++ b/Roles/Standard/Impostor/Concealing/Stealth.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public sealed class Stealth : RoleBase { diff --git a/Roles/Impostor/Swiftclaw.cs b/Roles/Standard/Impostor/Concealing/Swiftclaw.cs similarity index 99% rename from Roles/Impostor/Swiftclaw.cs rename to Roles/Standard/Impostor/Concealing/Swiftclaw.cs index 4cb6159a0..a7bcc882b 100644 --- a/Roles/Impostor/Swiftclaw.cs +++ b/Roles/Standard/Impostor/Concealing/Swiftclaw.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Swiftclaw : RoleBase { diff --git a/Roles/Impostor/Swooper.cs b/Roles/Standard/Impostor/Concealing/Swooper.cs similarity index 96% rename from Roles/Impostor/Swooper.cs rename to Roles/Standard/Impostor/Concealing/Swooper.cs index 80013b088..cb65df76e 100644 --- a/Roles/Impostor/Swooper.cs +++ b/Roles/Standard/Impostor/Concealing/Swooper.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Swooper : RoleBase { diff --git a/Roles/Impostor/Trickster.cs b/Roles/Standard/Impostor/Concealing/Trickster.cs similarity index 92% rename from Roles/Impostor/Trickster.cs rename to Roles/Standard/Impostor/Concealing/Trickster.cs index 103f50e60..0232a5319 100644 --- a/Roles/Impostor/Trickster.cs +++ b/Roles/Standard/Impostor/Concealing/Trickster.cs @@ -1,4 +1,4 @@ -namespace EHR.Impostor; +namespace EHR.Roles; internal class Trickster : RoleBase { diff --git a/Roles/Impostor/Undertaker.cs b/Roles/Standard/Impostor/Concealing/Undertaker.cs similarity index 98% rename from Roles/Impostor/Undertaker.cs rename to Roles/Standard/Impostor/Concealing/Undertaker.cs index 626a7cb53..6355f5cd9 100644 --- a/Roles/Impostor/Undertaker.cs +++ b/Roles/Standard/Impostor/Concealing/Undertaker.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Undertaker : RoleBase { diff --git a/Roles/Impostor/Vampire.cs b/Roles/Standard/Impostor/Concealing/Vampire.cs similarity index 96% rename from Roles/Impostor/Vampire.cs rename to Roles/Standard/Impostor/Concealing/Vampire.cs index 630646d3f..86bf06dcf 100644 --- a/Roles/Impostor/Vampire.cs +++ b/Roles/Standard/Impostor/Concealing/Vampire.cs @@ -2,13 +2,11 @@ using System; using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using UnityEngine; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Vampire : RoleBase { diff --git a/Roles/Impostor/Venerer.cs b/Roles/Standard/Impostor/Concealing/Venerer.cs similarity index 99% rename from Roles/Impostor/Venerer.cs rename to Roles/Standard/Impostor/Concealing/Venerer.cs index e0d62e117..16e87f105 100644 --- a/Roles/Impostor/Venerer.cs +++ b/Roles/Standard/Impostor/Concealing/Venerer.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Venerer : RoleBase { diff --git a/Roles/Impostor/Warlock.cs b/Roles/Standard/Impostor/Concealing/Warlock.cs similarity index 99% rename from Roles/Impostor/Warlock.cs rename to Roles/Standard/Impostor/Concealing/Warlock.cs index 2f63363e4..bebde309d 100644 --- a/Roles/Impostor/Warlock.cs +++ b/Roles/Standard/Impostor/Concealing/Warlock.cs @@ -2,13 +2,11 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using UnityEngine; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Warlock : RoleBase { diff --git a/Roles/Impostor/Abyssbringer.cs b/Roles/Standard/Impostor/Killing/Abyssbringer.cs similarity index 99% rename from Roles/Impostor/Abyssbringer.cs rename to Roles/Standard/Impostor/Killing/Abyssbringer.cs index 6b7ac97da..f4f9028d4 100644 --- a/Roles/Impostor/Abyssbringer.cs +++ b/Roles/Standard/Impostor/Killing/Abyssbringer.cs @@ -6,7 +6,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Abyssbringer : RoleBase { diff --git a/Roles/Impostor/Arrogance.cs b/Roles/Standard/Impostor/Killing/Arrogance.cs similarity index 99% rename from Roles/Impostor/Arrogance.cs rename to Roles/Standard/Impostor/Killing/Arrogance.cs index fa8afffef..e2736179e 100644 --- a/Roles/Impostor/Arrogance.cs +++ b/Roles/Standard/Impostor/Killing/Arrogance.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Arrogance : RoleBase { diff --git a/Roles/Impostor/Assumer.cs b/Roles/Standard/Impostor/Killing/Assumer.cs similarity index 99% rename from Roles/Impostor/Assumer.cs rename to Roles/Standard/Impostor/Killing/Assumer.cs index 51c459649..250fd6f9b 100644 --- a/Roles/Impostor/Assumer.cs +++ b/Roles/Standard/Impostor/Killing/Assumer.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using EHR.Patches; -namespace EHR.Impostor; +namespace EHR.Roles; public class Assumer : RoleBase { diff --git a/Roles/Impostor/Augmenter.cs b/Roles/Standard/Impostor/Killing/Augmenter.cs similarity index 97% rename from Roles/Impostor/Augmenter.cs rename to Roles/Standard/Impostor/Killing/Augmenter.cs index 790655692..cf83ed0d0 100644 --- a/Roles/Impostor/Augmenter.cs +++ b/Roles/Standard/Impostor/Killing/Augmenter.cs @@ -1,4 +1,4 @@ -namespace EHR.Impostor; +namespace EHR.Roles; public class Augmenter : RoleBase { diff --git a/Roles/Impostor/Bard.cs b/Roles/Standard/Impostor/Killing/Bard.cs similarity index 98% rename from Roles/Impostor/Bard.cs rename to Roles/Standard/Impostor/Killing/Bard.cs index 6d651ad66..241442dd9 100644 --- a/Roles/Impostor/Bard.cs +++ b/Roles/Standard/Impostor/Killing/Bard.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Bard : RoleBase { diff --git a/Roles/Impostor/Bomber.cs b/Roles/Standard/Impostor/Killing/Bomber.cs similarity index 99% rename from Roles/Impostor/Bomber.cs rename to Roles/Standard/Impostor/Killing/Bomber.cs index 82a70818e..b3cdfa4b4 100644 --- a/Roles/Impostor/Bomber.cs +++ b/Roles/Standard/Impostor/Killing/Bomber.cs @@ -1,11 +1,9 @@ using System; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Bomber : RoleBase { diff --git a/Roles/Impostor/BountyHunter.cs b/Roles/Standard/Impostor/Killing/BountyHunter.cs similarity index 97% rename from Roles/Impostor/BountyHunter.cs rename to Roles/Standard/Impostor/Killing/BountyHunter.cs index e1957375f..316398662 100644 --- a/Roles/Impostor/BountyHunter.cs +++ b/Roles/Standard/Impostor/Killing/BountyHunter.cs @@ -5,7 +5,7 @@ using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class BountyHunter : RoleBase { diff --git a/Roles/Impostor/Butcher.cs b/Roles/Standard/Impostor/Killing/Butcher.cs similarity index 99% rename from Roles/Impostor/Butcher.cs rename to Roles/Standard/Impostor/Killing/Butcher.cs index 945225f7d..74200eb9d 100644 --- a/Roles/Impostor/Butcher.cs +++ b/Roles/Standard/Impostor/Killing/Butcher.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using EHR.Modules; using Hazel; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Butcher : RoleBase { diff --git a/Roles/Impostor/Cantankerous.cs b/Roles/Standard/Impostor/Killing/Cantankerous.cs similarity index 98% rename from Roles/Impostor/Cantankerous.cs rename to Roles/Standard/Impostor/Killing/Cantankerous.cs index aa31f50af..dc9d3f4a0 100644 --- a/Roles/Impostor/Cantankerous.cs +++ b/Roles/Standard/Impostor/Killing/Cantankerous.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Cantankerous : RoleBase { diff --git a/Roles/Impostor/Chronomancer.cs b/Roles/Standard/Impostor/Killing/Chronomancer.cs similarity index 99% rename from Roles/Impostor/Chronomancer.cs rename to Roles/Standard/Impostor/Killing/Chronomancer.cs index 7cd3219b5..5ab8f65ed 100644 --- a/Roles/Impostor/Chronomancer.cs +++ b/Roles/Standard/Impostor/Killing/Chronomancer.cs @@ -3,7 +3,7 @@ using EHR.Modules; using Hazel; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Chronomancer : RoleBase { diff --git a/Roles/Impostor/Councillor.cs b/Roles/Standard/Impostor/Killing/Councillor.cs similarity index 97% rename from Roles/Impostor/Councillor.cs rename to Roles/Standard/Impostor/Killing/Councillor.cs index a44551091..926f7d30b 100644 --- a/Roles/Impostor/Councillor.cs +++ b/Roles/Standard/Impostor/Killing/Councillor.cs @@ -2,14 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Councillor : RoleBase { diff --git a/Roles/Impostor/EvilGuesser.cs b/Roles/Standard/Impostor/Killing/EvilGuesser.cs similarity index 97% rename from Roles/Impostor/EvilGuesser.cs rename to Roles/Standard/Impostor/Killing/EvilGuesser.cs index 2a0d53396..b6b9f3a55 100644 --- a/Roles/Impostor/EvilGuesser.cs +++ b/Roles/Standard/Impostor/Killing/EvilGuesser.cs @@ -1,7 +1,7 @@ using UnityEngine; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class EvilGuesser : RoleBase { diff --git a/Roles/Impostor/Fireworker.cs b/Roles/Standard/Impostor/Killing/Fireworker.cs similarity index 99% rename from Roles/Impostor/Fireworker.cs rename to Roles/Standard/Impostor/Killing/Fireworker.cs index 5b334b657..278f7fc2c 100644 --- a/Roles/Impostor/Fireworker.cs +++ b/Roles/Standard/Impostor/Killing/Fireworker.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Fireworker : RoleBase { diff --git a/Roles/Impostor/Greedy.cs b/Roles/Standard/Impostor/Killing/Greedy.cs similarity index 99% rename from Roles/Impostor/Greedy.cs rename to Roles/Standard/Impostor/Killing/Greedy.cs index 98897735d..92544ca7c 100644 --- a/Roles/Impostor/Greedy.cs +++ b/Roles/Standard/Impostor/Killing/Greedy.cs @@ -2,10 +2,9 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; -namespace EHR.Impostor; +namespace EHR.Roles; // Reference: https://github.com/Yumenopai/TownOfHost_Y public class Greedy : RoleBase // Also used for Pulse as the NK version of this diff --git a/Roles/Impostor/Hitman.cs b/Roles/Standard/Impostor/Killing/Hitman.cs similarity index 99% rename from Roles/Impostor/Hitman.cs rename to Roles/Standard/Impostor/Killing/Hitman.cs index dd7281229..e603ed61a 100644 --- a/Roles/Impostor/Hitman.cs +++ b/Roles/Standard/Impostor/Killing/Hitman.cs @@ -5,7 +5,7 @@ using Hazel; using static EHR.Options; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Hitman : RoleBase { diff --git a/Roles/Impostor/Inhibitor.cs b/Roles/Standard/Impostor/Killing/Inhibitor.cs similarity index 99% rename from Roles/Impostor/Inhibitor.cs rename to Roles/Standard/Impostor/Killing/Inhibitor.cs index a4b89a6e2..fec12ebfc 100644 --- a/Roles/Impostor/Inhibitor.cs +++ b/Roles/Standard/Impostor/Killing/Inhibitor.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Inhibitor : RoleBase { diff --git a/Roles/Impostor/Kamikaze.cs b/Roles/Standard/Impostor/Killing/Kamikaze.cs similarity index 98% rename from Roles/Impostor/Kamikaze.cs rename to Roles/Standard/Impostor/Killing/Kamikaze.cs index 8952750ab..2d6d3cd60 100644 --- a/Roles/Impostor/Kamikaze.cs +++ b/Roles/Standard/Impostor/Killing/Kamikaze.cs @@ -1,11 +1,9 @@ using System.Collections.Generic; using System.Linq; -using EHR.AddOns.Impostor; -using EHR.Crewmate; using static EHR.Options; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Kamikaze : RoleBase { diff --git a/Roles/Impostor/KillingMachine.cs b/Roles/Standard/Impostor/Killing/KillingMachine.cs similarity index 99% rename from Roles/Impostor/KillingMachine.cs rename to Roles/Standard/Impostor/Killing/KillingMachine.cs index b87d0360b..a915a40cf 100644 --- a/Roles/Impostor/KillingMachine.cs +++ b/Roles/Standard/Impostor/Killing/KillingMachine.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Impostor; +namespace EHR.Roles; internal class KillingMachine : RoleBase { diff --git a/Roles/Impostor/Lurker.cs b/Roles/Standard/Impostor/Killing/Lurker.cs similarity index 95% rename from Roles/Impostor/Lurker.cs rename to Roles/Standard/Impostor/Killing/Lurker.cs index 760357894..c5f9b1ccc 100644 --- a/Roles/Impostor/Lurker.cs +++ b/Roles/Standard/Impostor/Killing/Lurker.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Lurker : RoleBase { diff --git a/Roles/Impostor/Mafioso.cs b/Roles/Standard/Impostor/Killing/Mafioso.cs similarity index 99% rename from Roles/Impostor/Mafioso.cs rename to Roles/Standard/Impostor/Killing/Mafioso.cs index dbaf91008..532aa96e1 100644 --- a/Roles/Impostor/Mafioso.cs +++ b/Roles/Standard/Impostor/Killing/Mafioso.cs @@ -7,7 +7,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; /* * Tiers and their perks diff --git a/Roles/Impostor/Mercenary.cs b/Roles/Standard/Impostor/Killing/Mercenary.cs similarity index 99% rename from Roles/Impostor/Mercenary.cs rename to Roles/Standard/Impostor/Killing/Mercenary.cs index 2a04577e2..fab4c889c 100644 --- a/Roles/Impostor/Mercenary.cs +++ b/Roles/Standard/Impostor/Killing/Mercenary.cs @@ -3,7 +3,7 @@ using EHR.Modules; using EHR.Modules.Extensions; using Hazel; -namespace EHR.Impostor; +namespace EHR.Roles; public class Mercenary : RoleBase { diff --git a/Roles/Impostor/Nemesis.cs b/Roles/Standard/Impostor/Killing/Nemesis.cs similarity index 99% rename from Roles/Impostor/Nemesis.cs rename to Roles/Standard/Impostor/Killing/Nemesis.cs index b4834218c..972bb6e6e 100644 --- a/Roles/Impostor/Nemesis.cs +++ b/Roles/Standard/Impostor/Killing/Nemesis.cs @@ -3,13 +3,12 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Options; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Nemesis : RoleBase { diff --git a/Roles/Impostor/Ninja.cs b/Roles/Standard/Impostor/Killing/Ninja.cs similarity index 99% rename from Roles/Impostor/Ninja.cs rename to Roles/Standard/Impostor/Killing/Ninja.cs index 43494dc64..3e4c2ec0f 100644 --- a/Roles/Impostor/Ninja.cs +++ b/Roles/Standard/Impostor/Killing/Ninja.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Ninja : RoleBase { diff --git a/Roles/Impostor/Overheat.cs b/Roles/Standard/Impostor/Killing/Overheat.cs similarity index 99% rename from Roles/Impostor/Overheat.cs rename to Roles/Standard/Impostor/Killing/Overheat.cs index 3861dd4de..5b144fb79 100644 --- a/Roles/Impostor/Overheat.cs +++ b/Roles/Standard/Impostor/Killing/Overheat.cs @@ -2,7 +2,7 @@ using EHR.Modules; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Overheat : RoleBase { diff --git a/Roles/Impostor/Psychopath.cs b/Roles/Standard/Impostor/Killing/Psychopath.cs similarity index 98% rename from Roles/Impostor/Psychopath.cs rename to Roles/Standard/Impostor/Killing/Psychopath.cs index 1bbb59a44..7730077d5 100644 --- a/Roles/Impostor/Psychopath.cs +++ b/Roles/Standard/Impostor/Killing/Psychopath.cs @@ -3,7 +3,7 @@ using System.Linq; using AmongUs.GameOptions; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Psychopath : RoleBase { diff --git a/Roles/Impostor/QuickShooter.cs b/Roles/Standard/Impostor/Killing/QuickShooter.cs similarity index 96% rename from Roles/Impostor/QuickShooter.cs rename to Roles/Standard/Impostor/Killing/QuickShooter.cs index 9fc4676e2..2fcbf3906 100644 --- a/Roles/Impostor/QuickShooter.cs +++ b/Roles/Standard/Impostor/Killing/QuickShooter.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; internal class QuickShooter : RoleBase { diff --git a/Roles/Impostor/Saboteur.cs b/Roles/Standard/Impostor/Killing/Saboteur.cs similarity index 99% rename from Roles/Impostor/Saboteur.cs rename to Roles/Standard/Impostor/Killing/Saboteur.cs index 59d24c5bc..6e3451e47 100644 --- a/Roles/Impostor/Saboteur.cs +++ b/Roles/Standard/Impostor/Killing/Saboteur.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Saboteur : RoleBase { diff --git a/Roles/Impostor/Sapper.cs b/Roles/Standard/Impostor/Killing/Sapper.cs similarity index 99% rename from Roles/Impostor/Sapper.cs rename to Roles/Standard/Impostor/Killing/Sapper.cs index cec187d8a..5d7ed7ef1 100644 --- a/Roles/Impostor/Sapper.cs +++ b/Roles/Standard/Impostor/Killing/Sapper.cs @@ -2,12 +2,11 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Sapper : RoleBase { diff --git a/Roles/Impostor/Sniper.cs b/Roles/Standard/Impostor/Killing/Sniper.cs similarity index 96% rename from Roles/Impostor/Sniper.cs rename to Roles/Standard/Impostor/Killing/Sniper.cs index e11cd0842..be72648d2 100644 --- a/Roles/Impostor/Sniper.cs +++ b/Roles/Standard/Impostor/Killing/Sniper.cs @@ -1,14 +1,12 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Sniper : RoleBase { diff --git a/Roles/Impostor/Trapster.cs b/Roles/Standard/Impostor/Killing/Trapster.cs similarity index 99% rename from Roles/Impostor/Trapster.cs rename to Roles/Standard/Impostor/Killing/Trapster.cs index 46a8b106e..722f5fdf1 100644 --- a/Roles/Impostor/Trapster.cs +++ b/Roles/Standard/Impostor/Killing/Trapster.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using EHR.Modules; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Trapster : RoleBase { diff --git a/Roles/Impostor/Wasp.cs b/Roles/Standard/Impostor/Killing/Wasp.cs similarity index 99% rename from Roles/Impostor/Wasp.cs rename to Roles/Standard/Impostor/Killing/Wasp.cs index ee9bef5cb..4713a0ab9 100644 --- a/Roles/Impostor/Wasp.cs +++ b/Roles/Standard/Impostor/Killing/Wasp.cs @@ -6,7 +6,7 @@ using EHR.Modules; using EHR.Patches; using Hazel; -namespace EHR.Impostor; +namespace EHR.Roles; public class Wasp : RoleBase { diff --git a/Roles/Impostor/Wiper.cs b/Roles/Standard/Impostor/Killing/Wiper.cs similarity index 99% rename from Roles/Impostor/Wiper.cs rename to Roles/Standard/Impostor/Killing/Wiper.cs index 3100222da..e0782730a 100644 --- a/Roles/Impostor/Wiper.cs +++ b/Roles/Standard/Impostor/Killing/Wiper.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Wiper : RoleBase { diff --git a/Roles/Impostor/Witch.cs b/Roles/Standard/Impostor/Killing/Witch.cs similarity index 96% rename from Roles/Impostor/Witch.cs rename to Roles/Standard/Impostor/Killing/Witch.cs index 2e5ba9da3..46cbe43cc 100644 --- a/Roles/Impostor/Witch.cs +++ b/Roles/Standard/Impostor/Killing/Witch.cs @@ -2,16 +2,14 @@ using System; using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using EHR.Patches; using Hazel; using UnityEngine; using static EHR.Options; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Witch : RoleBase { diff --git a/Roles/Impostor/Zombie.cs b/Roles/Standard/Impostor/Killing/Zombie.cs similarity index 99% rename from Roles/Impostor/Zombie.cs rename to Roles/Standard/Impostor/Killing/Zombie.cs index fbbc72b7d..e0f3ecf6d 100644 --- a/Roles/Impostor/Zombie.cs +++ b/Roles/Standard/Impostor/Killing/Zombie.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Zombie : RoleBase { diff --git a/Roles/Impostor/Crewpostor.cs b/Roles/Standard/Impostor/Madmate/Crewpostor.cs similarity index 99% rename from Roles/Impostor/Crewpostor.cs rename to Roles/Standard/Impostor/Madmate/Crewpostor.cs index f93dfaf7e..f0f1475d6 100644 --- a/Roles/Impostor/Crewpostor.cs +++ b/Roles/Standard/Impostor/Madmate/Crewpostor.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Crewpostor : RoleBase { diff --git a/Roles/Impostor/Hypocrite.cs b/Roles/Standard/Impostor/Madmate/Hypocrite.cs similarity index 99% rename from Roles/Impostor/Hypocrite.cs rename to Roles/Standard/Impostor/Madmate/Hypocrite.cs index 120d3be5e..4b3c7f586 100644 --- a/Roles/Impostor/Hypocrite.cs +++ b/Roles/Standard/Impostor/Madmate/Hypocrite.cs @@ -1,6 +1,6 @@ using EHR.Modules; -namespace EHR.Impostor; +namespace EHR.Roles; public class Hypocrite : RoleBase { diff --git a/Roles/Impostor/Parasite.cs b/Roles/Standard/Impostor/Madmate/Parasite.cs similarity index 98% rename from Roles/Impostor/Parasite.cs rename to Roles/Standard/Impostor/Madmate/Parasite.cs index 748a6cde2..2cb9366f7 100644 --- a/Roles/Impostor/Parasite.cs +++ b/Roles/Standard/Impostor/Madmate/Parasite.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Parasite : RoleBase { diff --git a/Roles/Impostor/Renegade.cs b/Roles/Standard/Impostor/Madmate/Renegade.cs similarity index 96% rename from Roles/Impostor/Renegade.cs rename to Roles/Standard/Impostor/Madmate/Renegade.cs index 3134b53a6..611184d79 100644 --- a/Roles/Impostor/Renegade.cs +++ b/Roles/Standard/Impostor/Madmate/Renegade.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Renegade : RoleBase { diff --git a/Roles/Impostor/AntiAdminer.cs b/Roles/Standard/Impostor/Miscellaneous/AntiAdminer.cs similarity index 97% rename from Roles/Impostor/AntiAdminer.cs rename to Roles/Standard/Impostor/Miscellaneous/AntiAdminer.cs index 738f44e75..bb8237f42 100644 --- a/Roles/Impostor/AntiAdminer.cs +++ b/Roles/Standard/Impostor/Miscellaneous/AntiAdminer.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -namespace EHR.Impostor; +namespace EHR.Roles; // Reference: https://github.com/ykundesu/SuperNewRoles/blob/master/SuperNewRoles/Mode/SuperHostRoles/BlockTool.cs // Reference: https://github.com/Yumenopai/TownOfHost_Y/tree/AntiAdminer diff --git a/Roles/Impostor/Changeling.cs b/Roles/Standard/Impostor/Miscellaneous/Changeling.cs similarity index 99% rename from Roles/Impostor/Changeling.cs rename to Roles/Standard/Impostor/Miscellaneous/Changeling.cs index aabd2bf95..82c976798 100644 --- a/Roles/Impostor/Changeling.cs +++ b/Roles/Standard/Impostor/Miscellaneous/Changeling.cs @@ -5,7 +5,7 @@ using AmongUs.GameOptions; using EHR.Modules; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Changeling : RoleBase { diff --git a/Roles/Impostor/Consigliere.cs b/Roles/Standard/Impostor/Miscellaneous/Consigliere.cs similarity index 99% rename from Roles/Impostor/Consigliere.cs rename to Roles/Standard/Impostor/Miscellaneous/Consigliere.cs index a14f9b5d2..23b9739d5 100644 --- a/Roles/Impostor/Consigliere.cs +++ b/Roles/Standard/Impostor/Miscellaneous/Consigliere.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Consigliere : RoleBase { diff --git a/Roles/Impostor/CursedWolf.cs b/Roles/Standard/Impostor/Miscellaneous/CursedWolf.cs similarity index 98% rename from Roles/Impostor/CursedWolf.cs rename to Roles/Standard/Impostor/Miscellaneous/CursedWolf.cs index 121f2d3ef..267936da4 100644 --- a/Roles/Impostor/CursedWolf.cs +++ b/Roles/Standard/Impostor/Miscellaneous/CursedWolf.cs @@ -1,7 +1,6 @@ using AmongUs.GameOptions; -using EHR.Neutral; -namespace EHR.Impostor; +namespace EHR.Roles; internal class CursedWolf : RoleBase { diff --git a/Roles/Impostor/EvilTracker.cs b/Roles/Standard/Impostor/Miscellaneous/EvilTracker.cs similarity index 97% rename from Roles/Impostor/EvilTracker.cs rename to Roles/Standard/Impostor/Miscellaneous/EvilTracker.cs index f9c3840ea..40fab3b67 100644 --- a/Roles/Impostor/EvilTracker.cs +++ b/Roles/Standard/Impostor/Miscellaneous/EvilTracker.cs @@ -9,7 +9,7 @@ using UnityEngine; using static EHR.Options; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class EvilTracker : RoleBase { diff --git a/Roles/Impostor/Gambler.cs b/Roles/Standard/Impostor/Miscellaneous/Gambler.cs similarity index 99% rename from Roles/Impostor/Gambler.cs rename to Roles/Standard/Impostor/Miscellaneous/Gambler.cs index 4fc2772a5..73f9e28cc 100644 --- a/Roles/Impostor/Gambler.cs +++ b/Roles/Standard/Impostor/Miscellaneous/Gambler.cs @@ -2,13 +2,11 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; -using EHR.Neutral; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Gambler : RoleBase { diff --git a/Roles/Impostor/Generator.cs b/Roles/Standard/Impostor/Miscellaneous/Generator.cs similarity index 99% rename from Roles/Impostor/Generator.cs rename to Roles/Standard/Impostor/Miscellaneous/Generator.cs index d507aaba3..f1f37d710 100644 --- a/Roles/Impostor/Generator.cs +++ b/Roles/Standard/Impostor/Miscellaneous/Generator.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; internal static class GeneratorStatic { diff --git a/Roles/Impostor/Loner.cs b/Roles/Standard/Impostor/Miscellaneous/Loner.cs similarity index 97% rename from Roles/Impostor/Loner.cs rename to Roles/Standard/Impostor/Miscellaneous/Loner.cs index a4f7bb681..8f90d2e6e 100644 --- a/Roles/Impostor/Loner.cs +++ b/Roles/Standard/Impostor/Miscellaneous/Loner.cs @@ -1,9 +1,8 @@ using System; using System.Linq; using EHR.Modules; -using EHR.Neutral; -namespace EHR.Impostor; +namespace EHR.Roles; public class Loner : RoleBase { diff --git a/Roles/Impostor/Visionary.cs b/Roles/Standard/Impostor/Miscellaneous/Visionary.cs similarity index 99% rename from Roles/Impostor/Visionary.cs rename to Roles/Standard/Impostor/Miscellaneous/Visionary.cs index 28df9a95a..dde3f11b0 100644 --- a/Roles/Impostor/Visionary.cs +++ b/Roles/Standard/Impostor/Miscellaneous/Visionary.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Visionary : RoleBase { diff --git a/Roles/Impostor/Wildling.cs b/Roles/Standard/Impostor/Miscellaneous/Wildling.cs similarity index 96% rename from Roles/Impostor/Wildling.cs rename to Roles/Standard/Impostor/Miscellaneous/Wildling.cs index e18d92c76..1772155c2 100644 --- a/Roles/Impostor/Wildling.cs +++ b/Roles/Standard/Impostor/Miscellaneous/Wildling.cs @@ -2,11 +2,10 @@ using System; using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using Hazel; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Wildling : RoleBase { diff --git a/Roles/Impostor/Blackmailer.cs b/Roles/Standard/Impostor/Support/Blackmailer.cs similarity index 99% rename from Roles/Impostor/Blackmailer.cs rename to Roles/Standard/Impostor/Support/Blackmailer.cs index 0be71a9d3..84cb592e4 100644 --- a/Roles/Impostor/Blackmailer.cs +++ b/Roles/Standard/Impostor/Support/Blackmailer.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -using EHR.Neutral; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Blackmailer : RoleBase { diff --git a/Roles/Impostor/Camouflager.cs b/Roles/Standard/Impostor/Support/Camouflager.cs similarity index 96% rename from Roles/Impostor/Camouflager.cs rename to Roles/Standard/Impostor/Support/Camouflager.cs index 4d038a026..2bf58f5e8 100644 --- a/Roles/Impostor/Camouflager.cs +++ b/Roles/Standard/Impostor/Support/Camouflager.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; public class Camouflager : RoleBase { diff --git a/Roles/Impostor/Capitalist.cs b/Roles/Standard/Impostor/Support/Capitalist.cs similarity index 98% rename from Roles/Impostor/Capitalist.cs rename to Roles/Standard/Impostor/Support/Capitalist.cs index ab63ddd6a..c2f5bd843 100644 --- a/Roles/Impostor/Capitalist.cs +++ b/Roles/Standard/Impostor/Support/Capitalist.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Capitalist : RoleBase { diff --git a/Roles/Impostor/Catalyst.cs b/Roles/Standard/Impostor/Support/Catalyst.cs similarity index 98% rename from Roles/Impostor/Catalyst.cs rename to Roles/Standard/Impostor/Support/Catalyst.cs index 485e0eb93..7465bc658 100644 --- a/Roles/Impostor/Catalyst.cs +++ b/Roles/Standard/Impostor/Support/Catalyst.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace EHR.Impostor; +namespace EHR.Roles; public class Catalyst : RoleBase { diff --git a/Roles/Impostor/Centralizer.cs b/Roles/Standard/Impostor/Support/Centralizer.cs similarity index 99% rename from Roles/Impostor/Centralizer.cs rename to Roles/Standard/Impostor/Support/Centralizer.cs index 2af46131d..0e17ccc5c 100644 --- a/Roles/Impostor/Centralizer.cs +++ b/Roles/Standard/Impostor/Support/Centralizer.cs @@ -1,7 +1,7 @@ using System.Linq; using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; public class Centralizer : RoleBase { diff --git a/Roles/Impostor/Cleaner.cs b/Roles/Standard/Impostor/Support/Cleaner.cs similarity index 99% rename from Roles/Impostor/Cleaner.cs rename to Roles/Standard/Impostor/Support/Cleaner.cs index aba4784d6..daa54001b 100644 --- a/Roles/Impostor/Cleaner.cs +++ b/Roles/Standard/Impostor/Support/Cleaner.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Neutral; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Cleaner : RoleBase { diff --git a/Roles/Impostor/ClockBlocker.cs b/Roles/Standard/Impostor/Support/ClockBlocker.cs similarity index 98% rename from Roles/Impostor/ClockBlocker.cs rename to Roles/Standard/Impostor/Support/ClockBlocker.cs index def1f5fb7..f013aeda5 100644 --- a/Roles/Impostor/ClockBlocker.cs +++ b/Roles/Standard/Impostor/Support/ClockBlocker.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace EHR.Impostor; +namespace EHR.Roles; public class ClockBlocker : RoleBase { diff --git a/Roles/Impostor/Commander.cs b/Roles/Standard/Impostor/Support/Commander.cs similarity index 99% rename from Roles/Impostor/Commander.cs rename to Roles/Standard/Impostor/Support/Commander.cs index 7146d6b55..aa6b48ac8 100644 --- a/Roles/Impostor/Commander.cs +++ b/Roles/Standard/Impostor/Support/Commander.cs @@ -6,7 +6,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Commander : RoleBase { diff --git a/Roles/Impostor/Consort.cs b/Roles/Standard/Impostor/Support/Consort.cs similarity index 98% rename from Roles/Impostor/Consort.cs rename to Roles/Standard/Impostor/Support/Consort.cs index 550e11d51..02430d20f 100644 --- a/Roles/Impostor/Consort.cs +++ b/Roles/Standard/Impostor/Support/Consort.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Consort : RoleBase { diff --git a/Roles/Impostor/Dazzler.cs b/Roles/Standard/Impostor/Support/Dazzler.cs similarity index 96% rename from Roles/Impostor/Dazzler.cs rename to Roles/Standard/Impostor/Support/Dazzler.cs index e3542e646..0472a778d 100644 --- a/Roles/Impostor/Dazzler.cs +++ b/Roles/Standard/Impostor/Support/Dazzler.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Neutral; using static EHR.Options; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Dazzler : RoleBase { diff --git a/Roles/Impostor/Deathpact.cs b/Roles/Standard/Impostor/Support/Deathpact.cs similarity index 97% rename from Roles/Impostor/Deathpact.cs rename to Roles/Standard/Impostor/Support/Deathpact.cs index b9fee6aac..d354705b8 100644 --- a/Roles/Impostor/Deathpact.cs +++ b/Roles/Standard/Impostor/Support/Deathpact.cs @@ -1,15 +1,13 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; -using EHR.Neutral; using UnityEngine; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Deathpact : RoleBase { diff --git a/Roles/Impostor/Devourer.cs b/Roles/Standard/Impostor/Support/Devourer.cs similarity index 96% rename from Roles/Impostor/Devourer.cs rename to Roles/Standard/Impostor/Support/Devourer.cs index 4aeaca361..1a0dec2c5 100644 --- a/Roles/Impostor/Devourer.cs +++ b/Roles/Standard/Impostor/Support/Devourer.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Neutral; using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Devourer : RoleBase { diff --git a/Roles/Impostor/Disperser.cs b/Roles/Standard/Impostor/Support/Disperser.cs similarity index 96% rename from Roles/Impostor/Disperser.cs rename to Roles/Standard/Impostor/Support/Disperser.cs index bd267588e..5d2f84892 100644 --- a/Roles/Impostor/Disperser.cs +++ b/Roles/Standard/Impostor/Support/Disperser.cs @@ -4,7 +4,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Disperser : RoleBase { diff --git a/Roles/Impostor/EvilEraser.cs b/Roles/Standard/Impostor/Support/EvilEraser.cs similarity index 99% rename from Roles/Impostor/EvilEraser.cs rename to Roles/Standard/Impostor/Support/EvilEraser.cs index 8fbef5ba1..ee285dc02 100644 --- a/Roles/Impostor/EvilEraser.cs +++ b/Roles/Standard/Impostor/Support/EvilEraser.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using EHR.Neutral; using Hazel; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; internal class EvilEraser : RoleBase { diff --git a/Roles/Impostor/Framer.cs b/Roles/Standard/Impostor/Support/Framer.cs similarity index 98% rename from Roles/Impostor/Framer.cs rename to Roles/Standard/Impostor/Support/Framer.cs index 6cd14578c..120ad83bf 100644 --- a/Roles/Impostor/Framer.cs +++ b/Roles/Standard/Impostor/Support/Framer.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EHR.Impostor; +namespace EHR.Roles; public class Framer : RoleBase { diff --git a/Roles/Impostor/Freezer.cs b/Roles/Standard/Impostor/Support/Freezer.cs similarity index 98% rename from Roles/Impostor/Freezer.cs rename to Roles/Standard/Impostor/Support/Freezer.cs index 093ea35f8..b56c9900b 100644 --- a/Roles/Impostor/Freezer.cs +++ b/Roles/Standard/Impostor/Support/Freezer.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Freezer : RoleBase { diff --git a/Roles/Impostor/Gangster.cs b/Roles/Standard/Impostor/Support/Gangster.cs similarity index 97% rename from Roles/Impostor/Gangster.cs rename to Roles/Standard/Impostor/Support/Gangster.cs index 4e83373d2..14a7b4a8c 100644 --- a/Roles/Impostor/Gangster.cs +++ b/Roles/Standard/Impostor/Support/Gangster.cs @@ -2,7 +2,7 @@ using Hazel; using static EHR.Translator; -namespace EHR.Impostor; +namespace EHR.Roles; public class Gangster : RoleBase { diff --git a/Roles/Impostor/Godfather.cs b/Roles/Standard/Impostor/Support/Godfather.cs similarity index 96% rename from Roles/Impostor/Godfather.cs rename to Roles/Standard/Impostor/Support/Godfather.cs index 4848bf880..802a09f4b 100644 --- a/Roles/Impostor/Godfather.cs +++ b/Roles/Standard/Impostor/Support/Godfather.cs @@ -1,6 +1,4 @@ -using EHR.Neutral; - -namespace EHR.Impostor; +namespace EHR.Roles; internal class Godfather : RoleBase { diff --git a/Roles/Impostor/Hypnotist.cs b/Roles/Standard/Impostor/Support/Hypnotist.cs similarity index 99% rename from Roles/Impostor/Hypnotist.cs rename to Roles/Standard/Impostor/Support/Hypnotist.cs index 7c024168b..291f0d280 100644 --- a/Roles/Impostor/Hypnotist.cs +++ b/Roles/Standard/Impostor/Support/Hypnotist.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Impostor; +namespace EHR.Roles; public class Hypnotist : RoleBase { diff --git a/Roles/Impostor/Librarian.cs b/Roles/Standard/Impostor/Support/Librarian.cs similarity index 99% rename from Roles/Impostor/Librarian.cs rename to Roles/Standard/Impostor/Support/Librarian.cs index 898d98626..43d4186fa 100644 --- a/Roles/Impostor/Librarian.cs +++ b/Roles/Standard/Impostor/Support/Librarian.cs @@ -6,7 +6,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Librarian : RoleBase { diff --git a/Roles/Impostor/Nullifier.cs b/Roles/Standard/Impostor/Support/Nullifier.cs similarity index 98% rename from Roles/Impostor/Nullifier.cs rename to Roles/Standard/Impostor/Support/Nullifier.cs index 68f1a8543..5f94a5f4b 100644 --- a/Roles/Impostor/Nullifier.cs +++ b/Roles/Standard/Impostor/Support/Nullifier.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using EHR.Crewmate; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Nullifier : RoleBase { diff --git a/Roles/Impostor/Occultist.cs b/Roles/Standard/Impostor/Support/Occultist.cs similarity index 99% rename from Roles/Impostor/Occultist.cs rename to Roles/Standard/Impostor/Support/Occultist.cs index eb7315259..08a183c5f 100644 --- a/Roles/Impostor/Occultist.cs +++ b/Roles/Standard/Impostor/Support/Occultist.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using EHR.Modules; -namespace EHR.Impostor; +namespace EHR.Roles; public class Occultist : RoleBase { diff --git a/Roles/Impostor/Silencer.cs b/Roles/Standard/Impostor/Support/Silencer.cs similarity index 99% rename from Roles/Impostor/Silencer.cs rename to Roles/Standard/Impostor/Support/Silencer.cs index c2f5633a0..d085d4e48 100644 --- a/Roles/Impostor/Silencer.cs +++ b/Roles/Standard/Impostor/Support/Silencer.cs @@ -1,14 +1,13 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; using Epic.OnlineServices.PlayerDataStorage; using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; public class Silencer : RoleBase { diff --git a/Roles/Impostor/Swapster.cs b/Roles/Standard/Impostor/Support/Swapster.cs similarity index 98% rename from Roles/Impostor/Swapster.cs rename to Roles/Standard/Impostor/Support/Swapster.cs index 70a76b68d..f483543d5 100644 --- a/Roles/Impostor/Swapster.cs +++ b/Roles/Standard/Impostor/Support/Swapster.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Swapster : RoleBase { diff --git a/Roles/Impostor/TimeThief.cs b/Roles/Standard/Impostor/Support/TimeThief.cs similarity index 96% rename from Roles/Impostor/TimeThief.cs rename to Roles/Standard/Impostor/Support/TimeThief.cs index 602434d53..2a12d558c 100644 --- a/Roles/Impostor/TimeThief.cs +++ b/Roles/Standard/Impostor/Support/TimeThief.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace EHR.Impostor; +namespace EHR.Roles; public class TimeThief : RoleBase { diff --git a/Roles/Impostor/Twister.cs b/Roles/Standard/Impostor/Support/Twister.cs similarity index 96% rename from Roles/Impostor/Twister.cs rename to Roles/Standard/Impostor/Support/Twister.cs index c6c86a445..af4f5022a 100644 --- a/Roles/Impostor/Twister.cs +++ b/Roles/Standard/Impostor/Support/Twister.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Neutral; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class Twister : RoleBase { diff --git a/Roles/Impostor/Ventriloquist.cs b/Roles/Standard/Impostor/Support/Ventriloquist.cs similarity index 98% rename from Roles/Impostor/Ventriloquist.cs rename to Roles/Standard/Impostor/Support/Ventriloquist.cs index 85259c0ce..30ad9947b 100644 --- a/Roles/Impostor/Ventriloquist.cs +++ b/Roles/Standard/Impostor/Support/Ventriloquist.cs @@ -1,11 +1,10 @@ using System; using System.Linq; using EHR.Modules; -using EHR.Neutral; using Hazel; using UnityEngine; -namespace EHR.Impostor; +namespace EHR.Roles; public class Ventriloquist : RoleBase { diff --git a/Roles/Impostor/Vindicator.cs b/Roles/Standard/Impostor/Support/Vindicator.cs similarity index 96% rename from Roles/Impostor/Vindicator.cs rename to Roles/Standard/Impostor/Support/Vindicator.cs index 9ade25007..cf1d138a1 100644 --- a/Roles/Impostor/Vindicator.cs +++ b/Roles/Standard/Impostor/Support/Vindicator.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class Vindicator : RoleBase { diff --git a/Roles/Impostor/YinYanger.cs b/Roles/Standard/Impostor/Support/YinYanger.cs similarity index 99% rename from Roles/Impostor/YinYanger.cs rename to Roles/Standard/Impostor/Support/YinYanger.cs index 6a453c1f0..2dc8aa2ca 100644 --- a/Roles/Impostor/YinYanger.cs +++ b/Roles/Standard/Impostor/Support/YinYanger.cs @@ -4,7 +4,7 @@ using Hazel; using static EHR.Options; using static EHR.Utils; -namespace EHR.Impostor; +namespace EHR.Roles; public class YinYanger : RoleBase { diff --git a/Roles/Impostor/ImpostorVanillaRoles.cs b/Roles/Standard/Impostor/Vanilla/ImpostorVanillaRoles.cs similarity index 98% rename from Roles/Impostor/ImpostorVanillaRoles.cs rename to Roles/Standard/Impostor/Vanilla/ImpostorVanillaRoles.cs index 4444d1fbf..2f566ef23 100644 --- a/Roles/Impostor/ImpostorVanillaRoles.cs +++ b/Roles/Standard/Impostor/Vanilla/ImpostorVanillaRoles.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Impostor; +namespace EHR.Roles; internal class ImpostorVanillaRoles : IVanillaSettingHolder { diff --git a/Roles/Impostor/PhantomEHR.cs b/Roles/Standard/Impostor/Vanilla/PhantomEHR.cs similarity index 96% rename from Roles/Impostor/PhantomEHR.cs rename to Roles/Standard/Impostor/Vanilla/PhantomEHR.cs index f33da0cfa..ed1065a2e 100644 --- a/Roles/Impostor/PhantomEHR.cs +++ b/Roles/Standard/Impostor/Vanilla/PhantomEHR.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Impostor; +namespace EHR.Roles; public class PhantomEHR : RoleBase { diff --git a/Roles/Neutral/Amnesiac.cs b/Roles/Standard/Neutral/Benign/Amnesiac.cs similarity index 97% rename from Roles/Neutral/Amnesiac.cs rename to Roles/Standard/Neutral/Benign/Amnesiac.cs index 547ca6ccd..01c4241a8 100644 --- a/Roles/Neutral/Amnesiac.cs +++ b/Roles/Standard/Neutral/Benign/Amnesiac.cs @@ -7,7 +7,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Amnesiac : RoleBase { diff --git a/Roles/Neutral/Backstabber.cs b/Roles/Standard/Neutral/Benign/Backstabber.cs similarity index 99% rename from Roles/Neutral/Backstabber.cs rename to Roles/Standard/Neutral/Benign/Backstabber.cs index c58fe27b2..27624cf6c 100644 --- a/Roles/Neutral/Backstabber.cs +++ b/Roles/Standard/Neutral/Benign/Backstabber.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Neutral; +namespace EHR.Roles; public class Backstabber : RoleBase { diff --git a/Roles/Neutral/Dealer.cs b/Roles/Standard/Neutral/Benign/Dealer.cs similarity index 99% rename from Roles/Neutral/Dealer.cs rename to Roles/Standard/Neutral/Benign/Dealer.cs index 0aa2c3c1b..2a1c5cc0c 100644 --- a/Roles/Neutral/Dealer.cs +++ b/Roles/Standard/Neutral/Benign/Dealer.cs @@ -4,7 +4,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Dealer : RoleBase { diff --git a/Roles/Neutral/Follower.cs b/Roles/Standard/Neutral/Benign/Follower.cs similarity index 99% rename from Roles/Neutral/Follower.cs rename to Roles/Standard/Neutral/Benign/Follower.cs index c02320075..b6e6554d7 100644 --- a/Roles/Neutral/Follower.cs +++ b/Roles/Standard/Neutral/Benign/Follower.cs @@ -6,7 +6,7 @@ using static EHR.Options; using static EHR.Translator; using Math = System.Math; -namespace EHR.Neutral; +namespace EHR.Roles; public class Follower : RoleBase { diff --git a/Roles/Neutral/Hater.cs b/Roles/Standard/Neutral/Benign/Hater.cs similarity index 99% rename from Roles/Neutral/Hater.cs rename to Roles/Standard/Neutral/Benign/Hater.cs index 6c4c73b47..4e201ff0b 100644 --- a/Roles/Neutral/Hater.cs +++ b/Roles/Standard/Neutral/Benign/Hater.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Hater : RoleBase { diff --git a/Roles/Neutral/Impartial.cs b/Roles/Standard/Neutral/Benign/Impartial.cs similarity index 99% rename from Roles/Neutral/Impartial.cs rename to Roles/Standard/Neutral/Benign/Impartial.cs index 5bdd2e5e8..95dc49d9a 100644 --- a/Roles/Neutral/Impartial.cs +++ b/Roles/Standard/Neutral/Benign/Impartial.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Impartial : RoleBase { diff --git a/Roles/Neutral/Investor.cs b/Roles/Standard/Neutral/Benign/Investor.cs similarity index 98% rename from Roles/Neutral/Investor.cs rename to Roles/Standard/Neutral/Benign/Investor.cs index 9578fa779..6f85c09c1 100644 --- a/Roles/Neutral/Investor.cs +++ b/Roles/Standard/Neutral/Benign/Investor.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Investor : RoleBase { diff --git a/Roles/Neutral/Lawyer.cs b/Roles/Standard/Neutral/Benign/Lawyer.cs similarity index 97% rename from Roles/Neutral/Lawyer.cs rename to Roles/Standard/Neutral/Benign/Lawyer.cs index 357f559e7..245f64bd4 100644 --- a/Roles/Neutral/Lawyer.cs +++ b/Roles/Standard/Neutral/Benign/Lawyer.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Lawyer : RoleBase { diff --git a/Roles/Neutral/Maverick.cs b/Roles/Standard/Neutral/Benign/Maverick.cs similarity index 95% rename from Roles/Neutral/Maverick.cs rename to Roles/Standard/Neutral/Benign/Maverick.cs index 6ed11a78a..c8d046396 100644 --- a/Roles/Neutral/Maverick.cs +++ b/Roles/Standard/Neutral/Benign/Maverick.cs @@ -4,7 +4,7 @@ using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Maverick : RoleBase { diff --git a/Roles/Neutral/NecroGuesser.cs b/Roles/Standard/Neutral/Benign/NecroGuesser.cs similarity index 95% rename from Roles/Neutral/NecroGuesser.cs rename to Roles/Standard/Neutral/Benign/NecroGuesser.cs index 74d19d379..321742e76 100644 --- a/Roles/Neutral/NecroGuesser.cs +++ b/Roles/Standard/Neutral/Benign/NecroGuesser.cs @@ -1,4 +1,4 @@ -namespace EHR.Neutral; +namespace EHR.Roles; public class NecroGuesser : RoleBase { diff --git a/Roles/Neutral/Opportunist.cs b/Roles/Standard/Neutral/Benign/Opportunist.cs similarity index 98% rename from Roles/Neutral/Opportunist.cs rename to Roles/Standard/Neutral/Benign/Opportunist.cs index 227dd8d7f..30a51f8f6 100644 --- a/Roles/Neutral/Opportunist.cs +++ b/Roles/Standard/Neutral/Benign/Opportunist.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Opportunist : RoleBase { diff --git a/Roles/Neutral/Pawn.cs b/Roles/Standard/Neutral/Benign/Pawn.cs similarity index 97% rename from Roles/Neutral/Pawn.cs rename to Roles/Standard/Neutral/Benign/Pawn.cs index fca988a87..a43a3943b 100644 --- a/Roles/Neutral/Pawn.cs +++ b/Roles/Standard/Neutral/Benign/Pawn.cs @@ -1,6 +1,6 @@ using EHR.Modules; -namespace EHR.Neutral; +namespace EHR.Roles; public class Pawn : RoleBase { diff --git a/Roles/Neutral/Postman.cs b/Roles/Standard/Neutral/Benign/Postman.cs similarity index 99% rename from Roles/Neutral/Postman.cs rename to Roles/Standard/Neutral/Benign/Postman.cs index 0cfd0e81d..9bb179018 100644 --- a/Roles/Neutral/Postman.cs +++ b/Roles/Standard/Neutral/Benign/Postman.cs @@ -4,7 +4,7 @@ using EHR.Modules; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Postman : RoleBase { diff --git a/Roles/Neutral/Predator.cs b/Roles/Standard/Neutral/Benign/Predator.cs similarity index 99% rename from Roles/Neutral/Predator.cs rename to Roles/Standard/Neutral/Benign/Predator.cs index dbbd3762d..1e7072533 100644 --- a/Roles/Neutral/Predator.cs +++ b/Roles/Standard/Neutral/Benign/Predator.cs @@ -6,7 +6,7 @@ using EHR.Modules; using HarmonyLib; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Predator : RoleBase { diff --git a/Roles/Neutral/Provocateur.cs b/Roles/Standard/Neutral/Benign/Provocateur.cs similarity index 98% rename from Roles/Neutral/Provocateur.cs rename to Roles/Standard/Neutral/Benign/Provocateur.cs index 512c0a6c1..f5aefb0a9 100644 --- a/Roles/Neutral/Provocateur.cs +++ b/Roles/Standard/Neutral/Benign/Provocateur.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Provocateur : RoleBase { diff --git a/Roles/Neutral/Pursuer.cs b/Roles/Standard/Neutral/Benign/Pursuer.cs similarity index 96% rename from Roles/Neutral/Pursuer.cs rename to Roles/Standard/Neutral/Benign/Pursuer.cs index 205cafd64..daa67bb70 100644 --- a/Roles/Neutral/Pursuer.cs +++ b/Roles/Standard/Neutral/Benign/Pursuer.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using EHR.Modules; -namespace EHR.Neutral; +namespace EHR.Roles; public class Pursuer : RoleBase { diff --git a/Roles/Neutral/Revolutionist.cs b/Roles/Standard/Neutral/Benign/Revolutionist.cs similarity index 99% rename from Roles/Neutral/Revolutionist.cs rename to Roles/Standard/Neutral/Benign/Revolutionist.cs index a1f26356d..aad440939 100644 --- a/Roles/Neutral/Revolutionist.cs +++ b/Roles/Standard/Neutral/Benign/Revolutionist.cs @@ -4,7 +4,7 @@ using EHR.Modules; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Revolutionist : RoleBase { diff --git a/Roles/Neutral/Romantic.cs b/Roles/Standard/Neutral/Benign/Romantic.cs similarity index 97% rename from Roles/Neutral/Romantic.cs rename to Roles/Standard/Neutral/Benign/Romantic.cs index 327631cb0..063bd3c22 100644 --- a/Roles/Neutral/Romantic.cs +++ b/Roles/Standard/Neutral/Benign/Romantic.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Romantic : RoleBase { diff --git a/Roles/Neutral/RoomRusher.cs b/Roles/Standard/Neutral/Benign/RoomRusher.cs similarity index 99% rename from Roles/Neutral/RoomRusher.cs rename to Roles/Standard/Neutral/Benign/RoomRusher.cs index 378ddbb39..13278dd09 100644 --- a/Roles/Neutral/RoomRusher.cs +++ b/Roles/Standard/Neutral/Benign/RoomRusher.cs @@ -2,11 +2,12 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; +using EHR.Gamemodes; using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class RoomRusher : RoleBase { diff --git a/Roles/Neutral/SchrodingersCat.cs b/Roles/Standard/Neutral/Benign/SchrodingersCat.cs similarity index 98% rename from Roles/Neutral/SchrodingersCat.cs rename to Roles/Standard/Neutral/Benign/SchrodingersCat.cs index 1b8d55ffe..ba0be2a09 100644 --- a/Roles/Neutral/SchrodingersCat.cs +++ b/Roles/Standard/Neutral/Benign/SchrodingersCat.cs @@ -1,6 +1,6 @@ using Hazel; -namespace EHR.Impostor; +namespace EHR.Roles; internal class SchrodingersCat : RoleBase { diff --git a/Roles/Neutral/Shifter.cs b/Roles/Standard/Neutral/Benign/Shifter.cs similarity index 99% rename from Roles/Neutral/Shifter.cs rename to Roles/Standard/Neutral/Benign/Shifter.cs index a2d72680e..f47599452 100644 --- a/Roles/Neutral/Shifter.cs +++ b/Roles/Standard/Neutral/Benign/Shifter.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using EHR.Modules; using EHR.Patches; -namespace EHR.Neutral; +namespace EHR.Roles; public class Shifter : RoleBase { diff --git a/Roles/Neutral/SoulHunter.cs b/Roles/Standard/Neutral/Benign/SoulHunter.cs similarity index 99% rename from Roles/Neutral/SoulHunter.cs rename to Roles/Standard/Neutral/Benign/SoulHunter.cs index 21368d1c9..cdbb917d7 100644 --- a/Roles/Neutral/SoulHunter.cs +++ b/Roles/Standard/Neutral/Benign/SoulHunter.cs @@ -7,7 +7,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Neutral; +namespace EHR.Roles; internal class SoulHunter : RoleBase { diff --git a/Roles/Neutral/Specter.cs b/Roles/Standard/Neutral/Benign/Specter.cs similarity index 98% rename from Roles/Neutral/Specter.cs rename to Roles/Standard/Neutral/Benign/Specter.cs index ec14c5a33..fdef8f9b9 100644 --- a/Roles/Neutral/Specter.cs +++ b/Roles/Standard/Neutral/Benign/Specter.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Specter : RoleBase { diff --git a/Roles/Neutral/Tank.cs b/Roles/Standard/Neutral/Benign/Tank.cs similarity index 99% rename from Roles/Neutral/Tank.cs rename to Roles/Standard/Neutral/Benign/Tank.cs index 021dc8b22..868403af8 100644 --- a/Roles/Neutral/Tank.cs +++ b/Roles/Standard/Neutral/Benign/Tank.cs @@ -2,7 +2,7 @@ using System.Linq; using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; public class Tank : RoleBase { diff --git a/Roles/Neutral/Technician.cs b/Roles/Standard/Neutral/Benign/Technician.cs similarity index 99% rename from Roles/Neutral/Technician.cs rename to Roles/Standard/Neutral/Benign/Technician.cs index ac714137b..c92c70920 100644 --- a/Roles/Neutral/Technician.cs +++ b/Roles/Standard/Neutral/Benign/Technician.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Technician : RoleBase { diff --git a/Roles/Neutral/Arsonist.cs b/Roles/Standard/Neutral/Evil/Arsonist.cs similarity index 99% rename from Roles/Neutral/Arsonist.cs rename to Roles/Standard/Neutral/Evil/Arsonist.cs index 3abd542b4..c83e4935a 100644 --- a/Roles/Neutral/Arsonist.cs +++ b/Roles/Standard/Neutral/Evil/Arsonist.cs @@ -5,7 +5,7 @@ using EHR.Modules; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Arsonist : RoleBase { diff --git a/Roles/Neutral/Collector.cs b/Roles/Standard/Neutral/Evil/Collector.cs similarity index 96% rename from Roles/Neutral/Collector.cs rename to Roles/Standard/Neutral/Evil/Collector.cs index 9d152f23d..6f4fa1e32 100644 --- a/Roles/Neutral/Collector.cs +++ b/Roles/Standard/Neutral/Evil/Collector.cs @@ -4,7 +4,7 @@ using EHR.Modules; using EHR.Patches; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Collector : RoleBase { diff --git a/Roles/Neutral/Doomsayer.cs b/Roles/Standard/Neutral/Evil/Doomsayer.cs similarity index 97% rename from Roles/Neutral/Doomsayer.cs rename to Roles/Standard/Neutral/Evil/Doomsayer.cs index bd7552ef3..0cffbc08b 100644 --- a/Roles/Neutral/Doomsayer.cs +++ b/Roles/Standard/Neutral/Evil/Doomsayer.cs @@ -4,7 +4,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Doomsayer : RoleBase { diff --git a/Roles/Neutral/Executioner.cs b/Roles/Standard/Neutral/Evil/Executioner.cs similarity index 97% rename from Roles/Neutral/Executioner.cs rename to Roles/Standard/Neutral/Evil/Executioner.cs index c58fe4784..142c88375 100644 --- a/Roles/Neutral/Executioner.cs +++ b/Roles/Standard/Neutral/Evil/Executioner.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Executioner : RoleBase { diff --git a/Roles/Neutral/Gaslighter.cs b/Roles/Standard/Neutral/Evil/Gaslighter.cs similarity index 99% rename from Roles/Neutral/Gaslighter.cs rename to Roles/Standard/Neutral/Evil/Gaslighter.cs index 0cf094ce4..4dbfa388e 100644 --- a/Roles/Neutral/Gaslighter.cs +++ b/Roles/Standard/Neutral/Evil/Gaslighter.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using EHR.Crewmate; using EHR.Modules; using EHR.Patches; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Gaslighter : RoleBase { diff --git a/Roles/Neutral/God.cs b/Roles/Standard/Neutral/Evil/God.cs similarity index 97% rename from Roles/Neutral/God.cs rename to Roles/Standard/Neutral/Evil/God.cs index eef6425cc..b99d6411e 100644 --- a/Roles/Neutral/God.cs +++ b/Roles/Standard/Neutral/Evil/God.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class God : RoleBase { diff --git a/Roles/Neutral/Innocent.cs b/Roles/Standard/Neutral/Evil/Innocent.cs similarity index 98% rename from Roles/Neutral/Innocent.cs rename to Roles/Standard/Neutral/Evil/Innocent.cs index e2b025725..e9aff4e2c 100644 --- a/Roles/Neutral/Innocent.cs +++ b/Roles/Standard/Neutral/Evil/Innocent.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Innocent : RoleBase { diff --git a/Roles/Neutral/Jester.cs b/Roles/Standard/Neutral/Evil/Jester.cs similarity index 99% rename from Roles/Neutral/Jester.cs rename to Roles/Standard/Neutral/Evil/Jester.cs index 3ba1d6ec1..da9360994 100644 --- a/Roles/Neutral/Jester.cs +++ b/Roles/Standard/Neutral/Evil/Jester.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Jester : RoleBase { diff --git a/Roles/Neutral/Terrorist.cs b/Roles/Standard/Neutral/Evil/Terrorist.cs similarity index 98% rename from Roles/Neutral/Terrorist.cs rename to Roles/Standard/Neutral/Evil/Terrorist.cs index ba8623ca0..cee15950d 100644 --- a/Roles/Neutral/Terrorist.cs +++ b/Roles/Standard/Neutral/Evil/Terrorist.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Terrorist : RoleBase { diff --git a/Roles/Neutral/Thief.cs b/Roles/Standard/Neutral/Evil/Thief.cs similarity index 99% rename from Roles/Neutral/Thief.cs rename to Roles/Standard/Neutral/Evil/Thief.cs index 9ab882352..dcccefa96 100644 --- a/Roles/Neutral/Thief.cs +++ b/Roles/Standard/Neutral/Evil/Thief.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; public class Thief : RoleBase { diff --git a/Roles/Neutral/Vector.cs b/Roles/Standard/Neutral/Evil/Vector.cs similarity index 99% rename from Roles/Neutral/Vector.cs rename to Roles/Standard/Neutral/Evil/Vector.cs index 63193b5d4..1655f8b8b 100644 --- a/Roles/Neutral/Vector.cs +++ b/Roles/Standard/Neutral/Evil/Vector.cs @@ -7,7 +7,7 @@ using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Vector : RoleBase { diff --git a/Roles/Neutral/Vulture.cs b/Roles/Standard/Neutral/Evil/Vulture.cs similarity index 97% rename from Roles/Neutral/Vulture.cs rename to Roles/Standard/Neutral/Evil/Vulture.cs index 31d0a5c58..a5ba7083b 100644 --- a/Roles/Neutral/Vulture.cs +++ b/Roles/Standard/Neutral/Evil/Vulture.cs @@ -6,7 +6,7 @@ using UnityEngine; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Vulture : RoleBase { diff --git a/Roles/Neutral/Workaholic.cs b/Roles/Standard/Neutral/Evil/Workaholic.cs similarity index 99% rename from Roles/Neutral/Workaholic.cs rename to Roles/Standard/Neutral/Evil/Workaholic.cs index f9fbd4689..9d1a157a1 100644 --- a/Roles/Neutral/Workaholic.cs +++ b/Roles/Standard/Neutral/Evil/Workaholic.cs @@ -5,7 +5,7 @@ using EHR.Modules; using static EHR.Options; // From: TOH_Y -namespace EHR.Neutral; +namespace EHR.Roles; internal class Workaholic : RoleBase { diff --git a/Roles/Neutral/Agitator.cs b/Roles/Standard/Neutral/Killing/Agitator.cs similarity index 99% rename from Roles/Neutral/Agitator.cs rename to Roles/Standard/Neutral/Killing/Agitator.cs index f33be5065..4d7054c29 100644 --- a/Roles/Neutral/Agitator.cs +++ b/Roles/Standard/Neutral/Killing/Agitator.cs @@ -1,13 +1,12 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; using Hazel; using UnityEngine; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Agitator : RoleBase { diff --git a/Roles/Neutral/Amogus.cs b/Roles/Standard/Neutral/Killing/Amogus.cs similarity index 99% rename from Roles/Neutral/Amogus.cs rename to Roles/Standard/Neutral/Killing/Amogus.cs index d3a76c47a..3f6a82d62 100644 --- a/Roles/Neutral/Amogus.cs +++ b/Roles/Standard/Neutral/Killing/Amogus.cs @@ -5,7 +5,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Amogus : RoleBase { diff --git a/Roles/Neutral/Bandit.cs b/Roles/Standard/Neutral/Killing/Bandit.cs similarity index 97% rename from Roles/Neutral/Bandit.cs rename to Roles/Standard/Neutral/Killing/Bandit.cs index abed7045f..d67713ae9 100644 --- a/Roles/Neutral/Bandit.cs +++ b/Roles/Standard/Neutral/Killing/Bandit.cs @@ -5,7 +5,7 @@ using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Bandit : RoleBase { diff --git a/Roles/Neutral/Bargainer.cs b/Roles/Standard/Neutral/Killing/Bargainer.cs similarity index 99% rename from Roles/Neutral/Bargainer.cs rename to Roles/Standard/Neutral/Killing/Bargainer.cs index 09568535c..556a13e99 100644 --- a/Roles/Neutral/Bargainer.cs +++ b/Roles/Standard/Neutral/Killing/Bargainer.cs @@ -9,7 +9,7 @@ using static EHR.Options; // ReSharper disable PossibleMultipleEnumeration -namespace EHR.Neutral; +namespace EHR.Roles; internal class Bargainer : RoleBase { diff --git a/Roles/Neutral/Beehive.cs b/Roles/Standard/Neutral/Killing/Beehive.cs similarity index 99% rename from Roles/Neutral/Beehive.cs rename to Roles/Standard/Neutral/Killing/Beehive.cs index 8f687787b..e48d8b357 100644 --- a/Roles/Neutral/Beehive.cs +++ b/Roles/Standard/Neutral/Killing/Beehive.cs @@ -5,7 +5,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Beehive : RoleBase { diff --git a/Roles/Neutral/Berserker.cs b/Roles/Standard/Neutral/Killing/Berserker.cs similarity index 99% rename from Roles/Neutral/Berserker.cs rename to Roles/Standard/Neutral/Killing/Berserker.cs index bb97821a0..6d6be35c2 100644 --- a/Roles/Neutral/Berserker.cs +++ b/Roles/Standard/Neutral/Killing/Berserker.cs @@ -4,7 +4,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Berserker : RoleBase { diff --git a/Roles/Neutral/BloodKnight.cs b/Roles/Standard/Neutral/Killing/BloodKnight.cs similarity index 96% rename from Roles/Neutral/BloodKnight.cs rename to Roles/Standard/Neutral/Killing/BloodKnight.cs index 53a4f6edb..99604d74a 100644 --- a/Roles/Neutral/BloodKnight.cs +++ b/Roles/Standard/Neutral/Killing/BloodKnight.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class BloodKnight : RoleBase { diff --git a/Roles/Neutral/Bubble.cs b/Roles/Standard/Neutral/Killing/Bubble.cs similarity index 99% rename from Roles/Neutral/Bubble.cs rename to Roles/Standard/Neutral/Killing/Bubble.cs index 70215a200..b3bf93e35 100644 --- a/Roles/Neutral/Bubble.cs +++ b/Roles/Standard/Neutral/Killing/Bubble.cs @@ -6,7 +6,7 @@ using Hazel; using static EHR.Options; using static EHR.Utils; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Bubble : RoleBase { diff --git a/Roles/Neutral/Chemist.cs b/Roles/Standard/Neutral/Killing/Chemist.cs similarity index 99% rename from Roles/Neutral/Chemist.cs rename to Roles/Standard/Neutral/Killing/Chemist.cs index 85c837fe2..6575bbcd1 100644 --- a/Roles/Neutral/Chemist.cs +++ b/Roles/Standard/Neutral/Killing/Chemist.cs @@ -7,7 +7,7 @@ using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Chemist : RoleBase { diff --git a/Roles/Neutral/Cherokious.cs b/Roles/Standard/Neutral/Killing/Cherokious.cs similarity index 97% rename from Roles/Neutral/Cherokious.cs rename to Roles/Standard/Neutral/Killing/Cherokious.cs index d96ee2efb..b14579900 100644 --- a/Roles/Neutral/Cherokious.cs +++ b/Roles/Standard/Neutral/Killing/Cherokious.cs @@ -1,8 +1,7 @@ using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Patches; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Cherokious : RoleBase { diff --git a/Roles/Neutral/Cultist.cs b/Roles/Standard/Neutral/Killing/Cultist.cs similarity index 99% rename from Roles/Neutral/Cultist.cs rename to Roles/Standard/Neutral/Killing/Cultist.cs index 52ee3c0cd..0859321ea 100644 --- a/Roles/Neutral/Cultist.cs +++ b/Roles/Standard/Neutral/Killing/Cultist.cs @@ -6,7 +6,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Cultist : RoleBase { diff --git a/Roles/Neutral/Demon.cs b/Roles/Standard/Neutral/Killing/Demon.cs similarity index 99% rename from Roles/Neutral/Demon.cs rename to Roles/Standard/Neutral/Killing/Demon.cs index f0dd7ceec..349d99d00 100644 --- a/Roles/Neutral/Demon.cs +++ b/Roles/Standard/Neutral/Killing/Demon.cs @@ -5,7 +5,7 @@ using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Demon : RoleBase { diff --git a/Roles/Neutral/Doppelganger.cs b/Roles/Standard/Neutral/Killing/Doppelganger.cs similarity index 99% rename from Roles/Neutral/Doppelganger.cs rename to Roles/Standard/Neutral/Killing/Doppelganger.cs index b3b728afa..f01effa55 100644 --- a/Roles/Neutral/Doppelganger.cs +++ b/Roles/Standard/Neutral/Killing/Doppelganger.cs @@ -2,13 +2,12 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Impostor; using EHR.Modules; using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Doppelganger : RoleBase { diff --git a/Roles/Neutral/Duality.cs b/Roles/Standard/Neutral/Killing/Duality.cs similarity index 99% rename from Roles/Neutral/Duality.cs rename to Roles/Standard/Neutral/Killing/Duality.cs index 4001a9920..55df2e33c 100644 --- a/Roles/Neutral/Duality.cs +++ b/Roles/Standard/Neutral/Killing/Duality.cs @@ -4,7 +4,7 @@ using EHR.Modules; using EHR.Modules.Extensions; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Duality : RoleBase { diff --git a/Roles/Neutral/Eclipse.cs b/Roles/Standard/Neutral/Killing/Eclipse.cs similarity index 96% rename from Roles/Neutral/Eclipse.cs rename to Roles/Standard/Neutral/Killing/Eclipse.cs index d1cd25468..4ee2bdf81 100644 --- a/Roles/Neutral/Eclipse.cs +++ b/Roles/Standard/Neutral/Killing/Eclipse.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Eclipse : RoleBase { diff --git a/Roles/Neutral/Enderman.cs b/Roles/Standard/Neutral/Killing/Enderman.cs similarity index 99% rename from Roles/Neutral/Enderman.cs rename to Roles/Standard/Neutral/Killing/Enderman.cs index 9541c6f33..bdfd871fa 100644 --- a/Roles/Neutral/Enderman.cs +++ b/Roles/Standard/Neutral/Killing/Enderman.cs @@ -3,7 +3,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Enderman : RoleBase { diff --git a/Roles/Neutral/Evolver.cs b/Roles/Standard/Neutral/Killing/Evolver.cs similarity index 99% rename from Roles/Neutral/Evolver.cs rename to Roles/Standard/Neutral/Killing/Evolver.cs index b8f3b97d8..6ca913de8 100644 --- a/Roles/Neutral/Evolver.cs +++ b/Roles/Standard/Neutral/Killing/Evolver.cs @@ -5,7 +5,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Evolver : RoleBase { diff --git a/Roles/Neutral/Explosivist.cs b/Roles/Standard/Neutral/Killing/Explosivist.cs similarity index 99% rename from Roles/Neutral/Explosivist.cs rename to Roles/Standard/Neutral/Killing/Explosivist.cs index 0b4c9c3a3..b020871c4 100644 --- a/Roles/Neutral/Explosivist.cs +++ b/Roles/Standard/Neutral/Killing/Explosivist.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Explosivist : RoleBase { diff --git a/Roles/Neutral/Glitch.cs b/Roles/Standard/Neutral/Killing/Glitch.cs similarity index 96% rename from Roles/Neutral/Glitch.cs rename to Roles/Standard/Neutral/Killing/Glitch.cs index 1dd88f1df..340b73cc0 100644 --- a/Roles/Neutral/Glitch.cs +++ b/Roles/Standard/Neutral/Killing/Glitch.cs @@ -4,7 +4,7 @@ using EHR.Modules; using Hazel; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Glitch : RoleBase { diff --git a/Roles/Neutral/HeadHunter.cs b/Roles/Standard/Neutral/Killing/HeadHunter.cs similarity index 96% rename from Roles/Neutral/HeadHunter.cs rename to Roles/Standard/Neutral/Killing/HeadHunter.cs index 6bbba658c..d19b164fb 100644 --- a/Roles/Neutral/HeadHunter.cs +++ b/Roles/Standard/Neutral/Killing/HeadHunter.cs @@ -6,7 +6,7 @@ using EHR.Modules; using Hazel; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class HeadHunter : RoleBase { diff --git a/Roles/Neutral/HexMaster.cs b/Roles/Standard/Neutral/Killing/HexMaster.cs similarity index 93% rename from Roles/Neutral/HexMaster.cs rename to Roles/Standard/Neutral/Killing/HexMaster.cs index 4cfad0de6..9d1178ca9 100644 --- a/Roles/Neutral/HexMaster.cs +++ b/Roles/Standard/Neutral/Killing/HexMaster.cs @@ -1,8 +1,7 @@ using AmongUs.GameOptions; -using EHR.Impostor; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class HexMaster : RoleBase { diff --git a/Roles/Neutral/Hookshot.cs b/Roles/Standard/Neutral/Killing/Hookshot.cs similarity index 99% rename from Roles/Neutral/Hookshot.cs rename to Roles/Standard/Neutral/Killing/Hookshot.cs index c0f0d854a..46794e4bc 100644 --- a/Roles/Neutral/Hookshot.cs +++ b/Roles/Standard/Neutral/Killing/Hookshot.cs @@ -4,7 +4,7 @@ using Hazel; using static EHR.Options; using static EHR.Utils; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Hookshot : RoleBase { diff --git a/Roles/Neutral/Infection.cs b/Roles/Standard/Neutral/Killing/Infection.cs similarity index 99% rename from Roles/Neutral/Infection.cs rename to Roles/Standard/Neutral/Killing/Infection.cs index 7c7c2db00..f56d961ff 100644 --- a/Roles/Neutral/Infection.cs +++ b/Roles/Standard/Neutral/Killing/Infection.cs @@ -6,7 +6,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Infection : RoleBase { diff --git a/Roles/Neutral/Jackal.cs b/Roles/Standard/Neutral/Killing/Jackal.cs similarity index 97% rename from Roles/Neutral/Jackal.cs rename to Roles/Standard/Neutral/Killing/Jackal.cs index 1cb396e69..174960339 100644 --- a/Roles/Neutral/Jackal.cs +++ b/Roles/Standard/Neutral/Killing/Jackal.cs @@ -7,7 +7,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Jackal : RoleBase { diff --git a/Roles/Neutral/Jinx.cs b/Roles/Standard/Neutral/Killing/Jinx.cs similarity index 96% rename from Roles/Neutral/Jinx.cs rename to Roles/Standard/Neutral/Killing/Jinx.cs index 6fe5fcf6b..dce66668d 100644 --- a/Roles/Neutral/Jinx.cs +++ b/Roles/Standard/Neutral/Killing/Jinx.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Jinx : RoleBase { diff --git a/Roles/Neutral/Juggernaut.cs b/Roles/Standard/Neutral/Killing/Juggernaut.cs similarity index 96% rename from Roles/Neutral/Juggernaut.cs rename to Roles/Standard/Neutral/Killing/Juggernaut.cs index 945c2af7e..cfbe30a0c 100644 --- a/Roles/Neutral/Juggernaut.cs +++ b/Roles/Standard/Neutral/Killing/Juggernaut.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Juggernaut : RoleBase { diff --git a/Roles/Neutral/Magician.cs b/Roles/Standard/Neutral/Killing/Magician.cs similarity index 99% rename from Roles/Neutral/Magician.cs rename to Roles/Standard/Neutral/Killing/Magician.cs index aadbba15f..7aab6f106 100644 --- a/Roles/Neutral/Magician.cs +++ b/Roles/Standard/Neutral/Killing/Magician.cs @@ -1,14 +1,13 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; using UnityEngine; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Neutral; +namespace EHR.Roles; public class Magician : RoleBase { diff --git a/Roles/Neutral/Medusa.cs b/Roles/Standard/Neutral/Killing/Medusa.cs similarity index 96% rename from Roles/Neutral/Medusa.cs rename to Roles/Standard/Neutral/Killing/Medusa.cs index 21d4d302f..452bb3b32 100644 --- a/Roles/Neutral/Medusa.cs +++ b/Roles/Standard/Neutral/Killing/Medusa.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Medusa : RoleBase { diff --git a/Roles/Neutral/Mycologist.cs b/Roles/Standard/Neutral/Killing/Mycologist.cs similarity index 99% rename from Roles/Neutral/Mycologist.cs rename to Roles/Standard/Neutral/Killing/Mycologist.cs index cdd7b1173..9b58c8dd4 100644 --- a/Roles/Neutral/Mycologist.cs +++ b/Roles/Standard/Neutral/Killing/Mycologist.cs @@ -7,7 +7,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Mycologist : RoleBase { diff --git a/Roles/Neutral/Necromancer.cs b/Roles/Standard/Neutral/Killing/Necromancer.cs similarity index 99% rename from Roles/Neutral/Necromancer.cs rename to Roles/Standard/Neutral/Killing/Necromancer.cs index 8343ebe00..a63346cff 100644 --- a/Roles/Neutral/Necromancer.cs +++ b/Roles/Standard/Neutral/Killing/Necromancer.cs @@ -5,7 +5,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Necromancer : RoleBase { diff --git a/Roles/Neutral/Nonplus.cs b/Roles/Standard/Neutral/Killing/Nonplus.cs similarity index 99% rename from Roles/Neutral/Nonplus.cs rename to Roles/Standard/Neutral/Killing/Nonplus.cs index 0ee8be183..2eada5f0f 100644 --- a/Roles/Neutral/Nonplus.cs +++ b/Roles/Standard/Neutral/Killing/Nonplus.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; public class Nonplus : RoleBase { diff --git a/Roles/Neutral/NoteKiller.cs b/Roles/Standard/Neutral/Killing/NoteKiller.cs similarity index 99% rename from Roles/Neutral/NoteKiller.cs rename to Roles/Standard/Neutral/Killing/NoteKiller.cs index 4b3c44d57..007ee249b 100644 --- a/Roles/Neutral/NoteKiller.cs +++ b/Roles/Standard/Neutral/Killing/NoteKiller.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class NoteKiller : RoleBase { diff --git a/Roles/Neutral/Patroller.cs b/Roles/Standard/Neutral/Killing/Patroller.cs similarity index 99% rename from Roles/Neutral/Patroller.cs rename to Roles/Standard/Neutral/Killing/Patroller.cs index 4aad55774..60704bb37 100644 --- a/Roles/Neutral/Patroller.cs +++ b/Roles/Standard/Neutral/Killing/Patroller.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; public class Patroller : RoleBase { diff --git a/Roles/Neutral/Pelican.cs b/Roles/Standard/Neutral/Killing/Pelican.cs similarity index 96% rename from Roles/Neutral/Pelican.cs rename to Roles/Standard/Neutral/Killing/Pelican.cs index 3773fb094..6b524f637 100644 --- a/Roles/Neutral/Pelican.cs +++ b/Roles/Standard/Neutral/Killing/Pelican.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Pelican : RoleBase { diff --git a/Roles/Neutral/Pickpocket.cs b/Roles/Standard/Neutral/Killing/Pickpocket.cs similarity index 95% rename from Roles/Neutral/Pickpocket.cs rename to Roles/Standard/Neutral/Killing/Pickpocket.cs index 72f8bbdea..445548943 100644 --- a/Roles/Neutral/Pickpocket.cs +++ b/Roles/Standard/Neutral/Killing/Pickpocket.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Pickpocket : RoleBase { diff --git a/Roles/Neutral/PlagueBearer.cs b/Roles/Standard/Neutral/Killing/PlagueBearer.cs similarity index 96% rename from Roles/Neutral/PlagueBearer.cs rename to Roles/Standard/Neutral/Killing/PlagueBearer.cs index a3664b55c..99f2a17f4 100644 --- a/Roles/Neutral/PlagueBearer.cs +++ b/Roles/Standard/Neutral/Killing/PlagueBearer.cs @@ -5,7 +5,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class PlagueBearer : RoleBase { diff --git a/Roles/Neutral/Poisoner.cs b/Roles/Standard/Neutral/Killing/Poisoner.cs similarity index 96% rename from Roles/Neutral/Poisoner.cs rename to Roles/Standard/Neutral/Killing/Poisoner.cs index 0dd52fee4..ecf6c560e 100644 --- a/Roles/Neutral/Poisoner.cs +++ b/Roles/Standard/Neutral/Killing/Poisoner.cs @@ -1,4 +1,4 @@ -namespace EHR.Neutral; +namespace EHR.Roles; public class Poisoner : RoleBase { diff --git a/Roles/Neutral/Pulse.cs b/Roles/Standard/Neutral/Killing/Pulse.cs similarity index 98% rename from Roles/Neutral/Pulse.cs rename to Roles/Standard/Neutral/Killing/Pulse.cs index a719a36b2..be9836cee 100644 --- a/Roles/Neutral/Pulse.cs +++ b/Roles/Standard/Neutral/Killing/Pulse.cs @@ -1,4 +1,4 @@ -namespace EHR.Neutral; +namespace EHR.Roles; public class Pulse : RoleBase { diff --git a/Roles/Neutral/Pyromaniac.cs b/Roles/Standard/Neutral/Killing/Pyromaniac.cs similarity index 96% rename from Roles/Neutral/Pyromaniac.cs rename to Roles/Standard/Neutral/Killing/Pyromaniac.cs index fa8b723e0..b56d426d4 100644 --- a/Roles/Neutral/Pyromaniac.cs +++ b/Roles/Standard/Neutral/Killing/Pyromaniac.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Pyromaniac : RoleBase { diff --git a/Roles/Neutral/QuizMaster.cs b/Roles/Standard/Neutral/Killing/QuizMaster.cs similarity index 99% rename from Roles/Neutral/QuizMaster.cs rename to Roles/Standard/Neutral/Killing/QuizMaster.cs index 6287ed011..7f0663117 100644 --- a/Roles/Neutral/QuizMaster.cs +++ b/Roles/Standard/Neutral/Killing/QuizMaster.cs @@ -2,11 +2,12 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; +using EHR.Gamemodes; using EHR.Modules; using EHR.Patches; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class QuizMaster : RoleBase { diff --git a/Roles/Neutral/Reckless.cs b/Roles/Standard/Neutral/Killing/Reckless.cs similarity index 98% rename from Roles/Neutral/Reckless.cs rename to Roles/Standard/Neutral/Killing/Reckless.cs index 9cff1bef5..9dff6af02 100644 --- a/Roles/Neutral/Reckless.cs +++ b/Roles/Standard/Neutral/Killing/Reckless.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Reckless : RoleBase { diff --git a/Roles/Neutral/Ritualist.cs b/Roles/Standard/Neutral/Killing/Ritualist.cs similarity index 95% rename from Roles/Neutral/Ritualist.cs rename to Roles/Standard/Neutral/Killing/Ritualist.cs index 0ed2eff61..0dc915c78 100644 --- a/Roles/Neutral/Ritualist.cs +++ b/Roles/Standard/Neutral/Killing/Ritualist.cs @@ -1,6 +1,6 @@ using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Ritualist : RoleBase { diff --git a/Roles/Neutral/Rogue.cs b/Roles/Standard/Neutral/Killing/Rogue.cs similarity index 99% rename from Roles/Neutral/Rogue.cs rename to Roles/Standard/Neutral/Killing/Rogue.cs index bb111cb42..ccbfc70eb 100644 --- a/Roles/Neutral/Rogue.cs +++ b/Roles/Standard/Neutral/Killing/Rogue.cs @@ -6,7 +6,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Rogue : RoleBase { diff --git a/Roles/Neutral/RouleteGrandeur.cs b/Roles/Standard/Neutral/Killing/RouleteGrandeur.cs similarity index 99% rename from Roles/Neutral/RouleteGrandeur.cs rename to Roles/Standard/Neutral/Killing/RouleteGrandeur.cs index 00ee9f6b1..f370e56b8 100644 --- a/Roles/Neutral/RouleteGrandeur.cs +++ b/Roles/Standard/Neutral/Killing/RouleteGrandeur.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class RouleteGrandeur : RoleBase { diff --git a/Roles/Neutral/Samurai.cs b/Roles/Standard/Neutral/Killing/Samurai.cs similarity index 99% rename from Roles/Neutral/Samurai.cs rename to Roles/Standard/Neutral/Killing/Samurai.cs index 1ef3c590a..f2b01f533 100644 --- a/Roles/Neutral/Samurai.cs +++ b/Roles/Standard/Neutral/Killing/Samurai.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Samurai : RoleBase { diff --git a/Roles/Neutral/SerialKiller.cs b/Roles/Standard/Neutral/Killing/SerialKiller.cs similarity index 97% rename from Roles/Neutral/SerialKiller.cs rename to Roles/Standard/Neutral/Killing/SerialKiller.cs index 4e978673c..7348759cb 100644 --- a/Roles/Neutral/SerialKiller.cs +++ b/Roles/Standard/Neutral/Killing/SerialKiller.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; public class SerialKiller : RoleBase { diff --git a/Roles/Neutral/Sharpshooter.cs b/Roles/Standard/Neutral/Killing/Sharpshooter.cs similarity index 99% rename from Roles/Neutral/Sharpshooter.cs rename to Roles/Standard/Neutral/Killing/Sharpshooter.cs index e23215b2d..e815735c2 100644 --- a/Roles/Neutral/Sharpshooter.cs +++ b/Roles/Standard/Neutral/Killing/Sharpshooter.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Sharpshooter : RoleBase { diff --git a/Roles/Neutral/Simon.cs b/Roles/Standard/Neutral/Killing/Simon.cs similarity index 99% rename from Roles/Neutral/Simon.cs rename to Roles/Standard/Neutral/Killing/Simon.cs index 27b58f0fa..39a66b727 100644 --- a/Roles/Neutral/Simon.cs +++ b/Roles/Standard/Neutral/Killing/Simon.cs @@ -6,7 +6,7 @@ using Hazel; using UnityEngine; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Simon : RoleBase { diff --git a/Roles/Neutral/Slenderman.cs b/Roles/Standard/Neutral/Killing/Slenderman.cs similarity index 99% rename from Roles/Neutral/Slenderman.cs rename to Roles/Standard/Neutral/Killing/Slenderman.cs index 6797d0515..ec45e575f 100644 --- a/Roles/Neutral/Slenderman.cs +++ b/Roles/Standard/Neutral/Killing/Slenderman.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Slenderman : RoleBase { diff --git a/Roles/Neutral/SoulCollector.cs b/Roles/Standard/Neutral/Killing/SoulCollector.cs similarity index 99% rename from Roles/Neutral/SoulCollector.cs rename to Roles/Standard/Neutral/Killing/SoulCollector.cs index 4d5b57008..add594e5f 100644 --- a/Roles/Neutral/SoulCollector.cs +++ b/Roles/Standard/Neutral/Killing/SoulCollector.cs @@ -2,7 +2,7 @@ using AmongUs.GameOptions; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class SoulCollector : RoleBase { diff --git a/Roles/Neutral/Spider.cs b/Roles/Standard/Neutral/Killing/Spider.cs similarity index 99% rename from Roles/Neutral/Spider.cs rename to Roles/Standard/Neutral/Killing/Spider.cs index d358a5a56..90c90ea0c 100644 --- a/Roles/Neutral/Spider.cs +++ b/Roles/Standard/Neutral/Killing/Spider.cs @@ -5,7 +5,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Spider : RoleBase { diff --git a/Roles/Neutral/Spiritcaller.cs b/Roles/Standard/Neutral/Killing/Spiritcaller.cs similarity index 97% rename from Roles/Neutral/Spiritcaller.cs rename to Roles/Standard/Neutral/Killing/Spiritcaller.cs index 9bca915ce..440297f31 100644 --- a/Roles/Neutral/Spiritcaller.cs +++ b/Roles/Standard/Neutral/Killing/Spiritcaller.cs @@ -5,7 +5,7 @@ using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Spiritcaller : RoleBase { diff --git a/Roles/Neutral/Sprayer.cs b/Roles/Standard/Neutral/Killing/Sprayer.cs similarity index 99% rename from Roles/Neutral/Sprayer.cs rename to Roles/Standard/Neutral/Killing/Sprayer.cs index 5d1e15883..5f7d3ff6d 100644 --- a/Roles/Neutral/Sprayer.cs +++ b/Roles/Standard/Neutral/Killing/Sprayer.cs @@ -5,7 +5,7 @@ using static EHR.Options; using static EHR.Translator; using static EHR.Utils; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Sprayer : RoleBase { diff --git a/Roles/Neutral/Stalker.cs b/Roles/Standard/Neutral/Killing/Stalker.cs similarity index 99% rename from Roles/Neutral/Stalker.cs rename to Roles/Standard/Neutral/Killing/Stalker.cs index b6e83f983..d60ce0a7b 100644 --- a/Roles/Neutral/Stalker.cs +++ b/Roles/Standard/Neutral/Killing/Stalker.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; // Credit: https://github.com/Yumenopai/TownOfHost_Y public class Stalker : RoleBase diff --git a/Roles/Neutral/Sunnyboy.cs b/Roles/Standard/Neutral/Killing/Sunnyboy.cs similarity index 95% rename from Roles/Neutral/Sunnyboy.cs rename to Roles/Standard/Neutral/Killing/Sunnyboy.cs index 3272582bb..345e2d1a2 100644 --- a/Roles/Neutral/Sunnyboy.cs +++ b/Roles/Standard/Neutral/Killing/Sunnyboy.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Sunnyboy : RoleBase { diff --git a/Roles/Neutral/Thanos.cs b/Roles/Standard/Neutral/Killing/Thanos.cs similarity index 99% rename from Roles/Neutral/Thanos.cs rename to Roles/Standard/Neutral/Killing/Thanos.cs index 616f4db2a..6c1538903 100644 --- a/Roles/Neutral/Thanos.cs +++ b/Roles/Standard/Neutral/Killing/Thanos.cs @@ -5,7 +5,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Thanos : RoleBase { diff --git a/Roles/Neutral/Tiger.cs b/Roles/Standard/Neutral/Killing/Tiger.cs similarity index 99% rename from Roles/Neutral/Tiger.cs rename to Roles/Standard/Neutral/Killing/Tiger.cs index 71af461e0..e13b1ba71 100644 --- a/Roles/Neutral/Tiger.cs +++ b/Roles/Standard/Neutral/Killing/Tiger.cs @@ -3,7 +3,7 @@ using AmongUs.GameOptions; using EHR.Modules; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; internal class Tiger : RoleBase { diff --git a/Roles/Neutral/Traitor.cs b/Roles/Standard/Neutral/Killing/Traitor.cs similarity index 96% rename from Roles/Neutral/Traitor.cs rename to Roles/Standard/Neutral/Killing/Traitor.cs index c30153103..5e3f11d46 100644 --- a/Roles/Neutral/Traitor.cs +++ b/Roles/Standard/Neutral/Killing/Traitor.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using AmongUs.GameOptions; using static EHR.Options; -namespace EHR.Neutral; +namespace EHR.Roles; public class Traitor : RoleBase { diff --git a/Roles/Neutral/Tremor.cs b/Roles/Standard/Neutral/Killing/Tremor.cs similarity index 99% rename from Roles/Neutral/Tremor.cs rename to Roles/Standard/Neutral/Killing/Tremor.cs index c1b51db26..8df8fa474 100644 --- a/Roles/Neutral/Tremor.cs +++ b/Roles/Standard/Neutral/Killing/Tremor.cs @@ -5,7 +5,7 @@ using EHR.Modules; using Hazel; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Tremor : RoleBase { diff --git a/Roles/Neutral/Vengeance.cs b/Roles/Standard/Neutral/Killing/Vengeance.cs similarity index 96% rename from Roles/Neutral/Vengeance.cs rename to Roles/Standard/Neutral/Killing/Vengeance.cs index f6217e09f..68023f97c 100644 --- a/Roles/Neutral/Vengeance.cs +++ b/Roles/Standard/Neutral/Killing/Vengeance.cs @@ -4,7 +4,7 @@ using EHR.Modules; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Vengeance : RoleBase { diff --git a/Roles/Neutral/Virus.cs b/Roles/Standard/Neutral/Killing/Virus.cs similarity index 97% rename from Roles/Neutral/Virus.cs rename to Roles/Standard/Neutral/Killing/Virus.cs index 2fa7ca214..052178674 100644 --- a/Roles/Neutral/Virus.cs +++ b/Roles/Standard/Neutral/Killing/Virus.cs @@ -7,7 +7,7 @@ using EHR.Patches; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Virus : RoleBase { diff --git a/Roles/Neutral/Vortex.cs b/Roles/Standard/Neutral/Killing/Vortex.cs similarity index 99% rename from Roles/Neutral/Vortex.cs rename to Roles/Standard/Neutral/Killing/Vortex.cs index fa0d70be1..9273a54f1 100644 --- a/Roles/Neutral/Vortex.cs +++ b/Roles/Standard/Neutral/Killing/Vortex.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Neutral; +namespace EHR.Roles; public class Vortex : RoleBase { diff --git a/Roles/Neutral/WeaponMaster.cs b/Roles/Standard/Neutral/Killing/WeaponMaster.cs similarity index 99% rename from Roles/Neutral/WeaponMaster.cs rename to Roles/Standard/Neutral/Killing/WeaponMaster.cs index 6c8fa5aa9..7fff2cacc 100644 --- a/Roles/Neutral/WeaponMaster.cs +++ b/Roles/Standard/Neutral/Killing/WeaponMaster.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class WeaponMaster : RoleBase { diff --git a/Roles/Neutral/Weatherman.cs b/Roles/Standard/Neutral/Killing/Weatherman.cs similarity index 98% rename from Roles/Neutral/Weatherman.cs rename to Roles/Standard/Neutral/Killing/Weatherman.cs index 8396dbda6..7fd996cc5 100644 --- a/Roles/Neutral/Weatherman.cs +++ b/Roles/Standard/Neutral/Killing/Weatherman.cs @@ -1,7 +1,8 @@ using System; using AmongUs.GameOptions; +using EHR.Gamemodes; -namespace EHR.Neutral; +namespace EHR.Roles; public class Weatherman : RoleBase { diff --git a/Roles/Neutral/Werewolf.cs b/Roles/Standard/Neutral/Killing/Werewolf.cs similarity index 96% rename from Roles/Neutral/Werewolf.cs rename to Roles/Standard/Neutral/Killing/Werewolf.cs index 5d76800c0..b28f76e0b 100644 --- a/Roles/Neutral/Werewolf.cs +++ b/Roles/Standard/Neutral/Killing/Werewolf.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; using Hazel; using static EHR.Options; using static EHR.Translator; -namespace EHR.Neutral; +namespace EHR.Roles; public class Werewolf : RoleBase { diff --git a/Roles/Neutral/Wraith.cs b/Roles/Standard/Neutral/Killing/Wraith.cs similarity index 95% rename from Roles/Neutral/Wraith.cs rename to Roles/Standard/Neutral/Killing/Wraith.cs index f105487d4..864f4d2a5 100644 --- a/Roles/Neutral/Wraith.cs +++ b/Roles/Standard/Neutral/Killing/Wraith.cs @@ -1,4 +1,4 @@ -namespace EHR.Neutral; +namespace EHR.Roles; public class Wraith : RoleBase { diff --git a/Roles/Neutral/Auditor.cs b/Roles/Standard/Neutral/Pariah/Auditor.cs similarity index 99% rename from Roles/Neutral/Auditor.cs rename to Roles/Standard/Neutral/Pariah/Auditor.cs index 2660bcd39..d2991f2df 100644 --- a/Roles/Neutral/Auditor.cs +++ b/Roles/Standard/Neutral/Pariah/Auditor.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Auditor : RoleBase { diff --git a/Roles/Neutral/Clerk.cs b/Roles/Standard/Neutral/Pariah/Clerk.cs similarity index 98% rename from Roles/Neutral/Clerk.cs rename to Roles/Standard/Neutral/Pariah/Clerk.cs index a4898e5db..ab5b6309a 100644 --- a/Roles/Neutral/Clerk.cs +++ b/Roles/Standard/Neutral/Pariah/Clerk.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Crewmate; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Clerk : RoleBase { diff --git a/Roles/Neutral/Curser.cs b/Roles/Standard/Neutral/Pariah/Curser.cs similarity index 99% rename from Roles/Neutral/Curser.cs rename to Roles/Standard/Neutral/Pariah/Curser.cs index eebb85576..0d740ef3a 100644 --- a/Roles/Neutral/Curser.cs +++ b/Roles/Standard/Neutral/Pariah/Curser.cs @@ -2,7 +2,7 @@ using System.Linq; using AmongUs.GameOptions; -namespace EHR.Neutral; +namespace EHR.Roles; public class Curser : RoleBase { diff --git a/Roles/Neutral/Magistrate.cs b/Roles/Standard/Neutral/Pariah/Magistrate.cs similarity index 99% rename from Roles/Neutral/Magistrate.cs rename to Roles/Standard/Neutral/Pariah/Magistrate.cs index cee0a84f2..2fcbcb797 100644 --- a/Roles/Neutral/Magistrate.cs +++ b/Roles/Standard/Neutral/Pariah/Magistrate.cs @@ -1,7 +1,7 @@ using AmongUs.GameOptions; using EHR.Modules; -namespace EHR.Neutral; +namespace EHR.Roles; public class Magistrate : RoleBase { diff --git a/Roles/Neutral/Seamstress.cs b/Roles/Standard/Neutral/Pariah/Seamstress.cs similarity index 99% rename from Roles/Neutral/Seamstress.cs rename to Roles/Standard/Neutral/Pariah/Seamstress.cs index 12f09622d..aa5c697b7 100644 --- a/Roles/Neutral/Seamstress.cs +++ b/Roles/Standard/Neutral/Pariah/Seamstress.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Seamstress : RoleBase { diff --git a/Roles/Neutral/Spirit.cs b/Roles/Standard/Neutral/Pariah/Spirit.cs similarity index 99% rename from Roles/Neutral/Spirit.cs rename to Roles/Standard/Neutral/Pariah/Spirit.cs index 47e91f865..9e630867f 100644 --- a/Roles/Neutral/Spirit.cs +++ b/Roles/Standard/Neutral/Pariah/Spirit.cs @@ -4,7 +4,7 @@ using AmongUs.GameOptions; using EHR.Modules; using Hazel; -namespace EHR.Neutral; +namespace EHR.Roles; public class Spirit : RoleBase { diff --git a/Roles/Neutral/Starspawn.cs b/Roles/Standard/Neutral/Pariah/Starspawn.cs similarity index 99% rename from Roles/Neutral/Starspawn.cs rename to Roles/Standard/Neutral/Pariah/Starspawn.cs index b9b295523..446243c22 100644 --- a/Roles/Neutral/Starspawn.cs +++ b/Roles/Standard/Neutral/Pariah/Starspawn.cs @@ -6,7 +6,7 @@ using Hazel; using TMPro; using UnityEngine; -namespace EHR.Neutral; +namespace EHR.Roles; public class Starspawn : RoleBase { diff --git a/Roles/VanillaRole.cs b/Roles/VanillaRole.cs index 7d9c05bee..c19914d38 100644 --- a/Roles/VanillaRole.cs +++ b/Roles/VanillaRole.cs @@ -1,4 +1,4 @@ -namespace EHR; +namespace EHR.Roles; internal class VanillaRole : RoleBase {