Fix Ascendancy header image and rename itemTooltip to tooltipHeader (#1189)

Author: Blitz54

src/Assets/ascendancypassiveheaderleft.png

@@ -528,7 +528,7 @@ function GemSelectClass:AddGemTooltip(gemInstance)
 	self.tooltip.color = colorCodes.GEM
 	local grantedEffect = gemInstance.gemData.grantedEffect
 	local additionalEffects = gemInstance.gemData.additionalGrantedEffects
-	self.tooltip.itemTooltip = "GEM"
+	self.tooltip.tooltipHeader = "GEM"
 	if grantedEffect.name:match("^Spectre:") or grantedEffect.name:match("^Companion:") then
 		self.tooltip:AddLine(20, colorCodes.GEM .. (gemInstance.displayEffect and gemInstance.displayEffect.nameSpec or gemInstance.gemData.name))	
 	else

src/Assets/ascendancypassiveheadermiddle.png

@@ -2596,7 +2596,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 	-- Item name
 	local rarityCode = colorCodes[item.rarity]
 	tooltip.maxWidth = 600 -- Should instead get the longest mod and set the width to that. Some flavour text is way too long so we need a cap of sorts.
-	tooltip.itemTooltip = item.rarity
+	tooltip.tooltipHeader = item.rarity
 	tooltip.center = true
 	tooltip.color = rarityCode
 	if item.title then

src/Assets/ascendancypassiveheaderright.png

@@ -1079,8 +1079,13 @@ function PassiveTreeViewClass:AddNodeName(tooltip, node, build)
 		Notable = "NOTABLE",
 		Socket = "JEWEL",
 		Keystone = "KEYSTONE",
+		Ascendancy = "ASCENDANCY",
 	}
-	tooltip.itemTooltip = tooltipMap[node.type] or "UNKNOWN"
+	if (node.type == "Notable" or node.type == "Normal") and node.ascendancyName then
+		tooltip.tooltipHeader = "ASCENDANCY"
+	else
+		tooltip.tooltipHeader = tooltipMap[node.type] or "UNKNOWN"
+	end
 	tooltip:AddLine(24, "^7"..node.dn..(launch.devModeAlt and " ["..node.id.."]" or ""))
 	if launch.devModeAlt and node.id > 65535 then
 		-- Decompose cluster node Id

src/Classes/GemSelectControl.lua

@@ -24,7 +24,7 @@ end)
 function TooltipClass:Clear()
 	wipeTable(self.lines)
 	wipeTable(self.blocks)
-	self.itemTooltip = false
+	self.tooltipHeader = false
 	self.titleYOffset = 0
 	self.recipe = nil
 	self.center = false
@@ -86,8 +86,8 @@ function TooltipClass:AddSeparator(size)
 
 	local separatorImage = nil
 
-	if self.itemTooltip then
-		local rarity = tostring(self.itemTooltip):upper()
+	if self.tooltipHeader then
+		local rarity = tostring(self.tooltipHeader):upper()
 		local separatorConfigs = {
 			RELIC = "Assets/ItemsSeparatorFoil.png",
 			UNIQUE = "Assets/ItemsSeparatorUnique.png",
@@ -258,8 +258,8 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
 	end
 	local ttW, ttH = self:GetSize()
 
-	-- ensure ttW is at least title width + 50 pixels, this fixes the header image for Magic items and some Tree passives. NOT WORKING NOW?????
-	if self.itemTooltip and self.lines[1] and self.lines[1].text then
+	-- ensure ttW is at least title width + 50 pixels, this fixes the header image for Magic items and some Tree passives.
+	if self.tooltipHeader and self.lines[1] and self.lines[1].text then
 		local titleW = DrawStringWidth(self.lines[1].size, "VAR", self.lines[1].text)
 		if titleW + 50 > ttW then
 			ttW = titleW + 50
@@ -276,10 +276,11 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
 		NOTABLE = {left="Assets/NotablePassiveHeaderLeft.png",middle="Assets/NotablePassiveHeaderMiddle.png",right="Assets/NotablePassiveHeaderRight.png",height=38,sideWidth=38,middleWidth=32,textYOffset=2},
 		PASSIVE = {left="Assets/NormalPassiveHeaderLeft.png",middle="Assets/NormalPassiveHeaderMiddle.png",right="Assets/NormalPassiveHeaderRight.png",height=38,sideWidth=32,middleWidth=32,textYOffset=2},
 		KEYSTONE = {left="Assets/KeystonePassiveHeaderLeft.png",middle="Assets/KeystonePassiveHeaderMiddle.png",right="Assets/KeystonePassiveHeaderRight.png",height=38,sideWidth=32,middleWidth=32,textYOffset=2},
+		ASCENDANCY = {left="Assets/AscendancyPassiveHeaderLeft.png",middle="Assets/AscendancyPassiveHeaderMiddle.png",right="Assets/AscendancyPassiveHeaderRight.png",height=38,sideWidth=32,middleWidth=32,textYOffset=2},
 	}
 	local config
-	if self.itemTooltip and main.showFlavourText and self.lines[1] and self.lines[1].text then
-		local rarity = tostring(self.itemTooltip):upper()
+	if self.tooltipHeader and main.showFlavourText and self.lines[1] and self.lines[1].text then
+		local rarity = tostring(self.tooltipHeader):upper()
 		config = headerConfigs[rarity] or headerConfigs.NORMAL
 		self.titleYOffset = config.textYOffset or 0
 	end
@@ -310,8 +311,8 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
 	SetDrawColor(1, 1, 1)
 
 	-- Item header (drawn within borders)
-	if self.itemTooltip and main.showFlavourText and self.lines[1] and self.lines[1].text then
-		local rarity = tostring(self.itemTooltip):upper()
+	if self.tooltipHeader and main.showFlavourText and self.lines[1] and self.lines[1].text then
+		local rarity = tostring(self.tooltipHeader):upper()
 		local config = headerConfigs[rarity] or headerConfigs.NORMAL
 
 		self.titleYOffset = config.textYOffset or 0
@@ -365,7 +366,7 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
 			local skip = false
 			if line[1] and type(line[1]) == "table" and line[1].isSeparator then
 				-- Only skip first separator for items and skill gems
-				local tooltipType = self.itemTooltip and tostring(self.itemTooltip):upper() or ""
+				local tooltipType = self.tooltipHeader and tostring(self.tooltipHeader):upper() or ""
 				if main.showFlavourText and not firstSeparatorSkipped and 
 				(tooltipType == "RELIC" or tooltipType == "UNIQUE" or tooltipType == "RARE" or tooltipType == "MAGIC" or tooltipType == "GEM") then
 					firstSeparatorSkipped = true