Skip to content

Commit 99d458b

Browse files
LocalIdentityLocalIdentity
andauthored
Fix crash on selecting some Imbued gems + trigger supports not working (#9793)
* Fix invalid imbued gems appearing in list Support gems like Prismatic Burst of Summon Wisps are not valid imbued supports as they grant active skills * Fix Cast on Crit and other secondary granted effects Secondary granted effects from supports like cast on crit or cast when damage taken weren't working as we were not adding the secondary granted effects --------- Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent f52d3cd commit 99d458b

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

src/Classes/GemSelectControl.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ function GemSelectClass:PopulateGemList()
113113
local levelRequirement = gemData.grantedEffect.levels[1].levelRequirement or 1
114114
if characterLevel >= levelRequirement or not matchLevel then
115115
if self.imbuedSelect then
116-
-- Imbued dropdown only allows non-exceptional support gems.
117-
if gemData.grantedEffect.support and not gemData.tagString:match("Exceptional") and not gemData.grantedEffect.plusVersionOf then
116+
-- Imbued dropdown only allows non-exceptional support gems and supports that don't grant active skills
117+
if gemData.grantedEffect.support and not gemData.tagString:match("Exceptional") and not gemData.grantedEffect.plusVersionOf and (not gemData.secondaryGrantedEffect or gemData.secondaryGrantedEffect.support) then
118118
self.gems["Default:" .. gemId] = gemData
119119
end
120120
else
@@ -139,7 +139,7 @@ function GemSelectClass:FilterSupport(gemId, gemData)
139139
end
140140

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

145145
return (not gemData.grantedEffect.support

src/Modules/CalcSetup.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,12 @@ function calcs.initEnv(build, mode, override, specEnv)
15161516
end
15171517
-- if the slot has an imbued support, add it as an ExtraSupport
15181518
if build.skillsTab.imbuedSupportBySlot and build.skillsTab.imbuedSupportBySlot[slotName] and group.imbuedSupport then
1519-
addExtraSupports(nil, build.skillsTab.imbuedSupportBySlot[slotName], 1)
1519+
local imbuedSupport = build.skillsTab.imbuedSupportBySlot[slotName]
1520+
addExtraSupports(nil, imbuedSupport, 1)
1521+
local imbuedGemData = env.data.gems[env.data.gemForSkill[imbuedSupport]]
1522+
if imbuedGemData and imbuedGemData.secondaryGrantedEffect and imbuedGemData.secondaryGrantedEffect.support then
1523+
addExtraSupports(nil, imbuedGemData.secondaryGrantedEffect, 1)
1524+
end
15201525
end
15211526

15221527
for gemIndex, gemInstance in ipairs(group.gemList) do

0 commit comments

Comments
 (0)