Skip to content

Show proper Unique Jewel Icons on tree #1491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LocalIdentity merged 5 commits into from
Oct 9, 2025
Merged

Show proper Unique Jewel Icons on tree #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e00cb57
Show proper Unique Jewel Icons on tree
Blitz54 Oct 8, 2025
603ff64
Fix heart of the well to be all desecrated mods
Blitz54 Oct 8, 2025
3efa074
modcache for tree
Blitz54 Oct 8, 2025
c6f68d6
Fix influence icons on all tree nodes
Blitz54 Oct 8, 2025
2dc3fc8
Merge branch 'dev' into unique-jewel-icons
Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Classes/PassiveTreeView.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,11 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)

local socket, jewel = build.itemsTab:GetSocketAndJewelForNodeID(nodeId)
if isAlloc and jewel then
overlay = jewel.baseName
if jewel.rarity == "UNIQUE" then
overlay = jewel.title
else
overlay = jewel.baseName
end
end
elseif node.type == "OnlyImage" then
-- This is the icon that appears in the center of many groups
Expand Down
26 changes: 13 additions & 13 deletions src/Classes/Tooltip.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,17 +270,17 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
Desecrated = "Assets/VeiledItemSymbol.png",
}
local headerConfigs = {
RELIC = {left="Assets/ItemsHeaderFoilLeft.png",middle="Assets/ItemsHeaderFoilMiddle.png",right="Assets/ItemsHeaderFoilRight.png",height=56,sideWidth=43,middleWidth=43,textYOffset=2},
UNIQUE = {left="Assets/ItemsHeaderUniqueLeft.png",middle="Assets/ItemsHeaderUniqueMiddle.png",right="Assets/ItemsHeaderUniqueRight.png",height=56,sideWidth=43,middleWidth=43,textYOffset=2},
RARE = {left="Assets/ItemsHeaderRareLeft.png",middle="Assets/ItemsHeaderRareMiddle.png",right="Assets/ItemsHeaderRareRight.png",height=56,sideWidth=43,middleWidth=43,textYOffset=2},
MAGIC = {left="Assets/ItemsHeaderMagicLeft.png",middle="Assets/ItemsHeaderMagicMiddle.png",right="Assets/ItemsHeaderMagicRight.png",height=38,sideWidth=32,middleWidth=32,textYOffset=4},
NORMAL = {left="Assets/ItemsHeaderWhiteLeft.png",middle="Assets/ItemsHeaderWhiteMiddle.png",right="Assets/ItemsHeaderWhiteRight.png",height=38,sideWidth=32,middleWidth=32,textYOffset=4},
GEM = {left="Assets/ItemsHeaderGemLeft.png",middle="Assets/ItemsHeaderGemMiddle.png",right="Assets/ItemsHeaderGemRight.png",height=38,sideWidth=32,middleWidth=32,textYOffset=4},
JEWEL = {left="Assets/JewelPassiveHeaderLeft.png",middle="Assets/JewelPassiveHeaderMiddle.png",right="Assets/JewelPassiveHeaderRight.png",height=38,sideWidth=32,middleWidth=32,textYOffset=2},
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},
RELIC = {left="Assets/ItemsHeaderFoilLeft.png", middle="Assets/ItemsHeaderFoilMiddle.png", right="Assets/ItemsHeaderFoilRight.png", height=56, sideWidth=43, middleWidth=43, textYOffset=2, allowInfluenceIcon=true},
UNIQUE = {left="Assets/ItemsHeaderUniqueLeft.png", middle="Assets/ItemsHeaderUniqueMiddle.png", right="Assets/ItemsHeaderUniqueRight.png", height=56, sideWidth=43, middleWidth=43, textYOffset=2, allowInfluenceIcon=true},
RARE = {left="Assets/ItemsHeaderRareLeft.png", middle="Assets/ItemsHeaderRareMiddle.png", right="Assets/ItemsHeaderRareRight.png", height=56, sideWidth=43, middleWidth=43, textYOffset=2, allowInfluenceIcon=true},
MAGIC = {left="Assets/ItemsHeaderMagicLeft.png", middle="Assets/ItemsHeaderMagicMiddle.png", right="Assets/ItemsHeaderMagicRight.png", height=38, sideWidth=32, middleWidth=32, textYOffset=4, allowInfluenceIcon=true},
NORMAL = {left="Assets/ItemsHeaderWhiteLeft.png", middle="Assets/ItemsHeaderWhiteMiddle.png", right="Assets/ItemsHeaderWhiteRight.png", height=38, sideWidth=32, middleWidth=32, textYOffset=4, allowInfluenceIcon=true},
GEM = {left="Assets/ItemsHeaderGemLeft.png", middle="Assets/ItemsHeaderGemMiddle.png", right="Assets/ItemsHeaderGemRight.png", height=38, sideWidth=32, middleWidth=32, textYOffset=4},
JEWEL = {left="Assets/JewelPassiveHeaderLeft.png", middle="Assets/JewelPassiveHeaderMiddle.png", right="Assets/JewelPassiveHeaderRight.png", height=38, sideWidth=32, middleWidth=32, textYOffset=2},
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.tooltipHeader and main.showFlavourText and self.lines[1] and self.lines[1].text then
Expand Down Expand Up @@ -350,7 +350,7 @@ function TooltipClass:Draw(x, y, w, h, viewPort)

-- Draw left cap first, then influence icon on top
DrawImage(self.headerLeft, headerX, headerY, headerSideWidth, headerHeight)
if self.influenceHeader1 and self.tooltipHeader ~= "JEWEL" then
if self.influenceHeader1 and config.allowInfluenceIcon then
DrawImage(self.influenceIcon1, headerX+5, headerY+(headerHeight/4), headerSideWidth/2+6, headerHeight/2)
end

Expand All @@ -370,7 +370,7 @@ function TooltipClass:Draw(x, y, w, h, viewPort)

-- Draw right cap
DrawImage(self.headerRight, headerX + headerTotalWidth - headerSideWidth, headerY, headerSideWidth, headerHeight)
if self.influenceHeader2 and self.tooltipHeader ~= "JEWEL" then
if self.influenceHeader2 and config.allowInfluenceIcon then
DrawImage(self.influenceIcon2, headerX + headerTotalWidth - headerSideWidth+10, headerY+(headerHeight/4), headerSideWidth/2+6, headerHeight/2)
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Uniques/Special/Generated.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ do
table.insert(heart, "Selected Alt Variant Two: 40")
table.insert(heart, "Selected Alt Variant Three: 41")
for index, mod in ipairs(heartMods) do
table.insert(heart, "{variant:" .. index .. "}" .. mod.mod[1])
table.insert(heart, "{variant:" .. index .. "}{desecrated}" .. mod.mod[1])
end
table.insert(data.uniques.generated, table.concat(heart, "\n"))
end
16 changes: 15 additions & 1 deletion src/Export/Scripts/passivetree.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,12 +508,26 @@ for jewel in jewelArt:Rows() do
goto nexttogo
end
local asset = uiImages[string.lower(jewel.JewelArt)]
printf("Adding jewel socket " .. jewel.Item.Name .. " " .. asset.path .. " to sprite")
local name = jewel.Item.Name
printf("Adding jewel socket " .. name .. " " .. asset.path .. " to sprite")
addToSheet(getSheet("jewel-sockets"), asset.path, "jewelpassive", commonMetadata(name))
:: nexttogo ::
end

-- adding unique jewel sockets
local uniqueJewelArt = dat("PassiveJewelUniqueArt")
for jewel in uniqueJewelArt:Rows() do
if jewel.WordsKey.Text:find(ignoreFilter) ~= nil then
printf("Ignoring unique jewel socket " .. jewel.Item.Name)
goto nexttogo
end
local asset = uiImages[string.lower(jewel.JewelArt)]
local name = jewel.WordsKey.Text
printf("Adding unique jewel socket " .. name .. " " .. asset.path .. " to sprite")
addToSheet(getSheet("jewel-sockets"), asset.path, "jewelpassive", commonMetadata(name))
:: nexttogo ::
end

-- adding monster types
local monsterCategories = dat("MonsterCategories")
for category in monsterCategories:Rows() do
Expand Down
2 changes: 1 addition & 1 deletion src/Export/spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13915,7 +13915,7 @@ return {
},
[4]={
list=false,
name="JewelAsset",
name="JewelArt",
refTo="",
type="String",
width=560
Expand Down
Binary file modified src/TreeData/0_3/jewel-sockets_152_156_BC7.dds.zst
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/TreeData/0_3/tree.json
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 17 additions & 8 deletions src/TreeData/0_3/tree.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,15 +1180,24 @@ return {
AscendancyMiddle=1
},
["jewel-sockets_152_156_BC7.dds.zst"]={
Diamond=6,
Emerald=4,
Ruby=1,
Sapphire=7,
["Time-Lost Diamond"]=6,
["Time-Lost Emerald"]=2,
["Time-Lost Ruby"]=3,
["Against the Darkness"]=14,
["Controlled Metamorphosis"]=7,
Diamond=14,
Emerald=12,
["From Nothing"]=10,
["Heart of the Well"]=2,
["Heroic Tragedy"]=8,
Megalomaniac=15,
["Prism of Belief"]=6,
Ruby=13,
Sapphire=1,
["The Adorned"]=4,
["Time-Lost Diamond"]=14,
["Time-Lost Emerald"]=9,
["Time-Lost Ruby"]=11,
["Time-Lost Sapphire"]=5,
["Timeless Jewel"]=6
["Timeless Jewel"]=14,
["Undying Hate"]=3
},
["legion_1024_1024_BC7.dds.zst"]={
["art/textures/interface/2d/2dart/uiimages/ingame/abyss/abysspassiveskillscreenjewelcircle1.dds"]=1
Expand Down