mirror of
https://github.com/Gurge44/EndlessHostRoles.git
synced 2026-10-20 01:46:25 +00:00
pesti immune to exo
This commit is contained in:
1 parent
548f7f68b2
commit
293657e623
3 files changed
+13
-9
No files matched your search
@@ -170,6 +170,7 @@ public enum CustomRoles
|
||||
Benefactor,
|
||||
Bestower,
|
||||
Bodyguard,
|
||||
Bouncer,
|
||||
CameraMan,
|
||||
Captain,
|
||||
Car,
|
||||
|
||||
@@ -391,7 +391,7 @@ internal static class ChatCommands
|
||||
|
||||
if (GameStates.InGame && (Silencer.ForSilencer.Contains(PlayerControl.LocalPlayer.PlayerId) || (Main.PlayerStates[PlayerControl.LocalPlayer.PlayerId].Role is Dad { IsEnable: true } dad && dad.UsingAbilities.Contains(Dad.Ability.GoForMilk))) && PlayerControl.LocalPlayer.IsAlive()) goto Canceled;
|
||||
|
||||
if (GameStates.IsMeeting && Exorcist.AbilityEndTS > Utils.TimeStamp && !text.StartsWith("/cmd"))
|
||||
if (GameStates.IsMeeting && Exorcist.AbilityEndTS > Utils.TimeStamp && !text.StartsWith("/cmd") && !PlayerControl.LocalPlayer.Is(CustomRoles.Pestilence))
|
||||
{
|
||||
LateTask.New(() =>
|
||||
{
|
||||
@@ -3458,7 +3458,7 @@ internal static class ChatCommands
|
||||
|
||||
if (text.StartsWith("\n")) text = text[1..];
|
||||
|
||||
if (GameStates.IsMeeting && Exorcist.AbilityEndTS > now && player.IsAlive() && !text.StartsWith("/cmd"))
|
||||
if (GameStates.IsMeeting && Exorcist.AbilityEndTS > now && player.IsAlive() && !text.StartsWith("/cmd") && !player.Is(CustomRoles.Pestilence))
|
||||
{
|
||||
player.RpcGuesserMurderPlayer();
|
||||
player.SetRealKiller(Main.EnumeratePlayerControls().FirstOrDefault(x => x.Is(CustomRoles.Exorcist)));
|
||||
|
||||
@@ -107,14 +107,17 @@ public class Bouncer : RoleBase
|
||||
if (pc.IsInRoom(MarkedRoom)) return;
|
||||
LastPosition[pc.PlayerId] = pc.transform.position;
|
||||
}
|
||||
else if (pc.IsInRoom(MarkedRoom) && WhoGetsBounced.GetValue() switch
|
||||
else if (pc.IsInRoom(MarkedRoom))
|
||||
{
|
||||
0 => true,
|
||||
1 => pc.Is(Team.Impostor),
|
||||
2 => pc.Is(Team.Impostor) || pc.IsNeutralKiller() || pc.IsNeutralPariah() || pc.IsNeutralEvil(),
|
||||
_ => false
|
||||
})
|
||||
pc.TP(lastPosition);
|
||||
if (WhoGetsBounced.GetValue() switch
|
||||
{
|
||||
0 => true,
|
||||
1 => pc.Is(Team.Impostor),
|
||||
2 => pc.Is(Team.Impostor) || pc.IsNeutralKiller() || pc.IsNeutralPariah() || pc.IsNeutralEvil(),
|
||||
_ => false
|
||||
})
|
||||
pc.TP(lastPosition);
|
||||
}
|
||||
else
|
||||
LastPosition[pc.PlayerId] = pc.transform.position;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user