Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
eb30974
Add option for Item Flavour Text with Styled Tooltips and Passive Tre…
Blitz54 Oct 26, 2025
b72bae3
Bad merge cleanup
Wires77 Oct 26, 2025
ea99baf
Header images and some flavourtext
Blitz54 Oct 27, 2025
08a35ed
Ascendancy and mastery headers
Blitz54 Oct 27, 2025
5222754
fix oils I guess, and mastery headers
Blitz54 Oct 27, 2025
b786e30
Fix flavour texts
Blitz54 Oct 27, 2025
760dd59
slightly bigger images
Blitz54 Oct 28, 2025
c87de6e
influence icons
Blitz54 Oct 28, 2025
cd0dcdb
fix oils color properly I think
Blitz54 Oct 28, 2025
c4bda46
Initial influence logic
Blitz54 Oct 28, 2025
4b9e261
Influence done
Blitz54 Oct 28, 2025
b8d5fe5
Grand spectrum flavour text
Blitz54 Oct 28, 2025
94620da
Merge branch 'PathOfBuildingCommunity:dev' into pretty-ui
Blitz54 Oct 29, 2025
6cc8f02
Add comment back
Blitz54 Oct 29, 2025
47173b2
Fix influence icon for fractured influenced
Blitz54 Oct 29, 2025
6954c0a
better positioning for icons
Blitz54 Oct 29, 2025
1cbd276
Replica uniques icon
Blitz54 Oct 29, 2025
61de0b4
Grasping mail flavour text
Blitz54 Oct 29, 2025
b14799f
fix error on normal items and fix spaces
Blitz54 Oct 29, 2025
74e1355
fix exarch/eater influence on import
Blitz54 Oct 29, 2025
8a345eb
Relic text and color
Blitz54 Oct 29, 2025
df98ea9
Fix Missing Eater and Exarch influence on import
Oct 29, 2025
cd6e8cf
show veiled icon on unveiled items
Blitz54 Oct 29, 2025
890c0f0
Show flavour text on keystones
Blitz54 Oct 30, 2025
f4261d4
Set max width for tree tooltips
Blitz54 Oct 30, 2025
2ae4e94
add separator for threshold jewel text, to provide space on pretty UI
Blitz54 Oct 30, 2025
d2d1062
Merge branch 'PathOfBuildingCommunity:dev' into pretty-ui
Blitz54 Oct 30, 2025
e8096cb
Add fontin fonts
Blitz54 Oct 30, 2025
29bd359
Add regular Fontin for tree nodes
Blitz54 Oct 30, 2025
9e28d06
Merge branch 'dev' of https://github.com/Blitz54/PathOfBuilding into …
Blitz54 Oct 30, 2025
eae52eb
Merge branch 'PathOfBuildingCommunity:dev' into pretty-ui
Blitz54 Oct 30, 2025
e3b6ca6
tiny fixes
Blitz54 Oct 30, 2025
c820dc7
Print influence icons white, but headers tinted for relic
Blitz54 Oct 30, 2025
3adbd21
fix merge issue on dev
Blitz54 Oct 30, 2025
b37d68a
Merge branch 'dev' into pretty-ui
Oct 30, 2025
84f8c75
Fix indents
Oct 30, 2025
dd3de65
Left align tree nodes
Oct 30, 2025
febef50
Relic header colours
Blitz54 Oct 30, 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
Binary file modified runtime/SimpleGraphic.dll
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.10.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.12.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.14.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.16.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.18.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.20.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.22.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.24.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.26.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.28.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.32.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.36.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.40.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.48.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.56.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Bitstream Vera Sans Mono.64.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.10.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.12.tga
Binary file not shown.
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.16.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.18.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.20.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.22.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.24.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.26.tga
Binary file not shown.
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.32.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.36.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.40.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.48.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.56.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin Italic.64.tga
Binary file not shown.
2,064 changes: 2,064 additions & 0 deletions runtime/SimpleGraphic/Fonts/Fontin Italic.tgf

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2,064 changes: 2,064 additions & 0 deletions runtime/SimpleGraphic/Fonts/Fontin SmallCaps Italic.tgf

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2,064 changes: 2,064 additions & 0 deletions runtime/SimpleGraphic/Fonts/Fontin SmallCaps.tgf

Large diffs are not rendered by default.

Binary file added runtime/SimpleGraphic/Fonts/Fontin.10.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.12.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.14.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.16.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.18.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.20.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.22.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.24.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.26.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.28.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.32.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.36.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.40.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.48.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.56.tga
Binary file not shown.
Binary file added runtime/SimpleGraphic/Fonts/Fontin.64.tga
Binary file not shown.
2,064 changes: 2,064 additions & 0 deletions runtime/SimpleGraphic/Fonts/Fontin.tgf

Large diffs are not rendered by default.

Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.10.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.12.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.14.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.16.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.18.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.20.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.22.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.24.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.26.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.28.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.32.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.36.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.40.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.48.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.56.tga
Binary file not shown.
Binary file modified runtime/SimpleGraphic/Fonts/Liberation Sans Bold.64.tga
Binary file not shown.
Binary file modified runtime/abseil_dll.dll
Binary file not shown.
Binary file modified runtime/fmt.dll
Binary file not shown.
Binary file modified runtime/glfw3.dll
Binary file not shown.
Binary file modified runtime/libGLESv2.dll
Binary file not shown.
Binary file modified runtime/libwebpdecoder.dll
Binary file not shown.
Binary file modified runtime/lua51.dll
Binary file not shown.
Binary file modified runtime/re2.dll
Binary file not shown.
Binary file modified runtime/zlib1.dll
Binary file not shown.
Binary file modified runtime/zstd.dll
Binary file not shown.
Binary file added src/Assets/ascendancypassiveheaderleft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/ascendancypassiveheadermiddle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/ascendancypassiveheaderright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/crusadericon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/eatericon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/eldericon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/exarchicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/experimentedicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/fracturedicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/huntericon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderfoilleft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderfoilmiddle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderfoilright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheadergemleft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheadergemmiddle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheadergemright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheadermagicleft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheadermagicmiddle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheadermagicright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderrareleft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderraremiddle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderrareright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderuniqueleft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderuniquemiddle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderuniqueright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/itemsheaderwhiteleft.png
Binary file added src/Assets/itemsheaderwhitemiddle.png
Binary file added src/Assets/itemsheaderwhiteright.png
Binary file added src/Assets/itemsseparatorfoil.png
Binary file added src/Assets/itemsseparatorgem.png
Binary file added src/Assets/itemsseparatormagic.png
Binary file added src/Assets/itemsseparatorrare.png
Binary file added src/Assets/itemsseparatorunique.png
Binary file added src/Assets/itemsseparatorwhite.png
Binary file added src/Assets/jewelpassiveheaderleft.png
Binary file added src/Assets/jewelpassiveheadermiddle.png
Binary file added src/Assets/jewelpassiveheaderright.png
Binary file added src/Assets/keystonepassiveheaderleft.png
Binary file added src/Assets/keystonepassiveheadermiddle.png
Binary file added src/Assets/keystonepassiveheaderright.png
Binary file added src/Assets/masteryheaderallocatedleft.png
Binary file added src/Assets/masteryheaderallocatedmiddle.png
Binary file added src/Assets/masteryheaderallocatedright.png
Binary file added src/Assets/masteryheaderunallocatedleft.png
Binary file added src/Assets/masteryheaderunallocatedmiddle.png
Binary file added src/Assets/masteryheaderunallocatedright.png
Binary file added src/Assets/normalpassiveheaderleft.png
Binary file added src/Assets/normalpassiveheadermiddle.png
Binary file added src/Assets/normalpassiveheaderright.png
Binary file added src/Assets/notablepassiveheaderleft.png
Binary file added src/Assets/notablepassiveheadermiddle.png
Binary file added src/Assets/notablepassiveheaderright.png
Binary file added src/Assets/redeemericon.png
Binary file added src/Assets/shapericon.png
Binary file added src/Assets/synthesisicon.png
Binary file added src/Assets/veiledicon.png
Binary file added src/Assets/warlordicon.png
61 changes: 32 additions & 29 deletions src/Classes/GemSelectControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,6 @@ function GemSelectClass:Draw(viewPort, noTooltip)
SetDrawColor(colorA,colorA,colorA)
DrawString(sx + 8, y, "CENTER_X", height - 2, "VAR", "A")


SetDrawLayer(nil, 10)
self.tooltip:Draw(x, y, width, height, viewPort)
SetDrawLayer(nil, 0)
Expand All @@ -563,43 +562,47 @@ function GemSelectClass:CheckSupporting(gemA, gemB)
end

function GemSelectClass:AddGemTooltip(gemInstance)
local fontSizeBig = main.showFlavourText and 18 or 16
local fontSizeTitle = main.showFlavourText and 24 or 20
self.tooltip.center = true
self.tooltip.color = colorCodes.GEM
self.tooltip.tooltipHeader = "GEM"
local primary = gemInstance.gemData.grantedEffect
local secondary = gemInstance.gemData.secondaryGrantedEffect
if secondary and (not secondary.support or gemInstance.gemData.secondaryEffectName) then
local grantedEffect = gemInstance.gemData.VaalGem and secondary or primary
local grantedEffectSecondary = gemInstance.gemData.VaalGem and primary or secondary
self.tooltip:AddLine(20, colorCodes.GEM .. altQualMap[gemInstance.qualityId]..grantedEffect.name)
self.tooltip:AddLine(fontSizeTitle, colorCodes.GEM .. altQualMap[gemInstance.qualityId]..grantedEffect.name, "FONTIN SC")
self.tooltip:AddSeparator(10)
self.tooltip:AddLine(16, "^x7F7F7F" .. gemInstance.gemData.tagString)
self.tooltip:AddLine(fontSizeBig, "^x7F7F7F" .. gemInstance.gemData.tagString)
self:AddCommonGemInfo(gemInstance, grantedEffect, true)
self.tooltip:AddSeparator(10)
self.tooltip:AddLine(20, colorCodes.GEM .. (gemInstance.gemData.secondaryEffectName or grantedEffectSecondary.name))
self.tooltip:AddLine(fontSizeTitle, colorCodes.GEM .. (gemInstance.gemData.secondaryEffectName or grantedEffectSecondary.name), "FONTIN SC")
self.tooltip:AddSeparator(10)
self:AddCommonGemInfo(gemInstance, grantedEffectSecondary)
else
local grantedEffect = gemInstance.gemData.grantedEffect
self.tooltip:AddLine(20, colorCodes.GEM .. altQualMap[gemInstance.qualityId]..grantedEffect.name)
self.tooltip:AddLine(fontSizeTitle, colorCodes.GEM .. altQualMap[gemInstance.qualityId]..grantedEffect.name, "FONTIN SC")
self.tooltip:AddSeparator(10)
self.tooltip:AddLine(16, "^x7F7F7F" .. gemInstance.gemData.tagString)
self.tooltip:AddLine(fontSizeBig, "^x7F7F7F" .. gemInstance.gemData.tagString, "FONTIN SC")
self:AddCommonGemInfo(gemInstance, grantedEffect, true, secondary and secondary.support and secondary)
end
end

function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mergeStatsFrom)
local fontSizeBig = main.showFlavourText and 18 or 16
local displayInstance = gemInstance.displayEffect or gemInstance
local grantedEffectLevel = grantedEffect.levels[displayInstance.level] or { }
if addReq then
self.tooltip:AddLine(16, string.format("^x7F7F7FLevel: ^7%d%s%s",
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FLevel: ^7%d%s%s",
gemInstance.level,
((displayInstance.level > gemInstance.level) and " (" .. colorCodes.MAGIC .. "+" .. (displayInstance.level - gemInstance.level) .. "^7)") or ((displayInstance.level < gemInstance.level) and " (" .. colorCodes.WARNING .. "-" .. (gemInstance.level - displayInstance.level) .. "^7)") or "",
(gemInstance.level >= gemInstance.gemData.naturalMaxLevel) and " (Max)" or ""
))
), "FONTIN SC")
end
if grantedEffect.support then
if grantedEffectLevel.manaMultiplier then
self.tooltip:AddLine(16, string.format("^x7F7F7FCost & Reservation Multiplier: ^7%d%%", grantedEffectLevel.manaMultiplier + 100))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FCost & Reservation Multiplier: ^7%d%%", grantedEffectLevel.manaMultiplier + 100), "FONTIN SC")
end
local reservation
for name, res in pairs(self.reservationMap) do
Expand All @@ -608,14 +611,14 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
end
end
if reservation then
self.tooltip:AddLine(16, "^x7F7F7FReservation Override: ^7"..reservation)
self.tooltip:AddLine(fontSizeBig, "^x7F7F7FReservation Override: ^7"..reservation, "FONTIN SC")
end
if grantedEffectLevel.cooldown then
local string = string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown)
if grantedEffectLevel.storedUses and grantedEffectLevel.storedUses > 1 then
string = string .. string.format(" (%d uses)", grantedEffectLevel.storedUses)
end
self.tooltip:AddLine(16, string)
self.tooltip:AddLine(fontSizeBig, string, "FONTIN SC")
end
else
local reservation
Expand All @@ -625,7 +628,7 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
end
end
if reservation then
self.tooltip:AddLine(16, "^x7F7F7FReservation: ^7" .. reservation)
self.tooltip:AddLine(fontSizeBig, "^x7F7F7FReservation: ^7" .. reservation, "FONTIN SC")
end
local cost
for _, res in ipairs(self.costs) do
Expand All @@ -634,50 +637,50 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
end
end
if cost then
self.tooltip:AddLine(16, "^x7F7F7FCost: ^7"..cost)
self.tooltip:AddLine(fontSizeBig, "^x7F7F7FCost: ^7"..cost, "FONTIN SC")
end
if grantedEffectLevel.cooldown then
local string = string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown)
local string = string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown, "FONTIN SC")
if grantedEffectLevel.storedUses and grantedEffectLevel.storedUses > 1 then
string = string .. string.format(" (%d uses)", grantedEffectLevel.storedUses)
end
self.tooltip:AddLine(16, string)
self.tooltip:AddLine(fontSizeBig, string, "FONTIN SC")
end
if grantedEffectLevel.vaalStoredUses then
self.tooltip:AddLine(16, string.format("^x7F7F7FCan Store ^7%d ^x7F7F7FUse (%d Souls)", grantedEffectLevel.vaalStoredUses, grantedEffectLevel.vaalStoredUses * grantedEffectLevel.cost.Soul))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FCan Store ^7%d ^x7F7F7FUse (%d Souls)", grantedEffectLevel.vaalStoredUses, grantedEffectLevel.vaalStoredUses * grantedEffectLevel.cost.Soul), "FONTIN SC")
end
if grantedEffectLevel.soulPreventionDuration then
self.tooltip:AddLine(16, string.format("^x7F7F7FSoul Gain Prevention: ^7%d sec", grantedEffectLevel.soulPreventionDuration))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FSoul Gain Prevention: ^7%d sec", grantedEffectLevel.soulPreventionDuration), "FONTIN SC")
end
if gemInstance.gemData.tags.attack then
if grantedEffectLevel.attackSpeedMultiplier then
self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Speed: ^7%d%% of base", grantedEffectLevel.attackSpeedMultiplier + 100))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FAttack Speed: ^7%d%% of base", grantedEffectLevel.attackSpeedMultiplier + 100), "FONTIN SC")
end
if grantedEffectLevel.attackTime then
self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Time: ^7%.2f sec", grantedEffectLevel.attackTime / 1000))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FAttack Time: ^7%.2f sec", grantedEffectLevel.attackTime / 1000), "FONTIN SC")
end
if grantedEffectLevel.baseMultiplier then
self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Damage: ^7%g%% of base", grantedEffectLevel.baseMultiplier * 100))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FAttack Damage: ^7%g%% of base", grantedEffectLevel.baseMultiplier * 100), "FONTIN SC")
end
else
if grantedEffect.castTime > 0 then
self.tooltip:AddLine(16, string.format("^x7F7F7FCast Time: ^7%.2f sec", grantedEffect.castTime))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FCast Time: ^7%.2f sec", grantedEffect.castTime), "FONTIN SC")
else
self.tooltip:AddLine(16, "^x7F7F7FCast Time: ^7Instant")
self.tooltip:AddLine(fontSizeBig, "^x7F7F7FCast Time: ^7Instant", "FONTIN SC")
end
end
if grantedEffectLevel.critChance then
self.tooltip:AddLine(16, string.format("^x7F7F7FCritical Strike Chance: ^7%.2f%%", grantedEffectLevel.critChance))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FCritical Strike Chance: ^7%.2f%%", grantedEffectLevel.critChance), "FONTIN SC")
end
if grantedEffectLevel.damageEffectiveness then
self.tooltip:AddLine(16, string.format("^x7F7F7FEffectiveness of Added Damage: ^7%d%%", grantedEffectLevel.damageEffectiveness * 100))
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FEffectiveness of Added Damage: ^7%d%%", grantedEffectLevel.damageEffectiveness * 100), "FONTIN SC")
end
end
if addReq and displayInstance.quality > 0 then
self.tooltip:AddLine(16, string.format("^x7F7F7FQuality: "..colorCodes.MAGIC.."+%d%%^7%s",
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FQuality: "..colorCodes.MAGIC.."+%d%%^7%s",
gemInstance.quality,
(displayInstance.quality > gemInstance.quality) and " ("..colorCodes.MAGIC.."+"..(displayInstance.quality - gemInstance.quality).."^7)" or ""
))
), "FONTIN SC")
end
self.tooltip:AddSeparator(10)
if addReq then
Expand All @@ -690,7 +693,7 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
if grantedEffect.description then
local wrap = main:WrapString(grantedEffect.description, 16, m_max(DrawStringWidth(16, "VAR", gemInstance.gemData.tagString), 400))
for _, line in ipairs(wrap) do
self.tooltip:AddLine(16, colorCodes.GEM..line)
self.tooltip:AddLine(fontSizeBig, colorCodes.GEM..line, "FONTIN SC")
end
end
if self.skillsTab.build.data.describeStats then
Expand All @@ -715,14 +718,14 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
end
line = line .. " ^2" .. devText
end
self.tooltip:AddLine(16, colorCodes.MAGIC .. line)
self.tooltip:AddLine(fontSizeBig, colorCodes.MAGIC .. line, "FONTIN SC")
else
if launch.devModeAlt then
line = line .. " ^1" .. lineMap[line]
end
local line = colorCodes.UNSUPPORTED .. line
line = main.notSupportedModTooltips and (line .. main.notSupportedTooltipText) or line
self.tooltip:AddLine(16, line)
self.tooltip:AddLine(fontSizeBig, line, "FONTIN SC")
end
end
end
Expand Down
6 changes: 6 additions & 0 deletions src/Classes/ImportTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,12 @@ function ImportTabClass:ImportItem(itemData, slotName)
item[curInfluenceInfo.key] = itemData.influences[curInfluenceInfo.display:lower()]
end
end
if itemData.searing then
item.cleansing = true
end
if itemData.tangled then
item.tangle = true
end
if itemData.ilvl > 0 then
item.itemLevel = itemData.ilvl
end
Expand Down
16 changes: 15 additions & 1 deletion src/Classes/Item.lua
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,13 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
if colorCodes[rarity:upper()] then
self.rarity = rarity:upper()
end
if self.rarity == "UNIQUE" then
if self.rarity == "UNIQUE" or self.rarity == "RELIC" then
-- Hack for relics
for _, line in ipairs(self.rawLines) do
if line:find("Foil Unique") then
self.rarity = "RELIC"
local captured = line:match("%((.-)%)")
self.foilType = captured or "Rainbow"
break
end
end
Expand Down Expand Up @@ -369,6 +371,9 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)

while self.rawLines[l] do
local line = self.rawLines[l]
if line == "Veiled Prefix" or line == "Veiled Suffix" then
self.veiled = true
end
if flaskBuffLines and flaskBuffLines[line] then
flaskBuffLines[line] = nil
elseif tinctureBuffLines and tinctureBuffLines[line] then
Expand All @@ -385,6 +390,9 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.fractured = true
elseif line == "Synthesised Item" then
self.synthesised = true
elseif line:match("Foil Unique") then
local captured = line:match("%((.-)%)")
self.foilType = captured or "Rainbow"
elseif influenceItemMap[line] then
self[influenceItemMap[line]] = true
elseif line == "Requirements:" then
Expand Down Expand Up @@ -1167,9 +1175,15 @@ function ItemClass:BuildRaw()
if self.mirrored then
t_insert(rawLines, "Mirrored")
end
if self.fractured then
t_insert(rawLines, "Fractured Item")
end
if self.corrupted or self.scourge then
t_insert(rawLines, "Corrupted")
end
if self.foilType then
t_insert(rawLines, "Foil Unique" .. " (" .. self.foilType .. ")")
end
return table.concat(rawLines, "\n")
end

Expand Down
Loading