Skip to content

Use slider instead of text editor for ring quality #650

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

Closed
nessgor wants to merge 1 commit into from
Closed

Use slider instead of text editor for ring quality #650

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 8 additions & 17 deletions src/Classes/ItemsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,12 +427,8 @@ holding Shift will put it in the second.]])
function(index, value)
self.displayItem.catalyst = index - 1
if not self.displayItem.catalystQuality then
if string.match(self.displayItem.name, "Breach Ring") then
self.displayItem.catalystQuality = 50
else
self.displayItem.catalystQuality = 20
end
self.controls.displayItemCatalystQualityEdit:SetText(self.displayItem.catalystQuality)
self.displayItem.catalystQuality = string.match(self.displayItem.name, "Breach Ring") and 50 or 20
self.controls.displayItemCatalystQualityEdit:SetVal(self.displayItem.catalystQuality)
end
if self.displayItem.crafted then
for i = 1, self.displayItem.affixLimit do
Expand All @@ -447,18 +443,12 @@ holding Shift will put it in the second.]])
self.controls.displayItemCatalyst.shown = function()
return self.displayItem and (self.displayItem.crafted or self.displayItem.hasModTags) and (self.displayItem.base.type == "Amulet" or self.displayItem.base.type == "Ring")
end
self.controls.displayItemCatalystQualityEdit = new("EditControl", {"LEFT",self.controls.displayItemCatalyst,"RIGHT"}, {2, 0, 60, 20}, nil, nil, "%D", 2, function(buf)
self.displayItem.catalystQuality = tonumber(buf)
if self.displayItem.crafted then
for i = 1, self.displayItem.affixLimit do
-- Force affix selectors to update
local drop = self.controls["displayItemAffix"..i]
drop.selFunc(drop.selIndex, drop.list[drop.selIndex])
end
end
self.controls.displayItemCatalystQualityEdit = new("SliderControl", {"LEFT",self.controls.displayItemCatalyst,"RIGHT"}, {2, 0, 60, 20}, function(val)
self.displayItem.catalystQuality = round(tonumber(val) * (string.match(self.displayItem.name, "Breach Ring") and 50 or 20))
self.displayItem:BuildAndParseRaw()
self:UpdateDisplayItemTooltip()
end)
self.controls.displayItemCatalystQualityEdit.width = 100;
self.controls.displayItemCatalystQualityEdit.shown = function()
return self.displayItem and (self.displayItem.crafted or self.displayItem.hasModTags) and self.displayItem.catalyst and self.displayItem.catalyst > 0
end
Expand Down Expand Up @@ -1466,9 +1456,10 @@ function ItemsTabClass:SetDisplayItem(item)
self.controls.displayItemQualityEdit:SetText(item.quality)
self.controls.displayItemCatalyst:SetSel((item.catalyst or 0) + 1)
if item.catalystQuality then
self.controls.displayItemCatalystQualityEdit:SetText(m_max(item.catalystQuality, 0))
local val = item.catalystQuality / (string.match(self.displayItem.name, "Breach Ring") and 50 or 20)
self.controls.displayItemCatalystQualityEdit:SetVal(m_max(val, 0))
else
self.controls.displayItemCatalystQualityEdit:SetText(0)
self.controls.displayItemCatalystQualityEdit:SetVal(0)
end
self:UpdateCustomControls()
self:UpdateRuneControls()
Expand Down