Skip to content

Fix gem group counting logic #2292

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

Open
moxaj wants to merge 2 commits into
base: dev
Choose a base branch
from
+26 −11
Open

Fix gem group counting logic #2292

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49cc525
Fix gem group counting logic
moxaj Jun 24, 2026
dd94b19
Fix function invocation for unit test
moxaj Jun 24, 2026
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
37 changes: 26 additions & 11 deletions src/Classes/SkillsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,19 +1517,37 @@ function SkillsTabClass:SetActiveSkillSet(skillSetId, deferSync)
end
end

-- Count the number of gem groups that have at least one enabled non-provided gem
function SkillsTabClass:CountGemGroups()
local gemGroupCount = 0
for _, socketGroup in ipairs(self.socketGroupList) do
if socketGroup.enabled then
local hasEnabledNonProvidedGem = false
for _, gem in ipairs(socketGroup.gemList) do
if gem.enabled then
local grantedEffect = gem and (gem.grantedEffect or gem.gemData and gem.gemData.grantedEffect)
local provided = ((gem and (gem.fromItem or gem.fromTree)
or (grantedEffect and (grantedEffect.fromItem or grantedEffect.fromTree))))
if not provided then
hasEnabledNonProvidedGem = true
break
end
end
end
if hasEnabledNonProvidedGem then
gemGroupCount = gemGroupCount + 1
end
end
end
return gemGroupCount
end

-- Loop over all socket groups and gem instances
-- to updated global gem count assignments
function SkillsTabClass:UpdateGlobalGemCountAssignments()
wipeTable(GlobalGemAssignments)
local countSocketGroups = 0
for _, socketGroup in ipairs(self.socketGroupList) do
local countGroup = true
if socketGroup.enabled then
local activeGem = socketGroup.gemList[1]
local activeGrantedEffect = activeGem and (activeGem.grantedEffect or activeGem.gemData and activeGem.gemData.grantedEffect)
if activeGem and (activeGem.fromItem or activeGem.fromTree or activeGrantedEffect and (activeGrantedEffect.fromItem or activeGrantedEffect.fromTree)) then
countGroup = false
end
for _, gemInstance in ipairs(socketGroup.gemList) do
if gemInstance.gemData and gemInstance.enabled then
if GlobalGemAssignments[gemInstance.gemData.name] then
Expand All @@ -1551,10 +1569,7 @@ function SkillsTabClass:UpdateGlobalGemCountAssignments()
end
end
end
if countGroup then
countSocketGroups = countSocketGroups + 1
end
end
GlobalGemAssignments["GemGroupCount"] = countSocketGroups
GlobalGemAssignments["GemGroupCount"] = SkillsTabClass.CountGemGroups(self)
end

Loading