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

Update Active and Support Gem Filtering #7446

Merged
merged 1 commit into from
Mar 24, 2024
Merged

Update Active and Support Gem Filtering #7446

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
41 changes: 27 additions & 14 deletions src/Classes/GemSelectControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,23 @@ function GemSelectClass:PopulateGemList()
local showNormal = self.skillsTab.showSupportGemTypes == "NORMAL"
local matchLevel = self.skillsTab.defaultGemLevel == "characterLevel"
local characterLevel = self.skillsTab.build and self.skillsTab.build.characterLevel or 1
local sortActive = self.sortGemsBy and self.sortGemsBy == "active" or not self.sortGemsBy
local sortSupport = self.sortGemsBy and self.sortGemsBy == "support" or not self.sortGemsBy

for gemId, gemData in pairs(self.skillsTab.build.data.gems) do
local levelRequirement = gemData.grantedEffect.levels[1].levelRequirement or 1
if characterLevel >= levelRequirement or not matchLevel then
if (showAwakened or showAll) and gemData.grantedEffect.plusVersionOf then
self.gems["Default:" .. gemId] = gemData
elseif showNormal or showAll then
if self.skillsTab.showAltQualityGems and (self.skillsTab.defaultGemQuality or 0) > 0 then
for _, altQual in ipairs(self.skillsTab:getGemAltQualityList(gemData)) do
self.gems[altQual.type .. ":" .. gemId] = gemData
end
else
if (gemData.tags["support"] and sortSupport) or (not gemData.tags["support"] and sortActive) then
local levelRequirement = gemData.grantedEffect.levels[1].levelRequirement or 1
if characterLevel >= levelRequirement or not matchLevel then
if (showAwakened or showAll) and gemData.grantedEffect.plusVersionOf then
self.gems["Default:" .. gemId] = gemData
elseif showNormal or showAll then
if self.skillsTab.showAltQualityGems and (self.skillsTab.defaultGemQuality or 0) > 0 then
for _, altQual in ipairs(self.skillsTab:getGemAltQualityList(gemData)) do
self.gems[altQual.type .. ":" .. gemId] = gemData
end
else
self.gems["Default:" .. gemId] = gemData
end
end
end
end
Expand Down Expand Up @@ -765,11 +770,19 @@ function GemSelectClass:OnKeyDown(key, doubleClick)
local width, height = self:GetSize()
local cursorX, cursorY = GetCursorPos()
if cursorX > (x + width - 18) then
self.mode = ":support:"
self.bypassSort = true
-- clear cache if last sort was not Support
if self.sortGemsBy ~= "support" then
self.sortCache = nil
end
self.sortGemsBy = "support"
self.bypassSort = false
elseif (cursorX > (x + width - 40) and cursorX < (cursorX + width - 20)) then
self.mode = ":active:"
self.bypassSort = true
-- clear cache if last sort was not Active
if self.sortGemsBy ~= "active" then
self.sortCache = nil
end
self.sortGemsBy = "active"
self.bypassSort = false
else
self.bypassSort = false
end
Expand Down
Loading