Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v2.35.3](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.3) (2023/12/06)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.2...v2.35.3)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+### Fixed Bugs
+- Fix damage taken as mods not appearing in Calcs tab breakdown [\#6932](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6932) ([Regisle](https://github.com/Regisle), [LocalIdentity](https://github.com/LocalIdentity))
+- Fix Lucky Spell Suppression chance not displaying in sidebar [\#6931](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6931) ([MoonOverMira](https://github.com/MoonOverMira))
+### Accuracy Improvements
+- Update Splitting Steel quality mod [\#6927](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6927) ([kayokalinauskas](https://github.com/kayokalinauskas))
+
+
+
+
 ## [v2.35.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.2) (2023/12/06)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.1...v2.35.2)

changelog.txt

@@ -1,3 +1,13 @@
+VERSION[2.35.3][2023/12/06]
+
+--- Fixed Bugs ---
+* Fix damage taken as mods not appearing in Calcs tab breakdown (Regisle, LocalIdentity)
+* Fix Lucky Spell Suppression chance not displaying in sidebar (MoonOverMira)
+
+--- Accuracy Improvements ---
+* Update Splitting Steel quality mod (kayokalinauskas)
+
+
 VERSION[2.35.2][2023/12/06]
 
 --- Fixed Bugs ---

src/Data/Skills/act_dex.lua

@@ -9339,7 +9339,7 @@ skills["ImpactingSteel"] = {
 	},
 	qualityStats = {
 		Default = {
-			{ "impale_debuff_effect_+%", 1 },
+			{ "impale_debuff_effect_+%", 2 },
 		},
 		Alternate1 = {
 			{ "chance_to_inflict_additional_impale_%", 0.5 },

src/Modules/Build.lua

@@ -385,7 +385,7 @@ function buildMode:Init(dbFileName, buildName, buildXML, convertBuild)
 		{ stat = "SpellBlockChance", label = "Spell Block Chance", fmt = "d%%", overCapStat = "SpellBlockChanceOverCap" },
 		{ stat = "AttackDodgeChance", label = "Attack Dodge Chance", fmt = "d%%", overCapStat = "AttackDodgeChanceOverCap" },
 		{ stat = "SpellDodgeChance", label = "Spell Dodge Chance", fmt = "d%%", overCapStat = "SpellDodgeChanceOverCap" },
-		{ stat = "SpellSuppressionChance", label = "Spell Suppression Chance", fmt = "d%%", overCapStat = "SpellSuppressionChanceOverCap" },
+		{ stat = "EffectiveSpellSuppressionChance", label = "Spell Suppression Chance", fmt = "d%%", overCapStat = "SpellSuppressionChanceOverCap" },
 		{ },
 		{ stat = "FireResist", label = "Fire Resistance", fmt = "d%%", color = colorCodes.FIRE, condFunc = function() return true end, overCapStat = "FireResistOverCap"},
 		{ stat = "FireResistOverCap", label = "Fire Res. Over Max", fmt = "d%%", hideStat = true },

src/Modules/CalcDefence.lua

@@ -1414,7 +1414,7 @@ function calcs.buildDefenceEstimations(env, actor)
 				if destType ~= damageType then
 					dotShiftTable[destType] = modDB:Sum("BASE", nil, damageType.."DamageTakenAs"..destType, isElemental[damageType] and "ElementalDamageTakenAs"..destType or nil)
 					dotDestinationTotal = dotDestinationTotal + dotShiftTable[destType]
-					shiftTable[destType] = dotShiftTable[destType] + modDB:Sum("BASE", nil, damageType.."DamageTakenFromHitsAs"..destType, isElemental[damageType] and "ElementalDamageTakenFromHitsAs"..destType or nil)
+					shiftTable[destType] = dotShiftTable[destType] + modDB:Sum("BASE", nil, damageType.."DamageFromHitsTakenAs"..destType, isElemental[damageType] and "ElementalDamageFromHitsTakenAs"..destType or nil)
 					destTotal = destTotal + shiftTable[destType]
 				end
 			end

src/Modules/CalcSections.lua

@@ -1755,23 +1755,83 @@ return {
 		},
 		{ format = "{2:output:PhysicalTakenDamage}", 
 			{ breakdown = "PhysicalTakenDamage" }, 
-			{ modName = { "PhysicalDamageTakenAsLightning", "PhysicalDamageTakenAsCold", "PhysicalDamageTakenAsFire", "PhysicalDamageTakenAsChaos", "LightningDamageTakenAsPhysical", "ColdDamageTakenAsPhysical", "FireDamageTakenAsPhysical", "ElementalDamageTakenAsPhysical", "ChaosDamageTakenAsPhysical" } } 
+			{ label = "Physical Taken as", modName = {
+				"PhysicalDamageTakenAsLightning", "PhysicalDamageFromHitsTakenAsLightning",
+				"PhysicalDamageTakenAsCold", "PhysicalDamageFromHitsTakenAsCold",
+				"PhysicalDamageTakenAsFire", "PhysicalDamageFromHitsTakenAsFire",
+				"PhysicalDamageTakenAsChaos", "PhysicalDamageFromHitsTakenAsChaos"
+			} },
+		  	{ label = "Taken as Physical", modName = {
+				"LightningDamageTakenAsPhysical", "LightningDamageFromHitsTakenAsPhysical",
+				"ColdDamageTakenAsPhysical", "ColdDamageFromHitsTakenAsPhysical",
+				"FireDamageTakenAsPhysical", "FireDamageFromHitsTakenAsPhysical",
+				"ElementalDamageTakenAsPhysical", "ElementalDamageFromHitsTakenAsPhysical",
+				"ChaosDamageTakenAsPhysical", "ChaosDamageFromHitsTakenAsPhysical"
+			} },
 		},
 		{ format = "{2:output:LightningTakenDamage}",
 			{ breakdown = "LightningTakenDamage" }, 
-			{ modName = { "PhysicalDamageTakenAsLightning", "LightningDamageTakenAsPhysical", "LightningDamageTakenAsCold", "LightningDamageTakenAsFire", "LightningDamageTakenAsChaos", "ColdDamageTakenAsLightning", "FireDamageTakenAsLightning", "ElementalDamageTakenAsPhysical", "ElementalDamageTakenAsChaos", "ChaosDamageTakenAsLightning" } }
+			{ label = "Lightning Taken as", modName = {
+				"LightningDamageTakenAsPhysical", "LightningDamageFromHitsTakenAsPhysical",
+				"LightningDamageTakenAsCold", "LightningDamageFromHitsTakenAsCold",
+				"LightningDamageTakenAsFire", "LightningDamageFromHitsTakenAsFire",
+				"ElementalDamageTakenAsPhysical", "ElementalDamageFromHitsTakenAsPhysical", "ElementalDamageTakenAsChaos", "ElementalDamageFromHitsTakenAsChaos",
+				"LightningDamageTakenAsChaos", "LightningDamageFromHitsTakenAsChaos"
+			} },
+		  	{ label = "Taken as Lightning", modName = {
+				"PhysicalDamageTakenAsLightning", "PhysicalDamageFromHitsTakenAsLightning",
+				"ColdDamageTakenAsLightning", "ColdDamageFromHitsTakenAsLightning",
+				"FireDamageTakenAsLightning", "FireDamageFromHitsTakenAsLightning",
+				"ChaosDamageTakenAsLightning", "ChaosDamageFromHitsTakenAsLightning"
+			} },
 		},
 		{ format = "{2:output:ColdTakenDamage}",
 			{ breakdown = "ColdTakenDamage" }, 
-			{ modName = { "PhysicalDamageTakenAsCold", "LightningDamageTakenAsCold", "ColdDamageTakenAsPhysical", "ColdDamageTakenAsLightning", "ColdDamageTakenAsFire", "ColdDamageTakenAsChaos", "FireDamageTakenAsCold", "ElementalDamageTakenAsPhysical", "ElementalDamageTakenAsChaos", "ChaosDamageTakenAsCold" } }
+			{ label = "Cold Taken as", modName = {
+				"ColdDamageTakenAsPhysical", "ColdDamageFromHitsTakenAsPhysical",
+				"ColdDamageTakenAsLightning", "ColdDamageFromHitsTakenAsLightning",
+				"ColdDamageTakenAsFire", "ColdDamageFromHitsTakenAsFire",
+				"ElementalDamageTakenAsPhysical", "ElementalDamageFromHitsTakenAsPhysical", "ElementalDamageTakenAsChaos", "ElementalDamageFromHitsTakenAsChaos",
+				"ColdDamageTakenAsChaos", "ColdDamageFromHitsTakenAsChaos"
+			} },
+		  	{ label = "Taken as Cold", modName = {
+				"PhysicalDamageTakenAsCold", "PhysicalDamageFromHitsTakenAsCold",
+				"LightningDamageTakenAsCold", "LightningDamageFromHitsTakenAsCold",
+				"FireDamageTakenAsCold", "FireDamageFromHitsTakenAsCold",
+				"ChaosDamageTakenAsCold", "ChaosDamageFromHitsTakenAsCold"
+			} },
 		},
 		{ format = "{2:output:FireTakenDamage}", 
 			{ breakdown = "FireTakenDamage" }, 
-			{ modName = { "PhysicalDamageTakenAsFire", "LightningDamageTakenAsFire", "ColdDamageTakenAsFire", "FireDamageTakenAsPhysical", "FireDamageTakenAsLightning", "FireDamageTakenAsCold", "FireDamageTakenAsChaos", "ElementalDamageTakenAsPhysical", "ElementalDamageTakenAsChaos", "ChaosDamageTakenAsFire" }  } 
+			{ label = "Fire Taken as", modName = {
+				"FireDamageTakenAsPhysical", "FireDamageFromHitsTakenAsPhysical",
+				"FireDamageTakenAsLightning", "FireDamageFromHitsTakenAsLightning",
+				"FireDamageTakenAsCold", "FireDamageFromHitsTakenAsCold",
+				"ElementalDamageTakenAsPhysical", "ElementalDamageFromHitsTakenAsPhysical", "ElementalDamageTakenAsChaos", "ElementalDamageFromHitsTakenAsChaos",
+				"FireDamageTakenAsChaos", "FireDamageFromHitsTakenAsChaos"
+			} },
+		  	{ label = "Taken as Fire", modName = {
+				"PhysicalDamageTakenAsFire", "PhysicalDamageFromHitsTakenAsFire",
+				"LightningDamageTakenAsFire", "LightningDamageFromHitsTakenAsFire",
+				"ColdDamageTakenAsFire", "ColdDamageFromHitsTakenAsFire",
+				"ChaosDamageTakenAsFire", "ChaosDamageFromHitsTakenAsFire"
+			} },
 		},
 		{ format = "{2:output:ChaosTakenDamage}",
 			{ breakdown = "ChaosTakenDamage" }, 
-			{ modName = { "PhysicalDamageTakenAsChaos", "LightningDamageTakenAsChaos", "ColdDamageTakenAsChaos", "FireDamageTakenAsChaos", "ElementalDamageTakenAsChaos", "ChaosDamageTakenAsPhysical", "ChaosDamageTakenAsLightning", "ChaosDamageTakenAsCold", "ChaosDamageTakenAsFire" } }
+			{ label = "Chaos Taken as", modName = {
+				"ChaosDamageTakenAsPhysical", "ChaosDamageFromHitsTakenAsPhysical",
+				"ChaosDamageTakenAsLightning", "ChaosDamageFromHitsTakenAsLightning",
+				"ChaosDamageTakenAsCold", "ChaosDamageFromHitsTakenAsCold",
+				"ChaosDamageTakenAsFire", "ChaosDamageFromHitsTakenAsFire"
+			} },
+		  	{ label = "Taken as Chaos", modName = {
+				"PhysicalDamageTakenAsChaos", "PhysicalDamageFromHitsTakenAsChaos",
+				"LightningDamageTakenAsChaos", "LightningDamageFromHitsTakenAsChaos",
+				"ColdDamageTakenAsChaos", "ColdDamageFromHitsTakenAsChaos",
+				"FireDamageTakenAsChaos", "FireDamageFromHitsTakenAsChaos",
+				"ElementalDamageTakenAsChaos", "ElementalDamageFromHitsTakenAsChaos"
+			} },
 		},
 	},
 } }, { defaultCollapsed = false, label = "Damaging Hits", data = {
@@ -2062,23 +2122,88 @@ return {
 	{ label = "DoT taken",
 		{ format = "x {2:output:PhysicalTakenDotMult}", 
 			{ breakdown = "PhysicalTakenDotMult" }, 
-			{ modName = { "DamageTaken", "DamageTakenOverTime", "PhysicalDamageTaken", "PhysicalDamageTakenOverTime" } } 
+			{ modName = { "DamageTaken", "DamageTakenOverTime", "PhysicalDamageTaken", "PhysicalDamageTakenOverTime" } },
+			{ label = "Physical Taken as", modName = {
+				"PhysicalDamageTakenAsLightning",
+				"PhysicalDamageTakenAsCold",
+				"PhysicalDamageTakenAsFire",
+				"PhysicalDamageTakenAsChaos"
+			} },
+		  	{ label = "Taken as Physical", modName = {
+				"LightningDamageTakenAsPhysical",
+				"ColdDamageTakenAsPhysical",
+				"FireDamageTakenAsPhysical",
+				"ElementalDamageTakenAsPhysical",
+				"ChaosDamageTakenAsPhysical"
+			} },
 		},
 		{ format = "x {2:output:LightningTakenDotMult}",
 			{ breakdown = "LightningTakenDotMult" }, 
-			{ modName = { "DamageTaken", "DamageTakenOverTime", "LightningDamageTaken", "LightningDamageTakenOverTime", "ElementalDamageTaken", "ElementalDamageTakenOverTime", "SelfIgnoreLightningResistance" } }
+			{ modName = { "DamageTaken", "DamageTakenOverTime", "LightningDamageTaken", "LightningDamageTakenOverTime", "ElementalDamageTaken", "ElementalDamageTakenOverTime", "SelfIgnoreLightningResistance" } },
+			{ label = "Lightning Taken as", modName = {
+				"LightningDamageTakenAsPhysical",
+				"LightningDamageTakenAsCold",
+				"LightningDamageTakenAsFire",
+				"ElementalDamageTakenAsPhysical", "ElementalDamageTakenAsChaos",
+				"LightningDamageTakenAsChaos"
+			} },
+		  	{ label = "Taken as Lightning", modName = {
+				"PhysicalDamageTakenAsLightning",
+				"ColdDamageTakenAsLightning",
+				"FireDamageTakenAsLightning",
+				"ChaosDamageTakenAsLightning"
+			} },
 		},
 		{ format = "x {2:output:ColdTakenDotMult}",
 			{ breakdown = "ColdTakenDotMult" }, 
-			{ modName = { "DamageTaken", "DamageTakenOverTime", "ColdDamageTaken", "ColdDamageTakenOverTime", "ElementalDamageTaken", "ElementalDamageTakenOverTime", "SelfIgnoreColdResistance" } }
+			{ modName = { "DamageTaken", "DamageTakenOverTime", "ColdDamageTaken", "ColdDamageTakenOverTime", "ElementalDamageTaken", "ElementalDamageTakenOverTime", "SelfIgnoreColdResistance" } },
+			{ label = "Cold Taken as", modName = {
+				"ColdDamageTakenAsPhysical",
+				"ColdDamageTakenAsLightning",
+				"ColdDamageTakenAsFire",
+				"ElementalDamageTakenAsPhysical", "ElementalDamageTakenAsChaos",
+				"ColdDamageTakenAsChaos"
+			} },
+		  	{ label = "Taken as Cold", modName = {
+				"PhysicalDamageTakenAsCold",
+				"LightningDamageTakenAsCold",
+				"FireDamageTakenAsCold",
+				"ChaosDamageTakenAsCold"
+			} },
 		},
 		{ format = "x {2:output:FireTakenDotMult}", 
 			{ breakdown = "FireTakenDotMult" }, 
-			{ modName = { "DamageTaken", "DamageTakenOverTime", "FireDamageTaken", "FireDamageTakenOverTime", "ElementalDamageTaken", "ElementalDamageTakenOverTime", "SelfIgnoreFireResistance" }  } 
+			{ modName = { "DamageTaken", "DamageTakenOverTime", "FireDamageTaken", "FireDamageTakenOverTime", "ElementalDamageTaken", "ElementalDamageTakenOverTime", "SelfIgnoreFireResistance" }  },
+			{ label = "Fire Taken as", modName = {
+				"FireDamageTakenAsPhysical",
+				"FireDamageTakenAsLightning",
+				"FireDamageTakenAsCold",
+				"ElementalDamageTakenAsPhysical", "ElementalDamageTakenAsChaos", 
+				"FireDamageTakenAsChaos"
+			} },
+		  	{ label = "Taken as Fire", modName = {
+				"PhysicalDamageTakenAsFire",
+				"LightningDamageTakenAsFire",
+				"ColdDamageTakenAsFire", "FireDamageTakenAsCold",
+				"ChaosDamageTakenAsFire"
+			} },
 		},
 		{ format = "x {2:output:ChaosTakenDotMult}",
 			{ breakdown = "ChaosTakenDotMult" }, 
-			{ modName = { "DamageTaken", "DamageTakenOverTime", "ChaosDamageTaken", "ChaosDamageTakenOverTime", "SelfIgnoreChaosResistance" } }
+			{ modName = { "DamageTaken", "DamageTakenOverTime", "ChaosDamageTaken", "ChaosDamageTakenOverTime", "SelfIgnoreChaosResistance" } },
+			{ label = "Chaos Taken as", modName = {
+				"ChaosDamageTakenAsPhysical",
+				"ChaosDamageTakenAsLightning",
+				"ChaosDamageTakenAsCold",
+				"ChaosDamageTakenAsFire",
+			} },
+		  	{ label = "Taken as Chaos", modName = {
+				"PhysicalDamageTakenAsChaos",
+				"LightningDamageTakenAsChaos",
+				"ColdDamageTakenAsChaos",
+				"FireDamageTakenAsChaos",
+				"ElementalDamageTakenAsChaos"
+			} },
 		},
 	},
 	{ label = "Total Pool",

src/Modules/ModParser.lua

@@ -249,7 +249,7 @@ local modNameList = {
 	["attack damage taken"] = "AttackDamageTaken",
 	["spell damage taken"] = "SpellDamageTaken",
 	["physical damage taken"] = "PhysicalDamageTaken",
-	["physical damage from hits taken"] = "PhysicalDamageTakenFromHits",
+	["physical damage from hits taken"] = "PhysicalDamageFromHitsTaken",
 	["physical damage taken when hit"] = "PhysicalDamageTakenWhenHit",
 	["physical damage taken from hits"] = "PhysicalDamageTakenWhenHit",
 	["physical damage taken from attacks"] = "PhysicalDamageTakenFromAttacks",
@@ -259,35 +259,35 @@ local modNameList = {
 	["physical damage over time damage taken"] = "PhysicalDamageTakenOverTime",
 	["reflected physical damage taken"] = "PhysicalReflectedDamageTaken",
 	["lightning damage taken"] = "LightningDamageTaken",
-	["lightning damage from hits taken"] = "LightningDamageTakenFromHits",
+	["lightning damage from hits taken"] = "LightningDamageFromHitsTaken",
 	["lightning damage taken when hit"] = "LightningDamageTakenWhenHit",
 	["lightning damage taken from attacks"] = "LightningDamageTakenFromAttacks",
 	["lightning damage taken from attack hits"] = "LightningDamageTakenFromAttacks",
 	["lightning damage taken over time"] = "LightningDamageTakenOverTime",
 	["cold damage taken"] = "ColdDamageTaken",
-	["cold damage from hits taken"] = "ColdDamageTakenFromHits",
+	["cold damage from hits taken"] = "ColdDamageFromHitsTaken",
 	["cold damage taken when hit"] = "ColdDamageTakenWhenHit",
 	["cold damage taken from hits"] = "ColdDamageTakenWhenHit",
 	["cold damage taken from attacks"] = "ColdDamageTakenFromAttacks",
 	["cold damage taken from attack hits"] = "ColdDamageTakenFromAttacks",
 	["cold damage taken over time"] = "ColdDamageTakenOverTime",
 	["fire damage taken"] = "FireDamageTaken",
-	["fire damage from hits taken"] = "FireDamageTakenFromHits",
+	["fire damage from hits taken"] = "FireDamageFromHitsTaken",
 	["fire damage taken when hit"] = "FireDamageTakenWhenHit",
 	["fire damage taken from hits"] = "FireDamageTakenWhenHit",
 	["fire damage taken from attacks"] = "FireDamageTakenFromAttacks",
 	["fire damage taken from attack hits"] = "FireDamageTakenFromAttacks",
 	["fire damage taken over time"] = "FireDamageTakenOverTime",
 	["chaos damage taken"] = "ChaosDamageTaken",
-	["chaos damage from hits taken"] = "ChaosDamageTakenFromHits",
+	["chaos damage from hits taken"] = "ChaosDamageFromHitsTaken",
 	["chaos damage taken when hit"] = "ChaosDamageTakenWhenHit",
 	["chaos damage taken from hits"] = "ChaosDamageTakenWhenHit",
 	["chaos damage taken from attacks"] = "ChaosDamageTakenFromAttacks",
 	["chaos damage taken from attack hits"] = "ChaosDamageTakenFromAttacks",
 	["chaos damage taken over time"] = "ChaosDamageTakenOverTime",
 	["chaos damage over time taken"] = "ChaosDamageTakenOverTime",
 	["elemental damage taken"] = "ElementalDamageTaken",
-	["elemental damage from hits taken"] = "ElementalDamageTakenFromHits",
+	["elemental damage from hits taken"] = "ElementalDamageFromHitsTaken",
 	["elemental damage taken when hit"] = "ElementalDamageTakenWhenHit",
 	["elemental damage taken from hits"] = "ElementalDamageTakenWhenHit",
 	["elemental damage taken over time"] = "ElementalDamageTakenOverTime",