Prevent weapon set A node allocation in weapon set B path

Author: TheDechev

src/Classes/PassiveTreeView.lua

@@ -271,42 +271,59 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 
 	local hotkeyPressed = IsKeyDown("1") or IsKeyDown("I") or IsKeyDown("2") or IsKeyDown("S") or IsKeyDown("3") or IsKeyDown("D")
 
-	-- Helper function to determine if global node allocation should be blocked
-	local function shouldBlockGlobalNodeAllocation(node)
-		local isGlobalNode = node.type == "Keystone" or node.type == "Socket" or node.containJewelSocket
+	-- Helper function to check if a path crosses between different weapon sets
+	local function pathCrossesWeaponSets(node)
+		return self:PathCrossesWeaponSets(node, spec)
+	end
 
-		if not isGlobalNode or node.alloc or not node.path then
+	-- Unified helper function to determine if node allocation should be blocked
+	local function shouldBlockNodeAllocation(node)
+		if not node.path or node.alloc then
 			return false
 		end
 
-		local weaponSetMode = spec.allocMode > 0
-		local connectedToWeaponSetNodes = self:IsConnectedToWeaponSetNodes(node)
-
-		-- Only allow allocation from main tree AND node must not be connected to weapon set nodes
-		local shouldBlock = weaponSetMode or connectedToWeaponSetNodes
-
-		return shouldBlock
-	end
-
-	-- Helper function to determine if global node deallocation should be blocked
-	local function shouldBlockGlobalNodeDeallocation(node)
 		local isGlobalNode = node.type == "Keystone" or node.type == "Socket" or node.containJewelSocket
+		local isAttributeNode = node.isAttribute
+
+		-- Fold early - handle global nodes first
+		if isGlobalNode then
+			local weaponSetMode = spec.allocMode > 0
+			local connectedToWeaponSetNodes = self:IsConnectedToWeaponSetNodes(node)
+			return weaponSetMode or connectedToWeaponSetNodes
+		elseif isAttributeNode then
+			-- Attribute nodes follow same rules as regular nodes for weapon set crossing
+			return pathCrossesWeaponSets(node)
+		else
+			-- Regular nodes - check for weapon set path crossing
+			return pathCrossesWeaponSets(node)
+		end
+	end
 
-		if not isGlobalNode or not node.alloc then
+	-- Unified helper function to determine if node deallocation should be blocked
+	local function shouldBlockNodeDeallocation(node)
+		if not node.alloc then
 			return false
 		end
 
-		-- Main-tree global nodes can only be deallocated from main tree
-		-- Legacy weapon-set global nodes can be deallocated from any mode
-		local shouldBlock = node.allocMode == 0 and spec.allocMode > 0
-
-		return shouldBlock
+		local isGlobalNode = node.type == "Keystone" or node.type == "Socket" or node.containJewelSocket
+		local isAttributeNode = node.isAttribute
+
+		-- Fold early - handle global nodes first
+		if isGlobalNode then
+			return node.allocMode == 0 and spec.allocMode > 0
+		elseif isAttributeNode then
+			-- Attribute nodes follow same rules as regular nodes
+			return node.allocMode ~= spec.allocMode and node.allocMode ~= 0
+		else
+			-- Regular nodes
+			return node.allocMode ~= spec.allocMode and node.allocMode ~= 0
+		end
 	end
 
 	if treeClick == "LEFT" then
 		if hoverNode then
 			-- User left-clicked on a node
-			if hoverNode.alloc and not shouldBlockGlobalNodeDeallocation(hoverNode) then
+			if hoverNode.alloc and not shouldBlockNodeDeallocation(hoverNode) then
 				-- Handle deallocation of allocated nodes
 				if hoverNode.isAttribute then
 					-- change to other attribute without needing to deallocate
@@ -323,7 +340,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 				end
 				spec:AddUndoState()
 				build.buildFlag = true
-			elseif hoverNode.path and not shouldBlockGlobalNodeAllocation(hoverNode) then
+			elseif hoverNode.path and not shouldBlockNodeAllocation(hoverNode) then
 				-- Handle allocation of unallocated nodes
 				if hoverNode.isAttribute and not hotkeyPressed then
 					build.treeTab:ModifyAttributePopup(hoverNode)
@@ -350,7 +367,8 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 					build.itemsTab:SelectControl(slot)
 					build.viewMode = "ITEMS"
 				end
-			else
+			elseif not hoverNode.alloc and not shouldBlockNodeAllocation(hoverNode) then
+				-- Only proceed with allocation if it's not blocked
 				-- a way for us to bypass the popup when allocating attribute nodes, last used hotkey + RMB
 				-- RMB + non attribute node logic
 				-- RMB hot-swap logic
@@ -1183,7 +1201,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
 			tooltip:AddLine(14, colorCodes.TIP.."Tip: Right click this socket to go to the items page and choose the jewel for this socket.")
 		end
 
-		self:AddGlobalNodeWarningsToTooltip(tooltip, node, build)
+		self:AddNodeWarningsToTooltip(tooltip, node, build)
 
 		tooltip:AddLine(14, colorCodes.TIP.."Tip: Hold Shift or Ctrl to hide this tooltip.")
 		return
@@ -1448,7 +1466,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
 		tooltip:AddLine(14, colorCodes.TIP)
 	end
 
-	self:AddGlobalNodeWarningsToTooltip(tooltip, node, build)
+	self:AddNodeWarningsToTooltip(tooltip, node, build)
 
 	if node.type == "Socket" then
 		tooltip:AddLine(14, colorCodes.TIP.."Tip: Hold Shift or Ctrl to hide this tooltip.")
@@ -1484,31 +1502,79 @@ function PassiveTreeViewClass:IsConnectedToWeaponSetNodes(node)
 	return false
 end
 
--- Helper function to add warnings in the tooltip for global nodes (keystones/jewel sockets)
-function PassiveTreeViewClass:AddGlobalNodeWarningsToTooltip(tooltip, node, build)
+-- Helper function to check if a node can be reached from current weapon set without crossing other weapon sets
+function PassiveTreeViewClass:CanReachFromCurrentWeaponSet(node, spec)
+	if not node or node.alloc then
+		return true -- Already allocated nodes don't need path checking
+	end
+
+	-- Check if any directly linked allocated node belongs to current weapon set or main tree
+	local canReachFromCurrentSet = false
+
+	if node.linked then
+		for _, linkedNode in ipairs(node.linked) do
+			if linkedNode.alloc then
+				-- Can reach if linked node is from current weapon set or main tree
+				if linkedNode.allocMode == spec.allocMode or linkedNode.allocMode == 0 then
+					canReachFromCurrentSet = true
+				end
+
+				-- Block if linked node is from different weapon set
+				if linkedNode.allocMode ~= spec.allocMode and linkedNode.allocMode ~= 0 then
+					return false
+				end
+			end
+		end
+	end
+
+	return canReachFromCurrentSet
+end
+
+-- Helper function to check if a path crosses between different weapon sets
+function PassiveTreeViewClass:PathCrossesWeaponSets(node, spec)
+	-- Use the new reachability check instead of path analysis
+	return not self:CanReachFromCurrentWeaponSet(node, spec)
+end
+
+-- Helper function to add warnings in the tooltip for nodes affected by weapon set rules
+function PassiveTreeViewClass:AddNodeWarningsToTooltip(tooltip, node, build)
 	local isGlobalNode = node.type == "Keystone" or node.type == "Socket" or node.containJewelSocket
+	local isAttributeNode = node.isAttribute
+	local spec = build.spec
 
-	if not isGlobalNode then
-		return -- No warning needed for non-global nodes
+	-- Early fold - no warnings needed for these cases
+	if not isGlobalNode and not isAttributeNode and not self:PathCrossesWeaponSets(node, spec) then
+		return
 	end
 
-	local nodeTypeText = node.type == "Keystone" and "keystones" or "jewel sockets"
 	local warningText = ""
 	local tipText = ""
 
 	if not node.alloc and node.path then
-		-- Unallocated global node - check allocation conditions
-		if build.spec.allocMode > 0 then
-			warningText = "Cannot allocate " .. nodeTypeText .. " while weapon set " .. build.spec.allocMode .. " is selected"
-			tipText = "Tip: Switch to main tree (Alt+scroll) to allocate " .. nodeTypeText
-		elseif self:IsConnectedToWeaponSetNodes(node) then
-			warningText = "Cannot allocate " .. nodeTypeText .. " - connected to weapon set nodes"
-			tipText = "Tip: Deallocate weapon set nodes in the connection path to allow allocation"
-		end
-	elseif node.alloc and node.allocMode == 0 and build.spec.allocMode > 0 then
-		-- Allocated main-tree global node viewed from weapon set
-		warningText = "Cannot deallocate global " .. nodeTypeText .. " from weapon set " .. build.spec.allocMode
-		tipText = "Tip: Switch to main tree (Alt+scroll) to deallocate " .. nodeTypeText
+		-- Unallocated node warnings
+		if isGlobalNode then
+			local nodeTypeText = node.type == "Keystone" and "keystones" or "jewel sockets"
+			if spec.allocMode > 0 then
+				warningText = "Cannot allocate " .. nodeTypeText .. " while weapon set " .. spec.allocMode .. " is selected"
+				tipText = "Tip: Switch to main tree (Alt+scroll) to allocate " .. nodeTypeText
+			elseif self:IsConnectedToWeaponSetNodes(node) then
+				warningText = "Cannot allocate " .. nodeTypeText .. " - connected to weapon set nodes"
+				tipText = "Tip: Deallocate weapon set nodes in the connection path to allow allocation"
+			end
+		elseif isAttributeNode or self:PathCrossesWeaponSets(node, spec) then
+			warningText = "Cannot allocate - path crosses between different weapon sets"
+			tipText = "Tip: Deallocate conflicting weapon set nodes in the path first"
+		end
+	elseif node.alloc then
+		-- Allocated node warnings
+		if isGlobalNode and node.allocMode == 0 and spec.allocMode > 0 then
+			local nodeTypeText = node.type == "Keystone" and "keystones" or "jewel sockets"
+			warningText = "Cannot deallocate global " .. nodeTypeText .. " from weapon set " .. spec.allocMode
+			tipText = "Tip: Switch to main tree (Alt+scroll) to deallocate " .. nodeTypeText
+		elseif (isAttributeNode or not isGlobalNode) and node.allocMode ~= spec.allocMode and node.allocMode ~= 0 then
+			warningText = "Cannot deallocate - node was allocated by weapon set " .. node.allocMode
+			tipText = "Tip: Switch to weapon set " .. node.allocMode .. " (Alt+scroll) to deallocate this node"
+		end
 	end
 
 	if warningText ~= "" then