Skip to content

Commit 5f8a410

Browse files
authored
Fix Foulborn Icons showing on tree nodes, and foil items not importing type (#9363)
* Fix foulborn icon showing on tree nodes * Fix relic colors on import * made a variable local
1 parent f03a84a commit 5f8a410

3 files changed

Lines changed: 26 additions & 9 deletions

File tree

src/Classes/ImportTab.lua

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,23 @@ function ImportTabClass:ImportItem(itemData, slotName)
10651065
end
10661066
end
10671067
end
1068+
if itemData.foilVariation or itemData.isRelic then
1069+
local foilVariants = {
1070+
"Amethyst",
1071+
"Verdant",
1072+
"Ruby",
1073+
"Cobalt",
1074+
"Sunset",
1075+
"Aureate",
1076+
"Celestial Quartz",
1077+
"Celestial Ruby",
1078+
"Celestial Emerald",
1079+
"Celestial Aureate",
1080+
"Celestial Pearl",
1081+
"Celestial Amethyst",
1082+
}
1083+
item.foilType = foilVariants[itemData.foilVariation] or "Rainbow"
1084+
end
10681085

10691086
-- Add and equip the new item
10701087
item:BuildAndParseRaw()

src/Classes/PassiveTreeView.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ function PassiveTreeViewClass:AddNodeName(tooltip, node, build)
11111111
else
11121112
tooltip.tooltipHeader = tooltipMap[node.type] or "UNKNOWN"
11131113
end
1114-
nodeName = node.dn
1114+
local nodeName = node.dn
11151115
if main.showFlavourText then
11161116
nodeName = "^xF8E6CA" .. node.dn
11171117
end

src/Classes/Tooltip.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -329,14 +329,14 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
329329
Exarch = "Assets/exarchicon.png",
330330
Synthesis = "Assets/synthesisicon.png",
331331
Experimented = "Assets/experimentedicon.png",
332-
Foulborn = "Assets/breachicon.png",
332+
Foulborn = "Assets/breachicon.png",
333333
}
334334
local headerConfigs = {
335-
RELIC = {left="Assets/itemsheaderfoilleft.png",middle="Assets/itemsheaderfoilmiddle.png",right="Assets/itemsheaderfoilright.png",height=54,sideWidth=47,middleWidth=52,textYOffset=2},
336-
UNIQUE = {left="Assets/itemsheaderuniqueleft.png",middle="Assets/itemsheaderuniquemiddle.png",right="Assets/itemsheaderuniqueright.png",height=54,sideWidth=47,middleWidth=52,textYOffset=2},
337-
RARE = {left="Assets/itemsheaderrareleft.png",middle="Assets/itemsheaderraremiddle.png",right="Assets/itemsheaderrareright.png",height=54,sideWidth=47,middleWidth=52,textYOffset=2},
338-
MAGIC = {left="Assets/itemsheadermagicleft.png",middle="Assets/itemsheadermagicmiddle.png",right="Assets/itemsheadermagicright.png",height=38,sideWidth=32,middleWidth=32,textYOffset=4},
339-
NORMAL = {left="Assets/itemsheaderwhiteleft.png",middle="Assets/itemsheaderwhitemiddle.png",right="Assets/itemsheaderwhiteright.png",height=38,sideWidth=32,middleWidth=32,textYOffset=4},
335+
RELIC = {left="Assets/itemsheaderfoilleft.png",middle="Assets/itemsheaderfoilmiddle.png",right="Assets/itemsheaderfoilright.png",height=54,sideWidth=47,middleWidth=52,textYOffset=1,allowInfluenceIcon=true},
336+
UNIQUE = {left="Assets/itemsheaderuniqueleft.png",middle="Assets/itemsheaderuniquemiddle.png",right="Assets/itemsheaderuniqueright.png",height=54,sideWidth=47,middleWidth=52,textYOffset=1,allowInfluenceIcon=true},
337+
RARE = {left="Assets/itemsheaderrareleft.png",middle="Assets/itemsheaderraremiddle.png",right="Assets/itemsheaderrareright.png",height=54,sideWidth=47,middleWidth=52,textYOffset=1,allowInfluenceIcon=true},
338+
MAGIC = {left="Assets/itemsheadermagicleft.png",middle="Assets/itemsheadermagicmiddle.png",right="Assets/itemsheadermagicright.png",height=38,sideWidth=32,middleWidth=32,textYOffset=4,allowInfluenceIcon=true},
339+
NORMAL = {left="Assets/itemsheaderwhiteleft.png",middle="Assets/itemsheaderwhitemiddle.png",right="Assets/itemsheaderwhiteright.png",height=38,sideWidth=32,middleWidth=32,textYOffset=4,allowInfluenceIcon=true},
340340
GEM = {left="Assets/itemsheadergemleft.png",middle="Assets/itemsheadergemmiddle.png",right="Assets/itemsheadergemright.png",height=38,sideWidth=33,middleWidth=38,textYOffset=3},
341341
JEWEL = {left="Assets/jewelpassiveheaderleft.png",middle="Assets/jewelpassiveheadermiddle.png",right="Assets/jewelpassiveheaderright.png",height=38,sideWidth=33,middleWidth=38,textYOffset=3},
342342
NOTABLE = {left="Assets/notablepassiveheaderleft.png",middle="Assets/notablepassiveheadermiddle.png",right="Assets/notablepassiveheaderright.png",height=38,sideWidth=38,middleWidth=38,textYOffset=3},
@@ -438,7 +438,7 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
438438
end
439439
-- Draw left cap first, then influence icon on top
440440
DrawImage(self.headerLeft, headerX, headerY, headerSideWidth, headerHeight)
441-
if self.influenceHeader1 then
441+
if self.influenceHeader1 and config.allowInfluenceIcon then
442442
SetDrawColor(1, 1, 1)
443443
DrawImage(self.influenceIcon1, headerX + 2, headerY + (headerHeight - (headerHeight/2))/2, headerHeight/2, headerHeight/2)
444444
end
@@ -468,7 +468,7 @@ function TooltipClass:Draw(x, y, w, h, viewPort)
468468

469469
-- Draw right cap
470470
DrawImage(self.headerRight, headerX + headerTotalWidth - headerSideWidth, headerY, headerSideWidth, headerHeight)
471-
if self.influenceHeader2 then
471+
if self.influenceHeader2 and config.allowInfluenceIcon then
472472
SetDrawColor(1, 1, 1)
473473
DrawImage(self.influenceIcon2, headerX + headerTotalWidth - (headerHeight/2) - 2, headerY + (headerHeight - (headerHeight/2))/2, headerHeight/2, headerHeight/2)
474474
end

0 commit comments

Comments
 (0)