Use function to remove duplicate code

Author: LocalIdentity

src/Modules/CalcActiveSkill.lua

@@ -107,31 +107,38 @@ function calcs.createActiveSkill(activeEffect, supportList, actor, socketGroup,
 	activeSkill.effectList = { activeEffect }
 	local rejectedSupportsIndices = {}
 
-	for index, supportEffect in ipairs(supportList) do
-		-- Loop through grantedEffectList until we find a support gem if the gem has an active and support component e.g. Autoexertion
+	-- Return first compatible support grantedEffect plus a flag indicating the support has a support component
+	local function getGrantedSupportEffect(supportEffect)
+		local hasSupport = false
 		if supportEffect.gemData then
 			for _, grantedEffect in ipairs(supportEffect.gemData.grantedEffectList) do
-				if grantedEffect.support then
-					-- Pass 1: Add skill types from compatible supports
+				if grantedEffect and grantedEffect.support then
+					hasSupport = true
 					if calcLib.canGrantedEffectSupportActiveSkill(grantedEffect, activeSkill) then
-						for _, skillType in pairs(grantedEffect.addSkillTypes) do
-							activeSkill.skillTypes[skillType] = true
-						end
-					else
-						t_insert(rejectedSupportsIndices, index)
+						return grantedEffect, true
 					end
 				end
 			end
-		else
-			-- Skill with no GemData e.g. Item granted supports
+		elseif supportEffect.grantedEffect then
+			hasSupport = true
 			if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
-				for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
-					activeSkill.skillTypes[skillType] = true
-				end
-			else
-				t_insert(rejectedSupportsIndices, index)
+				return supportEffect.grantedEffect, true
 			end
 		end
+		return nil, hasSupport
+	end
+
+	for index, supportEffect in ipairs(supportList) do
+		-- Loop through grantedEffectList until we find a support gem if the gem has an active and support component e.g. Autoexertion
+		local grantedSupportEffect, hasSupport = getGrantedSupportEffect(supportEffect)
+		if grantedSupportEffect then
+			-- Pass 1: Add skill types from compatible supports
+			for _, skillType in pairs(grantedSupportEffect.addSkillTypes) do
+				activeSkill.skillTypes[skillType] = true
+			end
+		elseif hasSupport then
+			t_insert(rejectedSupportsIndices, index)
+		end
 	end
 
 	-- loop over rejected supports until none are added.
@@ -141,43 +148,20 @@ function calcs.createActiveSkill(activeEffect, supportList, actor, socketGroup,
 		notAddedNewSupport = true
 		for index, supportEffectIndex in ipairs(rejectedSupportsIndices) do
 			local supportEffect = supportList[supportEffectIndex]
-			if supportEffect.gemData then
-				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
-			else
-				if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
-					notAddedNewSupport = false
-					rejectedSupportsIndices[index] = nil
-					for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
-						activeSkill.skillTypes[skillType] = true
-					end
+			local grantedSupportEffect = getGrantedSupportEffect(supportEffect)
+			if grantedSupportEffect then
+				notAddedNewSupport = false
+				rejectedSupportsIndices[index] = nil
+				for _, skillType in pairs(grantedSupportEffect.addSkillTypes) do
+					activeSkill.skillTypes[skillType] = true
 				end
 			end
 		end
 	until (notAddedNewSupport)
 
 	for _, supportEffect in ipairs(supportList) do
 		-- Pass 2: Add all compatible supports
-		local grantedSupportEffect
-		if supportEffect.gemData then
-			for _, grantedEffect in ipairs(supportEffect.gemData.grantedEffectList) do
-				if grantedEffect and grantedEffect.support and calcLib.canGrantedEffectSupportActiveSkill(grantedEffect, activeSkill) then
-					grantedSupportEffect = grantedEffect
-					break
-				end
-			end
-		elseif calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
-			grantedSupportEffect = supportEffect.grantedEffect
-		end
+		local grantedSupportEffect = getGrantedSupportEffect(supportEffect)
 		if grantedSupportEffect then
 			t_insert(activeSkill.effectList, supportEffect)
 			if supportEffect.isSupporting and activeEffect.srcInstance then