Original solution

Author: LocalIdentity

src/Classes/PassiveSpec.lua

@@ -1625,7 +1625,9 @@ function PassiveSpecClass:BuildClusterJewelGraphs()
 			node.alloc = true
 			if not self.allocNodes[nodeId] then
 				self.allocNodes[nodeId] = node
-				t_insert(self.allocExtendedNodes, nodeId)
+				if not isValueInArray(self.allocExtendedNodes, nodeId) then
+					t_insert(self.allocExtendedNodes, nodeId)
+				end
 			end
 		end
 	end
@@ -1715,6 +1717,10 @@ function PassiveSpecClass:BuildSubgraph(jewel, parentSocket, id, upSize, importe
 	end
 
 	local function addToAllocatedSubgraphNodes(node)
+		-- Don't add to allocSubgraphNodes if node already exists
+		if isValueInArray(self.allocSubgraphNodes, node.id) then
+			return false
+		end
 		local proxyGroup = matchGroup(expansionJewel.proxy)
 		if proxyGroup then
 			for id, data in pairs(importedNodes) do
@@ -1761,7 +1767,6 @@ function PassiveSpecClass:BuildSubgraph(jewel, parentSocket, id, upSize, importe
 		self.nodes[node.id] = node
 		if addToAllocatedSubgraphNodes(node) then
 			t_insert(self.allocSubgraphNodes, node.id)
-			t_insert(self.allocExtendedNodes, node.id)
 		end
 		return
 	end
@@ -1776,21 +1781,6 @@ function PassiveSpecClass:BuildSubgraph(jewel, parentSocket, id, upSize, importe
 		end
 	end
 
-	-- Check if we need to downsize the group
-	local groupSize = expansionJewel.size
-	upSize = upSize or 0
-	while clusterJewel.sizeIndex < groupSize do
-		-- Look for the socket with index 1 first (middle socket of large groups), then index 0
-		local socket = findSocket(proxyGroup, 1) or findSocket(proxyGroup, 0)
-		assert(socket, "Downsizing socket not found")
-
-		-- Grab the proxy node/group from the socket
-		proxyNode = self.tree.nodes[tonumber(socket.expansionJewel.proxy)]
-		proxyGroup = proxyNode.group
-		groupSize = socket.expansionJewel.size
-		upSize = upSize + 1
-	end
-
 	-- Initialise orbit flags
 	local nodeOrbit = clusterJewel.sizeIndex + 1
 	subGraph.group.oo[nodeOrbit] = true
@@ -2002,13 +1992,14 @@ function PassiveSpecClass:BuildSubgraph(jewel, parentSocket, id, upSize, importe
 			return m_floor(srcOidx * destNodesPerOrbit / srcNodesPerOrbit)
 		end
 	end
-	local proxyNodeSkillsPerOrbit = self.tree.skillsPerOrbit[proxyNode.o+1]
-
+	
+	local skillsPerOrbit = self.tree.skillsPerOrbit[clusterJewel.sizeIndex+2]
+	local startOidx = data.clusterJewels.orbitOffsets[proxyNode.id][clusterJewel.sizeIndex]
 	-- Translate oidx positioning to TreeData-relative values
 	for _, node in pairs(indicies) do
-		local proxyNodeOidxRelativeToClusterIndicies = translateOidx(proxyNode.oidx, proxyNodeSkillsPerOrbit, clusterJewel.totalIndicies)
-		local correctedNodeOidxRelativeToClusterIndicies = (node.oidx + proxyNodeOidxRelativeToClusterIndicies) % clusterJewel.totalIndicies
-		local correctedNodeOidxRelativeToTreeSkillsPerOrbit = translateOidx(correctedNodeOidxRelativeToClusterIndicies, clusterJewel.totalIndicies, proxyNodeSkillsPerOrbit)
+		local startOidxRelativeToClusterIndicies = translateOidx(startOidx, skillsPerOrbit, clusterJewel.totalIndicies)
+		local correctedNodeOidxRelativeToClusterIndicies = (node.oidx + startOidx) % clusterJewel.totalIndicies
+		local correctedNodeOidxRelativeToTreeSkillsPerOrbit = translateOidx(correctedNodeOidxRelativeToClusterIndicies, clusterJewel.totalIndicies, skillsPerOrbit)
 		node.oidx = correctedNodeOidxRelativeToTreeSkillsPerOrbit
 	end