Export cluster jewel index data, mess with jewel rendering logic

src/Classes/PassiveSpec.lua

@@ -11,6 +11,8 @@ local t_remove = table.remove
 local m_min = math.min
 local m_max = math.max
 local m_floor = math.floor
+local band = bit.band
+local b_rshift = bit.rshift
 local b_lshift = bit.lshift
 
 local PassiveSpecClass = newClass("PassiveSpec", "UndoHandler", function(self, build, treeVersion)
@@ -1113,8 +1115,8 @@ function PassiveSpecClass:BuildSubgraph(jewel, parentSocket, id, upSize, importe
 			icon = keystoneNode.icon,
 			expansionSkill = true,
 			group = subGraph.group,
-			o = 0,
-			oidx = 1,
+			o = 1,
+			oidx = data.clusterJewels.orbitOffsets[parentSocket.id][expansionJewel.size],
 			linked = { },
 			power = { },
 		}
@@ -1373,7 +1375,7 @@ function PassiveSpecClass:BuildSubgraph(jewel, parentSocket, id, upSize, importe
 	-- 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 correctedNodeOidxRelativeToClusterIndicies = (node.oidx + data.clusterJewels.orbitOffsets[parentSocket.id][expansionJewel.size - 1]) % clusterJewel.totalIndicies
 		local correctedNodeOidxRelativeToTreeSkillsPerOrbit = translateOidx(correctedNodeOidxRelativeToClusterIndicies, clusterJewel.totalIndicies, proxyNodeSkillsPerOrbit)
 		node.oidx = correctedNodeOidxRelativeToTreeSkillsPerOrbit
 	end

src/Data/ClusterJewels.lua

@@ -890,4 +890,162 @@ return {
 		"Hollow Palm Technique",
 		"Pitfighter",
 	},
+	orbitOffsets = {
+		[7960] = {
+			[0] = 3,
+			[1] = 5,
+			[2] = 5,
+		},
+		[46882] = {
+			[0] = 0,
+			[1] = 11,
+			[2] = 11,
+		},
+		[55190] = {
+			[0] = 2,
+			[1] = 3,
+			[2] = 3,
+		},
+		[2491] = {
+			[0] = 1,
+			[1] = 1,
+			[2] = 1,
+		},
+		[32763] = {
+			[0] = 5,
+			[1] = 9,
+			[2] = 9,
+		},
+		[21984] = {
+			[0] = 4,
+			[1] = 7,
+			[2] = 7,
+		},
+		[29712] = {
+			[0] = 2,
+			[1] = 3,
+		},
+		[48679] = {
+			[0] = 3,
+			[1] = 5,
+		},
+		[9408] = {
+			[0] = 3,
+			[1] = 7,
+		},
+		[12613] = {
+			[0] = 1,
+		},
+		[16218] = {
+			[0] = 2,
+		},
+		[2311] = {
+			[0] = 3,
+		},
+		[22994] = {
+			[0] = 5,
+			[1] = 9,
+		},
+		[40400] = {
+			[0] = 5,
+			[1] = 11,
+		},
+		[46393] = {
+			[0] = 0,
+			[1] = 1,
+		},
+		[61305] = {
+			[0] = 4,
+		},
+		[12161] = {
+			[0] = 5,
+		},
+		[3109] = {
+			[0] = 0,
+		},
+		[49080] = {
+			[0] = 1,
+			[1] = 1,
+		},
+		[17219] = {
+			[0] = 2,
+			[1] = 3,
+		},
+		[44169] = {
+			[0] = 3,
+			[1] = 5,
+		},
+		[24970] = {
+			[0] = 0,
+		},
+		[36931] = {
+			[0] = 1,
+		},
+		[14993] = {
+			[0] = 2,
+		},
+		[10532] = {
+			[0] = 5,
+			[1] = 11,
+		},
+		[23756] = {
+			[0] = 1,
+			[1] = 1,
+		},
+		[46519] = {
+			[0] = 2,
+			[1] = 3,
+		},
+		[23984] = {
+			[0] = 5,
+		},
+		[51198] = {
+			[0] = 0,
+		},
+		[61666] = {
+			[0] = 1,
+		},
+		[6910] = {
+			[0] = 4,
+			[1] = 7,
+		},
+		[49684] = {
+			[0] = 5,
+			[1] = 9,
+		},
+		[33753] = {
+			[0] = 5,
+			[1] = 11,
+		},
+		[18436] = {
+			[0] = 3,
+		},
+		[11150] = {
+			[0] = 4,
+		},
+		[22748] = {
+			[0] = 5,
+		},
+		[64583] = {
+			[0] = 3,
+			[1] = 5,
+		},
+		[61288] = {
+			[0] = 4,
+			[1] = 7,
+		},
+		[13170] = {
+			[0] = 5,
+			[1] = 9,
+		},
+		[9797] = {
+			[0] = 2,
+		},
+		[41876] = {
+			[0] = 3,
+		},
+		[59585] = {
+			[0] = 4,
+		},
+	},
 }

src/Export/Scripts/cluster.lua

@@ -59,6 +59,22 @@ for skill in dat("PassiveTreeExpansionSpecialSkills"):Rows() do
 	end
 end
 out:write('\t},\n')
+out:write('\torbitOffsets = {\n')
+for jewelSlot in dat("PassiveJewelSlots"):Rows() do
+	if jewelSlot.ClusterSize then
+		out:write('\t\t[', jewelSlot.Passive.Hash, '] = {\n')
+		out:write('\t\t\t[0] = ', jewelSlot.StartIndices[1], ',\n')
+		if jewelSlot.StartIndices[2] then
+			out:write('\t\t\t[1] = ', jewelSlot.StartIndices[2], ',\n')
+		end
+		if jewelSlot.StartIndices[3] then
+			out:write('\t\t\t[2] = ', jewelSlot.StartIndices[3], ',\n')
+		end
+		out:write('\t\t},\n')
+	end
+end
+out:write('\t},\n')
+
 
 out:write('}')
 out:close()

src/Export/spec.lua

@@ -3251,7 +3251,7 @@ return {
 			list=true,
 			name="AddTypes",
 			refTo="ActiveSkillType",
-			type="Enum",
+			type="ShortKey",
 			width=100
 		},
 		[7]={
@@ -6023,7 +6023,7 @@ return {
 			list=false,
 			name="Parent",
 			refTo="PassiveJewelSlots",
-			type="Enum",
+			type="ShortKey",
 			width=170
 		},
 		[5]={
@@ -6032,6 +6032,13 @@ return {
 			refTo="PassiveSkills",
 			type="Key",
 			width=210
+		},
+		[6]={
+			list=true,
+			name="StartIndices",
+			refTo="",
+			type="Int",
+			width=150
 		}
 	},
 	PassiveSkillBuffs={