Add support for Abyssal Lich Ascendancy (#1238)

* Fix hardcoded ascendancy jewel socket in export script

* Fix ascedancy background position when a new ascendancy appear

* Fix ascendency filtering logic to use 'Replace' property

* Add Ascendancy replacement feature

* feat enable Abyss Lich in passive tree

* Remove bullet points from nodes

---------

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

Author: 3 people

src/Classes/PassiveSpec.lua

@@ -972,8 +972,12 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 		-- ignore cluster jewel nodes that don't have an id in the tree
 		if self.tree.nodes[id] then
 			local nodeToReplace = self.tree.nodes[id]
-			if self.tree.nodes[id].isSwitchable and self.tree.nodes[id].options[self.curClassName] then
-				nodeToReplace = self.tree.nodes[id].options[self.curClassName]
+			if self.tree.nodes[id].isSwitchable then
+				if self.tree.nodes[id].options[self.curClassName] then
+					nodeToReplace = self.tree.nodes[id].options[self.curClassName]
+				elseif self.tree.nodes[id].options[self.curAscendClassName] then
+					nodeToReplace = self.tree.nodes[id].options[self.curAscendClassName]
+				end
 				self.switchableNodes[nodeToReplace.id] = node
 			end
 			self:ReplaceNode(node, nodeToReplace)
@@ -1415,6 +1419,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 end
 
 function PassiveSpecClass:ReplaceNode(old, newNode)
+	old.overlay = newNode.overlay
+	old.icon = newNode.icon
 	-- Edited nodes can share a name
 	if old.sd == newNode.sd then
 		return 1
@@ -1426,8 +1432,6 @@ function PassiveSpecClass:ReplaceNode(old, newNode)
 	old.modList = new("ModList")
 	old.modList:AddList(newNode.modList)
 	old.keystoneMod = newNode.keystoneMod
-	old.icon = newNode.icon
-	old.spriteId = newNode.spriteId
 	old.activeEffectImage = newNode.activeEffectImage
 	old.reminderText = newNode.reminderText or { }
 end

src/Classes/PassiveTree.lua

@@ -230,6 +230,12 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 			node.type = "AscendClassStart"
 			local ascendClass = self.ascendNameMap[node.ascendancyName].ascendClass
 			ascendClass.startNodeId = node.id
+			if node.isSwitchable then
+				for ascName, _ in pairs(node.options) do
+					local option = self.ascendNameMap[ascName].ascendClass
+					option.startNodeId = node.id
+				end
+			end
 		elseif node.isOnlyImage then
 			node.type = "OnlyImage"
 		elseif node.isJewelSocket then
@@ -550,6 +556,16 @@ function PassiveTreeClass:ProcessNode(node)
 			switchNode.dn = switchNode.name
 			switchNode.sd = switchNode.stats
 
+			if switchNode.jewelOverlay then
+				ConPrintf("SwitchNode with jewelOverlay found: "..switchNode.name)
+				switchNode.overlay = switchNode.jewelOverlay
+				if switchNode.overlay then
+					local size = node.targetSize["overlay"] and node.targetSize["overlay"].width or node.targetSize.width
+					switchNode.rsq = size * size
+					switchNode.size = size
+				end
+			end
+
 			self:ProcessStats(switchNode)
 		end
 	end

src/Classes/PassiveTreeView.lua

@@ -421,7 +421,14 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 	-- draw ascendancies
 	for name, data in pairs(tree.ascendNameMap) do
 		local ascendancy = data.ascendClass
-		if ascendancy.background then
+		local drawn = true
+		if ascendancy.replaceBy and ascendancy.replaceBy == spec.curAscendClassBaseName then
+			drawn = false
+		elseif ascendancy.replace and name ~= spec.curAscendClassBaseName then
+			drawn = false
+		end
+
+		if ascendancy.background and drawn  then
 			local bg = tree:GetAssetByName(ascendancy.background.image)
 			local scrX, scrY = treeToScreen(ascendancy.background.x * tree.scaleImage, ascendancy.background.y * tree.scaleImage)
 			bg.width = ascendancy.background.width

src/Data/ModCache.lua

@@ -615,6 +615,7 @@ local tree = {
 }
 
 printf("Generating classes...")
+local ascedancyReplacements = {}
 for i, classId in ipairs(psg.passives) do
 	local passiveRow = dat("passiveskills"):GetRow("PassiveSkillNodeId", classId)
 	if passiveRow == nil then
@@ -665,14 +666,18 @@ for i, classId in ipairs(psg.passives) do
 
 		local ascendancies = dat("ascendancy"):GetRowList("Class", character)
 		for k, ascendency in ipairs(ascendancies) do
-			if ascendency.Name:find(ignoreFilter) ~= nil or ascendency.isDisabled or ascendency.Id == "Witch3b" then
+			if ascendency.Name:find(ignoreFilter) ~= nil or ascendency.isDisabled then
 				printf("Ignoring ascendency " .. ascendency.Name .. " for class " .. character.Name)
 				goto continue3
 			end
+			if ascendency.Replace then
+				ascedancyReplacements[ascendency.Replace.Name] = ascendency.Name
+			end
 			table.insert(classDef.ascendancies, {
 				["id"] = ascendency.Name,
 				["name"] = ascendency.Name,
 				["internalId"] = ascendency.Id,
+				["replace"] = ascendency.Replace and ascendency.Replace.Name or nil,
 				["background"] = {
 					image = "Classes" .. ascendency.Name,
 					section = "AscendancyBackground",
@@ -815,8 +820,7 @@ for i, group in ipairs(psg.groups) do
 				if passiveRow.JewelSocket then
 					node["containJewelSocket"] = true
 
-					local uioverride = dat("passiveskilltreenodeframeart"):GetRow("Id", "LichAscendancyJewel")
-
+					local uioverride = passiveRow.Ascendancy.UIArt.JewelFrame
 					if uioverride then
 						local uiSocketNormal = uiImages[string.lower(uioverride.Normal)]
 						addToSheet(getSheet("group-background"), uiSocketNormal.path, "frame", commonMetadata(nil))
@@ -986,6 +990,63 @@ for i, group in ipairs(psg.groups) do
 				}
 			end
 
+			if passiveRow.Ascendancy and ascedancyReplacements[passiveRow.Ascendancy.Name] then
+				node["isSwitchable"] = true
+				local ascendancyRow = dat("ascendancy"):GetRow("Name", ascedancyReplacements[passiveRow.Ascendancy.Name])
+
+				local nodeInfo = {
+					["ascendancyName"] = ascedancyReplacements[passiveRow.Ascendancy.Name]
+				}
+
+				local switchNode = dat("ascendancypassiveskilloverrides"):GetRow("OriginalNode", passiveRow)
+				if switchNode then
+					nodeInfo.id = switchNode.SwitchedNode.PassiveSkillNodeId
+					nodeInfo.name = switchNode.SwitchedNode.Name
+					nodeInfo.icon = switchNode.SwitchedNode.Icon
+					nodeInfo.stats = {}
+
+					-- add to assets
+					addToSheet(getSheet("skills"), switchNode.SwitchedNode.Icon, "normalActive", commonMetadata(nil))
+					addToSheet(getSheet("skills-disabled"), switchNode.SwitchedNode.Icon, "normalInactive", commonMetadata(nil))
+
+					-- Stats
+					if switchNode.SwitchedNode.Stats ~= nil then
+						local parseStats = {}
+						for k, stat in ipairs(switchNode.SwitchedNode.Stats) do
+							parseStats[stat.Id] = { min = switchNode.SwitchedNode["Stat" .. k], max = switchNode.SwitchedNode["Stat" .. k] }
+						end
+						local out, orders = describeStats(parseStats)
+						for k, line in ipairs(out) do
+							table.insert(nodeInfo["stats"], line)
+						end
+					end
+				end
+
+				if passiveRow.JewelSocket and ascendancyRow.UIArt.JewelFrame then
+					-- override the jewel socket assets if any
+					local uioverride = ascendancyRow.UIArt.JewelFrame
+					
+					local uiSocketNormal = uiImages[string.lower(uioverride.Normal)]
+					addToSheet(getSheet("group-background"), uiSocketNormal.path, "frame", commonMetadata(nil))
+
+					local uiSocketActive = uiImages[string.lower(uioverride.Active)]
+					addToSheet(getSheet("group-background"), uiSocketActive.path, "frame", commonMetadata(nil))
+
+					local uiSocketCanAllocate = uiImages[string.lower(uioverride.CanAllocate)]
+					addToSheet(getSheet("group-background"), uiSocketCanAllocate.path, "frame", commonMetadata(nil))
+
+					nodeInfo.jewelOverlay = {
+						alloc = uiSocketActive.path,
+						path = uiSocketCanAllocate.path,
+						unalloc = uiSocketNormal.path,
+					}
+				end
+
+				node["options"] = {
+					[ascedancyReplacements[passiveRow.Ascendancy.Name]] = nodeInfo
+				}
+			end
+
 			-- classStartName
 			if #passiveRow.ClassStart > 0 then
 				node["classesStart"] = {}
@@ -1109,6 +1170,11 @@ for i, classId in ipairs(psg.passives) do
 	for _, class in ipairs(classes) do
 		for _, ascendancy in ipairs(class.ascendancies) do
 			printf("Positioning ascendancy " .. ascendancy.name .. " for class " .. class.name)
+			
+			local angle = startAngle + (j - 1) * angleStep
+			local cX = hardCoded * math.cos(angle)
+			local cY = hardCoded * math.sin(angle)
+
 			local info = ascendancyGroups[ascendancy.id]
 			if info == nil then
 				printf("Ascendancy group " .. ascendancy.id .. " not found")
@@ -1119,15 +1185,12 @@ for i, classId in ipairs(psg.passives) do
 				printf("Ascendancy node " .. ascendancy.id .. " not found")
 				goto continuepositioning
 			end
-			local groupAscendancy = tree.groups[ascendancyNode.group]
-
-			local angle = startAngle + (j - 1) * angleStep
-			local cX = hardCoded * math.cos(angle)
-			local cY = hardCoded * math.sin(angle)
 
 			ascendancy.background.x = cX
 			ascendancy.background.y = cY
 
+			local groupAscendancy = tree.groups[ascendancyNode.group]
+
 			local innerRadious = dat("ascendancy"):GetRow("Id", ascendancy.internalId).distanceTree
 
 			local newInnerX = cX + math.cos(angleToCenter) * innerRadious
@@ -1155,12 +1218,46 @@ for i, classId in ipairs(psg.passives) do
 					tree.max_y = math.max(tree.max_y, group.y + hardCoded / 2)
 				end
 			end
+
 			j = j + 1
 			:: continuepositioning ::
 		end
 	end
 end
 
+printf("Fixing replace ascendancies position...")
+for from, to in pairs(ascedancyReplacements) do
+	local fromAscendancy
+	local toAscendancy
+	for _, class in ipairs(tree.classes) do
+		for _, ascendancy in ipairs(class.ascendancies) do
+			if ascendancy.name == from then
+				fromAscendancy = ascendancy
+			end
+			if ascendancy.name == to then
+				toAscendancy = ascendancy
+			end
+		end
+	end
+
+	if fromAscendancy == nil then
+		printf("From ascendancy " .. from .. " not found")
+		goto continuereplace
+	end
+	if toAscendancy == nil then
+		printf("To ascendancy " .. to .. " not found")
+		goto continuereplace
+	end
+
+	fromAscendancy.replaceBy = to
+
+	toAscendancy.background.x = fromAscendancy.background.x
+	toAscendancy.background.y = fromAscendancy.background.y
+
+	:: continuereplace ::
+end
+
+
 printf("Generating sprite info...")
 for i, sheet in ipairs(sheets) do
 	printf("Calculating sprite dimensions for " .. sheet.name)