1.7.1

AmongUsRevamped.cs

@@ -42,7 +42,7 @@ public partial class Main : BasePlugin
 
     public static bool HasArgumentException;
     public static string CredentialsText;
-    public const string ModVersion = "v1.6.5";
+    public const string ModVersion = "v1.7.1";
 
     public static float GameTimer;
 

Modules/CustomRoleManagement.cs

@@ -19,6 +19,8 @@ public static class CustomRoleManagement
 
     public static void AssignRoles()
     {
+        if (Options.Gamemode.GetValue() > 1) return;
+
         // crewmateRoles = assigned with crewmate role base
         // impostorRoles = assigned with impostor role base
         List<(string roleName, int percentage)> crewmateRoles = new()
@@ -114,7 +116,12 @@ public static class CustomRoleManagement
     private static int PendingRoleMessages = 0;
     public static void SendRoleMessages(Dictionary<string, string> roleMessages)
     {
-        if (PlayerRoles.Count == 0 || PlayerControl.LocalPlayer.Data.IsDead) return;
+        if (PlayerRoles.Count == 0 || PlayerControl.LocalPlayer.Data.IsDead)
+        {
+            HandlingRoleMessages = false;
+            PendingRoleMessages = 0;
+            return;
+        }
 
         HashSet<string> sentRoles = new HashSet<string>();
 

Modules/FixedUpdate.cs

@@ -36,7 +36,6 @@ public static class FixedUpdate
 [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.FixedUpdate))]
 class FixedUpdateInGamePatch
 {
-    public static List<PlayerControl> ScheduledKicks = new();
     private static Dictionary<byte, string> LastColors = new();
     private static float t;
     private static GameObject settingsLabel;
@@ -103,13 +102,10 @@ class FixedUpdateInGamePatch
                 break;
         }
 
-        if (__instance.CanMove && __instance.Data.PlayerLevel + 1 < Options.KickLowLevelPlayer.GetInt() && __instance.Data.ClientId != AmongUsClient.Instance.HostId)
+        if (__instance.Data.PlayerLevel != 0 && __instance.Data.PlayerLevel < Options.KickLowLevelPlayer.GetInt() - 1 && __instance.Data.ClientId != AmongUsClient.Instance.HostId)
         {
-            if (ScheduledKicks.Contains(__instance)) return;
-
             if (!Options.TempBanLowLevelPlayer.GetBool()) 
             {
-                ScheduledKicks.Add(__instance);
                 AmongUsClient.Instance.KickPlayer(__instance.Data.ClientId, false);
                 Logger.Info($" {__instance.Data.PlayerName} was kicked for being under level {Options.KickLowLevelPlayer.GetInt()}", "KickLowLevelPlayer");
                 Logger.SendInGame($" {__instance.Data.PlayerName} was kicked for being under level {Options.KickLowLevelPlayer.GetInt()}");

Modules/Utils.cs

@@ -220,8 +220,6 @@ public static class Utils
         PlayerControlCompleteTaskPatch.tasksInitiated = false;
         PlayerControlCompleteTaskPatch.ignoredCompletedTasks = 0;
         PlayerControlCompleteTaskPatch.ignoredTasks = 0;
-
-        FixedUpdateInGamePatch.ScheduledKicks.Clear();
     }
 
     public static PlayerControl[] AllAlivePlayerControls

Patches/ChatPatches.cs

@@ -243,10 +243,10 @@ internal static class SendChatPatch
             if (!isKick && !isBan && !isColorKick && !isColorBan)
             {
                 
-                __instance.freeChatField.textArea.SetText(converted);
-                Utils.ChatCommand(__instance, $"{converted}", "", false);
+                //__instance.freeChatField.textArea.SetText(converted);
+                //Utils.ChatCommand(__instance, $"{converted}", "", false);
                 Logger.Info($" {PlayerControl.LocalPlayer.Data.PlayerName}: {msgtext}", "SendChat");
-                return false;
+                return true;
             }
 
             string arg = text.Substring(isKick ? 6 : isBan ? 5 : isColorKick ? 7 : isColorBan ? 6 : 0).Trim();

Patches/IntroPatch.cs

@@ -17,7 +17,7 @@ internal static class CoShowIntroPatch
 
         NormalGameEndChecker.customRoles = CustomRoleManagement.PlayerToCustomRole();
 
-        if (CustomRoleManagement.PlayerRoles.Count != 0 && !Utils.isHideNSeek)
+        if (CustomRoleManagement.PlayerRoles.Count != 0 && !Utils.isHideNSeek && Options.Gamemode.GetValue() < 2)
         {
             _ = new LateTask(() =>
             {
@@ -47,6 +47,16 @@ internal static class CoShowIntroPatch
                 Utils.CanCallMeetings = true;
             }, Options.ChatBeforeFirstMeeting.GetBool() ? 39.5f : 33f, "MeetingEnabled");     
         }
+
+        if (Options.Gamemode.GetValue() == 2 && Options.SNSChatInGame.GetBool() || Options.Gamemode.GetValue() == 0 && Options.ChatBeforeFirstMeeting.GetBool())
+        {
+            _ = new LateTask(() =>
+            {  
+                PlayerControl.LocalPlayer.CmdReportDeadBody(null);
+                if (MeetingHud.Instance != null) MeetingHud.Instance.RpcClose(); 
+
+            }, 9f, "SetChatVisible");  
+        }
     }
 }
 
@@ -57,16 +67,6 @@ class BeginCrewmatePatch
     {
         if (!AmongUsClient.Instance.AmHost) return;
 
-        if (Options.Gamemode.GetValue() == 2 && Options.SNSChatInGame.GetBool() || Options.Gamemode.GetValue() == 0 && Options.ChatBeforeFirstMeeting.GetBool())
-        {
-            _ = new LateTask(() =>
-            {  
-                PlayerControl.LocalPlayer.CmdReportDeadBody(null);
-                if (MeetingHud.Instance != null) MeetingHud.Instance.RpcClose(); 
-
-            }, 7f, "SetChatVisible");  
-        }
-
         if (Main.GM.Value)
         {
             __instance.TeamTitle.text = "Game Master";

Patches/OnGameStartedPatch.cs

@@ -38,14 +38,17 @@ class PlayerControlSetRolePatch
     {
         if (!FirstAssign || !AmongUsClient.Instance.AmHost) return true;
 
+        var oldRole = roleType;
+
         canOverrideRole = false;
 
         if (Main.GM.Value && __instance == PlayerControl.LocalPlayer)
         {
             roleType = RoleTypes.CrewmateGhost;
+            return true;
         }
 
-        if (CustomRoleManagement.PlayerRoles.TryGetValue(__instance.PlayerId, out var role) && role == "Mayor")
+        if (CustomRoleManagement.PlayerRoles.TryGetValue(__instance.PlayerId, out var role) && role == "Mayor" && Options.Gamemode.GetValue() < 2)
         {
             if (Options.MayorVentToMeeting.GetBool())
             {
@@ -56,8 +59,9 @@ class PlayerControlSetRolePatch
             {
                 roleType = RoleTypes.Crewmate;
             }
+            Logger.Info($" {__instance.Data.PlayerName} | {oldRole} -> {roleType}", "ChangedRoleBase");
         }
-        if (CustomRoleManagement.PlayerRoles.TryGetValue(__instance.PlayerId, out var r) && r == "Jester")
+        if (CustomRoleManagement.PlayerRoles.TryGetValue(__instance.PlayerId, out var r) && r == "Jester" && Options.Gamemode.GetValue() < 2)
         {
             if (Options.JesterCanVent.GetBool())
             {
@@ -68,6 +72,7 @@ class PlayerControlSetRolePatch
             {
                 roleType = RoleTypes.Crewmate;
             }
+            Logger.Info($" {__instance.Data.PlayerName} | {oldRole} -> {roleType}", "ChangedRoleBase");
         }
 
         if (Utils.isHideNSeek && i == 0)

Patches/PlayerControlPatches.cs

@@ -23,11 +23,12 @@ class ReportDeadBodyPatch
         }
 
         // target == null means meeting
-        if (target == null) return true;
 
         if (Options.Gamemode.GetValue() == 2 || Options.Gamemode.GetValue() == 3)
         {
-            Logger.Info($" Stopped {__instance.Data.PlayerName} reporting the body of {target.PlayerName}", "ReportDeadBodyPatch");
+            if (target != null) Logger.Info($" Stopped {__instance.Data.PlayerName} reporting the body of {target.PlayerName}", "ReportDeadBodyPatch");
+            else Logger.Info($" Stopped {__instance.Data.PlayerName} trying to call a meeting", "ReportDeadBodyPatch");
+
             return false;
         }
         else return true;
@@ -62,7 +63,7 @@ internal static class MurderPlayerPatch
                 {
                     if (p.Data.Role.IsImpostor)
                     {
-                        p.cosmetics.nameText.text = $"{p.Data.PlayerName}<color=red><size=90%>({killCount[__instance.Data.PlayerId]}†)";
+                        p.cosmetics.nameText.text = $"{p.Data.PlayerName}<color=red><size=90%>({killCount[p.Data.PlayerId]}†)";
                     }
                     else
                     {
@@ -106,8 +107,8 @@ internal static class MurderPlayerPatch
                 if (misfireCount[__instance.Data.PlayerId] >= Options.MisfiresToSuicide.GetFloat())
                 {
                     __instance.RpcSetRole(RoleTypes.ImpostorGhost);
-                    Logger.Info($" {__instance.Data.PlayerName} misfired {misfireCount[playerId]} times and suicided", "SNSKillManager");
-                    Logger.SendInGame($" {__instance.Data.PlayerName} misfired {misfireCount[playerId]} times and suicided");
+                    Logger.Info($" {__instance.Data.PlayerName} misfired {misfireCount[playerId]} time(s) and suicided", "SNSKillManager");
+                    Logger.SendInGame($" {__instance.Data.PlayerName} misfired {misfireCount[playerId]} time(s) and suicided");
                 }
 
             }
@@ -174,6 +175,16 @@ class PlayerControlCompleteTaskPatch
 
         if (Options.Gamemode.GetValue() != 3) CalculateTaskWin();
 
+        if (Options.Gamemode.GetValue() == 3)
+        {
+            if (!__instance.Data.IsDead && playerTasksCompleted[__instance] >= __instance.Data.Tasks.Count)
+            {
+                Utils.CustomWinnerEndGame(__instance, 1);
+                NormalGameEndChecker.LastWinReason = $"{__instance.Data.PlayerName} wins! (Completed tasks)";
+                NormalGameEndChecker.canUpdateWinnerText = false;
+            }
+        }
+
         if (PlayerControl.LocalPlayer.Data.IsDead)
         {
             TMP_Text nameText = __instance.cosmetics.nameText;

README.md

@@ -29,7 +29,7 @@
 <img src="https://github.com/astra1dev/AUnlocker/assets/90265231/14226f03-a003-4efc-b27b-6df53fb394d6" width=410 height=240>****
 ‎ 
 
-# 🎮 Features (v1.6.5):
+# 🎮 Features (v1.7.1):
 ## <b> 🌟 Custom Roles:</b>
 - Mayor (Crewmate)
 - The mayor has extra votes and can call meetings by venting, depending on settings.