Re-add killing impostors

g0aty · Sep 12, 2024 · 70cbea4 · 70cbea4
1 parent 3e26dd3
commit 70cbea4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/gui/tabs/host_tab.cpp b/gui/tabs/host_tab.cpp
@@ -248,9 +248,6 @@ namespace HostTab {
 						if (IsInLobby()) State.lobbyRpcQueue.push(new RpcSetRole(*Game::pLocalPlayer, RoleTypes__Enum::Crewmate));
 					}
 				}*/
-				if (ToggleButton("Kill Other Impostors", &State.KillImpostors)) {
-					State.Save();
-				}
 
 				if (ToggleButton("Unlock Kill Button", &State.UnlockKillButton)) {
 					State.Save();

diff --git a/gui/tabs/self_tab.cpp b/gui/tabs/self_tab.cpp
@@ -292,6 +292,10 @@ namespace SelfTab {
                 if (ToggleButton("God Mode", &State.GodMode))
                     State.Save();
             //}
+            ImGui::SameLine();
+            if (ToggleButton("Kill Other Impostors", &State.KillImpostors)) {
+                State.Save();
+            }
 
             if (ToggleButton("(Shift + Right Click) to Teleport", &State.ShiftRightClickTP)) {
                 State.Save();
@@ -437,10 +441,6 @@ namespace SelfTab {
             }
 
             if (!State.SafeMode) {
-                if (ToggleButton("Kill Other Impostors", &State.KillImpostors)) {
-                    State.Save();
-                }
-                ImGui::SameLine();
                 if (ToggleButton("Unlock Kill Button", &State.UnlockKillButton)) {
                     State.Save();
                 }

diff --git a/hooks/PlayerControl.cpp b/hooks/PlayerControl.cpp
@@ -1098,7 +1098,7 @@ void dKillButton_SetTarget(KillButton* __this, PlayerControl* target, MethodInfo
 			for (auto p : GetAllPlayerControl()) {
 				if (p == *Game::pLocalPlayer) continue; //we don't want to kill ourselves
 				auto pData = GetPlayerData(p);
-				if (PlayerIsImpostor(pData) && !((State.KillImpostors && (IsHost() || !State.SafeMode)) || (IsHost() && State.BattleRoyale))) continue; //neither impostors
+				if (PlayerIsImpostor(pData) && !(State.KillImpostors || (IsHost() && State.BattleRoyale))) continue; //neither impostors
 				if (pData->fields.IsDead) continue; //nor ghosts
 				float currentDist = GetDistanceBetweenPoints_Unity(GetTrueAdjustedPosition(p), localPos);
 				if (currentDist < max_dist) {
@@ -1150,7 +1150,7 @@ PlayerControl* dImpostorRole_FindClosestTarget(ImpostorRole* __this, MethodInfo*
 		for (auto p : GetAllPlayerControl()) {
 			if (p == *Game::pLocalPlayer) continue; //we don't want to kill ourselves
 			auto pData = GetPlayerData(p);
-			if (PlayerIsImpostor(pData) && !((State.KillImpostors && (IsHost() || !State.SafeMode)) || (IsHost() && State.BattleRoyale))) continue; //neither impostors
+			if (PlayerIsImpostor(pData) && !(State.KillImpostors || (IsHost() && State.BattleRoyale))) continue; //neither impostors
 			if (pData->fields.IsDead) continue; //nor ghosts
 			float currentDist = GetDistanceBetweenPoints_Unity(GetTrueAdjustedPosition(p), localPos);
 			if (currentDist < max_dist) {