Lich Jewel Socket support was added

Author: justjuangui

src/Classes/CalcBreakdownControl.lua

@@ -397,7 +397,11 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 			if item then
 				row.sourceName = colorCodes[item.rarity]..item.name
 				row.sourceNameTooltip = function(tooltip)
-					build.itemsTab:AddItemTooltip(tooltip, item, row.mod.sourceSlot)
+					local args = row.mod.sourceSlot
+					if row.mod.sourceSlot == "Jewel" and row.mod.sourceSlotNum ~= nil and build.spec.nodes[row.mod.sourceSlotNum] and build.spec.nodes[row.mod.sourceSlotNum].containJewelSocket then
+						args = { nodeId = row.mod.sourceSlotNum }
+					end
+					build.itemsTab:AddItemTooltip(tooltip, item, args)
 				end
 			end
 		elseif sourceType == "Tree" then

src/Classes/ItemsTab.lua

@@ -146,7 +146,7 @@ local ItemsTabClass = newClass("ItemsTab", "UndoHandler", "ControlHost", "Contro
 	self.sockets = { }
 	local socketOrder = { }
 	for _, node in pairs(build.latestTree.nodes) do
-		if node.type == "Socket" then
+		if node.type == "Socket" or node.containJewelSocket then
 			t_insert(socketOrder, node)
 		end
 	end
@@ -1815,6 +1815,12 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet)
 		local node = self.build.spec.tree.nodes[tonumber(slotId)] or self.build.spec.nodes[tonumber(slotId)]
 		if not node or item.type ~= "Jewel" then
 			return false
+		elseif node.containJewelSocket  then
+			if item.rarity == "UNIQUE" then
+				-- Unique jewels can only be in unique jewel sockets
+				return false
+			end
+			return true
 		elseif node.charmSocket or item.base.subType == "Charm" then
 			-- Charm sockets can only have charms, and charms can only be in charm sockets
 			if node.charmSocket and item.base.subType == "Charm" then
@@ -2760,11 +2766,53 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 		item.requirements.str or 0, item.requirements.dex or 0, item.requirements.int or 0)
 
 	-- Modifiers
+	-- Support for Lich Socket Jewel only for tooltip display
+	-- the real calculation is done in the CalcSetup
+	local scale = 1
+	local extraTooltip = ""
+	if slot and slot.nodeId then
+		local node = self.build.spec.nodes[slot.nodeId]
+		if node and node.containJewelSocket then
+			local jewelEffect = node.modList:Sum("INC", nil, "SocketedJewelEffect")
+			extraTooltip = "^x7F7F7FSocketed Jewel Effect: "			
+			if jewelEffect > 0 then
+				extraTooltip = extraTooltip .. s_format(colorCodes.MAGIC.."+%d%%", jewelEffect)
+				tooltip:AddSeparator(10)
+				tooltip:AddLine(16, extraTooltip)
+				tooltip:AddSeparator(10)
+			end
+			
+			scale = scale + (jewelEffect / 100)
+		end
+	end
+
 	for _, modList in ipairs{item.enchantModLines, item.runeModLines, item.implicitModLines, item.explicitModLines} do
 		if modList[1] then
 			for _, modLine in ipairs(modList) do
 				if item:CheckModLineVariant(modLine) then
-					tooltip:AddLine(16, itemLib.formatModLine(modLine, dbMode))
+					if scale ~= 1 then
+						local codyModLine = copyTable(modLine)
+						local modsList = copyTable(modLine.modList)
+						local scaledList = new("ModList")
+						-- some passive node mods are only Condition/Flag and have no value to scale by default, grab number from line
+						if modsList[1] and modsList[1].type == "FLAG" then
+							modsList[1].value = tonumber(codyModLine.line:match("%d+"))
+						end
+						scaledList:ScaleAddList(modsList, scale)
+						for j, mod in ipairs(scaledList) do
+							local newValue = 0
+							if type(mod.value) == "number" then
+								newValue = mod.value
+							elseif type(mod.value) == "table" then
+								newValue = mod.value.mod.value
+							end
+							codyModLine.line = codyModLine.line:gsub("%d*%.?%d+", math.abs(newValue))
+						end
+						tooltip:AddLine(16, itemLib.formatModLine(codyModLine, dbMode))
+					else
+						tooltip:AddLine(16, itemLib.formatModLine(modLine, dbMode))
+					end
+
 					-- Show mods from granted Notables
 					if modLine.modList[1] and modLine.modList[1].name == "GrantedPassive" then
 						local node = self.build.spec.tree.notableMap[modLine.modList[1].value]

src/Classes/PassiveTree.lua

@@ -251,6 +251,9 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 					self.notableMap[node.dn:lower()] = node
 				end
 			else
+				if node.containJewelSocket then
+					self.sockets[node.id] = node
+				end
 				self.ascendancyMap[node.dn:lower()] = node
 				if not self.classNotables[self.ascendNameMap[node.ascendancyName].class.name] then
 					self.classNotables[self.ascendNameMap[node.ascendancyName].class.name] = { }
@@ -334,7 +337,7 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 	for nodeId, socket in pairs(self.sockets) do
 		if socket.name == "Charm Socket" then
 			socket.charmSocket = true
-		else
+		elseif not socket.containJewelSocket then
 			socket.nodesInRadius = { }
 			socket.attributesInRadius = { }
 			for radiusIndex, _ in ipairs(data.jewelRadius) do
@@ -508,9 +511,8 @@ end
 
 -- Common processing code for nodes (used for both real tree nodes and subgraph nodes)
 function PassiveTreeClass:ProcessNode(node)
-
 	node.targetSize = self:GetNodeTargetSize(node)
-	node.overlay = self.nodeOverlay[node.type]
+	node.overlay = node.containJewelSocket and node.jewelOverlay or self.nodeOverlay[node.type]
 	if node.overlay then
 		local size = node.targetSize["overlay"] and node.targetSize["overlay"].width or node.targetSize.width
 		node.rsq = size * size
@@ -761,6 +763,11 @@ function PassiveTreeClass:GetNodeTargetSize(node)
 			['overlay'] = { width = math.floor(80 * self.scaleImage), height = math.floor(80 * self.scaleImage) },
 			width = math.floor(37  * self.scaleImage), height = math.floor( 37  * self.scaleImage)
 		}
+	elseif node.containJewelSocket then
+		return {
+			['overlay'] = { width = math.floor(80 * self.scaleImage), height = math.floor(80 * self.scaleImage) },
+			width = math.floor(80 * self.scaleImage), height = math.floor(80 * self.scaleImage)
+		}
 	elseif node.ascendancyName then
 		return {
 			['overlay'] = { width = math.floor(100 * self.scaleImage), height = math.floor(100 * self.scaleImage) },

src/Classes/PassiveTreeView.lua

@@ -302,7 +302,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 		end
 	elseif treeClick == "RIGHT" then
 		if hoverNode then
-			if hoverNode.alloc and hoverNode.type == "Socket" then
+			if hoverNode.alloc and (hoverNode.type == "Socket" or hoverNode.containJewelSocket) then
 				local slot = build.itemsTab.sockets[hoverNode.id]
 				if slot:IsEnabled() then
 					-- User right-clicked a jewel socket, jump to the item page and focus the corresponding item slot control
@@ -354,7 +354,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 	local class = tree.classes[spec.curClassId]
 	if class and class.background then
 		local bgAssetName = class.background.image
-		if spec.curAscendClassId ~= 0 then
+		if spec.curAscendClassId ~= 0 and class.classes[spec.curAscendClassId] then
 			bgAssetName = class.classes[spec.curAscendClassId].background.image
 		end
 		local bg = tree:GetAssetByName(bgAssetName)
@@ -599,7 +599,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 			else
 				state = "unalloc"
 			end
-			if node.type == "Socket" then
+			if node.type == "Socket" or node.containJewelSocket then
 				-- Node is a jewel socket, retrieve the socketed jewel (if present) so we can display the correct art
 				base = tree:GetAssetByName(node.overlay[state])
 
@@ -845,7 +845,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 	SetDrawLayer(nil, 25)
 	for nodeId in pairs(tree.sockets) do
 		local node = spec.nodes[nodeId]
-		if node and node.name ~= "Charm Socket" and (not node.expansionJewel or node.expansionJewel.size == 2) then
+		if node and node.name ~= "Charm Socket" and node.containJewelSocket ~= true and (not node.expansionJewel or node.expansionJewel.size == 2) then
 			local scrX, scrY = treeToScreen(node.x, node.y)
 			local socket, jewel = build.itemsTab:GetSocketAndJewelForNodeID(nodeId)
 			if node == hoverNode then
@@ -1268,7 +1268,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
 		local isInRadius = false
 		for id, socket in pairs(build.itemsTab.sockets) do
 			if build.itemsTab.activeSocketList and socket.inactive == false or socket.inactive == nil then
-				isInRadius = isInRadius or build.spec.nodes[id].nodesInRadius[3][node.id] ~= nil
+				isInRadius = isInRadius or (build.spec.nodes[id] and build.spec.nodes[id].nodesInRadius and build.spec.nodes[id].nodesInRadius[3][node.id] ~= nil)
 				if isInRadius then break end
 			end
 		end
@@ -1291,6 +1291,20 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
 		end
 	end
 
+	if node.containJewelSocket then
+		tooltip:AddSeparator(14)
+		-- Jewel socket with a jewel in it, show the jewel tooltip instead of the node tooltip
+		local socket, jewel = build.itemsTab:GetSocketAndJewelForNodeID(node.id)
+		if jewel then
+			build.itemsTab:AddItemTooltip(tooltip, jewel, { nodeId = node.id })
+			tooltip:AddSeparator(14)
+		end
+
+		if socket ~= nil and socket:IsEnabled() then
+			tooltip:AddLine(14, colorCodes.TIP.."Tip: Right click this socket to go to the items page and choose the jewel for this socket.")
+		end
+	end
+
 	-- Reminder text
 	if node.reminderText then
 		tooltip:AddSeparator(14)

src/Export/Scripts/passivetree.lua

@@ -794,6 +794,33 @@ for i, group in ipairs(psg.groups) do
 				node["ascendancyName"] = passiveRow.Ascendancy.Name
 				node["isAscendancyStart"] = passiveRow.AscendancyStart or nil
 
+				-- support for jewel sockets in ascendancy
+				if passiveRow.JewelSocket then
+					node["containJewelSocket"] = true
+
+					local uioverride = dat("passivenodeuiartoverride"):GetRow("Id", passiveRow.Id)
+
+					if uioverride then
+						local uiSocketNormal = uiImages[string.lower(uioverride.SocketNormal)]
+						addToSheet(getSheet("group-background"), uiSocketNormal.path, "frame", commonMetadata(nil))
+
+						local uiSocketActive = uiImages[string.lower(uioverride.SocketActive)]
+						addToSheet(getSheet("group-background"), uiSocketActive.path, "frame", commonMetadata(nil))
+
+						local uiSocketCanAllocate = uiImages[string.lower(uioverride.SocketCanAllocate)]
+						addToSheet(getSheet("group-background"), uiSocketCanAllocate.path, "frame", commonMetadata(nil))
+
+						node.jewelOverlay = {
+							alloc = uiSocketActive.path,
+							path = uiSocketCanAllocate.path,
+							unalloc = uiSocketNormal.path,
+						}
+						
+					else
+						printf("Jewel socket not found for ascendancy " .. passiveRow.Ascendancy.Name)
+					end
+				end
+
 				ascendancyGroups = ascendancyGroups or {}
 				ascendancyGroups[passiveRow.Ascendancy.Name] = ascendancyGroups[passiveRow.Ascendancy.Name] or { }
 				ascendancyGroups[passiveRow.Ascendancy.Name].startId = passiveRow.AscendancyStart and passive.id or ascendancyGroups[passiveRow.Ascendancy.Name].startId

src/Modules/CalcSetup.lua

@@ -933,6 +933,17 @@ function calcs.initEnv(build, mode, override, specEnv)
 					scale = scale + node.distanceToClassStart * (item.jewelData.jewelIncEffectFromClassStart / 100)
 				end
 			end
+
+			local addSourceSlotNum = false
+			if slot.nodeId and item and item.type == "Jewel" then
+				local node = env.spec.nodes[slot.nodeId]
+				if node and node.containJewelSocket then
+					addSourceSlotNum = true
+					local inc = node.modList:Sum("INC", nil, "SocketedJewelEffect")
+					scale = scale + (inc / 100)
+				end
+			end
+
 			if item then
 				env.player.itemList[slotName] = item
 				-- Merge mods for this item
@@ -948,6 +959,13 @@ function calcs.initEnv(build, mode, override, specEnv)
 						end
 					end
 				end
+
+				if addSourceSlotNum then
+					srcList = copyTable(srcList, false)
+					for _, mod in ipairs(srcList) do
+						mod.sourceSlotNum = slot.slotNum
+					end
+				end
 
 				if item.requirements and not accelerate.requirementsItems then
 					t_insert(env.requirementsTableItems, {
@@ -1112,7 +1130,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 							env.itemModDB:ScaleAddMod(mod, scale)
 						end
 					end
-				elseif env.modDB.multipliers["CorruptedMagicJewelEffect"] and item.type == "Jewel" and item.rarity == "MAGIC" and item.corrupted and slot.nodeId and item.base.subType ~= "Charm" then
+				elseif env.modDB.multipliers["CorruptedMagicJewelEffect"] and item.type == "Jewel" and item.rarity == "MAGIC" and item.corrupted and slot.nodeId and item.base.subType ~= "Charm" and not env.spec.nodes[slot.nodeId].containJewelSocket then
 					scale = scale + env.modDB.multipliers["CorruptedMagicJewelEffect"]
 					local combinedList = new("ModList")
 					for _, mod in ipairs(srcList) do

src/TreeData/0_2/group-background_152_156_BC7.dds.zst

@@ -1117,12 +1117,15 @@ return {
 			PSSkillFrameHighlighted=1
 		},
 		["group-background_152_156_BC7.dds.zst"]={
-			JewelFrameAllocated=2,
-			JewelFrameCanAllocate=5,
-			JewelFrameUnallocated=3,
-			NotableFrameAllocated=1,
-			NotableFrameCanAllocate=6,
-			NotableFrameUnallocated=4
+			JewelFrameAllocated=5,
+			JewelFrameCanAllocate=8,
+			JewelFrameUnallocated=6,
+			NotableFrameAllocated=3,
+			NotableFrameCanAllocate=9,
+			NotableFrameUnallocated=7,
+			["art/textures/interface/2d/2dart/uiimages/ingame/lichpassiveskillscreenjewelsocketactive.dds"]=2,
+			["art/textures/interface/2d/2dart/uiimages/ingame/lichpassiveskillscreenjewelsocketcanallocate.dds"]=1,
+			["art/textures/interface/2d/2dart/uiimages/ingame/lichpassiveskillscreenjewelsocketnormal.dds"]=4
 		},
 		["group-background_160_164_BC7.dds.zst"]={
 			AscendancyFrameSmallAllocated=2,
@@ -37114,9 +37117,15 @@ return {
 			ascendancyName="Lich",
 			connections={
 			},
+			containJewelSocket=true,
 			group=881,
 			icon="Art/2DArt/SkillIcons/passives/MasteryBlank.dds",
 			isNotable=true,
+			jewelOverlay={
+				alloc="art/textures/interface/2d/2dart/uiimages/ingame/lichpassiveskillscreenjewelsocketactive.dds",
+				path="art/textures/interface/2d/2dart/uiimages/ingame/lichpassiveskillscreenjewelsocketcanallocate.dds",
+				unalloc="art/textures/interface/2d/2dart/uiimages/ingame/lichpassiveskillscreenjewelsocketnormal.dds"
+			},
 			name="Crystalline Phylactery",
 			orbit=6,
 			orbitIndex=0,