Take into account weapon conditions for shock (#4795)

* Take into account weapon conditions for shock

* Properly show both weapon's mods

Co-authored-by: Lilylicious <5985728+Lilylicious@users.noreply.github.com>

Author: Lilylicious

src/Modules/CalcOffence.lua

@@ -2909,7 +2909,7 @@ function calcs.offence(env, actor, activeSkill)
 			local baseFromHit = sourceHitDmg * chanceFromHit / (chanceFromHit + chanceFromCrit)
 			local baseFromCrit = sourceCritDmg * chanceFromCrit / (chanceFromHit + chanceFromCrit)
 			local baseVal = baseFromHit + baseFromCrit
-			local sourceMult = skillModList:More(nil, type.."AsThoughDealing")
+			local sourceMult = skillModList:More(cfg, type.."AsThoughDealing")
 			if breakdown and chance ~= 0 then
 				local breakdownChance = breakdown[type.."Chance"] or { }
 				breakdown[type.."Chance"] = breakdownChance

src/Modules/CalcSections.lua

@@ -1099,7 +1099,9 @@ return {
 		{ breakdown = "MainHand.ShockDPS" },
 		{ breakdown = "OffHand.ShockDPS" },
 		{ breakdown = "ShockDPS" },
-		{ label = "Player modifiers", modName = { "EnemyShockEffect", "ShockAsThoughDealing" }, cfg = "skill" },
+		{ label = "Player modifiers", notFlag = "attack", modName = { "EnemyShockEffect", "ShockAsThoughDealing" }, cfg = "skill" },
+		{ label = "Main hand modifiers", flag = "weapon1Attack", modName = { "EnemyShockEffect", "ShockAsThoughDealing" }, cfg = "weapon1" },
+		{ label = "Off hand modifiers", flag = "weapon2Attack", modName = { "EnemyShockEffect", "ShockAsThoughDealing" }, cfg = "weapon2" },
 		{ label = "Enemy modifiers", modName = "SelfShockEffect", enemy = true },
 	}, },
 	{ label = "Chance to Shock", bgCol = colorCodes.SHOCKBG, flag = "shock", { format = "{0:output:ShockChance}%",