Fix crash when sorting some gems by Full DPS

When we were checking to see if a gem could be affected by a possible support gem we were not considering if the gem had a additional granted effect which was the supporting part of the gem
Instead of using the granted effect of the support, we were using the granted effect of the gem which caused a bunch of issues for the code that only expects to deal with supports
Also applied this logic to cross linked supports too as I noticed it had a similar issue
Also made cross link supports skip it's own socketgroup as it's trying to look for other socketgroups that can support it
e.g. Ngamahu's Flame was checking it's own Molten Burst gem group which couldn't possible have supports

Author: LocalIdentity

src/Modules/CalcActiveSkill.lua

@@ -108,13 +108,18 @@ function calcs.createActiveSkill(activeEffect, supportList, actor, socketGroup,
 	local rejectedSupportsIndices = {}
 
 	for index, supportEffect in ipairs(supportList) do
-		-- Pass 1: Add skill types from compatible supports
-		if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
-			for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
-				activeSkill.skillTypes[skillType] = true
+		-- Loop through grantedEffectList until we find a support gem if the gem has an active and support component e.g. Autoexertion
+		for _, grantedEffect in ipairs(supportEffect.gemData.grantedEffectList) do
+			if grantedEffect.support then
+				-- Pass 1: Add skill types from compatible supports
+				if calcLib.canGrantedEffectSupportActiveSkill(grantedEffect, activeSkill) then
+					for _, skillType in pairs(grantedEffect.addSkillTypes) do
+						activeSkill.skillTypes[skillType] = true
+					end
+				else
+					t_insert(rejectedSupportsIndices, index)
+				end
 			end
-		else
-			t_insert(rejectedSupportsIndices, index)
 		end
 	end
 
@@ -125,27 +130,35 @@ function calcs.createActiveSkill(activeEffect, supportList, actor, socketGroup,
 		notAddedNewSupport = true
 		for index, supportEffectIndex in ipairs(rejectedSupportsIndices) do
 			local supportEffect = supportList[supportEffectIndex]
-			if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
-				notAddedNewSupport = false
-				rejectedSupportsIndices[index] = nil
-				for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
-					activeSkill.skillTypes[skillType] = true
+			for _, grantedEffect in ipairs(supportEffect.gemData.grantedEffectList) do
+				if grantedEffect.support then
+					if calcLib.canGrantedEffectSupportActiveSkill(grantedEffect, activeSkill) then
+						notAddedNewSupport = false
+						rejectedSupportsIndices[index] = nil
+						for _, skillType in pairs(grantedEffect.addSkillTypes) do
+							activeSkill.skillTypes[skillType] = true
+						end
+					end
 				end
 			end
 		end
 	until (notAddedNewSupport)
 
 	for _, supportEffect in ipairs(supportList) do
 		-- Pass 2: Add all compatible supports
-		if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
-			t_insert(activeSkill.effectList, supportEffect)
-			if supportEffect.isSupporting and activeEffect.srcInstance then
-				supportEffect.isSupporting[activeEffect.srcInstance] = true
-			end
-			if supportEffect.grantedEffect.addFlags and not summonSkill then
-				-- Support skill adds flags to supported skills (eg. Remote Mine adds 'mine')
-				for k in pairs(supportEffect.grantedEffect.addFlags) do
-					skillFlags[k] = true
+		for _, grantedEffect in ipairs(supportEffect.gemData.grantedEffectList) do
+			if grantedEffect.support then
+				if calcLib.canGrantedEffectSupportActiveSkill(grantedEffect, activeSkill) then
+					t_insert(activeSkill.effectList, supportEffect)
+					if supportEffect.isSupporting and activeEffect.srcInstance then
+						supportEffect.isSupporting[activeEffect.srcInstance] = true
+					end
+					if grantedEffect.addFlags and not summonSkill then
+						-- Support skill adds flags to supported skills (eg. Remote Mine adds 'mine')
+						for k in pairs(grantedEffect.addFlags) do
+							skillFlags[k] = true
+						end
+					end
 				end
 			end
 		end

src/Modules/CalcSetup.lua

@@ -1563,10 +1563,14 @@ function calcs.initEnv(build, mode, override, specEnv)
 										if supportLists[slotName] then
 											-- add socketed supports from other socketGroups
 											for _, otherSocketGroup in ipairs(build.skillsTab.socketGroupList) do
-												if otherSocketGroup.slot and otherSocketGroup.slot == group.slot then
+												if otherSocketGroup.slot and otherSocketGroup.slot == group.slot and not (otherSocketGroup.source and otherSocketGroup.source == group.source) then
 													for _, gem in ipairs(otherSocketGroup.gemList) do
-														if gem.gemData and gem.gemData.grantedEffect and gem.gemData.grantedEffect.support then
-															t_insert(group.displayGemList, gem)
+														if gem.gemData and gem.gemData.grantedEffectList then
+															for _, grantedEffect in ipairs(gem.gemData.grantedEffectList) do
+																if grantedEffect.support then
+																	t_insert(group.displayGemList, gem)
+																end
+															end
 														end
 													end
 												end