diff --git a/CHANGELOG.md b/CHANGELOG.md index ade06bb3f9..150d864e6c 100644 --- a/CHANGELOG.md +++ b/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) + + + +## 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) diff --git a/changelog.txt b/changelog.txt index 7f2eb38e65..9cc093dc4d 100644 --- a/changelog.txt +++ b/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 --- diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index eb23a23f71..bf2382c338 100644 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -2253,17 +2253,17 @@ c["10% of Damage taken Recouped as Mana"]={{[1]={flags=0,keywordFlags=0,name="Ma c["10% of Damage taken from Mana before Life while affected by Clarity"]={{[1]={[1]={type="Condition",var="AffectedByClarity"},flags=0,keywordFlags=0,name="DamageTakenFromManaBeforeLife",type="BASE",value=10}},nil} c["10% of Damage taken from Stunning Hits is Recovered as Life"]={{[1]={flags=0,keywordFlags=0,name="DamageTaken",type="BASE",value=10}}," from Stunning Hits is Recovered as Life "} c["10% of Damage you Reflect to Enemies when Hit is gained as Life"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="BASE",value=10}}," you Reflect to Enemies when Hit is gained as Life "} -c["10% of Fire Damage from Hits taken as Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTakenFromHitsAsPhysical",type="BASE",value=10}},nil} +c["10% of Fire Damage from Hits taken as Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageFromHitsTakenAsPhysical",type="BASE",value=10}},nil} c["10% of Leech is Instant"]={{[1]={flags=0,keywordFlags=0,name="InstantEnergyShieldLeech",type="BASE",value=10},[2]={flags=0,keywordFlags=0,name="InstantManaLeech",type="BASE",value=10},[3]={flags=0,keywordFlags=0,name="InstantLifeLeech",type="BASE",value=10}},nil} c["10% of Leech is Instant per Equipped Claw"]={{[1]={[1]={type="Multiplier",var="ClawItem"},flags=0,keywordFlags=0,name="InstantEnergyShieldLeech",type="BASE",value=10},[2]={[1]={type="Multiplier",var="ClawItem"},flags=0,keywordFlags=0,name="InstantManaLeech",type="BASE",value=10},[3]={[1]={type="Multiplier",var="ClawItem"},flags=0,keywordFlags=0,name="InstantLifeLeech",type="BASE",value=10}},nil} c["10% of Physical Damage Converted to Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToChaos",type="BASE",value=10}},nil} c["10% of Physical Damage Converted to Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToCold",type="BASE",value=10}},nil} c["10% of Physical Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=10}},nil} c["10% of Physical Damage Converted to Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=10}},nil} -c["10% of Physical Damage from Hits taken as Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsChaos",type="BASE",value=10}},nil} -c["10% of Physical Damage from Hits taken as Cold Damage while affected by Purity of Ice"]={{[1]={[1]={type="Condition",var="AffectedByPurityofIce"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsCold",type="BASE",value=10}},nil} -c["10% of Physical Damage from Hits taken as Fire Damage while affected by Purity of Fire"]={{[1]={[1]={type="Condition",var="AffectedByPurityofFire"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsFire",type="BASE",value=10}},nil} -c["10% of Physical Damage from Hits taken as Lightning Damage while affected by Purity of Lightning"]={{[1]={[1]={type="Condition",var="AffectedByPurityofLightning"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsLightning",type="BASE",value=10}},nil} +c["10% of Physical Damage from Hits taken as Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsChaos",type="BASE",value=10}},nil} +c["10% of Physical Damage from Hits taken as Cold Damage while affected by Purity of Ice"]={{[1]={[1]={type="Condition",var="AffectedByPurityofIce"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsCold",type="BASE",value=10}},nil} +c["10% of Physical Damage from Hits taken as Fire Damage while affected by Purity of Fire"]={{[1]={[1]={type="Condition",var="AffectedByPurityofFire"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsFire",type="BASE",value=10}},nil} +c["10% of Physical Damage from Hits taken as Lightning Damage while affected by Purity of Lightning"]={{[1]={[1]={type="Condition",var="AffectedByPurityofLightning"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsLightning",type="BASE",value=10}},nil} c["10% reduced Armour per 50 Strength"]={{[1]={[1]={div=50,stat="Str",type="PerStat"},flags=0,keywordFlags=0,name="Armour",type="INC",value=-10}},nil} c["10% reduced Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=-10}},nil} c["10% reduced Cast Speed"]={{[1]={flags=16,keywordFlags=0,name="Speed",type="INC",value=-10}},nil} @@ -2428,17 +2428,17 @@ c["100% more Critical Strike Chance against Enemies that are on Low Life"]={{[1] c["100% more Damage with Hits from Herald Skills"]={{[1]={[1]={skillType=62,type="SkillType"},flags=0,keywordFlags=262144,name="Damage",type="MORE",value=100}},nil} c["100% more Duration of Ailments on you"]={{[1]={flags=0,keywordFlags=0,name="SelfAilmentDuration",type="MORE",value=100}},nil} c["100% of Cold Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageConvertToFire",type="BASE",value=100}},nil} -c["100% of Cold Damage from Hits taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageTakenFromHitsAsFire",type="BASE",value=100}},nil} -c["100% of Cold Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageTakenFromHitsAsLightning",type="BASE",value=100}},nil} +c["100% of Cold Damage from Hits taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageFromHitsTakenAsFire",type="BASE",value=100}},nil} +c["100% of Cold Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageFromHitsTakenAsLightning",type="BASE",value=100}},nil} c["100% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=100}},nil} c["100% of Damage you Reflect to Enemies when Hit is leeched as Life"]={{[1]={flags=0,keywordFlags=0,name="DamageLifeLeech",type="BASE",value=100}}," you Reflect to Enemies when Hit "} -c["100% of Fire Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTakenFromHitsAsCold",type="BASE",value=100}},nil} -c["100% of Fire Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTakenFromHitsAsLightning",type="BASE",value=100}},nil} -c["100% of Fire Damage from Hits taken as Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTakenFromHitsAsPhysical",type="BASE",value=100}},nil} +c["100% of Fire Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageFromHitsTakenAsCold",type="BASE",value=100}},nil} +c["100% of Fire Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageFromHitsTakenAsLightning",type="BASE",value=100}},nil} +c["100% of Fire Damage from Hits taken as Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageFromHitsTakenAsPhysical",type="BASE",value=100}},nil} c["100% of Life Recovery from Flasks is applied to nearby Allies instead of You"]={{[1]={flags=0,keywordFlags=0,name="FlaskLifeRecovery",type="BASE",value=100}}," is applied to nearby Allies instead of You "} c["100% of Lightning Damage Converted to Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageConvertToChaos",type="BASE",value=100}},nil} -c["100% of Lightning Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageTakenFromHitsAsCold",type="BASE",value=100}},nil} -c["100% of Lightning Damage from Hits taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageTakenFromHitsAsFire",type="BASE",value=100}},nil} +c["100% of Lightning Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageFromHitsTakenAsCold",type="BASE",value=100}},nil} +c["100% of Lightning Damage from Hits taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageFromHitsTakenAsFire",type="BASE",value=100}},nil} c["100% of Physical Damage Converted to Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToCold",type="BASE",value=100}},nil} c["100% of Physical Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=100}},nil} c["100% of Physical Damage from Hits with this Weapon is Converted to a random Element"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToRandom",type="BASE",value=100}},nil} @@ -2582,9 +2582,9 @@ c["12% increased maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type=" c["12% of Damage Taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=12}},nil} c["12% of Damage Taken Recouped as Mana"]={{[1]={flags=0,keywordFlags=0,name="ManaRecoup",type="BASE",value=12}},nil} c["12% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=12}},nil} -c["12% of Physical Damage from Hits taken as Cold Damage while affected by Purity of Elements"]={{[1]={[1]={type="Condition",var="AffectedByPurityofElements"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsCold",type="BASE",value=12}},nil} -c["12% of Physical Damage from Hits taken as Fire Damage while affected by Purity of Elements"]={{[1]={[1]={type="Condition",var="AffectedByPurityofElements"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsFire",type="BASE",value=12}},nil} -c["12% of Physical Damage from Hits taken as Lightning Damage while affected by Purity of Elements"]={{[1]={[1]={type="Condition",var="AffectedByPurityofElements"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsLightning",type="BASE",value=12}},nil} +c["12% of Physical Damage from Hits taken as Cold Damage while affected by Purity of Elements"]={{[1]={[1]={type="Condition",var="AffectedByPurityofElements"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsCold",type="BASE",value=12}},nil} +c["12% of Physical Damage from Hits taken as Fire Damage while affected by Purity of Elements"]={{[1]={[1]={type="Condition",var="AffectedByPurityofElements"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsFire",type="BASE",value=12}},nil} +c["12% of Physical Damage from Hits taken as Lightning Damage while affected by Purity of Elements"]={{[1]={[1]={type="Condition",var="AffectedByPurityofElements"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsLightning",type="BASE",value=12}},nil} c["12% reduced Enemy Stun Threshold with Maces or Sceptres"]={{[1]={flags=1048580,keywordFlags=0,name="EnemyStunThreshold",type="INC",value=-12}},nil} c["12% reduced Skill Effect Duration"]={{[1]={flags=0,keywordFlags=0,name="Duration",type="INC",value=-12}},nil} c["120% increased Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="INC",value=120}},nil} @@ -2657,7 +2657,7 @@ c["13% increased Spell Damage"]={{[1]={flags=2,keywordFlags=0,name="Damage",type c["13% increased Stun and Block Recovery"]={{[1]={flags=0,keywordFlags=0,name="StunRecovery",type="INC",value=13}},nil} c["13% increased effect of Non-Curse Auras from your Skills"]={{[1]={[1]={skillType=43,type="SkillType"},[2]={neg=true,skillType=79,type="SkillType"},flags=0,keywordFlags=0,name="AuraEffect",type="INC",value=13}},nil} c["13% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=13}},nil} -c["13% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsCold",type="BASE",value=13}},nil} +c["13% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsCold",type="BASE",value=13}},nil} c["13% reduced Intelligence"]={{[1]={flags=0,keywordFlags=0,name="Int",type="INC",value=-13}},nil} c["13% reduced Mine Throwing Speed"]={{[1]={flags=0,keywordFlags=0,name="MineLayingSpeed",type="INC",value=-13}},nil} c["13% reduced maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="INC",value=-13}},nil} @@ -2950,7 +2950,7 @@ c["15% of Physical Damage Converted to Chaos Damage"]={{[1]={flags=0,keywordFlag c["15% of Physical Damage Converted to Cold Damage while you have at least 150 Devotion"]={{[1]={[1]={stat="Devotion",threshold=150,type="StatThreshold"},flags=0,keywordFlags=0,name="PhysicalDamageConvertToCold",type="BASE",value=15}},nil} c["15% of Physical Damage Converted to Fire Damage while you have at least 150 Devotion"]={{[1]={[1]={stat="Devotion",threshold=150,type="StatThreshold"},flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=15}},nil} c["15% of Physical Damage Converted to Lightning Damage while you have at least 150 Devotion"]={{[1]={[1]={stat="Devotion",threshold=150,type="StatThreshold"},flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=15}},nil} -c["15% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsCold",type="BASE",value=15}},nil} +c["15% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsCold",type="BASE",value=15}},nil} c["15% of Physical Damage taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenAsFire",type="BASE",value=15}},nil} c["15% of maximum Life taken as Chaos Damage per second"]={{[1]={[1]={percent=15,stat="Life",type="PercentStat"},flags=0,keywordFlags=0,name="ChaosDegen",type="BASE",value=1}},nil} c["15% reduced Accuracy Rating"]={{[1]={flags=0,keywordFlags=0,name="Accuracy",type="INC",value=-15}},nil} @@ -3566,7 +3566,7 @@ c["20% of Damage from Hits is taken from your Sentinel of Radiance's Life before c["20% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=20}},nil} c["20% of Damage taken Recouped as Mana"]={{[1]={flags=0,keywordFlags=0,name="ManaRecoup",type="BASE",value=20}},nil} c["20% of Damage taken while affected by Clarity Recouped as Mana"]={{[1]={[1]={type="Condition",var="AffectedByClarity"},flags=0,keywordFlags=0,name="ManaRecoup",type="BASE",value=20}},nil} -c["20% of Fire Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTakenFromHitsAsCold",type="BASE",value=20}},nil} +c["20% of Fire Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageFromHitsTakenAsCold",type="BASE",value=20}},nil} c["20% of Lightning Damage Leeched as Life during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="LightningDamageLifeLeech",type="BASE",value=20}},nil} c["20% of Lightning Damage Leeched as Mana during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="LightningDamageManaLeech",type="BASE",value=20}},nil} c["20% of Lightning Damage taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageTakenAsFire",type="BASE",value=20}},nil} @@ -3577,9 +3577,9 @@ c["20% of Overkill Damage is Leeched as Life 20% increased Attack Speed while Le c["20% of Overkill Damage is Leeched as Life 20% increased Attack Speed while Leeching Cannot be Stunned while Leeching You are Unaffected by Bleeding while Leeching"]={{[1]={[1]={type="Condition",var="Leeching"},[2]={type="Condition",var="Leeching"},flags=0,keywordFlags=0,name="DamageLifeLeech",type="BASE",value=20}}," Overkill 20% increased Attack Speed Cannot be Stunned You are Unaffected by Bleeding while Leeching "} c["20% of Physical Damage Converted to Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToChaos",type="BASE",value=20}},nil} c["20% of Physical Damage Converted to Lightning during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=20}},nil} -c["20% of Physical Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsCold",type="BASE",value=20}},nil} -c["20% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsCold",type="BASE",value=20}},nil} -c["20% of Physical Damage from Hits taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsFire",type="BASE",value=20}},nil} +c["20% of Physical Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsCold",type="BASE",value=20}},nil} +c["20% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsCold",type="BASE",value=20}},nil} +c["20% of Physical Damage from Hits taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsFire",type="BASE",value=20}},nil} c["20% of Physical Damage taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenAsFire",type="BASE",value=20}},nil} c["20% reduced Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=-20}},nil} c["20% reduced Cast Speed"]={{[1]={flags=16,keywordFlags=0,name="Speed",type="INC",value=-20}},nil} @@ -4010,13 +4010,13 @@ c["25% more Melee Physical Damage during effect"]={{[1]={[1]={type="Condition",v c["25% more Spell Damage if you've been Stunned while Casting Recently"]={{[1]={[1]={type="Condition",var="StunnedWhileCastingRecently"},flags=2,keywordFlags=0,name="Damage",type="MORE",value=25}},nil} c["25% of Damage taken Recouped as Life if Leech was removed by Filling Unreserved Life Recently"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=25}}," if Leech was removed by Filling Unreserved Life Recently "} c["25% of Damage taken Recouped as Life, Mana and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=25},[2]={flags=0,keywordFlags=0,name="EnergyShieldRecoup",type="BASE",value=25},[3]={flags=0,keywordFlags=0,name="ManaRecoup",type="BASE",value=25}},nil} -c["25% of Elemental Damage from Hits taken as Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ElementalDamageTakenFromHitsAsChaos",type="BASE",value=25}},nil} +c["25% of Elemental Damage from Hits taken as Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ElementalDamageFromHitsTakenAsChaos",type="BASE",value=25}},nil} c["25% of Maximum Life taken as Chaos Damage per second"]={{[1]={[1]={percent=25,stat="Life",type="PercentStat"},flags=0,keywordFlags=0,name="ChaosDegen",type="BASE",value=1}},nil} c["25% of Physical Damage Converted to Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToChaos",type="BASE",value=25}},nil} c["25% of Physical Damage Converted to Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToCold",type="BASE",value=25}},nil} c["25% of Physical Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=25}},nil} c["25% of Physical Damage Converted to Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=25}},nil} -c["25% of Physical Damage from Hits taken as Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsChaos",type="BASE",value=25}},nil} +c["25% of Physical Damage from Hits taken as Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsChaos",type="BASE",value=25}},nil} c["25% of Wand Physical Damage converted to Lightning Damage"]={{[1]={flags=8388612,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=25}},nil} c["25% reduced Attack Damage with Main Hand"]={{[1]={[1]={type="Condition",var="MainHandAttack"},[2]={skillType=1,type="SkillType"},flags=1,keywordFlags=0,name="Damage",type="INC",value=-25}},nil} c["25% reduced Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=-25}},nil} @@ -4419,7 +4419,7 @@ c["30% of Cold and Lightning Damage taken as Fire Damage while affected by Purit c["30% of Damage you Reflect to Enemies when Hit is gained as Life"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="BASE",value=30}}," you Reflect to Enemies when Hit is gained as Life "} c["30% of Damage you Reflect to Enemies when Hit is gained as Life 100% of Damage you Reflect to Enemies when Hit is leeched as Life"]={{[1]={flags=0,keywordFlags=0,name="DamageLifeLeech",type="BASE",value=30}}," you Reflect to Enemies when Hit is gained as Life 100% of Damage you Reflect to Enemies when Hit "} c["30% of Fire Damage Converted to Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageConvertToChaos",type="BASE",value=30}},nil} -c["30% of Fire Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTakenFromHitsAsCold",type="BASE",value=30}},nil} +c["30% of Fire Damage from Hits taken as Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="FireDamageFromHitsTakenAsCold",type="BASE",value=30}},nil} c["30% of Fire and Cold Damage taken as Lightning Damage while"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTakenAsLightning",type="BASE",value=30},[2]={flags=0,keywordFlags=0,name="ColdDamageTakenAsLightning",type="BASE",value=30}}," while "} c["30% of Fire and Cold Damage taken as Lightning Damage while affected by Purity of Lightning"]={{[1]={[1]={type="Condition",var="AffectedByPurityofLightning"},flags=0,keywordFlags=0,name="FireDamageTakenAsLightning",type="BASE",value=30},[2]={[1]={type="Condition",var="AffectedByPurityofLightning"},flags=0,keywordFlags=0,name="ColdDamageTakenAsLightning",type="BASE",value=30}},nil} c["30% of Fire and Lightning Damage taken as Cold Damage while affected by Purity of Ice"]={{[1]={[1]={type="Condition",var="AffectedByPurityofIce"},flags=0,keywordFlags=0,name="FireDamageTakenAsCold",type="BASE",value=30},[2]={[1]={type="Condition",var="AffectedByPurityofIce"},flags=0,keywordFlags=0,name="LightningDamageTakenAsCold",type="BASE",value=30}},nil} @@ -4429,8 +4429,8 @@ c["30% of Lightning Damage is taken from Mana before Life"]={{[1]={flags=0,keywo c["30% of Physical Damage Converted to Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToChaos",type="BASE",value=30}},nil} c["30% of Physical Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=30}},nil} c["30% of Physical Damage Converted to Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=30}},nil} -c["30% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsCold",type="BASE",value=30}},nil} -c["30% of Physical Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsLightning",type="BASE",value=30}},nil} +c["30% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsCold",type="BASE",value=30}},nil} +c["30% of Physical Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsLightning",type="BASE",value=30}},nil} c["30% reduced Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=-30}},nil} c["30% reduced Attack Speed while Phasing"]={{[1]={[1]={type="Condition",var="Phasing"},flags=1,keywordFlags=0,name="Speed",type="INC",value=-30}},nil} c["30% reduced Chance to Block Attack and Spell Damage"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="INC",value=-30},[2]={flags=0,keywordFlags=0,name="SpellBlockChance",type="INC",value=-30}},nil} @@ -4815,7 +4815,7 @@ c["40% of Physical Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags c["40% of Physical Damage Converted to Fire Damage while affected by Anger"]={{[1]={[1]={type="Condition",var="AffectedByAnger"},flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=40}},nil} c["40% of Physical Damage Converted to Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=40}},nil} c["40% of Physical Damage Converted to Lightning Damage while affected by Wrath"]={{[1]={[1]={type="Condition",var="AffectedByWrath"},flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=40}},nil} -c["40% of Physical Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsLightning",type="BASE",value=40}},nil} +c["40% of Physical Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsLightning",type="BASE",value=40}},nil} c["40% of Physical Damage taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenAsFire",type="BASE",value=40}},nil} c["40% reduced Area of Effect of Hex Skills"]={{[1]={[1]={skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=-40}},nil} c["40% reduced Critical Strike Chance per Power Charge"]={{[1]={[1]={type="Multiplier",var="PowerCharge"},flags=0,keywordFlags=0,name="CritChance",type="INC",value=-40}},nil} @@ -5237,7 +5237,7 @@ c["50% of Physical Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags c["50% of Physical Damage Converted to Fire while you have Avatar of Fire"]={{[1]={[1]={type="Condition",var="HaveAvatarOfFire"},flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=50}},nil} c["50% of Physical Damage Converted to Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=50}},nil} c["50% of Physical Damage Converted to Lightning during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=50}},nil} -c["50% of Physical Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsLightning",type="BASE",value=50}},nil} +c["50% of Physical Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsLightning",type="BASE",value=50}},nil} c["50% of Physical Damage from Hits with this Weapon is Converted to a random Element"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToRandom",type="BASE",value=50}},nil} c["50% of Physical, Cold and Lightning Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=50},[2]={flags=0,keywordFlags=0,name="LightningDamageConvertToFire",type="BASE",value=50},[3]={flags=0,keywordFlags=0,name="ColdDamageConvertToFire",type="BASE",value=50}},nil} c["50% reduced Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=-50}},nil} @@ -5684,7 +5684,7 @@ c["8% of Armour applies to Fire, Cold and Lightning Damage taken from Hits"]={{[ c["8% of Damage is taken from Mana before Life"]={{[1]={flags=0,keywordFlags=0,name="DamageTakenFromManaBeforeLife",type="BASE",value=8}},nil} c["8% of Damage taken Recouped as Mana"]={{[1]={flags=0,keywordFlags=0,name="ManaRecoup",type="BASE",value=8}},nil} c["8% of Maximum Life taken as Chaos Damage per second"]={{[1]={[1]={percent=8,stat="Life",type="PercentStat"},flags=0,keywordFlags=0,name="ChaosDegen",type="BASE",value=1}},nil} -c["8% of Physical Damage from Hits taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTakenFromHitsAsFire",type="BASE",value=8}},nil} +c["8% of Physical Damage from Hits taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsFire",type="BASE",value=8}},nil} c["8% reduced Critical Strike Chance per Blitz Charge"]={{[1]={[1]={type="Multiplier",var="BlitzCharge"},flags=0,keywordFlags=0,name="CritChance",type="INC",value=-8}},nil} c["8% reduced Elemental Damage taken while at Maximum Endurance Charges"]={{[1]={[1]={stat="EnduranceCharges",thresholdStat="EnduranceChargesMax",type="StatThreshold"},flags=0,keywordFlags=0,name="ElementalDamageTaken",type="INC",value=-8}},nil} c["8% reduced Enemy Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="EnemyStunThreshold",type="INC",value=-8}},nil} diff --git a/src/Data/Skills/act_dex.lua b/src/Data/Skills/act_dex.lua index af918e9eca..7b0b32587c 100644 --- a/src/Data/Skills/act_dex.lua +++ b/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 }, diff --git a/src/Modules/Build.lua b/src/Modules/Build.lua index 5d4e2063d9..e286c23668 100644 --- a/src/Modules/Build.lua +++ b/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 }, diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua index 5559877dc7..e5b4a252d4 100644 --- a/src/Modules/CalcDefence.lua +++ b/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 diff --git a/src/Modules/CalcSections.lua b/src/Modules/CalcSections.lua index 272ff4652a..831697f087 100644 --- a/src/Modules/CalcSections.lua +++ b/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", diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index be8af106fc..309b4bdb29 100644 --- a/src/Modules/ModParser.lua +++ b/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,27 +259,27 @@ 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", @@ -287,7 +287,7 @@ local modNameList = { ["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",