Add 3.29 skill trees (#9973)

* Add 3.29 skill trees

* Fix data error and restore position of Saresh Bloodline

* Fix trees

Moves the bloodlines to have the Necromantic one off to the side
Fixes the issue with the new sprite tables for positions
Moves the Luminary position to below the existing Reliquarian as otherwise its in the way of cluster jewels

* ModCache

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: Wires77

fix_ascendancy_positions.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 from __future__ import annotations
 
 import dataclasses
@@ -40,6 +41,7 @@ def __sub__(self, other: Point2D) -> Point2D:
     "Saboteur": Point2D(10200, -2200),
     "Ascendant": Point2D(-7800, 7200),
 	"Reliquarian": Point2D(-7800, 8900),
+    "Luminary": Point2D(-7800, 10600),
     "Warden": Point2D(8250, 8350),
     "Primalist": Point2D(7200, 9400),
     "Warlock": Point2D(9300, 7300),
@@ -53,7 +55,9 @@ def __sub__(self, other: Point2D) -> Point2D:
 	"KingInTheMists": Point2D(3750, 12000),
 	"Olroth": Point2D(5250, 12000),
 	"Oshabi": Point2D(6750, 12000),
-	"Necromantic": Point2D(8250, 12000),
+	"Necromantic": Point2D(9750, 12000),
+    "Abyssal": Point2D(-750, 13600),
+    "Brinerot": Point2D(750, 13600)
 }
 EXTRA_NODES = {
 	"Necromancer": [{"Node": {"name": "Nine Lives", "icon": "Art/2DArt/SkillIcons/passives/Ascendants/Int.png", "isNotable": True, "skill" : 27602}, 

src/Classes/ImportTab.lua

@@ -1049,7 +1049,8 @@ function ImportTabClass:BuildCharacterList(realm, league, characters, control)
 					elseif (charClass == "Juggernaut" or charClass == "Berserker" or charClass == "Chieftain" or
 							charClass == "Antiquarian" or charClass == "Behemoth" or charClass == "Ancestral Commander") then
 						classColor = colorCodes["MARAUDER"]
-					elseif (charClass == "Ascendant" or charClass == "Reliquarian" or charClass == "Scavenger") then
+					elseif (charClass == "Ascendant" or charClass == "Reliquarian" or charClass == "Luminary" or
+							charClass == "Scavenger") then
 						classColor = colorCodes["SCION"]
 					end
 				end

src/Classes/PassiveTree.lua

@@ -267,7 +267,7 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 		end
 		self.skillSprites = self.sprites
 	end
-	for type, data in pairs(self.skillSprites) do
+	for spriteType, data in pairs(self.skillSprites) do
 		local maxZoom
 		if not self.imageZoomLevels then
 			maxZoom = data
@@ -286,14 +286,18 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 			if not self.spriteMap[name] then
 				self.spriteMap[name] = { }
 			end
-			self.spriteMap[name][type] = {
+			local x = type(coords.x) == "table" and coords.x[#coords.x] or coords.x
+			local y = type(coords.y) == "table" and coords.y[#coords.y] or coords.y
+			local w = type(coords.w) == "table" and coords.w[#coords.w] or coords.w
+			local h = type(coords.h) == "table" and coords.h[#coords.h] or coords.h
+			self.spriteMap[name][spriteType] = {
 				handle = sheet.handle,
-				width = coords.w,
-				height = coords.h,
-				[1] = coords.x / sheet.width,
-				[2] = coords.y / sheet.height,
-				[3] = (coords.x + coords.w) / sheet.width,
-				[4] = (coords.y + coords.h) / sheet.height
+				width = w,
+				height = h,
+				[1] = x / sheet.width,
+				[2] = y / sheet.height,
+				[3] = (x + w) / sheet.width,
+				[4] = (y + h) / sheet.height
 			}
 		end
 	end
@@ -546,7 +550,7 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 			node.type = "Normal"
 			if ((node.ascendancyName == "Ascendant" and not node.isMultipleChoiceOption and not node.dn:find("Dexterity")
 				and not node.dn:find("Intelligence") and not node.dn:find("Strength") and not node.dn:find("Passive"))
-				or (node.isMultipleChoiceOption and node.ascendancyName)) and node.ascendancyName ~= "Reliquarian" then
+				or (node.isMultipleChoiceOption and node.ascendancyName)) and node.ascendancyName ~= "Reliquarian" and node.ascendancyName ~= "Luminary" then
 				local className = self.ascendNameMap[node.ascendancyName].class.name
 				self.ascendancyMap[node.dn:lower()] = node
 				if not self.classNotables[className] then

src/Data/ModCache.lua

@@ -11085,6 +11085,13 @@ return {
 			refTo="PassiveSkills",
 			type="Key",
 			width=150
+		},
+		[14]={
+			list=true,
+			name="BlockingPassive",
+			refTo="PassiveSkills",
+			type="Key",
+			width=280
 		}
 	},
 	passiveskilloverridetypes={

src/Export/spec.lua

@@ -9,7 +9,7 @@ liveTargetVersion = "3_0"
 ---@type string[]
 treeVersionList = { "2_6", "3_6", "3_7", "3_8", "3_9", "3_10", "3_11", "3_12", "3_13", "3_14", "3_15", "3_16", "3_17", "3_18", "3_19", "3_20", "3_21",
 					"3_22_ruthless", "3_22", "3_23_ruthless", "3_23", "3_24_ruthless", "3_24", "3_25_ruthless", "3_25_ruthless_alternate", "3_25_alternate", "3_25",
-					"3_26_ruthless", "3_26_ruthless_alternate", "3_26_alternate", "3_26", "3_27_ruthless", "3_27_ruthless_alternate", "3_27_alternate", "3_27", "3_28_ruthless", "3_28_ruthless_alternate", "3_28_alternate", "3_28" }
+					"3_26_ruthless", "3_26_ruthless_alternate", "3_26_alternate", "3_26", "3_27_ruthless", "3_27_ruthless_alternate", "3_27_alternate", "3_27", "3_28_ruthless", "3_28_ruthless_alternate", "3_28_alternate", "3_28", "3_29_ruthless", "3_29" }
 --- Always points to the latest skill tree version.
 latestTreeVersion = treeVersionList[#treeVersionList]
 ---Tree version where multiple skill trees per build were introduced to PoBC.
@@ -212,10 +212,28 @@ treeVersions = {
 		num = 3.28,
 		url = "https://www.pathofexile.com/passive-skill-tree/3.28.0/",
 	},
+	["3_29_ruthless"] = {
+		display = "3.29 (ruthless)",
+		num = 3.29,
+		url = "https://www.pathofexile.com/passive-skill-tree/ruthless/",
+	},
+	["3_29"] = {
+		display = "3.29",
+		num = 3.29,
+		url = "https://www.pathofexile.com/passive-skill-tree/3.29.0/",
+	},
 }
 
 ---Mapping PoEPlanner.com version when importing trees from there (https://cdn.poeplanner.com/json/versions.json)
 poePlannerVersions = {
+	[51] = "3_29",
+	[50] = "3_29_ruthless",
+	-- [49] = "3_29_alternate",
+	-- [48] = "3_29_ruthless_alternate",
+	[47] = "3_28",
+	[46] = "3_28_ruthless",
+	[45] = "3_28_alternate",
+	[44] = "3_28_ruthless_alternate",
 	[43] = "3_27",
 	[42] = "3_27_ruthless",
 	[37] = "3_26",