Fix issues with Judge and new meeting changes

This commit is contained in:
Atony committed 2026-08-18 15:10:11 -05:00
1 parent 411340d9e9
commit f96f75cea1
6 files changed
+46 -14

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
<ItemGroup>
<PackageReference Include="Reactor" Version="2.5.0-ci.371" />
<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
<PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.3.31" PrivateAssets="all" />
<PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.8.18" PrivateAssets="all" />
<PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
<PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
@@ -33,6 +33,16 @@ public class ProcessVotesEvent(List<CustomVote> votes, NetworkedPlayerInfo? exil
/// </summary>
public List<CustomVote> Votes { get; } = votes;
/// <summary>
/// Gets or sets a value indicating whether an overruling was done. Normally set by judge but can be overwritten.
/// </summary>
public bool OverruledVote { get; set; }
/// <summary>
/// Gets or sets a value specifically to determine which Judge (if any) caused the overruling. Normally set by judge but can be overwritten.
/// </summary>
public ushort OverruledNonce { get; set; }
/// <summary>
/// Gets or sets the player to be exiled. Will be <see langword="null"/> if no player is to be exiled.
/// </summary>
+5 -5
View File
@@ -77,7 +77,7 @@ internal static class MeetingHudPatches
[HarmonyPatch(nameof(MeetingHud.Update))]
public static void ForceSkipPatch(MeetingHud __instance)
{
if (__instance.state is not (MeetingHud.VoteStates.NotVoted or MeetingHud.VoteStates.Voted))
if (__instance.state is not (MeetingHud.MeetingStates.NotVoted or MeetingHud.MeetingStates.Voted))
{
return;
}
@@ -127,13 +127,13 @@ internal static class MeetingHudPatches
return false;
}
var playerVoteArea = __instance.playerStates.First(pv => pv.TargetPlayerId == pc.PlayerId);
var playerVoteArea = __instance.playerStates.First(pv => pv.PlayerId == pc.PlayerId);
playerVoteArea.AmDead = true;
playerVoteArea.Overlay.gameObject.SetActive(true);
foreach (var player in Helpers.GetAlivePlayers())
{
var pva = __instance.playerStates.First(pv => pv.TargetPlayerId == player.PlayerId);
var pva = __instance.playerStates.First(pv => pv.PlayerId == player.PlayerId);
var voteData = player.GetVoteData();
if (pva.AmDead || !voteData.VotedFor(pc.PlayerId))
@@ -150,7 +150,7 @@ internal static class MeetingHudPatches
__instance.SetDirtyBit(1U);
__instance.CheckForEndVoting();
if (__instance.state == MeetingHud.VoteStates.Results)
if (__instance.state == MeetingHud.MeetingStates.Results)
{
__instance.SetupProceedButton();
}
@@ -199,7 +199,7 @@ internal static class MeetingHudPatches
})
]);
__instance.RpcVotingComplete(voterStates, exiled, isTie);
__instance.RpcVotingComplete(voterStates, exiled, isTie, @event.OverruledVote, @event.OverruledNonce);
return false;
}
+1 -1
View File
@@ -164,7 +164,7 @@ public static class Extensions
/// </summary>
/// <param name="state">The <see cref="PlayerVoteArea"/>.</param>
/// <returns>The player's <see cref="PlayerControl"/>.</returns>
public static PlayerControl? GetPlayer(this PlayerVoteArea state) => GameData.Instance.GetPlayerById(state.TargetPlayerId)?.Object;
public static PlayerControl? GetPlayer(this PlayerVoteArea state) => GameData.Instance.GetPlayerById(state.PlayerId)?.Object;
/// <summary>
/// Gets an <see langword="int"/> representing the amount of tasks a player has left.
+22
View File
@@ -0,0 +1,22 @@
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Meeting.Voting;
using MiraAPI.Roles;
namespace MiraAPI.VanillaEvents;
public static class JudgeEvents
{
[RegisterEvent(100000)]
public static void ProcessVotesEventHandler(ProcessVotesEvent @event)
{
if (MeetingHud.Instance.TryGetWinningOverrule(out var judgeOverrule, out var networkedPlayerInfo, out var networkedPlayerInfo2))
{
@event.OverruledVote = true;
@event.OverruledNonce = judgeOverrule.OverruleNonce;
@event.ExiledPlayer = networkedPlayerInfo2.Role is ICustomRole { Team: not ModdedRoleTeams.Crewmate } || networkedPlayerInfo2.Role.TeamType == RoleTeamTypes.Impostor
? GameData.Instance.GetPlayerById(judgeOverrule.OverruledPlayerId)
: networkedPlayerInfo;
}
}
}
+7 -7
View File
@@ -75,14 +75,14 @@ public static class VotingUtils
{
if (!source.IsHost()) return;
MeetingHud.Instance.playerStates.First(state => state.TargetPlayerId == voterId).UnsetVote();
MeetingHud.Instance.playerStates.First(state => state.PlayerId == voterId).UnsetVote();
if (PlayerControl.LocalPlayer.PlayerId != voterId)
{
return;
}
MeetingHud.Instance.playerStates.First(state => state.TargetPlayerId == votedFor).ThumbsDown.enabled = false;
MeetingHud.Instance.playerStates.First(state => state.PlayerId == votedFor).ThumbsDown.enabled = false;
if (!AmongUsClient.Instance.AmHost)
{
@@ -93,10 +93,10 @@ public static class VotingUtils
foreach (var t in MeetingHud.Instance.playerStates)
{
t.voteComplete = false;
t.VoteComplete = false;
}
MeetingHud.Instance.SkipVoteButton.voteComplete = false;
MeetingHud.Instance.SkipVoteButton.VoteComplete = false;
MeetingHud.Instance.SkipVoteButton.gameObject.SetActive(true);
}
@@ -137,7 +137,7 @@ public static class VotingUtils
var localVoteData = PlayerControl.LocalPlayer.GetVoteData();
if (!localVoteData || localVoteData.VotesRemaining != 0) return;
MeetingHud.Instance.SkipVoteButton.voteComplete = true;
MeetingHud.Instance.SkipVoteButton.VoteComplete = true;
MeetingHud.Instance.SkipVoteButton.gameObject.SetActive(false);
}
@@ -146,7 +146,7 @@ public static class VotingUtils
// If player has no more votes, then make it show that the player has used all their votes.
if (voteData.VotesRemaining == 0)
{
MeetingHud.Instance.playerStates.First(x => x.TargetPlayerId == srcPlayerId).SetVote(suspectPlayerId);
MeetingHud.Instance.playerStates.First(x => x.PlayerId == srcPlayerId).SetVote(suspectPlayerId);
}
// If host, then check end voting, and set votes/send chat if applicable
@@ -233,7 +233,7 @@ public static class VotingUtils
MeetingHud.Instance.BloopAVoteIcon(playerById, num, MeetingHud.Instance.SkippedVoting.transform);
num++;
}
else if (vote.Suspect == playerVoteArea.TargetPlayerId)
else if (vote.Suspect == playerVoteArea.PlayerId)
{
if (!delays.TryAdd(vote.Suspect, 0))
{