Skip to content
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

Fix crash when hovering over Tinctures in Item tab #7862

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Fix crash when hovering over Tinctures in Item tab #7862

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fea6f3
Remove quality from tincture, Remove Add implicit from Tincture
Jul 23, 2024
bde5066
Merge branch 'PathOfBuildingCommunity:dev' into hotfix-crash-when-hov…
justjuangui Jul 23, 2024
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: 2 additions & 4 deletions src/Classes/ItemsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ holding Shift will put it in the second.]])
self:AddImplicitToDisplayItem()
end)
self.controls.displayItemAddImplicit.shown = function()
return self.displayItem and (self.displayItem.corruptible or ((self.displayItem.type ~= "Flask" or self.displayItem.type ~= "Jewel") and (self.displayItem.rarity == "NORMAL" or self.displayItem.rarity == "MAGIC" or self.displayItem.rarity == "RARE")))
return self.displayItem and self.displayItem.type ~= "Tincture" and (self.displayItem.corruptible or ((self.displayItem.type ~= "Flask" or self.displayItem.type ~= "Jewel") and (self.displayItem.rarity == "NORMAL" or self.displayItem.rarity == "MAGIC" or self.displayItem.rarity == "RARE")))
end

-- Section: Influence dropdowns
Expand Down Expand Up @@ -3273,9 +3273,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
elseif base.tincture then
-- Tincture-specific info
local tinctureData = item.tinctureData
if item.quality > 0 then
tooltip:AddLine(16, s_format("^x7F7F7FQuality: "..colorCodes.MAGIC.."+%d%%", item.quality))
end

tooltip:AddLine(16, s_format("^x7F7F7FInflicts Mana Burn every %s%.2f ^x7F7F7FSeconds", main:StatColor(tinctureData.manaBurn, base.tincture.manaBurn), tinctureData.manaBurn))
tooltip:AddLine(16, s_format("^x7F7F7F%s%.2f ^x7F7F7FSecond Cooldown When Deactivated", main:StatColor(tinctureData.cooldown, base.tincture.cooldown), tinctureData.cooldown))
for _, modLine in pairs(item.buffModLines) do
Expand Down
Loading