From 9c9f1a947c303749128b13d43d72cabcc8b6c291 Mon Sep 17 00:00:00 2001
From: avitasia <avitasia@proton.me>
Date: Fri, 19 Sep 2025 19:36:52 -0700
Subject: [PATCH] toggle both the default and in combat player render distance

---
 README.md    |  2 +-
 settings.lua | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e4e0cb8..f970fe5 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ The addon will prioritize render distances in the following order:
 - `/pbshowallplayers` or `/pbsap` - Toggle show all players on/off.  Can be keybound also.
 - `/pbhideallplayers` or `/pbhap` - Toggle hide all players on/off.  Can be keybound also.
 - `/pbcycleplayervisibility` or `/pbcycle` - Cycle through player visibility modes: normal → show all → hide all → repeat.  Can be keybound also.
-- `/pbtoggleplayerrenderist` or `/pbtrd` - Toggle player render distance between 0 and previous value.  Can be keybound also.
+- `/pbtoggleplayerrenderist` or `/pbtrd` - Toggle both normal and combat player render distances between 0 and their previous values.  Can be keybound also.
 
 ### Player Render List Commands
 - `/pbalwaysrender` or `/pbar` - Add current target to always render list
diff --git a/settings.lua b/settings.lua
index 2e741b4..488cddb 100644
--- a/settings.lua
+++ b/settings.lua
@@ -10,6 +10,7 @@ PerfBoost:RegisterDB("PerfBoostSettingsDB")
 PerfBoost:RegisterDefaults("profile", {
 	per_character_settings = false,
 	previous_player_render_dist = nil,
+	previous_player_render_dist_in_combat = nil,
 })
 PerfBoost.frame = CreateFrame("Frame", "PerfBoost", UIParent)
 
@@ -854,19 +855,27 @@ end
 SLASH_PBTOGGLEPLAYERRENDERIST1, SLASH_PBTOGGLEPLAYERRENDERIST2 = '/pbtoggleplayerrenderist', '/pbtrd'
 function SlashCmdList.PBTOGGLEPLAYERRENDERIST(msg, editbox)
 	local currentDist = PerfBoost.db.profile.PB_PlayerRenderDist
+	local currentDistInCombat = PerfBoost.db.profile.PB_PlayerRenderDistInCombat
 
 	if PerfBoost.db.profile.previous_player_render_dist ~= nil then
-		-- restore previous value
+		-- restore previous values
 		local restoreValue = PerfBoost.db.profile.previous_player_render_dist
+		local restoreValueInCombat = PerfBoost.db.profile.previous_player_render_dist_in_combat
 		PerfBoost.db.profile.PB_PlayerRenderDist = restoreValue
+		PerfBoost.db.profile.PB_PlayerRenderDistInCombat = restoreValueInCombat
 		SetCVar("PB_PlayerRenderDist", tostring(restoreValue))
-		DEFAULT_CHAT_FRAME:AddMessage("|cffffcc00PerfBoost:|r Player render distance restored to " .. restoreValue)
+		SetCVar("PB_PlayerRenderDistInCombat", tostring(restoreValueInCombat))
+		DEFAULT_CHAT_FRAME:AddMessage("|cffffcc00PerfBoost:|r Player render distances restored to " .. tostring(restoreValue) .. " (normal) and " .. tostring(restoreValueInCombat) .. " (combat)")
 		PerfBoost.db.profile.previous_player_render_dist = nil
+		PerfBoost.db.profile.previous_player_render_dist_in_combat = nil
 	else
-		-- Save current value and set PB_PlayerRenderDist to 0
+		-- Save current values and set both to 0
 		PerfBoost.db.profile.previous_player_render_dist = currentDist
+		PerfBoost.db.profile.previous_player_render_dist_in_combat = currentDistInCombat
 		PerfBoost.db.profile.PB_PlayerRenderDist = 0
+		PerfBoost.db.profile.PB_PlayerRenderDistInCombat = 0
 		SetCVar("PB_PlayerRenderDist", "0")
-		DEFAULT_CHAT_FRAME:AddMessage("|cffffcc00PerfBoost:|r Player render distance set to 0 (saved: " .. currentDist .. ")")
+		SetCVar("PB_PlayerRenderDistInCombat", "0")
+		DEFAULT_CHAT_FRAME:AddMessage("|cffffcc00PerfBoost:|r Player render distances set to 0 (saved: " .. tostring(currentDist) .. " normal, " .. tostring(currentDistInCombat) .. " combat)")
 	end
 end