diff --git a/CTA/CustomTeamAssigner/CustomRoles.cs b/CTA/CustomTeamAssigner/CustomRoles.cs index e6a4597ad..c5c6ecdff 100644 --- a/CTA/CustomTeamAssigner/CustomRoles.cs +++ b/CTA/CustomTeamAssigner/CustomRoles.cs @@ -289,6 +289,7 @@ public enum CustomRoles // Neutrals + Accumulator, Agitator, Amnesiac, Amogus, @@ -358,6 +359,7 @@ public enum CustomRoles Pulse, Pursuer, Pyromaniac, + Quarry, QuizMaster, Reckless, Revolutionist, diff --git a/Modules/CustomNetObject.cs b/Modules/CustomNetObject.cs index 7a7c4364c..f61c0470a 100644 --- a/Modules/CustomNetObject.cs +++ b/Modules/CustomNetObject.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Linq; using AmongUs.InnerNet.GameDataMessages; @@ -177,7 +178,7 @@ namespace EHR protected void CreateNetObject(string sprite, Vector2 position) { - if (GameStates.IsEnded || !AmongUsClient.Instance.AmHost || GameStates.CurrentServerType == GameStates.ServerType.Vanilla) return; + if (GameStates.IsEnded || !AmongUsClient.Instance.AmHost) return; Logger.Info($" Create Custom Net Object {GetType().Name} (ID {MaxId + 1}) at {position} - Time since game start: {Utils.TimeStamp - IntroCutsceneDestroyPatch.IntroDestroyTS}s", "CNO.CreateNetObject"); @@ -187,7 +188,7 @@ namespace EHR { Main.Instance.StartCoroutine(CoRoutine()); - System.Collections.IEnumerator CoRoutine() + IEnumerator CoRoutine() { Logger.Info("Delaying CNO Spawn", "CustomNetObject.CreateNetObject"); while (GameStates.InGame && !GameStates.IsEnded && (!Main.IntroDestroyed || Utils.TimeStamp - IntroCutsceneDestroyPatch.IntroDestroyTS < 10)) yield return null; @@ -366,7 +367,7 @@ namespace EHR Main.Instance.StartCoroutine(WaitForMeetingEnd()); return; - System.Collections.IEnumerator WaitForMeetingEnd() + IEnumerator WaitForMeetingEnd() { yield return new WaitForSecondsRealtime(5f); while (ReportDeadBodyPatch.MeetingStarted || GameStates.IsMeeting || ExileController.Instance || AntiBlackout.SkipTasks) yield return null; @@ -897,7 +898,7 @@ namespace EHR { public FallenTree(Vector2 position) { - CreateNetObject(EHR.Roles.Tree.FallenSprite, position); + CreateNetObject(Roles.Tree.FallenSprite, position); } } diff --git a/Modules/Utils.cs b/Modules/Utils.cs index a999e4abd..ac7d50f4c 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -3335,6 +3335,7 @@ public static class Utils return true; } +/* public static void SendGameData() { int messages = 0; @@ -3368,6 +3369,7 @@ public static class Utils AmongUsClient.Instance.SendOrDisconnect(writer); writer.Recycle(); } +*/ public static void SendGameDataTo(int targetClientId) { diff --git a/Patches/GameOptionsMenuPatch.cs b/Patches/GameOptionsMenuPatch.cs index 9fb89a3ba..780ee7b0b 100644 --- a/Patches/GameOptionsMenuPatch.cs +++ b/Patches/GameOptionsMenuPatch.cs @@ -1173,12 +1173,12 @@ public static class GameSettingMenuPatch var gms = Enum.GetValues()[..^1].ToList(); gms.Remove(CustomGameMode.TheMindGame); - if (GameStates.CurrentServerType == GameStates.ServerType.Vanilla) - { - gms.Remove(CustomGameMode.CaptureTheFlag); - gms.Remove(CustomGameMode.NaturalDisasters); - gms.Remove(CustomGameMode.BedWars); - } + // if (GameStates.CurrentServerType == GameStates.ServerType.Vanilla) + // { + // gms.Remove(CustomGameMode.CaptureTheFlag); + // gms.Remove(CustomGameMode.NaturalDisasters); + // gms.Remove(CustomGameMode.BedWars); + // } if (SubmergedCompatibility.Loaded && Main.NormalOptions.MapId == 6) gms.RemoveAll(SubmergedCompatibility.IsNotSupported); @@ -1192,7 +1192,7 @@ public static class GameSettingMenuPatch gms.Remove(CustomGameMode.Deathrace); } - int totalCols = 3; + const int totalCols = 3; GMButtons = [];