Skip to content

Add support gem filtering options in Skills tab #1437

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

Draft
wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft

Add support gem filtering options in Skills tab #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5803789
Lineage sorting
Blitz54 Sep 22, 2025
45c09dc
False Lineage tags on persistent buff supports
Blitz54 Sep 22, 2025
afc7d4b
Highest per family not working yet, but lineage sort works
Blitz54 Sep 22, 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
12 changes: 8 additions & 4 deletions src/Classes/GemSelectControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ end
function GemSelectClass:PopulateGemList()
wipeTable(self.gems)
local showAll = self.skillsTab.showSupportGemTypes == "ALL"
local showAwakened = self.skillsTab.showSupportGemTypes == "AWAKENED"
local showLineage = self.skillsTab.showSupportGemTypes == "LINEAGE"
local showNormal = self.skillsTab.showSupportGemTypes == "NORMAL"
local matchLevel = self.skillsTab.defaultGemLevel == "characterLevel"
local characterLevel = self.skillsTab.build and self.skillsTab.build.characterLevel or 1
Expand All @@ -101,7 +101,11 @@ function GemSelectClass:PopulateGemList()
if (self.sortGemsBy and gemData.tags[self.sortGemsBy] == true or not self.sortGemsBy) then
local levelRequirement = (gemData.grantedEffect.levels and gemData.grantedEffect.levels[1] and gemData.grantedEffect.levels[1].levelRequirement) or 1
if characterLevel >= levelRequirement or not matchLevel then
self.gems["Default:" .. gemId] = gemData
if (showLineage or showAll) and gemData.grantedEffect.isLineage then
self.gems["Default:" .. gemId] = gemData
elseif (showNormal or showAll) and not gemData.grantedEffect.isLineage then
self.gems["Default:" .. gemId] = gemData
end
end
end
end
Expand All @@ -115,8 +119,8 @@ function GemSelectClass:FilterSupport(gemId, gemData)
local showSupportTypes = self.skillsTab.showSupportGemTypes
return (not gemData.grantedEffect.support
or showSupportTypes == "ALL"
or (showSupportTypes == "NORMAL" and not gemData.grantedEffect.plusVersionOf)
or (showSupportTypes == "AWAKENED" and gemData.grantedEffect.plusVersionOf))
or (showSupportTypes == "NORMAL" and not gemData.grantedEffect.isLineage)
or (showSupportTypes == "LINEAGE" and gemData.grantedEffect.isLineage))
end

function GemSelectClass:BuildList(buf)
Expand Down
4 changes: 2 additions & 2 deletions src/Classes/SkillsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ This hides gems with a minimum level requirement above your character level, pre

local showSupportGemTypeList = {
{ label = "All", show = "ALL" },
{ label = "Non-Awakened", show = "NORMAL" },
{ label = "Awakened", show = "AWAKENED" },
{ label = "Highest Tier Per Family", show = "NORMAL" },
{ label = "Lineage", show = "LINEAGE" },
}

local sortGemTypeList = {
Expand Down
3 changes: 0 additions & 3 deletions src/Data/Skills/sup_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4109,7 +4109,6 @@ skills["SupportPrecisionPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Precision",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 10, levelRequirement = 0, },
},
Expand Down Expand Up @@ -4145,7 +4144,6 @@ skills["SupportPrecisionPlayerTwo"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Precision",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 20, levelRequirement = 0, },
},
Expand Down Expand Up @@ -5656,7 +5654,6 @@ skills["SupportWarmbloodedPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "WarmBlooded",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 15, levelRequirement = 0, },
},
Expand Down
7 changes: 0 additions & 7 deletions src/Data/Skills/sup_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,6 @@ skills["SupportClarityPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Clarity",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 10, levelRequirement = 0, },
},
Expand Down Expand Up @@ -1024,7 +1023,6 @@ skills["SupportClarityPlayerTwo"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Clarity",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 20, levelRequirement = 0, },
},
Expand Down Expand Up @@ -4128,7 +4126,6 @@ skills["SupportMysticismPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Mysticism",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 15, levelRequirement = 0, },
},
Expand Down Expand Up @@ -4164,7 +4161,6 @@ skills["SupportMysticismPlayerTwo"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Mysticism",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 30, levelRequirement = 0, },
},
Expand Down Expand Up @@ -4935,7 +4931,6 @@ skills["SupportStrongHeartedPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "StrongHearted",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 15, levelRequirement = 0, },
},
Expand Down Expand Up @@ -5118,7 +5113,6 @@ skills["SupportUpwellingPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Upwellling",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 15, levelRequirement = 0, },
},
Expand Down Expand Up @@ -5149,7 +5143,6 @@ skills["SupportUpwellingPlayerTwo"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Upwellling",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 30, levelRequirement = 0, },
},
Expand Down
9 changes: 0 additions & 9 deletions src/Data/Skills/sup_str.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,6 @@ skills["SupportCannibalismPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Cannibalism",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 15, levelRequirement = 0, },
},
Expand Down Expand Up @@ -1308,7 +1307,6 @@ skills["SupportCannibalismPlayerTwo"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Cannibalism",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 30, levelRequirement = 0, },
},
Expand Down Expand Up @@ -1543,7 +1541,6 @@ skills["SupportCoolheadedPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "CoolHeaded",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 15, levelRequirement = 0, },
},
Expand Down Expand Up @@ -2064,7 +2061,6 @@ skills["SupportDirestrikePlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Direstrike",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 20, levelRequirement = 0, },
},
Expand Down Expand Up @@ -2100,7 +2096,6 @@ skills["SupportDirestrikePlayerTwo"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Direstrike",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 40, levelRequirement = 0, },
},
Expand Down Expand Up @@ -3650,7 +3645,6 @@ skills["SupportHerbalismPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Herbalism",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 15, levelRequirement = 0, },
},
Expand Down Expand Up @@ -3686,7 +3680,6 @@ skills["SupportHerbalismPlayerTwo"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Herbalism",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 30, levelRequirement = 0, },
},
Expand Down Expand Up @@ -7155,7 +7148,6 @@ skills["SupportVitalityPlayer"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Vitality",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 20, levelRequirement = 0, },
},
Expand Down Expand Up @@ -7192,7 +7184,6 @@ skills["SupportVitalityPlayerTwo"] = {
addSkillTypes = { },
excludeSkillTypes = { },
gemFamily = { "Vitality",},
isLineage = true,
levels = {
[1] = { spiritReservationFlat = 40, levelRequirement = 0, },
},
Expand Down
12 changes: 5 additions & 7 deletions src/Export/Scripts/skills.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,13 @@ directiveTable.skill = function(state, args, out)
end
out:write('},\n')
end
if supportGem.Lineage then
if supportGem.Lineage and supportGem.FlavourText then
out:write('\tisLineage = true,\n')
if supportGem.FlavourText then
out:write('\tflavourText = {')
for _, line in ipairs(cleanAndSplit(supportGem.FlavourText.Text)) do
out:write('"', line, '", ')
end
out:write('},\n')
out:write('\tflavourText = {')
for _, line in ipairs(cleanAndSplit(supportGem.FlavourText.Text)) do
out:write('"', line, '", ')
end
out:write('},\n')
end
end
if skill.isTrigger then
Expand Down