AmongUsMods/EndlessHostRoles
1
0 Fork 0
mirror of https://github.com/Gurge44/EndlessHostRoles.git synced 2026-10-20 01:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Gurge44 committed 2025-09-08 09:12:59 +02:00
1 parent 72ddfe9be2
commit c04bca764e
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Modules/ExtendedPlayerControl.cs
+2 -2
View File
@@ -1167,7 +1167,7 @@ internal static class ExtendedPlayerControl
var murderPos = Pelican.GetBlackRoomPS();
sender.TP(pc, murderPos);
sender.TP(pc, murderPos, noCheckState: true);
sender.AutoStartRpc(pc.NetId, 12, targetClientId);
sender.WriteNetObject(dummyGhost);
@@ -1201,7 +1201,7 @@ internal static class ExtendedPlayerControl
if (pc.IsAlive())
{
sender.TP(pc, pcPos);
sender.TP(pc, pcPos, noCheckState: true);
sender.SetKillCooldown(pc, timer);
sender.Notify(pc, GetString("BlackScreenFixCompleteNotify"));
Roles/Neutral/Executioner.cs
+1 -1
View File
@@ -69,7 +69,7 @@ public class Executioner : RoleBase
List<PlayerControl> targetList = [];
targetList.AddRange(from target in Main.AllPlayerControls where playerId != target.PlayerId where CanTargetImpostor.GetBool() || !target.Is(CustomRoleTypes.Impostor) where CanTargetNeutralKiller.GetBool() || !target.IsNeutralKiller() where CanTargetNeutralBenign.GetBool() || !target.IsNeutralBenign() where CanTargetNeutralEvil.GetBool() || (!target.IsNeutralEvil() && !target.IsNeutralPariah()) where CanTargetCoven.GetBool() || !target.Is(CustomRoleTypes.Coven) where target.GetCustomRole() is not (CustomRoles.GM or CustomRoles.SuperStar) where Main.LoversPlayers.TrueForAll(x => x.PlayerId != playerId) select target);
targetList.AddRange(Main.AllPlayerControls.Where(x => x.IsCrewmate() && x.GetCustomRole() is not (CustomRoles.NiceSwapper or CustomRoles.Mayor or CustomRoles.NiceGuesser or CustomRoles.Dictator)));
targetList.RemoveAll(x => x.GetCustomRole() is CustomRoles.NiceSwapper or CustomRoles.Mayor or CustomRoles.NiceGuesser or CustomRoles.Dictator or CustomRoles.Executioner);
targetList.RemoveAll(x => x.GetCustomRole() is CustomRoles.NiceSwapper or CustomRoles.Mayor or CustomRoles.NiceGuesser or CustomRoles.Dictator or CustomRoles.Executioner or CustomRoles.Terrorist or CustomRoles.GM);
if (!CanTargetNeutralBenign.GetBool() && !CanTargetNeutralEvil.GetBool() && !CanTargetNeutralKiller.GetBool()) targetList.RemoveAll(x => x.GetCustomRole().IsNeutral() || x.Is(CustomRoles.Bloodlust));
if (targetList.Count == 0)