Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions src/Classes/GemSelectControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ function GemSelectClass:PopulateGemList()
local levelRequirement = gemData.grantedEffect.levels[1].levelRequirement or 1
if characterLevel >= levelRequirement or not matchLevel then
if self.imbuedSelect then
-- Imbued dropdown only allows non-exceptional support gems.
if gemData.grantedEffect.support and not gemData.tagString:match("Exceptional") and not gemData.grantedEffect.plusVersionOf then
-- Imbued dropdown only allows non-exceptional support gems and supports that don't grant active skills
if gemData.grantedEffect.support and not gemData.tagString:match("Exceptional") and not gemData.grantedEffect.plusVersionOf and (not gemData.secondaryGrantedEffect or gemData.secondaryGrantedEffect.support) then
self.gems["Default:" .. gemId] = gemData
end
else
Expand All @@ -139,7 +139,7 @@ function GemSelectClass:FilterSupport(gemId, gemData)
end

if self.imbuedSelect then
return gemData.grantedEffect.support and not gemData.tagString:match("Exceptional") and self.sortCache.canSupport[gemId]
return self.sortCache.canSupport[gemId]
end

return (not gemData.grantedEffect.support
Expand Down
7 changes: 6 additions & 1 deletion src/Modules/CalcSetup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,12 @@ function calcs.initEnv(build, mode, override, specEnv)
end
-- if the slot has an imbued support, add it as an ExtraSupport
if build.skillsTab.imbuedSupportBySlot and build.skillsTab.imbuedSupportBySlot[slotName] and group.imbuedSupport then
addExtraSupports(nil, build.skillsTab.imbuedSupportBySlot[slotName], 1)
local imbuedSupport = build.skillsTab.imbuedSupportBySlot[slotName]
addExtraSupports(nil, imbuedSupport, 1)
local imbuedGemData = env.data.gems[env.data.gemForSkill[imbuedSupport]]
if imbuedGemData and imbuedGemData.secondaryGrantedEffect and imbuedGemData.secondaryGrantedEffect.support then
addExtraSupports(nil, imbuedGemData.secondaryGrantedEffect, 1)
end
end

for gemIndex, gemInstance in ipairs(group.gemList) do
Expand Down
Loading