Skip to content

Commit

Permalink
改名
Browse files Browse the repository at this point in the history
  • Loading branch information
@mxyx0412
mxyx0412 committed Dec 25, 2024
1 parent ee460fc commit bef049e
Show file tree
Hide file tree
Showing 23 changed files with 222 additions and 222 deletions.
12 changes: 6 additions & 6 deletions TheOtherRoles/Buttons/Buttons.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ public static void createButtonsPostfix(HudManager __instance)
},
() =>
{
return GhostEngineer.player != null && GhostEngineer.player == CachedPlayer.LocalPlayer.PlayerControl &&
return GhostEngineer.Player != null && GhostEngineer.Player == CachedPlayer.LocalPlayer.PlayerControl &&
!GhostEngineer.Fixes && CachedPlayer.LocalPlayer.Data.IsDead;
},
() =>
Expand Down Expand Up @@ -3230,7 +3230,7 @@ public static void createButtonsPostfix(HudManager __instance)
},
() =>
{
return Amnisiac.player != null && Amnisiac.player.Any(x => x == CachedPlayer.LocalPlayer.PlayerControl) &&
return Amnisiac.Player != null && Amnisiac.Player.Any(x => x == CachedPlayer.LocalPlayer.PlayerControl) &&
!CachedPlayer.LocalPlayer.Data.IsDead;
},
() =>
Expand All @@ -3250,7 +3250,7 @@ public static void createButtonsPostfix(HudManager __instance)
() => { },
() =>
{
return Specter.player != null && Specter.player == CachedPlayer.LocalPlayer.PlayerControl &&
return Specter.Player != null && Specter.Player == CachedPlayer.LocalPlayer.PlayerControl &&
CachedPlayer.LocalPlayer.Data.IsDead & Specter.remember;
},
() =>
Expand Down Expand Up @@ -3427,7 +3427,7 @@ public static void createButtonsPostfix(HudManager __instance)
},
() =>
{
return Pursuer.pursuer != null && Pursuer.pursuer.Contains(CachedPlayer.LocalPlayer.PlayerControl) &&
return Pursuer.Player != null && Pursuer.Player.Contains(CachedPlayer.LocalPlayer.PlayerControl) &&
!CachedPlayer.LocalPlayer.Data.IsDead && Pursuer.blanks < Pursuer.blanksNumber;
},
() =>
Expand Down Expand Up @@ -3467,7 +3467,7 @@ public static void createButtonsPostfix(HudManager __instance)
},
() =>
{
return Survivor.survivor != null && Survivor.survivor.Contains(CachedPlayer.LocalPlayer.PlayerControl) &&
return Survivor.Player != null && Survivor.Player.Contains(CachedPlayer.LocalPlayer.PlayerControl) &&
!CachedPlayer.LocalPlayer.Data.IsDead && Survivor.vestEnable && Survivor.remainingVests > 0;
},
() =>
Expand Down Expand Up @@ -3522,7 +3522,7 @@ public static void createButtonsPostfix(HudManager __instance)
},
() =>
{
return Survivor.survivor != null && Survivor.survivor.Contains(CachedPlayer.LocalPlayer.PlayerControl) &&
return Survivor.Player != null && Survivor.Player.Contains(CachedPlayer.LocalPlayer.PlayerControl) &&
!CachedPlayer.LocalPlayer.Data.IsDead && Survivor.blanksEnable && Survivor.remainingBlanks > 0;
},
() =>
Expand Down
16 changes: 8 additions & 8 deletions TheOtherRoles/Helper/Helpers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,19 @@ public static bool hasFakeTasks(this PlayerControl player)
player == Juggernaut.juggernaut ||
player == Jester.jester ||
player == Arsonist.arsonist ||
player == Witness.player ||
player == Witness.Player ||
player == PartTimer.partTimer ||
player == Akujo.akujo ||
player == Specter.player ||
player == Specter.Player ||
player == Swooper.swooper ||
player == Lawyer.lawyer ||
player == Executioner.executioner ||
player == Vulture.vulture ||
player == Jackal.sidekick ||
player == Pavlovsdogs.pavlovsowner ||
Jackal.jackal.Any(x => x == player) ||
Pursuer.pursuer.Any(x => x == player) ||
Survivor.survivor.Any(x => x == player) ||
Pursuer.Player.Any(x => x == player) ||
Survivor.Player.Any(x => x == player) ||
Pavlovsdogs.pavlovsdogs.Any(x => x == player);
}

Expand Down Expand Up @@ -263,9 +263,9 @@ public static bool isEvilNeutral(PlayerControl player)
{
return isNeutral(player) &&
player != PartTimer.partTimer &&
!Amnisiac.player.Contains(player) &&
!Pursuer.pursuer.Contains(player) &&
!Survivor.survivor.Contains(player);
!Amnisiac.Player.Contains(player) &&
!Pursuer.Player.Contains(player) &&
!Survivor.Player.Contains(player);
}

public static bool isKiller(this PlayerControl player)
Expand Down Expand Up @@ -1189,7 +1189,7 @@ public static MurderAttemptResult checkMuderAttempt(PlayerControl killer, Player
return MurderAttemptResult.SuppressKill;
}

if (Survivor.survivor != null && Survivor.survivor.Contains(target) && Survivor.vestActive)
if (Survivor.Player != null && Survivor.Player.Contains(target) && Survivor.vestActive)
{
CustomButton.resetKillButton(killer, Survivor.vestResetCooldown);
SoundEffectsManager.play("fail");
Expand Down
2 changes: 1 addition & 1 deletion TheOtherRoles/Modules/ChatCommands.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public static void Postfix(HudManager __instance)
|| (CachedPlayer.LocalPlayer.PlayerControl.isLover() && Lovers.enableChat)))
__instance.Chat.SetVisible(true);

if (!InMeeting && !ModOption.DebugMode && Specter.player != null && PlayerControl.LocalPlayer == Specter.player)
if (!InMeeting && !ModOption.DebugMode && Specter.Player != null && PlayerControl.LocalPlayer == Specter.Player)
__instance.Chat?.SetVisible(false);


Expand Down
30 changes: 15 additions & 15 deletions TheOtherRoles/Patches/EndGamePatch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)] ref En
Werewolf.werewolf,
Lawyer.lawyer,
Executioner.executioner,
Witness.player,
Specter.player,
Witness.Player,
Specter.Player,
Thief.thief,
Juggernaut.juggernaut,
Doomsayer.doomsayer,
Expand All @@ -165,11 +165,11 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)] ref En
Pavlovsdogs.pavlovsowner,
}.Where(p => p != null));

notWinners.AddRange(Amnisiac.player.Where(p => p != null));
notWinners.AddRange(Amnisiac.Player.Where(p => p != null));
notWinners.AddRange(Pavlovsdogs.pavlovsdogs.Where(p => p != null));
notWinners.AddRange(Jackal.jackal.Where(p => p != null));
notWinners.AddRange(Pursuer.pursuer.Where(p => p != null));
notWinners.AddRange(Survivor.survivor.Where(p => p != null));
notWinners.AddRange(Pursuer.Player.Where(p => p != null));
notWinners.AddRange(Survivor.Player.Where(p => p != null));
if (Akujo.honmeiCannotFollowWin && Akujo.honmei != null) notWinners.Add(Akujo.honmei);

var winnersToRemove = new List<WinningPlayerData>();
Expand All @@ -182,7 +182,7 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)] ref En
var everyoneDead = AdditionalTempData.playerRoles.All(x => !x.IsAlive);
var miniLose = Mini.mini != null && gameOverReason == (GameOverReason)CustomGameOverReason.MiniLose;
var jesterWin = Jester.jester != null && gameOverReason == (GameOverReason)CustomGameOverReason.JesterWin;
var witnessWin = Witness.player != null && gameOverReason == (GameOverReason)CustomGameOverReason.WitnessWin;
var witnessWin = Witness.Player != null && gameOverReason == (GameOverReason)CustomGameOverReason.WitnessWin;
var impostorWin = gameOverReason is GameOverReason.ImpostorByKill or GameOverReason.ImpostorBySabotage or GameOverReason.ImpostorByVote;
var werewolfWin = gameOverReason == (GameOverReason)CustomGameOverReason.WerewolfWin && Werewolf.werewolf.IsAlive();
var juggernautWin = gameOverReason == (GameOverReason)CustomGameOverReason.JuggernautWin && Juggernaut.juggernaut.IsAlive();
Expand Down Expand Up @@ -233,7 +233,7 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)] ref En
else if (witnessWin)
{
TempData.winners = new Il2CppSystem.Collections.Generic.List<WinningPlayerData>();
var wpd = new WinningPlayerData(Witness.player.Data);
var wpd = new WinningPlayerData(Witness.Player.Data);
TempData.winners.Add(wpd);
AdditionalTempData.winCondition = WinCondition.WitnessWin;
}
Expand Down Expand Up @@ -285,9 +285,9 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)] ref En
if (p == null) continue;
if (p == Lovers.lover1 || p == Lovers.lover2)
TempData.winners.Add(new WinningPlayerData(p.Data));
else if (Pursuer.pursuer.Any(pc => pc == p) && Pursuer.pursuer.Any(pc => pc.IsAlive()))
else if (Pursuer.Player.Any(pc => pc == p) && Pursuer.Player.Any(pc => pc.IsAlive()))
TempData.winners.Add(new WinningPlayerData(p.Data));
else if (Survivor.survivor.Any(pc => pc == p) && Survivor.survivor.Any(pc => pc.IsAlive()))
else if (Survivor.Player.Any(pc => pc == p) && Survivor.Player.Any(pc => pc.IsAlive()))
TempData.winners.Add(new WinningPlayerData(p.Data));
else if (!notWinners.Contains(p) && !p.Data.Role.IsImpostor)
TempData.winners.Add(new WinningPlayerData(p.Data));
Expand Down Expand Up @@ -405,9 +405,9 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)] ref En
if (p == null) continue;
if (p == Akujo.akujo || p == Akujo.honmei)
TempData.winners.Add(new WinningPlayerData(p.Data));
else if (Pursuer.pursuer.Contains(p) && !p.Data.IsDead)
else if (Pursuer.Player.Contains(p) && !p.Data.IsDead)
TempData.winners.Add(new WinningPlayerData(p.Data));
else if (Survivor.survivor.Contains(p) && !p.Data.IsDead)
else if (Survivor.Player.Contains(p) && !p.Data.IsDead)
TempData.winners.Add(new WinningPlayerData(p.Data));
else if (!notWinners.Contains(p) && !p.Data.Role.IsImpostor)
TempData.winners.Add(new WinningPlayerData(p.Data));
Expand Down Expand Up @@ -459,9 +459,9 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)] ref En
}

// Possible Additional winner: Pursuer
if (Pursuer.pursuer != null && Pursuer.pursuer.Any(p => !p.Data.IsDead) && !Lawyer.notAckedExiled && !isPursurerLose)
if (Pursuer.Player != null && Pursuer.Player.Any(p => !p.Data.IsDead) && !Lawyer.notAckedExiled && !isPursurerLose)
{
foreach (var player in Pursuer.pursuer.Where(p => !p.Data.IsDead))
foreach (var player in Pursuer.Player.Where(p => !p.Data.IsDead))
{
if (!TempData.winners.ToArray().Any(x => x.PlayerName == player.Data.PlayerName))
TempData.winners.Add(new WinningPlayerData(player.Data));
Expand All @@ -470,9 +470,9 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)] ref En
}

// Possible Additional winner: Survivor
if (Survivor.survivor != null && Survivor.survivor.Any(p => !p.Data.IsDead) && !isPursurerLose)
if (Survivor.Player != null && Survivor.Player.Any(p => !p.Data.IsDead) && !isPursurerLose)
{
foreach (var player in Survivor.survivor.Where(p => !p.Data.IsDead))
foreach (var player in Survivor.Player.Where(p => !p.Data.IsDead))
{
if (!TempData.winners.ToArray().Any(x => x.PlayerName == player.Data.PlayerName))
TempData.winners.Add(new WinningPlayerData(player.Data));
Expand Down
2 changes: 1 addition & 1 deletion TheOtherRoles/Patches/ExileControllerPatch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ private static void WrapUpPostfix(GameData.PlayerInfo exiled)
AmongUsClient.Instance.FinishRpcImmediately(writer);
Executioner.PromotesRole();
}
else if (Witness.player == CachedPlayer.LocalPlayer.PlayerControl && Witness.target != null && Witness.killerTarget != null)
else if (Witness.Player == CachedPlayer.LocalPlayer.PlayerControl && Witness.target != null && Witness.killerTarget != null)
{
bool skip = exiled == null;
bool targetIsKillerAndNotExiled = Witness.target == Witness.killerTarget && (exiled?.Object == null || Witness.target != exiled?.Object);
Expand Down
4 changes: 2 additions & 2 deletions TheOtherRoles/Patches/MeetingHudPatch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public static void updateMeetingText(MeetingHud __instance)
{
meetingInfoText = string.Format(GetString("PartTimerMeetingInfo"), Swapper.charges);
}
else if (PlayerControl.LocalPlayer == Witness.player)
else if (PlayerControl.LocalPlayer == Witness.Player)
{
if (Witness.timeLeft > 0 && Witness.killerTarget == null)
meetingInfoText = string.Format(GetString("WitnessTimerLeft2"), $"{TimeSpan.FromSeconds(Witness.timeLeft):mm\\:ss}");
Expand Down Expand Up @@ -680,7 +680,7 @@ private static void Postfix(MeetingHud __instance, [HarmonyArgument(0)] byte[] s
{
Lovers.notAckedExiledIsLover = (Lovers.lover1 != null && Lovers.lover1.PlayerId == exiled.PlayerId) ||
(Lovers.lover2 != null && Lovers.lover2.PlayerId == exiled.PlayerId);
Lawyer.notAckedExiled = (Pursuer.pursuer != null && Pursuer.pursuer.Any(id => id.PlayerId == exiled.PlayerId)) ||
Lawyer.notAckedExiled = (Pursuer.Player != null && Pursuer.Player.Any(id => id.PlayerId == exiled.PlayerId)) ||
(Lawyer.lawyer != null && Lawyer.target != null &&
Lawyer.target.PlayerId == exiled.PlayerId && Lawyer.target != Jester.jester);
}
Expand Down
26 changes: 13 additions & 13 deletions TheOtherRoles/Patches/PlayerControlPatch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -848,15 +848,15 @@ public static void updatePlayerInfo()

public static void WitnessUpdate()
{
if (Witness.player.IsDead() && !InMeeting) return;
if (Witness.Player.IsDead() && !InMeeting) return;

if (MeetingHud.Instance)
{
if (Witness.target != null)
{
setInfo(Witness.target.PlayerId, cs(Color.red, "该玩家被标记为凶手"));
}
else if (PlayerControl.LocalPlayer == Witness.player && Witness.killerTarget != null)
else if (PlayerControl.LocalPlayer == Witness.Player && Witness.killerTarget != null)
{
setInfo(Witness.killerTarget.PlayerId, cs(Color.red, "该玩家可能为凶手"));
}
Expand Down Expand Up @@ -1200,9 +1200,9 @@ private static void vultureUpdate()

private static void amnisiacUpdate()
{
if (Amnisiac.player?.Count == 0 || Amnisiac.localArrows == null || !Amnisiac.showArrows || InMeeting) return;
if (Amnisiac.Player?.Count == 0 || Amnisiac.localArrows == null || !Amnisiac.showArrows || InMeeting) return;

foreach (var p in Amnisiac.player.ToList())
foreach (var p in Amnisiac.Player.ToList())
{
if (p.Data.IsDead)
{
Expand All @@ -1211,7 +1211,7 @@ private static void amnisiacUpdate()
Amnisiac.localArrows.Clear();
}
}
if (Amnisiac.player.Any(x => x.PlayerId == CachedPlayer.LocalId && x.IsAlive()))
if (Amnisiac.Player.Any(x => x.PlayerId == CachedPlayer.LocalId && x.IsAlive()))
{
DeadBody[] deadBodies = Object.FindObjectsOfType<DeadBody>();
bool arrowUpdate = Amnisiac.localArrows.Count != deadBodies.Length;
Expand Down Expand Up @@ -1556,14 +1556,14 @@ public static void swapperUpdate()

private static void pursuerSetTarget()
{
if (Pursuer.pursuer == null || !Pursuer.pursuer.Contains(CachedPlayer.LocalPlayer.PlayerControl)) return;
if (Pursuer.Player == null || !Pursuer.Player.Contains(CachedPlayer.LocalPlayer.PlayerControl)) return;
Pursuer.target = setTarget();
setPlayerOutline(Pursuer.target, Pursuer.color);
}

private static void survivorSetTarget()
{
if (Survivor.survivor == null || !Survivor.survivor.Contains(CachedPlayer.LocalPlayer.PlayerControl)) return;
if (Survivor.Player == null || !Survivor.Player.Contains(CachedPlayer.LocalPlayer.PlayerControl)) return;
Survivor.target = setTarget();
setPlayerOutline(Survivor.target, Survivor.color);
}
Expand Down Expand Up @@ -1976,7 +1976,7 @@ public static void Postfix(PlayerControl __instance)
{
if (PlayerControl.LocalPlayer == __instance) CanSeeRoleInfo = false;

if (__instance == Specter.player) Specter.player.clearAllTasks();
if (__instance == Specter.Player) Specter.Player.clearAllTasks();

RPCProcedure.clearGhostRoles(__instance.PlayerId);
DeadPlayers.RemoveAll(x => x.Player == __instance);
Expand Down Expand Up @@ -2086,7 +2086,7 @@ private static void Postfix(PlayerControl __instance, [HarmonyArgument(0)] GameD
}
}

if (Witness.player.IsAlive())
if (Witness.Player.IsAlive())
{
var writer = StartRPC(CachedPlayer.LocalPlayer.PlayerControl, CustomRPC.WitnessReport);
writer.Write(target?.PlayerId ?? byte.MaxValue);
Expand Down Expand Up @@ -2130,7 +2130,7 @@ public static void Postfix(PlayerControl __instance, [HarmonyArgument(0)] Player
if (resetToDead) __instance.Data.IsDead = true;

// Remove fake tasks when player dies
if (target.hasFakeTasks() || target == Lawyer.lawyer || Pursuer.pursuer.Contains(target) || target == Thief.thief)
if (target.hasFakeTasks() || target == Lawyer.lawyer || Pursuer.Player.Contains(target) || target == Thief.thief)
target.clearAllTasks();

// First kill (set before lover suicide)
Expand Down Expand Up @@ -2436,7 +2436,7 @@ public static void Postfix(PlayerControl __instance)
_ = new LateTask(() => { if (__instance == PlayerControl.LocalPlayer) CanSeeRoleInfo = true; }, 1f);

// Remove fake tasks when player dies
if (__instance.hasFakeTasks() || __instance == Pursuer.pursuer.Contains(__instance) || __instance == Thief.thief)
if (__instance.hasFakeTasks() || __instance == Pursuer.Player.Contains(__instance) || __instance == Thief.thief)
__instance.clearAllTasks();

// Lover suicide trigger on exile
Expand Down Expand Up @@ -2482,9 +2482,9 @@ public static void Postfix(PlayerControl __instance)
if (!Lawyer.targetWasGuessed)
{
Lawyer.lawyer?.Exiled();
if (Pursuer.pursuer != null)
if (Pursuer.Player != null)
{
foreach (var pursuer in Pursuer.pursuer.Where(x => x.PlayerId == lawyer.PlayerId)) pursuer?.Exiled();
foreach (var pursuer in Pursuer.Player.Where(x => x.PlayerId == lawyer.PlayerId)) pursuer?.Exiled();
}

RpcOverrideDeathReasonAndKiller(lawyer, CustomDeathReason.LawyerSuicide, lawyer);
Expand Down
Loading

0 comments on commit bef049e

Please sign in to comment.