Yeah I still can't fix the dumb level stuff

This commit is contained in:
Ape committed 2026-03-30 17:38:29 +02:00
1 parent 0f373b8328
commit 58df006f07
5 files changed
+15 -21

No files matched your search

+1 -1
View File
@@ -42,7 +42,7 @@ public partial class Main : BasePlugin
public static bool HasArgumentException; public static bool HasArgumentException;
public static string CredentialsText; public static string CredentialsText;
public const string ModVersion = "v1.6.5"; public const string ModVersion = "v1.6.6";
public static float GameTimer; public static float GameTimer;
+1 -5
View File
@@ -36,7 +36,6 @@ public static class FixedUpdate
[HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.FixedUpdate))] [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.FixedUpdate))]
class FixedUpdateInGamePatch class FixedUpdateInGamePatch
{ {
public static List<PlayerControl> ScheduledKicks = new();
private static Dictionary<byte, string> LastColors = new(); private static Dictionary<byte, string> LastColors = new();
private static float t; private static float t;
private static GameObject settingsLabel; private static GameObject settingsLabel;
@@ -103,13 +102,10 @@ class FixedUpdateInGamePatch
break; 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()) if (!Options.TempBanLowLevelPlayer.GetBool())
{ {
ScheduledKicks.Add(__instance);
AmongUsClient.Instance.KickPlayer(__instance.Data.ClientId, false); AmongUsClient.Instance.KickPlayer(__instance.Data.ClientId, false);
Logger.Info($" {__instance.Data.PlayerName} was kicked for being under level {Options.KickLowLevelPlayer.GetInt()}", "KickLowLevelPlayer"); 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()}"); Logger.SendInGame($" {__instance.Data.PlayerName} was kicked for being under level {Options.KickLowLevelPlayer.GetInt()}");
-2
View File
@@ -220,8 +220,6 @@ public static class Utils
PlayerControlCompleteTaskPatch.tasksInitiated = false; PlayerControlCompleteTaskPatch.tasksInitiated = false;
PlayerControlCompleteTaskPatch.ignoredCompletedTasks = 0; PlayerControlCompleteTaskPatch.ignoredCompletedTasks = 0;
PlayerControlCompleteTaskPatch.ignoredTasks = 0; PlayerControlCompleteTaskPatch.ignoredTasks = 0;
FixedUpdateInGamePatch.ScheduledKicks.Clear();
} }
public static PlayerControl[] AllAlivePlayerControls public static PlayerControl[] AllAlivePlayerControls
+10 -10
View File
@@ -47,6 +47,16 @@ internal static class CoShowIntroPatch
Utils.CanCallMeetings = true; Utils.CanCallMeetings = true;
}, Options.ChatBeforeFirstMeeting.GetBool() ? 39.5f : 33f, "MeetingEnabled"); }, 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 (!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) if (Main.GM.Value)
{ {
__instance.TeamTitle.text = "Game Master"; __instance.TeamTitle.text = "Game Master";
+3 -3
View File
@@ -62,7 +62,7 @@ internal static class MurderPlayerPatch
{ {
if (p.Data.Role.IsImpostor) 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 else
{ {
@@ -106,8 +106,8 @@ internal static class MurderPlayerPatch
if (misfireCount[__instance.Data.PlayerId] >= Options.MisfiresToSuicide.GetFloat()) if (misfireCount[__instance.Data.PlayerId] >= Options.MisfiresToSuicide.GetFloat())
{ {
__instance.RpcSetRole(RoleTypes.ImpostorGhost); __instance.RpcSetRole(RoleTypes.ImpostorGhost);
Logger.Info($" {__instance.Data.PlayerName} misfired {misfireCount[playerId]} times and suicided", "SNSKillManager"); Logger.Info($" {__instance.Data.PlayerName} misfired {misfireCount[playerId]} time(s) and suicided", "SNSKillManager");
Logger.SendInGame($" {__instance.Data.PlayerName} misfired {misfireCount[playerId]} times and suicided"); Logger.SendInGame($" {__instance.Data.PlayerName} misfired {misfireCount[playerId]} time(s) and suicided");
} }
} }