Merge branch 'dev' into pretty-ui

Author: LocalIdentity

fix_ascendancy_positions.py

@@ -42,6 +42,16 @@ def __sub__(self, other: Point2D) -> Point2D:
     "Warden": Point2D(8250, 8350),
     "Primalist": Point2D(7200, 9400),
     "Warlock": Point2D(9300, 7300),
+	"Aul": Point2D(-6750, 12000),
+	"Breachlord": Point2D(-5250, 12000),
+	"Catarina": Point2D(-3750, 12000),
+	"Trialmaster": Point2D(-2250, 12000),
+	"Delirious": Point2D(-750, 12000),
+	"Farrul": Point2D(750, 12000),
+	"Lycia": Point2D(2250, 12000),
+	"KingInTheMists": Point2D(3750, 12000),
+	"Olroth": Point2D(5250, 12000),
+	"Oshabi": Point2D(6750, 12000),
 }
 EXTRA_NODES = {
 	"Necromancer": [{"Node": {"name": "Nine Lives", "icon": "Art/2DArt/SkillIcons/passives/Ascendants/Int.png", "isNotable": True, "skill" : 27602}, 

src/Classes/PassiveSpec.lua

@@ -735,10 +735,9 @@ function PassiveSpecClass:CountAllocNodes()
 		if node.type ~= "ClassStart" and node.type ~= "AscendClassStart" then
 			if node.ascendancyName then
 				if not node.isMultipleChoiceOption then
+					ascUsed = ascUsed + 1
 					if self.tree.secondaryAscendNameMap and self.tree.secondaryAscendNameMap[node.ascendancyName] then
 						secondaryAscUsed = secondaryAscUsed + 1
-					else
-						ascUsed = ascUsed + 1
 					end
 				end
 			else

src/Classes/PassiveTree.lua

@@ -122,27 +122,50 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 		end
 	end
 
-	-- hide alternate_ascendancies as they are unobtainable in the newest versions and will cause a crash if an older version is loaded with it at the moment
+	-- hide legacy alternate ascendancies that are no longer obtainable
 	if self.alternate_ascendancies then
-		if launch.devMode then
-			ConPrintf("WARNING! alternate_ascendancies exist but are being hidden")
-		end
-		local tempMap = {}
-		local temp_groups = {}
+		local legacyAlternateAscendancyIds = {
+			Warden = true,
+			Warlock = true,
+			Primalist = true,
+		}
+		local filteredAlternateAscendancies = { }
+		local legacyAscMap = { }
 		for ascendClassId, ascendClass in pairs(self.alternate_ascendancies) do
-			tempMap[ascendClass.id] = true
+			if legacyAlternateAscendancyIds[ascendClass.id] then
+				legacyAscMap[ascendClass.id] = true
+			else
+				filteredAlternateAscendancies[ascendClassId] = ascendClass
+			end
 		end
-		for i, node in pairs(self.nodes) do
-			if node.ascendancyName and tempMap[node.ascendancyName] then
-				self.nodes[i] = nil
-				temp_groups[node.group] = true
+		if next(legacyAscMap) then
+			if launch.devMode then
+				local removed = { }
+				for id in pairs(legacyAscMap) do
+					removed[#removed + 1] = id
+				end
+				table.sort(removed)
+				ConPrintf("Removing legacy alternate ascendancies from tree: %s", table.concat(removed, ", "))
+			end
+			local temp_groups = {}
+			for nodeId, node in pairs(self.nodes) do
+				if node.ascendancyName and legacyAscMap[node.ascendancyName] then
+					self.nodes[nodeId] = nil
+					temp_groups[node.group] = true
+				end
+			end
+			for groupId in pairs(temp_groups) do
+				self.groups[groupId] = nil
+			end
+			for legacyId in pairs(legacyAscMap) do
+				self.ascendNameMap[legacyId] = nil
 			end
 		end
-		for i, group in pairs(temp_groups) do
-			self.groups[i] = nil
+		if next(filteredAlternateAscendancies) then
+			self.alternate_ascendancies = filteredAlternateAscendancies
+		else
+			self.alternate_ascendancies = nil
 		end
-			
-		self.alternate_ascendancies = nil
 	end
 
 	if self.alternate_ascendancies then
@@ -262,6 +285,64 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 		end
 	end
 
+	local bloodlineSpriteTypes = {
+		Trialmaster = "trialmasterBloodline",
+		Oshabi = "oshabiBloodline",
+		Olroth = "olrothBloodline",
+		Lycia = "lyciaBloodline",
+		KingInTheMists = "kingInTheMistsBloodline",
+		Farrul = "farrulBloodline",
+		Delirious = "deliriousBloodline",
+		Catarina = "catarinaBloodline",
+		Breachlord = "breachlordBloodline",
+		Aul = "aulBloodline",
+		Azmeri = "azmeriBloodline",
+	}
+	local bloodlineAssetNames = {
+		"AscendancyButton",
+		"AscendancyButtonHighlight",
+		"AscendancyButtonPressed",
+		"AscendancyFrameLargeNormal",
+		"AscendancyFrameLargeCanAllocate",
+		"AscendancyFrameLargeAllocated",
+		"AscendancyFrameSmallNormal",
+		"AscendancyFrameSmallCanAllocate",
+		"AscendancyFrameSmallAllocated",
+		"AscendancyMiddle",
+	}
+	self.bloodlineSpritePrefixes = self.bloodlineSpritePrefixes or { }
+	for ascendancyName, spriteType in pairs(bloodlineSpriteTypes) do
+		local hasSprite = false
+		for _, assetName in ipairs(bloodlineAssetNames) do
+			local spriteSet = self.spriteMap[assetName]
+			local spriteData = spriteSet and spriteSet[spriteType]
+			if spriteData then
+				self.assets[ascendancyName .. assetName] = spriteData
+				hasSprite = true
+			end
+		end
+		if hasSprite then
+			self.bloodlineSpritePrefixes[ascendancyName] = ascendancyName
+		end
+	end
+
+	if self.alternate_ascendancies then
+		-- Use the bloodline sprite sheets for the remaining alternate ascendancy emblems
+		local legacyClasses = {
+			ClassesPrimalist = true,
+			ClassesWarlock = true,
+			ClassesWarden = true,
+		}
+		for spriteName, spriteSet in pairs(self.spriteMap) do
+			if spriteName:match("^Classes") and not legacyClasses[spriteName] and not self.assets[spriteName] then
+				local _, sprite = next(spriteSet)
+				if sprite then
+					self.assets[spriteName] = sprite
+				end
+			end
+		end
+	end
+
 	-- Load legion sprite sheets and build sprite map
 	local legionSprites = LoadModule("TreeData/legion/tree-legion.lua")
 	for type, data in pairs(legionSprites) do
@@ -720,6 +801,11 @@ function PassiveTreeClass:ProcessNode(node)
 		node.sprites = self.spriteMap["Art/2DArt/SkillIcons/passives/MasteryBlank.png"]
 	end
 	node.overlay = self.nodeOverlay[node.type]
+	if node.ascendancyName then
+		node.bloodlineOverlayPrefix = self.bloodlineSpritePrefixes and self.bloodlineSpritePrefixes[node.ascendancyName]
+	else
+		node.bloodlineOverlayPrefix = nil
+	end
 	if node.overlay then
 		node.rsq = node.overlay.rsq
 		node.size = node.overlay.size

src/Classes/PassiveTreeView.lua

@@ -483,8 +483,11 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 			overlay = isAlloc and node.startArt or "PSStartNodeBackgroundInactive"
 		elseif node.type == "AscendClassStart" then
 			overlay = treeVersions[tree.treeVersion].num >= 3.10 and "AscendancyMiddle" or "PassiveSkillScreenAscendancyMiddle"
-			if node.ascendancyName and tree.secondaryAscendNameMap and tree.secondaryAscendNameMap[node.ascendancyName] then
-				overlay = "Azmeri"..overlay
+			if node.ascendancyName then
+				local prefix = tree.bloodlineSpritePrefixes and tree.bloodlineSpritePrefixes[node.ascendancyName]
+				if prefix then
+					overlay = prefix .. overlay
+				end
 			end
 		else
 			local state
@@ -561,9 +564,17 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 					effect = node.effectSprites["tattooActiveEffect"]
 				end
 				base = node.sprites[node.type:lower()..(isAlloc and "Active" or "Inactive")]
-				overlay = node.overlay[state .. (node.ascendancyName and "Ascend" or "") .. (node.isBlighted and "Blighted" or "")]
-				if node.ascendancyName and tree.secondaryAscendNameMap and tree.secondaryAscendNameMap[node.ascendancyName] then
-					overlay = "Azmeri"..overlay
+				local overlayKey = state .. (node.ascendancyName and "Ascend" or "") .. (node.isBlighted and "Blighted" or "")
+				local overlayName = node.overlay[overlayKey]
+				if node.ascendancyName then
+					local prefix = node.bloodlineOverlayPrefix or (tree.bloodlineSpritePrefixes and tree.bloodlineSpritePrefixes[node.ascendancyName])
+					if prefix and overlayName then
+						overlay = prefix .. overlayName
+					else
+						overlay = overlayName
+					end
+				else
+					overlay = overlayName
 				end
 			end
 		end