Fix all global effects apply from all stat sets

Author: LocalIdentity

src/Data/Skills/act_int.lua

@@ -6303,9 +6303,6 @@ skills["EssenceDrainPlayer"] = {
 				spell = true,
 				projectile = true,
 			},
-			baseMods = {
-				mod("Multiplier:ChaosDebuff", "BASE", 1, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Essence Drain" }),
-			},
 			constantStats = {
 				{ "movement_speed_+%_final_while_performing_action", -70 },
 				{ "movement_speed_acceleration_+%_per_second_while_performing_action", 160 },
@@ -7984,9 +7981,6 @@ skills["FlameWallPlayer"] = {
 			statDescriptionScope = "flame_wall",
 			baseFlags = {
 			},
-			baseMods = {
-				flag("applyBuffsFromAllStatSets"),
-			},
 			constantStats = {
 				{ "number_of_allowed_firewalls", 3 },
 				{ "firewall_attached_projectile_effect_mtx", 1 },
@@ -8070,10 +8064,10 @@ skills["FlameWallPlayer"] = {
 					mod("FireMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Flame Wall", effectCond = "FlameWallAddedDamage" }),
 				},
 				["flame_wall_minimum_added_lightning_damage_to_add_to_projectile"] = {
-					mod("LightningMin", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond ="FlameWallInfused" }),
+					mod("LightningMin", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond = "FlameWallInfused" }),
 				},
 				["flame_wall_maximum_added_lightning_damage_to_add_to_projectile"] = {
-					mod("LightningMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond ="FlameWallInfused" }),
+					mod("LightningMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond = "FlameWallInfused" }),
 				},
 			},
 			baseFlags = {
@@ -19340,9 +19334,6 @@ skills["SoulrendPlayer"] = {
 				spell = true,
 				projectile = true,
 			},
-			baseMods = {
-				mod("Multiplier:ChaosDebuff", "BASE", 1, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Soulrend" }),
-			},
 			constantStats = {
 				{ "active_skill_projectile_speed_+%_variation_final", 25 },
 				{ "movement_speed_+%_final_while_performing_action", -70 },

src/Export/Skills/act_int.txt

@@ -445,7 +445,6 @@ statMap = {
 #skill EssenceDrainPlayer
 #set EssenceDrainPlayer
 #flags spell projectile
-#baseMod mod("Multiplier:ChaosDebuff", "BASE", 1, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Essence Drain" })
 #mods
 #set EssenceDrainDotPlayer
 #flags spell projectile duration
@@ -564,7 +563,6 @@ statMap = {
 #skill FlameWallPlayer
 #set FlameWallPlayer
 #flags
-#baseMod flag("applyBuffsFromAllStatSets")
 #mods
 #set FlameWallProjectileBuffPlayer
 #flags
@@ -576,10 +574,10 @@ statMap = {
 		mod("FireMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Flame Wall", effectCond = "FlameWallAddedDamage" }),
 	},
 	["flame_wall_minimum_added_lightning_damage_to_add_to_projectile"] = {
-		mod("LightningMin", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond ="FlameWallInfused" }),
+		mod("LightningMin", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond = "FlameWallInfused" }),
 	},
 	["flame_wall_maximum_added_lightning_damage_to_add_to_projectile"] = {
-		mod("LightningMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond ="FlameWallInfused" }),
+		mod("LightningMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond = "FlameWallInfused" }),
 	},
 },
 #mods
@@ -1330,7 +1328,6 @@ statMap = {
 #skill SoulrendPlayer
 #set SoulrendPlayer
 #flags spell projectile
-#baseMod mod("Multiplier:ChaosDebuff", "BASE", 1, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Soulrend" })
 #mods
 #set SoulrendDotPlayer
 #flags spell duration

src/Modules/CalcActiveSkill.lua

@@ -65,29 +65,28 @@ local function checkForScalarMultiplier(modOrGroup, modList)
 	return 1 + scale / 100
 end
 
-local function getFlagFromBaseMods(baseMods, flag)
-	if baseMods then
-		for _, baseMod in ipairs(baseMods) do
-			if baseMod.type == "FLAG" and baseMod.name == flag then
+local function isGlobalEffect(modOrGroup)
+	local modList = modOrGroup.name and { modOrGroup } or modOrGroup
+	for _, mod in ipairs(modList) do
+		for _, tag in ipairs(mod) do
+			if tag.type == "GlobalEffect" then
 				return true
 			end
 		end
 	end
 	return false
 end
+
 -- Merge skill effect modifiers with given mod list
--- If a stat set is provided, only merge modifiers from that statset
+-- If a stat set is provided, merge it and global effects from the other stat sets
 function calcs.mergeSkillInstanceMods(env, modList, skillEffect, statSet, extraStats)
 	calcLib.validateGemLevel(skillEffect)
 	-- Verify that statSet provided is from skillEffect
 	if statSet and not isValueInArray(skillEffect.grantedEffect.statSets, statSet) then
 		return
 	end
 	local grantedEffect = skillEffect.grantedEffect
-	-- for some skills like Flame Wall, the Projectile Buff is on a separate statSet and we want to add it regardless of which statSet is active
-	-- enabled by adding '#baseMod flag("applyBuffsFromAllStatSets)' to the main/first skill txt
-	local applyBuffsFromAllStatSets = getFlagFromBaseMods(statSet and statSet.baseMods, "applyBuffsFromAllStatSets")
-	for _, set in ipairs((applyBuffsFromAllStatSets and grantedEffect.statSets or (statSet and {statSet} or grantedEffect.statSets))) do
+	local function mergeStatSet(set, onlyGlobals)
 		local stats = calcLib.buildSkillInstanceStats(skillEffect, grantedEffect, set)
 		if extraStats and extraStats[1] then
 			for _, stat in pairs(extraStats) do
@@ -99,16 +98,15 @@ function calcs.mergeSkillInstanceMods(env, modList, skillEffect, statSet, extraS
 			if map then
 				-- Some mods need different scalars for different stats, but the same value.  Putting them in a group allows this
 				for _, modOrGroup in ipairs(map) do
-					-- either we are adding the mods of the activeSkill like usual or we are adding only the Buffs from the other statSets
-					if not applyBuffsFromAllStatSets or (applyBuffsFromAllStatSets and modOrGroup[1] and modOrGroup[1].effectType == "Buff") then
+					if not onlyGlobals or isGlobalEffect(modOrGroup) then
 						local scalar = checkForScalarMultiplier(modOrGroup, modList)
 						-- Found a mod, since all mods have names
 						if modOrGroup.name then
 							modOrGroup.source = string.format("Skill:%s", grantedEffect.id)
 							mergeLevelMod(modList, modOrGroup, map.value or statValue * (map.mult or 1) * scalar / (map.div or 1) + (map.base or 0))
 						else
 							for _, mod in ipairs(modOrGroup) do
-								local scalar = checkForScalarMultiplier(mod)
+								local scalar = checkForScalarMultiplier(mod, modList)
 								mod.source = string.format("Skill:%s", grantedEffect.id)
 								mergeLevelMod(modList, mod, modOrGroup.value or statValue * (modOrGroup.mult or 1) * scalar / (modOrGroup.div or 1) + (modOrGroup.base or 0))
 							end
@@ -117,8 +115,23 @@ function calcs.mergeSkillInstanceMods(env, modList, skillEffect, statSet, extraS
 				end
 			end
 		end
+	end
+	for _, set in ipairs(statSet and {statSet} or grantedEffect.statSets) do
+		mergeStatSet(set)
 		modList:AddList(set.baseMods)
 	end
+	if statSet then
+		for _, set in ipairs(grantedEffect.statSets) do
+			if set ~= statSet then
+				mergeStatSet(set, true)
+				for _, baseMod in ipairs(set.baseMods or { }) do
+					if isGlobalEffect(baseMod) then
+						modList:AddMod(baseMod)
+					end
+				end
+			end
+		end
+	end
 end
 
 -- Create an active skill using the given active gem and list of support gems

src/Modules/CalcPerform.lua

@@ -1904,7 +1904,7 @@ function calcs.perform(env, skipEHP)
 			end
 		end
 	end
-	
+
 	local appliedCombustion = false
 	local warcryList = { }
 	for _, activeSkill in ipairs(env.player.activeSkillList) do