Skip to content

Commit 89c707e

Browse files
committed
Add more spectator checks in target assignments
1 parent 66314f0 commit 89c707e

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

TownOfUs/Modifiers/Crewmate/ToBecomeTraitorModifier.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using TownOfUs.Options.Roles.Impostor;
1414
using TownOfUs.Roles.Crewmate;
1515
using TownOfUs.Roles.Impostor;
16+
using TownOfUs.Roles.Other;
1617
using TownOfUs.Utilities;
1718
using UnityEngine;
1819
using Random = System.Random;
@@ -54,6 +55,7 @@ public void AssignTargets()
5455
!x.HasDied() &&
5556
!x.HasModifier<ExecutionerTargetModifier>() &&
5657
!x.HasModifier<EgotistModifier>() &&
58+
!SpectatorRole.TrackedSpectators.Contains(x.Data.PlayerName) &&
5759
(x.Data.Role is not ILoyalCrewmate loyalCrew || loyalCrew.CanBeTraitor)).ToList();
5860

5961
if (filtered.Count == 0)

TownOfUs/Modifiers/Game/Alliance/CrewpostorModifier.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using TownOfUs.Options.Modifiers;
1414
using TownOfUs.Options.Modifiers.Alliance;
1515
using TownOfUs.Roles;
16+
using TownOfUs.Roles.Other;
1617
using TownOfUs.Utilities;
1718
using UnityEngine;
1819

@@ -66,6 +67,7 @@ public void AssignTargets()
6667
var filtered = PlayerControl.AllPlayerControls.ToArray()
6768
.Where(x => x.IsCrewmate() &&
6869
!x.HasDied() &&
70+
!SpectatorRole.TrackedSpectators.Contains(x.Data.PlayerName) &&
6971
(x.Data.Role is not ILoyalCrewmate loyalCrew || loyalCrew.CanBeCrewpostor) &&
7072
!x.HasModifier<AllianceGameModifier>() &&
7173
!x.HasModifier<ExecutionerTargetModifier>()).ToList();

TownOfUs/Modifiers/Game/Alliance/LoverModifier.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using TownOfUs.Options.Modifiers.Alliance;
1818
using TownOfUs.Roles;
1919
using TownOfUs.Roles.Neutral;
20+
using TownOfUs.Roles.Other;
2021
using TownOfUs.Utilities;
2122
using UnityEngine;
2223
using Random = System.Random;
@@ -91,6 +92,7 @@ public void AssignTargets()
9192
var players = PlayerControl.AllPlayerControls.ToArray()
9293
.Where(x => !x.HasDied() && !x.HasModifier<ExecutionerTargetModifier>() &&
9394
!x.HasModifier<AllianceGameModifier>() &&
95+
!SpectatorRole.TrackedSpectators.Contains(x.Data.PlayerName) &&
9496
(x.Data.Role is not IUnlovable unlovable || !unlovable.IsUnlovable) && (loveOpt.NeutralLovers || !x.IsNeutral())).ToList();
9597
players.Shuffle();
9698

0 commit comments

Comments
 (0)