absolutely redundant changes (ok there are some fixes too)

This commit is contained in:
Gurge44 committed 2025-11-15 11:08:50 +01:00
1 parent 3ecfc12519
commit 92a91bbd74
9 files changed
+96 -112

No files matched your search

+2 -2
View File
@@ -42,8 +42,8 @@ public class Main : BasePlugin
private const string DebugKeyHash = "c0fd562955ba56af3ae20d7ec9e64c664f0facecef4b3e366e109306adeae29d";
private const string DebugKeySalt = "59687b";
private const string PluginGuid = "com.gurge44.endlesshostroles";
public const string PluginVersion = "6.8.1";
public const string PluginDisplayVersion = "6.8.1";
public const string PluginVersion = "6.8.2";
public const string PluginDisplayVersion = "6.8.2";
public const bool TestBuild = false;
public const string NeutralColor = "#ffab1b";
+14 -9
View File
@@ -137,17 +137,20 @@ namespace EHR
return;
}
LateTask.New(() =>
if (this is not ShapeshiftMenuElement)
{
var sender = CustomRpcSender.Create("FixModdedClientCNOText", SendOption.Reliable);
LateTask.New(() =>
{
var sender = CustomRpcSender.Create("FixModdedClientCNOText", SendOption.Reliable);
sender.AutoStartRpc(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.FixModdedClientCNO, player.OwnerId)
.WriteNetObject(playerControl)
.Write(false)
.EndRpc();
sender.AutoStartRpc(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.FixModdedClientCNO, player.OwnerId)
.WriteNetObject(playerControl)
.Write(false)
.EndRpc();
sender.SendMessage();
}, 0.4f);
sender.SendMessage();
}, 0.4f);
}
MessageWriter writer = MessageWriter.Get(SendOption.Reliable);
writer.StartMessage(6);
@@ -330,6 +333,8 @@ namespace EHR
public virtual void OnMeeting()
{
if (!AmongUsClient.Instance.AmHost) return;
MessageWriter writer = MessageWriter.Get(SendOption.Reliable);
writer.StartMessage(5);
writer.Write(AmongUsClient.Instance.GameId);
@@ -345,7 +350,7 @@ namespace EHR
System.Collections.IEnumerator WaitForMeetingEnd()
{
while (GameStates.IsMeeting || ExileController.Instance || AntiBlackout.SkipTasks) yield return null;
while (ReportDeadBodyPatch.MeetingStarted || GameStates.IsMeeting || ExileController.Instance || AntiBlackout.SkipTasks) yield return null;
if (GameStates.IsEnded || !GameStates.InGame || GameStates.IsLobby) yield break;
{
+1 -10
View File
@@ -239,16 +239,7 @@ internal static class EAC
var target = sr.ReadNetObject<PlayerControl>();
var resultFlags = (MurderResultFlags)sr.ReadInt32();
if (GameStates.IsLobby)
{
Report(pc, "Directly Murder Player In Lobby");
HandleCheat(pc, "Directly Murder Player In Lobby");
Logger.Fatal($"Player [{pc.OwnerId}:{pc.GetRealName()}] was killed directly in the lobby, rejected", "EAC");
sr.Recycle();
return true;
}
if (!resultFlags.HasFlag(MurderResultFlags.FailedError) && !resultFlags.HasFlag(MurderResultFlags.FailedProtected) && target != null && !target.Data.IsDead)
if (GameStates.IsInTask && !resultFlags.HasFlag(MurderResultFlags.FailedError) && !resultFlags.HasFlag(MurderResultFlags.FailedProtected) && target != null && !target.Data.IsDead)
LateTask.New(() => target.RpcRevive(), 0.1f, log: false);
Report(pc, "Directly Murder Player");
+35 -4
View File
@@ -24,8 +24,6 @@ namespace EHR;
internal static class ExtendedPlayerControl
{
public const MurderResultFlags ResultFlags = MurderResultFlags.Succeeded;
public static readonly HashSet<byte> BlackScreenWaitingPlayers = [];
public static readonly HashSet<byte> CancelBlackScreenFix = [];
@@ -1918,7 +1916,7 @@ internal static class ExtendedPlayerControl
return;
}
if (Options.CurrentGameMode == CustomGameMode.SoloPVP) return;
if (Options.CurrentGameMode == CustomGameMode.SoloPVP || GameStates.IsLobby || !GameStates.InGame || !Main.IntroDestroyed) return;
if (target == null) target = killer;
@@ -1995,7 +1993,40 @@ internal static class ExtendedPlayerControl
if (!Vacuum.BeforeMurderCheck(target))
killer = target;
killer.RpcMurderPlayer(target, true);
if (AmongUsClient.Instance.AmClient)
killer.MurderPlayer(target, MurderResultFlags.Succeeded);
var sender = CustomRpcSender.Create("RpcMurderPlayer", SendOption.Reliable);
sender.StartMessage();
if (Main.Invisible.Contains(target.PlayerId))
{
sender.StartRpc(target.NetTransform.NetId, RpcCalls.SnapTo)
.WriteVector2(new Vector2(50f, 50f))
.Write((ushort)(target.NetTransform.lastSequenceId + 16383))
.EndRpc();
sender.StartRpc(target.NetTransform.NetId, RpcCalls.SnapTo)
.WriteVector2(new Vector2(50f, 50f))
.Write((ushort)(target.NetTransform.lastSequenceId + 32767))
.EndRpc();
sender.StartRpc(target.NetTransform.NetId, RpcCalls.SnapTo)
.WriteVector2(new Vector2(50f, 50f))
.Write((ushort)(target.NetTransform.lastSequenceId + 32767 + 16383))
.EndRpc();
sender.StartRpc(target.NetTransform.NetId, RpcCalls.SnapTo)
.WriteVector2(target.transform.position)
.Write(target.NetTransform.lastSequenceId)
.EndRpc();
NumSnapToCallsThisRound += 4;
}
sender.StartRpc(killer.NetId, RpcCalls.MurderPlayer)
.WriteNetObject(target)
.Write((int)MurderResultFlags.Succeeded)
.EndRpc();
sender.SendMessage();
if (Main.PlayerStates.TryGetValue(target.PlayerId, out var playerState) && !playerState.IsDead)
playerState.SetDead();
+28 -24
View File
@@ -241,30 +241,34 @@ public static class NameColorManager
// If the color was determined, return true, else, check if the seer can see the target's role color without knowing the color
if (color != "") return true;
return seer == target
|| (Main.GodMode.Value && seer.AmOwner)
|| Options.CurrentGameMode is CustomGameMode.FFA or CustomGameMode.StopAndGo
|| (seer.Data.IsDead && !seer.IsAlive() && Options.GhostCanSeeOtherRoles.GetBool() && (!Utils.IsRevivingRoleAlive() || !Main.DiedThisRound.Contains(seer.PlayerId)))
|| (seer.Is(CustomRoles.Mimic) && target.Data.IsDead && !target.IsAlive() && Options.MimicCanSeeDeadRoles.GetBool())
|| target.Is(CustomRoles.GM)
|| seer.Is(CustomRoles.GM)
|| (seer.Is(CustomRoles.God) && God.KnowInfo.GetValue() == 2)
|| (seer.Is(CustomRoleTypes.Coven) && target.Is(CustomRoleTypes.Coven))
|| (seer.Is(CustomRoleTypes.Impostor) && target.Is(CustomRoleTypes.Impostor) && CustomTeamManager.ArentInCustomTeam(seer.PlayerId, target.PlayerId))
|| (seer.Is(CustomRoles.Traitor) && target.Is(Team.Impostor))
|| (seer.Is(CustomRoles.Jackal) && target.Is(CustomRoles.Sidekick))
|| (seer.Is(CustomRoles.Sidekick) && target.Is(CustomRoles.Sidekick))
|| (seer.Is(CustomRoles.Sidekick) && target.Is(CustomRoles.Jackal))
|| (seer.Is(CustomRoles.Madmate) && target.Is(CustomRoleTypes.Impostor) && Options.MadmateKnowWhosImp.GetBool())
|| (seer.Is(CustomRoleTypes.Impostor) && target.Is(CustomRoles.Madmate) && Options.ImpKnowWhosMadmate.GetBool())
|| (seer.Is(CustomRoles.Madmate) && target.Is(CustomRoles.Madmate) && Options.MadmateKnowWhosMadmate.GetBool())
|| (target.Is(CustomRoles.SuperStar) && Options.EveryOneKnowSuperStar.GetBool())
|| (target.Is(CustomRoles.Workaholic) && Workaholic.WorkaholicVisibleToEveryone.GetBool())
|| (target.Is(CustomRoles.Doctor) && !target.HasEvilAddon() && Options.DoctorVisibleToEveryone.GetBool())
|| (target.Is(CustomRoles.Gravestone) && Main.PlayerStates[target.Data.PlayerId].IsDead)
|| (target.Is(CustomRoles.Mayor) && Mayor.MayorRevealWhenDoneTasks.GetBool() && target.GetTaskState().IsTaskFinished)
|| (seer.Is(CustomRoleTypes.Crewmate) && target.Is(CustomRoles.Marshall) && target.GetTaskState().IsTaskFinished)
|| Main.PlayerStates.Values.Any(x => x.Role.KnowRole(seer, target));
if (seer == target
|| (Main.GodMode.Value && seer.AmOwner)
|| Options.CurrentGameMode is CustomGameMode.FFA or CustomGameMode.StopAndGo
|| (seer.Data.IsDead && !seer.IsAlive() && Options.GhostCanSeeOtherRoles.GetBool() && (!Utils.IsRevivingRoleAlive() || !Main.DiedThisRound.Contains(seer.PlayerId)))
|| (seer.Is(CustomRoles.Mimic) && target.Data.IsDead && !target.IsAlive() && Options.MimicCanSeeDeadRoles.GetBool())
|| target.Is(CustomRoles.GM)
|| seer.Is(CustomRoles.GM)
|| (seer.Is(CustomRoles.God) && God.KnowInfo.GetValue() == 2)
|| (seer.Is(CustomRoleTypes.Coven) && target.Is(CustomRoleTypes.Coven))
|| (seer.Is(CustomRoleTypes.Impostor) && target.Is(CustomRoleTypes.Impostor) && CustomTeamManager.ArentInCustomTeam(seer.PlayerId, target.PlayerId))
|| (seer.Is(CustomRoles.Traitor) && target.Is(Team.Impostor))
|| (seer.Is(CustomRoles.Jackal) && target.Is(CustomRoles.Sidekick))
|| (seer.Is(CustomRoles.Sidekick) && target.Is(CustomRoles.Sidekick))
|| (seer.Is(CustomRoles.Sidekick) && target.Is(CustomRoles.Jackal))
|| (seer.Is(CustomRoles.Madmate) && target.Is(CustomRoleTypes.Impostor) && Options.MadmateKnowWhosImp.GetBool())
|| (seer.Is(CustomRoleTypes.Impostor) && target.Is(CustomRoles.Madmate) && Options.ImpKnowWhosMadmate.GetBool())
|| (seer.Is(CustomRoles.Madmate) && target.Is(CustomRoles.Madmate) && Options.MadmateKnowWhosMadmate.GetBool())
|| (target.Is(CustomRoles.SuperStar) && Options.EveryOneKnowSuperStar.GetBool())
|| (target.Is(CustomRoles.Workaholic) && Workaholic.WorkaholicVisibleToEveryone.GetBool())
|| (target.Is(CustomRoles.Doctor) && !target.HasEvilAddon() && Options.DoctorVisibleToEveryone.GetBool())
|| (target.Is(CustomRoles.Gravestone) && Main.PlayerStates[target.Data.PlayerId].IsDead)
|| (target.Is(CustomRoles.Mayor) && Mayor.MayorRevealWhenDoneTasks.GetBool() && target.GetTaskState().IsTaskFinished)
|| (seer.Is(CustomRoleTypes.Crewmate) && target.Is(CustomRoles.Marshall) && target.GetTaskState().IsTaskFinished)
|| Main.PlayerStates.Values.Any(x => x.Role.KnowRole(seer, target)))
return true;
color = "#ffffff";
return true;
}
private static bool TryGetData(PlayerControl seer, PlayerControl target, out string colorCode)
+4 -3
View File
@@ -59,12 +59,12 @@ public class FallFromLadder
sender.AutoStartRpc(player.NetId, RpcCalls.MurderPlayer)
.WriteNetObject(player)
.Write((byte)ExtendedPlayerControl.ResultFlags)
.Write((int)MurderResultFlags.Succeeded)
.EndRpc();
sender.SendMessage();
player.NetTransform.SnapTo(targetPos);
player.MurderPlayer(player, ExtendedPlayerControl.ResultFlags);
player.MurderPlayer(player, MurderResultFlags.Succeeded);
Main.PlayerStates[player.PlayerId].deathReason = PlayerState.DeathReason.Fall;
Main.PlayerStates[player.PlayerId].SetDead();
}, 0.05f, "LadderFallTask");
@@ -73,10 +73,11 @@ public class FallFromLadder
}
[HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.ClimbLadder))]
internal class LadderPatch
internal static class LadderPatch
{
public static void Postfix(PlayerPhysics __instance, Ladder source /*, byte climbLadderSid*/)
{
if (!AmongUsClient.Instance.AmHost) return;
FallFromLadder.OnClimbLadder(__instance, source);
}
}
+1 -3
View File
@@ -1054,9 +1054,6 @@ internal static class MeetingHudStartPatch
case CustomRoles.Arsonist when seer.IsDousedPlayer(target):
sb.Append(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Arsonist), "▲"));
break;
case CustomRoles.Executioner:
sb.Append(Executioner.TargetMark(seer, target));
break;
case CustomRoles.EvilTracker:
sb.Append(EvilTracker.GetTargetMark(seer, target));
break;
@@ -1081,6 +1078,7 @@ internal static class MeetingHudStartPatch
if (Main.LoversPlayers.Exists(x => x.PlayerId == target.PlayerId) && (Main.LoversPlayers.Exists(x => x.PlayerId == seer.PlayerId) || seer.Data.IsDead))
sb.Append(Utils.ColorString(Utils.GetRoleColor(CustomRoles.Lovers), "♥"));
sb.Append(Executioner.TargetMark(seer, target));
sb.Append(Witch.GetSpelledMark(target.PlayerId, true));
sb.Append(Wasp.GetStungMark(target.PlayerId));
sb.Append(SpellCaster.HasSpelledMark(seer.PlayerId) ? Utils.ColorString(Team.Coven.GetColor(), "\u25c0") : string.Empty);
+7 -55
View File
@@ -66,59 +66,11 @@ internal static class CheckProtectPatch
}
}
[HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.RpcMurderPlayer))]
[HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.RpcMurderPlayer))] // never used by the mod
internal static class RpcMurderPlayerPatch
{
public static bool Prefix(PlayerControl __instance, PlayerControl target, bool didSucceed)
public static bool Prefix()
{
if (!AmongUsClient.Instance.AmHost)
{
Logger.Error("Client is calling RpcMurderPlayer, are you hacking?", "RpcMurderPlayerPatch.Prefix");
return false;
}
if (GameStates.IsLobby)
{
Logger.Info("Murder triggered in lobby, so murder canceled", "RpcMurderPlayer.Prefix");
return false;
}
MurderResultFlags murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError | MurderResultFlags.DecisionByHost;
if (AmongUsClient.Instance.AmClient)
__instance.MurderPlayer(target, murderResultFlags);
var sender = CustomRpcSender.Create("RpcMurderPlayer", SendOption.Reliable);
sender.StartMessage();
if (Main.Invisible.Contains(target.PlayerId) && murderResultFlags == MurderResultFlags.Succeeded)
{
sender.StartRpc(target.NetTransform.NetId, RpcCalls.SnapTo)
.WriteVector2(new Vector2(50f, 50f))
.Write((ushort)(target.NetTransform.lastSequenceId + 16383))
.EndRpc();
sender.StartRpc(target.NetTransform.NetId, RpcCalls.SnapTo)
.WriteVector2(new Vector2(50f, 50f))
.Write((ushort)(target.NetTransform.lastSequenceId + 32767))
.EndRpc();
sender.StartRpc(target.NetTransform.NetId, RpcCalls.SnapTo)
.WriteVector2(new Vector2(50f, 50f))
.Write((ushort)(target.NetTransform.lastSequenceId + 32767 + 16383))
.EndRpc();
sender.StartRpc(target.NetTransform.NetId, RpcCalls.SnapTo)
.WriteVector2(target.transform.position)
.Write(target.NetTransform.lastSequenceId)
.EndRpc();
NumSnapToCallsThisRound += 4;
}
sender.StartRpc(__instance.NetId, RpcCalls.MurderPlayer)
.WriteNetObject(target)
.Write((int)murderResultFlags)
.EndRpc();
sender.SendMessage();
return false;
}
}
@@ -669,13 +621,15 @@ internal static class MurderPlayerPatch
{
public static bool Prefix(PlayerControl __instance, [HarmonyArgument(0)] PlayerControl target, [HarmonyArgument(1)] MurderResultFlags resultFlags, ref bool __state)
{
if (GameStates.IsLobby || AntiBlackout.SkipTasks) return false;
if (GameStates.IsLobby || AntiBlackout.SkipTasks || !GameStates.InGame || GameStates.IsMeeting || ExileController.Instance) return false;
bool protectedByClient = resultFlags.HasFlag(MurderResultFlags.DecisionByHost) && target.IsProtected();
bool protectedByHost = resultFlags.HasFlag(MurderResultFlags.FailedProtected);
bool failed = resultFlags.HasFlag(MurderResultFlags.FailedError);
__state = !protectedByClient && !protectedByHost && !failed;
if (__state && (!Main.IntroDestroyed || IntroCutsceneDestroyPatch.PreventKill)) return false;
Logger.Info($"{__instance.GetNameWithRole()} => {target.GetNameWithRole()} - {nameof(protectedByClient)}: {protectedByClient}, {nameof(protectedByHost)}: {protectedByHost}, {nameof(failed)}: {failed}", "MurderPlayer");
RandomSpawn.CustomNetworkTransformHandleRpcPatch.HasSpawned.Add(__instance.PlayerId);
@@ -683,7 +637,7 @@ internal static class MurderPlayerPatch
if (!target.IsProtected() && !Doppelganger.DoppelVictim.ContainsKey(target.PlayerId) && !Camouflage.ResetSkinAfterDeathPlayers.Contains(target.PlayerId))
{
Camouflage.ResetSkinAfterDeathPlayers.Add(target.PlayerId);
Camouflage.RpcSetSkin(target, true);
LateTask.New(() => Camouflage.RpcSetSkin(target, true), 0.2f, log: false);
}
return true;
@@ -1925,14 +1879,12 @@ internal static class FixedUpdatePatch
if (AntiAdminer.IsDoorLogWatch) additionalSuffixes.Add(GetString("AntiAdminerDL"));
if (AntiAdminer.IsCameraWatch) additionalSuffixes.Add(GetString("AntiAdminerCA"));
break;
case CustomRoles.Executioner:
Mark.Append(Executioner.TargetMark(seer, target));
break;
case CustomRoles.Demon:
Mark.Append(Demon.TargetMark(seer, target));
break;
}
Mark.Append(Executioner.TargetMark(seer, target));
Mark.Append(Follower.TargetMark(seer, target));
Mark.Append(Romantic.TargetMark(seer, target));
Mark.Append(Lawyer.LawyerMark(seer, target));
+4 -2
View File
@@ -275,7 +275,8 @@ public class Penguin : RoleBase
if (!AmongUsClient.Instance.AmHost) return;
if (AbductVictim == null) return;
if (!IsGoose && MeetingKill) Penguin_.Kill(AbductVictim);
if (!IsGoose && MeetingKill && AbductVictim.IsAlive())
Penguin_.Kill(AbductVictim);
RemoveVictim(false);
}
@@ -361,7 +362,7 @@ public class Penguin : RoleBase
int sId = abductVictim.NetTransform.lastSequenceId + 5;
abductVictim.NetTransform.SnapTo(Penguin_.Pos(), (ushort)sId);
Penguin_.Kill(abductVictim);
Penguin_.MurderPlayer(abductVictim, MurderResultFlags.Succeeded);
var sender = CustomRpcSender.Create("PenguinMurder", SendOption.Reliable);
{
@@ -375,6 +376,7 @@ public class Penguin : RoleBase
sender.AutoStartRpc(Penguin_.NetId, RpcCalls.MurderPlayer);
{
sender.WriteNetObject(abductVictim);
sender.Write((int)MurderResultFlags.Succeeded);
}
sender.EndRpc();
}