Skip to content

Commit 9a226b4

Browse files
committed
Implement @deathbeam feedback
1. Make effective DPS visible again 2. Make damage per stack visible again (renamed to "Dmg./<ailment> Stack" for clarity)
1 parent 6e92661 commit 9a226b4

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

src/Modules/CalcSections.lua

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -897,12 +897,6 @@ return {
897897
{ label = "Source Chaos", textSize = 12, notFlag = "attack", haveOutput = "BleedChaosMax", { format = "{0:output:BleedChaosMin} to {0:output:BleedChaosMax}", { breakdown = "BleedChaos" }, }, },
898898
{ label = "MH Source Chaos", bgCol = colorCodes.MAINHANDBG, textSize = 12, flag = "weapon1Attack", haveOutput = "MainHand.BleedChaosMax", { format = "{0:output:MainHand.BleedChaosMin} to {0:output:MainHand.BleedChaosMax}", { breakdown = "MainHand.BleedChaos" }, }, },
899899
{ label = "OH Source Chaos", bgCol = colorCodes.OFFHANDBG, textSize = 12, flag = "weapon2Attack", haveOutput = "OffHand.BleedChaosMax", { format = "{0:output:OffHand.BleedChaosMin} to {0:output:OffHand.BleedChaosMax}", { breakdown = "OffHand.BleedChaos" }, }, },
900-
-- { label = "Effective DPS Mod", flag = "effective", { format = "x {3:output:BleedEffMult}", { breakdown = "BleedEffMult" }, { label = "Enemy modifiers", modName = { "DamageTaken", "DamageTakenOverTime", "PhysicalDamageTaken", "PhysicalDamageTakenOverTime", "PhysicalDamageReduction" }, enemy = true, cfg = "bleed" }, }, },
901-
-- { label = "Dmg. per Bleed", { format = "{1:output:BleedDamage}",
902-
-- { breakdown = "MainHand.BleedDamage" },
903-
-- { breakdown = "OffHand.BleedDamage" },
904-
-- { breakdown = "BleedDamage" },
905-
-- }, },
906900
{ label = "Chance to Bleed", { format = "{0:output:BleedChance}%",
907901
{ breakdown = "MainHand.BleedChance" },
908902
{ breakdown = "OffHand.BleedChance" },
@@ -921,12 +915,18 @@ return {
921915
{ label = "Stack Potential", { format = "{2:output:BleedStackPotential}", { breakdown = "BleedStackPotential" } }},
922916
{ label = "Average Bleed Roll", { format = "{2:output:BleedRollAverage}%", { breakdown = "BleedRollAverage" } }},
923917
{ label = "Magnitude Effect", { format = "x {2:output:BleedMagnitudeEffect}", { modName = "AilmentMagnitude", cfg = "bleed" }, }, },
918+
{ label = "Effective DPS Mod", flag = "effective", { format = "x {3:output:BleedEffMult}", { breakdown = "BleedEffMult" }, { label = "Enemy modifiers", modName = { "DamageTaken", "DamageTakenOverTime", "PhysicalDamageTaken", "PhysicalDamageTakenOverTime", "PhysicalDamageReduction" }, enemy = true, cfg = "bleed" }, }, },
924919
{ label = "Source Physical", textSize = 12, notFlag = "attack", haveOutput = "BleedPhysicalMax", { format = "{0:output:BleedPhysicalMin} to {0:output:BleedPhysicalMax}", { breakdown = "BleedPhysical" }, }, },
925920
{ label = "Bleed DPS", { format = "{1:output:BleedDPS}",
926921
{ breakdown = "BleedDPS" },
927922
{ breakdown = "MainHand.BleedDPS" },
928923
{ breakdown = "OffHand.BleedDPS" },
929924
}, },
925+
{ label = "Dmg./Bleed Stack", { format = "{1:output:BleedDamage}",
926+
{ breakdown = "MainHand.BleedDamage" },
927+
{ breakdown = "OffHand.BleedDamage" },
928+
{ breakdown = "BleedDamage" },
929+
}, },
930930
} }
931931
} },
932932
{ 1, "Poison", 1, colorCodes.OFFENCE, {{ defaultCollapsed = false, label = "Poison", data = {
@@ -947,15 +947,6 @@ return {
947947
{ label = "MH Source Chaos", bgCol = colorCodes.MAINHANDBG, textSize = 12, flag = "weapon1Attack", haveOutput = "MainHand.PoisonChaosMax", { format = "{0:output:MainHand.PoisonChaosMin} to {0:output:MainHand.PoisonChaosMax}", { breakdown = "MainHand.PoisonChaos" }, }, },
948948
{ label = "OH Source Chaos", bgCol = colorCodes.OFFHANDBG, textSize = 12, flag = "weapon2Attack", haveOutput = "OffHand.PoisonChaosMax", { format = "{0:output:OffHand.PoisonChaosMin} to {0:output:OffHand.PoisonChaosMax}", { breakdown = "OffHand.PoisonChaos" }, }, },
949949
{ label = "Source Physical", textSize = 12, notFlag = "attack", haveOutput = "PoisonPhysicalMax", { format = "{0:output:PoisonPhysicalMin} to {0:output:PoisonPhysicalMax}", { breakdown = "PoisonPhysical" }, }, },
950-
-- { label = "Effective DPS Mod", flag = "effective", { format = "x {3:output:PoisonEffMult}",
951-
-- { breakdown = "PoisonEffMult" },
952-
-- { label = "Enemy modifiers", modName = { "ChaosResist", "DamageTaken", "DamageTakenOverTime", "ChaosDamageTaken", "ChaosDamageTakenOverTime" }, enemy = true },
953-
-- }, },
954-
-- { label = "Dmg. per Poison", { format = "{1:output:PoisonDamage}",
955-
-- { breakdown = "MainHand.PoisonDamage" },
956-
-- { breakdown = "OffHand.PoisonDamage" },
957-
-- { breakdown = "PoisonDamage" },
958-
-- }, },
959950
{ label = "Chance to Poison", { format = "{0:output:PoisonChance}%",
960951
{ breakdown = "MainHand.PoisonChance" },
961952
{ breakdown = "OffHand.PoisonChance" },
@@ -974,11 +965,20 @@ return {
974965
{ label = "Stack Potential", { format = "{2:output:PoisonStackPotential}", { breakdown = "PoisonStackPotential" } }},
975966
{ label = "Average Poison Roll", { format = "{2:output:PoisonRollAverage}%", { breakdown = "PoisonRollAverage" } }},
976967
{ label = "Magnitude Effect", { format = "x {2:output:PoisonMagnitudeEffect}", { modName = "AilmentMagnitude", cfg = "poison" }, }, },
968+
{ label = "Effective DPS Mod", flag = "effective", { format = "x {3:output:PoisonEffMult}",
969+
{ breakdown = "PoisonEffMult" },
970+
{ label = "Enemy modifiers", modName = { "ChaosResist", "DamageTaken", "DamageTakenOverTime", "ChaosDamageTaken", "ChaosDamageTakenOverTime" }, enemy = true },
971+
}, },
977972
{ label = "Poison DPS", { format = "{1:output:PoisonDPS}",
978973
{ breakdown = "PoisonDPS" },
979974
{ breakdown = "MainHand.PoisonDPS" },
980975
{ breakdown = "OffHand.PoisonDPS" },
981976
}, },
977+
{ label = "Dmg./Poison Stack", { format = "{1:output:PoisonDamage}",
978+
{ breakdown = "MainHand.PoisonDamage" },
979+
{ breakdown = "OffHand.PoisonDamage" },
980+
{ breakdown = "PoisonDamage" },
981+
}, },
982982
{ label = "Caustic Ground", haveOutput = "CausticGroundFromPoison", { format = "{0:output:CausticGroundDPS}", { breakdown = "CausticGroundDPS" } } },
983983
} }
984984
} },
@@ -1001,11 +1001,6 @@ return {
10011001
{ label = "Source Chaos", textSize = 12, notFlag = "attack", haveOutput = "IgniteChaosMax", { format = "{0:output:IgniteChaosMin} to {0:output:IgniteChaosMax}", { breakdown = "IgniteChaos" }, }, },
10021002
{ label = "MH Source Chaos", bgCol = colorCodes.MAINHANDBG, textSize = 12, flag = "weapon1Attack", haveOutput = "MainHand.IgniteChaosMax", { format = "{0:output:MainHand.IgniteChaosMin} to {0:output:MainHand.IgniteChaosMax}", { breakdown = "MainHand.IgniteChaos" }, }, },
10031003
{ label = "OH Source Chaos", bgCol = colorCodes.OFFHANDBG, textSize = 12, flag = "weapon2Attack", haveOutput = "OffHand.IgniteChaosMax", { format = "{0:output:OffHand.IgniteChaosMin} to {0:output:OffHand.IgniteChaosMax}", { breakdown = "OffHand.IgniteChaos" }, }, },
1004-
-- { label = "Dmg. per Ignite", { format = "{1:output:IgniteDamage}",
1005-
-- { breakdown = "MainHand.IgniteDamage" },
1006-
-- { breakdown = "OffHand.IgniteDamage" },
1007-
-- { breakdown = "IgniteDamage" },
1008-
-- }, },
10091004
{ label = "Chance to Ignite", { format = "{0:output:IgniteChancePerHit}%",
10101005
{ breakdown = "MainHand.IgniteChance" },
10111006
{ breakdown = "OffHand.IgniteChance" },
@@ -1023,19 +1018,24 @@ return {
10231018
{ label = "Stack Potential", { format = "{2:output:IgniteStackPotential}", { breakdown = "IgniteStackPotential" } }},
10241019
{ label = "Average Ignite Roll", { format = "{2:output:IgniteRollAverage}%", { breakdown = "IgniteRollAverage" } }},
10251020
{ label = "Magnitude Effect", { format = "x {2:output:IgniteMagnitudeEffect}", { modName = "AilmentMagnitude", cfg = "ignite" }, }, },
1026-
-- { label = "Effective DPS Mod", flag = "effective", notFlag = "igniteToChaos", { format = "x {3:output:IgniteEffMult}",
1027-
-- { breakdown = "IgniteEffMult" },
1028-
-- { label = "Enemy modifiers", modName = { "FireResist", "ElementalResist", "DamageTaken", "DamageTakenOverTime", "FireDamageTaken", "FireDamageTakenOverTime", "ElementalDamageTaken" }, enemy = true },
1029-
-- }, },
1030-
-- { label = "Effective DPS Mod", flagList = { "effective", "igniteToChaos" }, { format = "x {3:output:IgniteEffMult}",
1031-
-- { breakdown = "IgniteEffMult" },
1032-
-- { label = "Enemy modifiers", modName = { "ChaosResist", "DamageTaken", "DamageTakenOverTime", "ChaosDamageTaken", "ChaosDamageTakenOverTime" }, enemy = true },
1033-
-- }, },
1021+
{ label = "Effective DPS Mod", flag = "effective", notFlag = "igniteToChaos", { format = "x {3:output:IgniteEffMult}",
1022+
{ breakdown = "IgniteEffMult" },
1023+
{ label = "Enemy modifiers", modName = { "FireResist", "ElementalResist", "DamageTaken", "DamageTakenOverTime", "FireDamageTaken", "FireDamageTakenOverTime", "ElementalDamageTaken" }, enemy = true },
1024+
}, },
1025+
{ label = "Effective DPS Mod", flagList = { "effective", "igniteToChaos" }, { format = "x {3:output:IgniteEffMult}",
1026+
{ breakdown = "IgniteEffMult" },
1027+
{ label = "Enemy modifiers", modName = { "ChaosResist", "DamageTaken", "DamageTakenOverTime", "ChaosDamageTaken", "ChaosDamageTakenOverTime" }, enemy = true },
1028+
}, },
10341029
{ label = "Ignite DPS", { format = "{1:output:IgniteDPS}",
10351030
{ breakdown = "IgniteDPS" },
10361031
{ breakdown = "MainHand.IgniteDPS" },
10371032
{ breakdown = "OffHand.IgniteDPS" },
10381033
}, },
1034+
{ label = "Dmg./Ignite Stack", { format = "{1:output:IgniteDamage}",
1035+
{ breakdown = "MainHand.IgniteDamage" },
1036+
{ breakdown = "OffHand.IgniteDamage" },
1037+
{ breakdown = "IgniteDamage" },
1038+
}, },
10391039
{ label = "Burning Ground", haveOutput = "BurningGroundFromIgnite", { format = "{0:output:BurningGroundDPS}", { breakdown = "BurningGroundDPS" } } },
10401040
} }
10411041
} },

0 commit comments

Comments
 (0)