mirror of
https://github.com/Gurge44/EndlessHostRoles.git
synced 2026-10-20 01:46:25 +00:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
f1c729b59c
9 files changed
+22
-21
No files matched your search
@@ -573,7 +573,7 @@ internal static class CheckMurderPatch
|
||||
{
|
||||
switch (killer.Is(CustomRoles.Pestilence))
|
||||
{
|
||||
case false when !killer.Is(CustomRoles.Minimalism):
|
||||
case false when !killer.Is(CustomRoles.KillingMachine):
|
||||
player.Kill(killer);
|
||||
Crusader.ForCrusade.Remove(target.PlayerId);
|
||||
killer.RpcGuardAndKill(target);
|
||||
@@ -769,7 +769,7 @@ internal static class MurderPlayerPatch
|
||||
var realKiller = target.GetRealKiller();
|
||||
if (realKiller != null) killer = realKiller;
|
||||
|
||||
if (target != killer && !killer.Is(CustomRoles.Minimalism) && (killer.PlayerId != target.PlayerId || target.GetRealKiller()?.GetCustomRole() is CustomRoles.Swooper or CustomRoles.Wraith || !killer.Is(CustomRoles.Oblivious) || !Options.ObliviousBaitImmune.GetBool()))
|
||||
if (target != killer && !killer.Is(CustomRoles.KillingMachine) && (killer.PlayerId != target.PlayerId || target.GetRealKiller()?.GetCustomRole() is CustomRoles.Swooper or CustomRoles.Wraith || !killer.Is(CustomRoles.Oblivious) || !Options.ObliviousBaitImmune.GetBool()))
|
||||
{
|
||||
killer.RPCPlayCustomSound("Congrats");
|
||||
target.RPCPlayCustomSound("Congrats");
|
||||
|
||||
Reference in new issue
Block a user