From 62fda85899d5e164d32c81f023daef4be5d7a872 Mon Sep 17 00:00:00 2001
From: Peechey <92683202+Peechey@users.noreply.github.com>
Date: Fri, 17 Apr 2026 09:33:57 -0500
Subject: [PATCH 1/2] remove tooltip and modify node popup for cluster jewel
 keystones

---
 src/Classes/PassiveTreeView.lua | 2 +-
 src/Classes/TreeTab.lua         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Classes/PassiveTreeView.lua b/src/Classes/PassiveTreeView.lua
index 3370a436e2..0324f1bf53 100644
--- a/src/Classes/PassiveTreeView.lua
+++ b/src/Classes/PassiveTreeView.lua
@@ -1351,7 +1351,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
 	if node and (node.isTattoo
 			or (node.type == "Normal" and (node.dn == "Strength" or node.dn == "Dexterity" or node.dn == "Intelligence"))
 			or (node.type == "Notable" and #node.sd > 0 and (node.sd[1]:match("+30 to Dexterity") or node.sd[1]:match("+30 to Strength") or node.sd[1]:match("+30 to Intelligence")))
-			or (node.type == "Keystone") or (node.type == "Mastery") )
+			or (node.type == "Keystone" and not node.expansionSkill) or (node.type == "Mastery"))
 	then
 		tooltip:AddSeparator(14)
 		local nodeEditType = (node.type == "Mastery") and "runegraft" or "tattoo"
diff --git a/src/Classes/TreeTab.lua b/src/Classes/TreeTab.lua
index d32323cfca..f4dc721dfd 100644
--- a/src/Classes/TreeTab.lua
+++ b/src/Classes/TreeTab.lua
@@ -838,6 +838,11 @@ function TreeTabClass:OpenExportPopup()
 end
 
 function TreeTabClass:ModifyNodePopup(selectedNode)
+	-- ignore cluster jewel Keystones like Secrets of Suffering
+	if selectedNode.type == "Keystone" and selectedNode.expansionSkill then
+		return
+	end
+
 	local controls = { }
 	local modGroups = { }
 	local treeNodes = self.build.spec.tree.nodes

From 44cfe2b9f82b2fb836e98eb03276d9cff7d7f3b5 Mon Sep 17 00:00:00 2001
From: Peechey <92683202+Peechey@users.noreply.github.com>
Date: Fri, 17 Apr 2026 10:03:49 -0500
Subject: [PATCH 2/2] update to expansionSkill only

---
 src/Classes/PassiveTreeView.lua | 5 +++--
 src/Classes/TreeTab.lua         | 5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Classes/PassiveTreeView.lua b/src/Classes/PassiveTreeView.lua
index 0324f1bf53..bf697b1c4f 100644
--- a/src/Classes/PassiveTreeView.lua
+++ b/src/Classes/PassiveTreeView.lua
@@ -418,7 +418,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 		elseif hoverNode and (hoverNode.isTattoo
 			or (hoverNode.type == "Normal" and (hoverNode.dn == "Strength" or hoverNode.dn == "Dexterity" or hoverNode.dn == "Intelligence"))
 			or (hoverNode.type == "Notable" and #hoverNode.sd > 0 and (hoverNode.sd[1]:match("+30 to Dexterity") or hoverNode.sd[1]:match("+30 to Strength") or hoverNode.sd[1]:match("+30 to Intelligence")))
-			or hoverNode.type == "Keystone")
+			or hoverNode.type == "Keystone") and not hoverNode.expansionSkill
 		then
 			build.treeTab:ModifyNodePopup(hoverNode, viewPort)
 			build.buildFlag = true
@@ -1351,7 +1351,8 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
 	if node and (node.isTattoo
 			or (node.type == "Normal" and (node.dn == "Strength" or node.dn == "Dexterity" or node.dn == "Intelligence"))
 			or (node.type == "Notable" and #node.sd > 0 and (node.sd[1]:match("+30 to Dexterity") or node.sd[1]:match("+30 to Strength") or node.sd[1]:match("+30 to Intelligence")))
-			or (node.type == "Keystone" and not node.expansionSkill) or (node.type == "Mastery"))
+			or (node.type == "Keystone") or (node.type == "Mastery"))
+			and not node.expansionSkill
 	then
 		tooltip:AddSeparator(14)
 		local nodeEditType = (node.type == "Mastery") and "runegraft" or "tattoo"
diff --git a/src/Classes/TreeTab.lua b/src/Classes/TreeTab.lua
index f4dc721dfd..d32323cfca 100644
--- a/src/Classes/TreeTab.lua
+++ b/src/Classes/TreeTab.lua
@@ -838,11 +838,6 @@ function TreeTabClass:OpenExportPopup()
 end
 
 function TreeTabClass:ModifyNodePopup(selectedNode)
-	-- ignore cluster jewel Keystones like Secrets of Suffering
-	if selectedNode.type == "Keystone" and selectedNode.expansionSkill then
-		return
-	end
-
 	local controls = { }
 	local modGroups = { }
 	local treeNodes = self.build.spec.tree.nodes