diff --git a/sim/common/cata/stat_bonus_cds.go b/sim/common/cata/stat_bonus_cds.go index 088967ae22..205d0b8438 100644 --- a/sim/common/cata/stat_bonus_cds.go +++ b/sim/common/cata/stat_bonus_cds.go @@ -29,7 +29,11 @@ func init() { shared.NewStrengthActive(64689, 1520, time.Second*20, time.Minute*2) // Bloodthirsty Gladiator's Badge of Victory shared.NewStrengthActive(62464, 1605, time.Second*20, time.Minute*2) // Impatience of Youth (Alliance) shared.NewStrengthActive(62469, 1605, time.Second*20, time.Minute*2) // Impatience of Youth (Horde) - shared.NewStrengthActive(61034, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Victory + shared.NewStrengthActive(61034, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Victory - 365 + shared.NewStrengthActive(70519, 1794, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Victory - 371 + shared.NewStrengthActive(70400, 2029, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Victory - 384 + shared.NewStrengthActive(72450, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Victory - 390 + shared.NewStrengthActive(73496, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Victory shared.NewStrengthActive(69002, 1277, time.Second*15, time.Minute) // Essence of the Eternal Flame shared.NewStrengthActive(77987, 2029, time.Second*15, time.Second*90) // Rotting Skull 384 - Not available to players shared.NewStrengthActive(77116, 2290, time.Second*15, time.Second*90) // Rotting Skull 397 - Valor Points @@ -43,7 +47,11 @@ func init() { shared.NewAgilityActive(62468, 1605, time.Second*20, time.Minute*2) // Unsolvable Riddle (Alliance) shared.NewAgilityActive(62463, 1605, time.Second*20, time.Minute*2) // Unsolvable Riddle (Horde) shared.NewAgilityActive(68709, 1605, time.Second*20, time.Minute*2) // Unsolvable Riddle (No Faction) - shared.NewAgilityActive(61033, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Conquest + shared.NewAgilityActive(61033, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Conquest - 365 + shared.NewAgilityActive(70517, 1794, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Conquest - 371 + shared.NewAgilityActive(70399, 2029, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Conquest - 384 + shared.NewAgilityActive(72304, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Conquest - 390 + shared.NewAgilityActive(73648, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Conquest shared.NewAgilityActive(69001, 1277, time.Second*15, time.Minute) // Ancient Petrified Seed shared.NewAgilityActive(77984, 2029, time.Second*15, time.Second*90) // Kiroptyric Sigil 384 - Not available to players shared.NewAgilityActive(77113, 2290, time.Second*15, time.Second*90) // Kiroptyric Sigil 397 - Valor Points @@ -72,7 +80,11 @@ func init() { shared.NewSpellPowerActive(52353, 1425, time.Second*20, time.Minute*2) // Figurine - Jeweled Serpent shared.NewSpellPowerActive(64688, 1520, time.Second*20, time.Minute*2) // Bloodthirsty Gladiator's Badge of Dominance shared.NewSpellPowerActive(58183, 1926, time.Second*20, time.Minute*2) // Soul Casket - shared.NewSpellPowerActive(61035, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Dominance + shared.NewSpellPowerActive(61035, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Dominance - 365 + shared.NewSpellPowerActive(70518, 1794, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Dominance - 371 + shared.NewSpellPowerActive(70401, 2029, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Dominance - 384 + shared.NewSpellPowerActive(72448, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Dominance - 390 + shared.NewSpellPowerActive(73498, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Dominance shared.NewSpellPowerActive(77985, 2029, time.Second*15, time.Second*90) // Bottled Wishes 384 - Not available to players shared.NewSpellPowerActive(77114, 2290, time.Second*15, time.Second*90) // Bottled Wishes 397 - Valor Points shared.NewSpellPowerActive(78005, 2585, time.Second*15, time.Second*90) // Bottled Wishes 410 - Not available to players diff --git a/sim/common/cata/stat_bonus_procs.go b/sim/common/cata/stat_bonus_procs.go index 1649fd1430..40d85d581b 100644 --- a/sim/common/cata/stat_bonus_procs.go +++ b/sim/common/cata/stat_bonus_procs.go @@ -843,39 +843,195 @@ func init() { }) shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ - Name: "Vicious Gladiator's Insignia of Dominance", + Name: "Vicious Gladiator's Insignia of Dominance - 365", ID: 61045, AuraID: 85027, Bonus: stats.Stats{stats.SpellPower: 963}, Duration: time.Second * 20, Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt, - ProcMask: core.ProcMaskSpellDamage | core.ProcMaskSpellHealing, + ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.25, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Vicious Gladiator's Insignia of Dominance - 371", + ID: 70578, + AuraID: 99719, + Bonus: stats.Stats{stats.SpellPower: 1077}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.25, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Ruthless Gladiator's Insignia of Dominance - 384", + ID: 70402, + AuraID: 99742, + Bonus: stats.Stats{stats.SpellPower: 1218}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.25, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Ruthless Gladiator's Insignia of Dominance - 390", + ID: 72449, + AuraID: 102435, + Bonus: stats.Stats{stats.SpellPower: 1287}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc, Outcome: core.OutcomeLanded, ProcChance: 0.25, ICD: time.Second * 55, }) shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ - Name: "Vicious Gladiator's Insignia of Victory", + Name: "Cataclysmic Gladiator's Insignia of Dominance", + ID: 73497, + AuraID: 105137, + Bonus: stats.Stats{stats.SpellPower: 1452}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.25, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Vicious Gladiator's Insignia of Victory - 365", ID: 61046, AuraID: 85032, Bonus: stats.Stats{stats.Strength: 963}, Duration: time.Second * 20, Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskDirect, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.15, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Vicious Gladiator's Insignia of Victory - 371", + ID: 70579, + AuraID: 99721, + Bonus: stats.Stats{stats.Strength: 1077}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.15, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Ruthless Gladiator's Insignia of Victory - 384", + ID: 70403, + AuraID: 99746, + Bonus: stats.Stats{stats.Strength: 1218}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, Outcome: core.OutcomeLanded, ProcChance: 0.15, ICD: time.Second * 55, }) shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ - Name: "Vicious Gladiator's Insignia of Conquest", + Name: "Ruthless Gladiator's Insignia of Victory - 390", + ID: 72455, + AuraID: 102432, + Bonus: stats.Stats{stats.Strength: 1287}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.15, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Cataclysmic Gladiator's Insignia of Victory", + ID: 73491, + AuraID: 105139, + Bonus: stats.Stats{stats.Strength: 1452}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.15, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Vicious Gladiator's Insignia of Conquest - 365", ID: 61047, AuraID: 85022, Bonus: stats.Stats{stats.Agility: 963}, Duration: time.Second * 20, Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskDirect, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.15, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Vicious Gladiator's Insignia of Conquest - 371", + ID: 70577, + AuraID: 99717, + Bonus: stats.Stats{stats.Agility: 1077}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.15, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Ruthless Gladiator's Insignia of Conquest - 384", + ID: 70404, + AuraID: 99748, + Bonus: stats.Stats{stats.Agility: 1218}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.15, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Ruthless Gladiator's Insignia of Conquest - 390", + ID: 72309, + AuraID: 102439, + Bonus: stats.Stats{stats.Agility: 1287}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, + Outcome: core.OutcomeLanded, + ProcChance: 0.15, + ICD: time.Second * 55, + }) + + shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{ + Name: "Cataclysmic Gladiator's Insignia of Conquest", + ID: 73643, + AuraID: 105135, + Bonus: stats.Stats{stats.Agility: 1452}, + Duration: time.Second * 20, + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskDirect | core.ProcMaskProc, Outcome: core.OutcomeLanded, ProcChance: 0.15, ICD: time.Second * 55, diff --git a/sim/death_knight/blood/TestBlood.results b/sim/death_knight/blood/TestBlood.results index d4a127ed35..164984509c 100644 --- a/sim/death_knight/blood/TestBlood.results +++ b/sim/death_knight/blood/TestBlood.results @@ -331,6 +331,54 @@ dps_results: { hps: 5951.89331 } } +dps_results: { + key: "TestBlood-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 22083.26415 + tps: 110584.81114 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 21735.85069 + tps: 108775.77583 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 22721.88212 + tps: 113804.19054 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 22078.27886 + tps: 110509.3346 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 21778.66598 + tps: 108991.01167 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 22683.29802 + tps: 113804.94923 + hps: 5314.81299 + } +} dps_results: { key: "TestBlood-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1507,6 +1555,102 @@ dps_results: { hps: 5325.58018 } } +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 22025.49296 + tps: 110241.87238 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 22039.90004 + tps: 110312.24819 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 21735.85069 + tps: 108775.77583 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 21735.85069 + tps: 108775.77583 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 22562.91054 + tps: 112993.49119 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 22609.78677 + tps: 113232.54356 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 22101.48009 + tps: 110712.74217 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 22076.31336 + tps: 110492.17134 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 21778.66598 + tps: 108991.01167 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 21778.66598 + tps: 108991.01167 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 22524.71179 + tps: 113014.80346 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 22582.90227 + tps: 113302.83059 + hps: 5314.81299 + } +} dps_results: { key: "TestBlood-AllItems-ScalesofLife-68915" value: { @@ -1995,6 +2139,14 @@ dps_results: { hps: 5314.81299 } } +dps_results: { + key: "TestBlood-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 21988.47894 + tps: 110039.12889 + hps: 5314.81299 + } +} dps_results: { key: "TestBlood-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -2003,6 +2155,14 @@ dps_results: { hps: 5314.81299 } } +dps_results: { + key: "TestBlood-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 21735.85069 + tps: 108775.77583 + hps: 5314.81299 + } +} dps_results: { key: "TestBlood-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -2011,6 +2171,14 @@ dps_results: { hps: 5314.81299 } } +dps_results: { + key: "TestBlood-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 22467.11997 + tps: 112504.99286 + hps: 5314.81299 + } +} dps_results: { key: "TestBlood-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -2062,8 +2230,16 @@ dps_results: { dps_results: { key: "TestBlood-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 22025.32968 - tps: 110242.69401 + dps: 22025.01247 + tps: 110240.29971 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 22075.89426 + tps: 110433.3783 hps: 5314.81299 } } @@ -2075,11 +2251,27 @@ dps_results: { hps: 5314.81299 } } +dps_results: { + key: "TestBlood-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 21778.66598 + tps: 108991.01167 + hps: 5314.81299 + } +} dps_results: { key: "TestBlood-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 22360.43695 - tps: 112145.57017 + dps: 22375.10835 + tps: 112187.02403 + hps: 5314.81299 + } +} +dps_results: { + key: "TestBlood-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 22453.62065 + tps: 112600.38862 hps: 5314.81299 } } diff --git a/sim/death_knight/frost/TestFrost.results b/sim/death_knight/frost/TestFrost.results index cac932be31..c37f3bc13c 100644 --- a/sim/death_knight/frost/TestFrost.results +++ b/sim/death_knight/frost/TestFrost.results @@ -323,6 +323,54 @@ dps_results: { hps: 517.70632 } } +dps_results: { + key: "TestFrost-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 38507.73851 + tps: 36202.42938 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 39992.1942 + tps: 37683.58369 + hps: 509.20666 + } +} dps_results: { key: "TestFrost-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1531,6 +1579,102 @@ dps_results: { hps: 516.93362 } } +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 38453.32716 + tps: 36164.37711 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 38432.12185 + tps: 36147.11337 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 39682.92359 + tps: 37361.21037 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 39787.52469 + tps: 37476.71491 + hps: 509.20666 + } +} dps_results: { key: "TestFrost-AllItems-ScalesofLife-68915" value: { @@ -2059,6 +2203,14 @@ dps_results: { hps: 509.20666 } } +dps_results: { + key: "TestFrost-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} dps_results: { key: "TestFrost-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -2067,6 +2219,14 @@ dps_results: { hps: 509.20666 } } +dps_results: { + key: "TestFrost-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} dps_results: { key: "TestFrost-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -2075,6 +2235,14 @@ dps_results: { hps: 509.20666 } } +dps_results: { + key: "TestFrost-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} dps_results: { key: "TestFrost-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -2126,8 +2294,16 @@ dps_results: { dps_results: { key: "TestFrost-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 38335.67708 - tps: 36062.93599 + dps: 38335.46688 + tps: 36049.95974 + hps: 508.43397 + } +} +dps_results: { + key: "TestFrost-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 38384.93436 + tps: 36106.20375 hps: 508.43397 } } @@ -2139,11 +2315,27 @@ dps_results: { hps: 509.20666 } } +dps_results: { + key: "TestFrost-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 38054.10089 + tps: 35791.38425 + hps: 509.20666 + } +} dps_results: { key: "TestFrost-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 39362.68022 - tps: 37058.40162 + dps: 39342.95558 + tps: 37040.28153 + hps: 509.20666 + } +} +dps_results: { + key: "TestFrost-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 39495.86867 + tps: 37192.81065 hps: 509.20666 } } diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results index abe24d69c3..755653034c 100644 --- a/sim/death_knight/unholy/TestUnholy.results +++ b/sim/death_knight/unholy/TestUnholy.results @@ -331,6 +331,54 @@ dps_results: { hps: 667.66767 } } +dps_results: { + key: "TestUnholy-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 39937.49206 + tps: 29567.0732 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 39435.09186 + tps: 29251.70993 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 40897.40866 + tps: 30240.29167 + hps: 644.15825 + } +} dps_results: { key: "TestUnholy-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1507,6 +1555,102 @@ dps_results: { hps: 665.31673 } } +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 39899.17667 + tps: 29548.23364 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 39883.22787 + tps: 29530.7963 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 40521.27377 + tps: 30022.32131 + hps: 648.07648 + } +} +dps_results: { + key: "TestUnholy-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 40836.45242 + tps: 30195.69675 + hps: 644.94189 + } +} dps_results: { key: "TestUnholy-AllItems-ScalesofLife-68915" value: { @@ -1995,6 +2139,14 @@ dps_results: { hps: 650.42743 } } +dps_results: { + key: "TestUnholy-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -2003,6 +2155,14 @@ dps_results: { hps: 650.42743 } } +dps_results: { + key: "TestUnholy-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -2011,6 +2171,14 @@ dps_results: { hps: 650.42743 } } +dps_results: { + key: "TestUnholy-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -2062,25 +2230,49 @@ dps_results: { dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 39828.74366 - tps: 29499.13691 + dps: 39823.82527 + tps: 29501.32889 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 39831.14892 + tps: 29490.24612 hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 39435.08337 - tps: 29251.69379 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 + } +} +dps_results: { + key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 39435.09186 + tps: 29251.70993 hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 40432.28341 - tps: 29989.08097 - hps: 644.15825 + dps: 40154.8341 + tps: 29801.74598 + hps: 648.07648 + } +} +dps_results: { + key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 40640.4822 + tps: 30124.49689 + hps: 648.86013 } } dps_results: { diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 7c3245cfbd..d1a8950f8a 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -288,6 +288,48 @@ dps_results: { tps: 29276.0661 } } +dps_results: { + key: "TestBalance-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 28375.47506 + tps: 28370.18429 + } +} +dps_results: { + key: "TestBalance-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 28232.27518 + tps: 28228.11136 + } +} +dps_results: { + key: "TestBalance-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} dps_results: { key: "TestBalance-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1352,6 +1394,90 @@ dps_results: { tps: 28656.35114 } } +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 28130.05353 + tps: 28128.78792 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 28202.42142 + tps: 28199.9689 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 27984.11699 + tps: 27983.26475 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 28047.52024 + tps: 28046.55085 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} +dps_results: { + key: "TestBalance-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} dps_results: { key: "TestBalance-AllItems-ScalesofLife-68915" value: { @@ -1816,6 +1942,13 @@ dps_results: { tps: 26872.90784 } } +dps_results: { + key: "TestBalance-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} dps_results: { key: "TestBalance-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1823,6 +1956,13 @@ dps_results: { tps: 27866.34674 } } +dps_results: { + key: "TestBalance-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 27982.17132 + tps: 27983.33114 + } +} dps_results: { key: "TestBalance-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1830,6 +1970,13 @@ dps_results: { tps: 26872.90784 } } +dps_results: { + key: "TestBalance-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} dps_results: { key: "TestBalance-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1879,11 +2026,25 @@ dps_results: { tps: 26872.90784 } } +dps_results: { + key: "TestBalance-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} dps_results: { key: "TestBalance-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 27749.33371 - tps: 27753.30543 + dps: 27745.49666 + tps: 27749.23177 + } +} +dps_results: { + key: "TestBalance-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 27861.56084 + tps: 27864.16809 } } dps_results: { @@ -1893,6 +2054,13 @@ dps_results: { tps: 26872.90784 } } +dps_results: { + key: "TestBalance-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 26853.23227 + tps: 26872.90784 + } +} dps_results: { key: "TestBalance-AllItems-WillofUnbinding-77198" value: { diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 965130be23..b6f3812319 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -288,6 +288,48 @@ dps_results: { tps: 44551.10952 } } +dps_results: { + key: "TestFeral-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 32693.36993 + tps: 42960.81121 + } +} +dps_results: { + key: "TestFeral-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 30472.70688 + tps: 42209.9693 + } +} +dps_results: { + key: "TestFeral-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 31297.18817 + tps: 43087.80585 + } +} +dps_results: { + key: "TestFeral-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 32789.56075 + tps: 44025.75567 + } +} +dps_results: { + key: "TestFeral-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 30451.89097 + tps: 42178.62167 + } +} +dps_results: { + key: "TestFeral-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 31411.46698 + tps: 43168.02993 + } +} dps_results: { key: "TestFeral-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1345,6 +1387,90 @@ dps_results: { tps: 42944.39642 } } +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 32268.09222 + tps: 43007.85616 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 32413.22328 + tps: 43139.70921 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 30472.70688 + tps: 42209.9693 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 30472.70688 + tps: 42209.9693 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 31158.67861 + tps: 42947.23016 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 31200.39009 + tps: 42998.27281 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 32426.45577 + tps: 43963.55541 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 32466.1948 + tps: 44398.17973 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 30459.43575 + tps: 42110.96042 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 30456.52233 + tps: 42111.61948 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 31229.73342 + tps: 43650.11261 + } +} +dps_results: { + key: "TestFeral-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 31291.05062 + tps: 43279.80907 + } +} dps_results: { key: "TestFeral-AllItems-ScalesofLife-68915" value: { @@ -1816,6 +1942,13 @@ dps_results: { tps: 42470.60631 } } +dps_results: { + key: "TestFeral-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 32016.64642 + tps: 42696.75934 + } +} dps_results: { key: "TestFeral-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1823,6 +1956,13 @@ dps_results: { tps: 42209.9693 } } +dps_results: { + key: "TestFeral-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 30472.70688 + tps: 42209.9693 + } +} dps_results: { key: "TestFeral-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1830,6 +1970,13 @@ dps_results: { tps: 42654.77938 } } +dps_results: { + key: "TestFeral-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 31093.59001 + tps: 42741.64226 + } +} dps_results: { key: "TestFeral-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1875,22 +2022,43 @@ dps_results: { dps_results: { key: "TestFeral-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 32092.5365 - tps: 44697.51398 + dps: 32036.80804 + tps: 44828.14074 + } +} +dps_results: { + key: "TestFeral-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 32242.20239 + tps: 44018.99287 } } dps_results: { key: "TestFeral-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 30459.43575 - tps: 42110.96042 + dps: 30476.82925 + tps: 42312.27644 + } +} +dps_results: { + key: "TestFeral-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 30446.93736 + tps: 41946.74216 } } dps_results: { key: "TestFeral-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 31161.43527 - tps: 43117.5235 + dps: 31168.62141 + tps: 43254.31545 + } +} +dps_results: { + key: "TestFeral-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 31154.60415 + tps: 44015.80547 } } dps_results: { diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results index 851a203d53..eb6627b41b 100644 --- a/sim/druid/guardian/TestGuardian.results +++ b/sim/druid/guardian/TestGuardian.results @@ -323,6 +323,54 @@ dps_results: { hps: 317.52538 } } +dps_results: { + key: "TestGuardian-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 10267.64375 + tps: 51404.86147 + hps: 319.10667 + } +} +dps_results: { + key: "TestGuardian-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 9610.92565 + tps: 48121.43617 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 9859.01736 + tps: 49361.8947 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 10185.59188 + tps: 50995.50646 + hps: 320.53125 + } +} +dps_results: { + key: "TestGuardian-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 9597.44853 + tps: 48054.14472 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 9825.51749 + tps: 49194.48951 + hps: 314.83292 + } +} dps_results: { key: "TestGuardian-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1547,6 +1595,102 @@ dps_results: { hps: 317.68208 } } +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 10194.62371 + tps: 51040.14124 + hps: 320.53125 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 10216.2333 + tps: 51148.0742 + hps: 320.53125 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 9610.92565 + tps: 48121.43617 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 9610.92565 + tps: 48121.43617 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 9819.01911 + tps: 49161.90345 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 9830.81346 + tps: 49220.87523 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 10076.91295 + tps: 50452.19685 + hps: 320.53125 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 10113.21607 + tps: 50633.95659 + hps: 319.10667 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 9597.44853 + tps: 48054.14472 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 9597.44853 + tps: 48054.14472 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 9789.1611 + tps: 49012.70759 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 9802.42416 + tps: 49079.0229 + hps: 314.83292 + } +} dps_results: { key: "TestGuardian-AllItems-ScalesofLife-69109" value: { @@ -2067,6 +2211,14 @@ dps_results: { hps: 320.53125 } } +dps_results: { + key: "TestGuardian-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 10144.86654 + tps: 50791.10813 + hps: 320.53125 + } +} dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -2075,6 +2227,14 @@ dps_results: { hps: 314.83292 } } +dps_results: { + key: "TestGuardian-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 9610.92565 + tps: 48121.43617 + hps: 314.83292 + } +} dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -2083,6 +2243,14 @@ dps_results: { hps: 314.83292 } } +dps_results: { + key: "TestGuardian-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 9794.9176 + tps: 49041.39591 + hps: 314.83292 + } +} dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -2134,8 +2302,16 @@ dps_results: { dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 9990.72511 - tps: 50021.04824 + dps: 9906.08255 + tps: 49598.20339 + hps: 316.2575 + } +} +dps_results: { + key: "TestGuardian-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 10026.18924 + tps: 50198.72243 hps: 317.68208 } } @@ -2147,11 +2323,27 @@ dps_results: { hps: 314.83292 } } +dps_results: { + key: "TestGuardian-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 9597.44853 + tps: 48054.14472 + hps: 314.83292 + } +} dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 9750.01019 - tps: 48816.95305 + dps: 9750.00943 + tps: 48816.94924 + hps: 314.83292 + } +} +dps_results: { + key: "TestGuardian-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 9766.697 + tps: 48900.38707 hps: 314.83292 } } diff --git a/sim/hunter/beast_mastery/TestBM.results b/sim/hunter/beast_mastery/TestBM.results index 02fc6e55d8..cdcb03505f 100644 --- a/sim/hunter/beast_mastery/TestBM.results +++ b/sim/hunter/beast_mastery/TestBM.results @@ -316,6 +316,48 @@ dps_results: { tps: 18635.34548 } } +dps_results: { + key: "TestBM-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 22258.21796 + tps: 18779.80225 + } +} +dps_results: { + key: "TestBM-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 22327.23666 + tps: 18858.20132 + } +} +dps_results: { + key: "TestBM-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} dps_results: { key: "TestBM-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1415,6 +1457,90 @@ dps_results: { tps: 17863.87554 } } +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 22003.00364 + tps: 18560.29098 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 22055.09046 + tps: 18602.84931 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 22071.13161 + tps: 18631.92637 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 22257.38278 + tps: 18790.48744 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} +dps_results: { + key: "TestBM-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} dps_results: { key: "TestBM-AllItems-ScalesofLife-68915" value: { @@ -1896,6 +2022,13 @@ dps_results: { tps: 18371.90937 } } +dps_results: { + key: "TestBM-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 21871.20616 + tps: 18451.42186 + } +} dps_results: { key: "TestBM-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1903,6 +2036,13 @@ dps_results: { tps: 17632.35153 } } +dps_results: { + key: "TestBM-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} dps_results: { key: "TestBM-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1910,6 +2050,13 @@ dps_results: { tps: 17632.35153 } } +dps_results: { + key: "TestBM-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} dps_results: { key: "TestBM-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1955,8 +2102,15 @@ dps_results: { dps_results: { key: "TestBM-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 21835.92466 - tps: 18421.28384 + dps: 21885.48942 + tps: 18470.24065 + } +} +dps_results: { + key: "TestBM-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 22002.18705 + tps: 18576.67928 } } dps_results: { @@ -1966,6 +2120,13 @@ dps_results: { tps: 17632.35153 } } +dps_results: { + key: "TestBM-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} dps_results: { key: "TestBM-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { @@ -1973,6 +2134,13 @@ dps_results: { tps: 17632.35153 } } +dps_results: { + key: "TestBM-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 20882.39663 + tps: 17632.35153 + } +} dps_results: { key: "TestBM-AllItems-Vishanka,JawsoftheEarth-78359" value: { diff --git a/sim/hunter/marksmanship/TestMM.results b/sim/hunter/marksmanship/TestMM.results index 8a8acbc4a1..42a4e65114 100644 --- a/sim/hunter/marksmanship/TestMM.results +++ b/sim/hunter/marksmanship/TestMM.results @@ -316,6 +316,48 @@ dps_results: { tps: 19698.99193 } } +dps_results: { + key: "TestMM-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 22082.42029 + tps: 19786.08917 + } +} +dps_results: { + key: "TestMM-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 21005.51626 + tps: 18832.04646 + } +} +dps_results: { + key: "TestMM-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 20804.36191 + tps: 18630.89211 + } +} +dps_results: { + key: "TestMM-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 22222.85564 + tps: 19896.70657 + } +} +dps_results: { + key: "TestMM-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 21049.62144 + tps: 18876.15165 + } +} +dps_results: { + key: "TestMM-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 20804.36191 + tps: 18630.89211 + } +} dps_results: { key: "TestMM-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1415,6 +1457,90 @@ dps_results: { tps: 19006.88497 } } +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 21867.22482 + tps: 19590.79769 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 21932.9742 + tps: 19651.28986 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 20973.08542 + tps: 18799.61563 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 20982.64836 + tps: 18809.17857 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 20804.36191 + tps: 18630.89211 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 20804.36191 + tps: 18630.89211 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 21997.91671 + tps: 19683.9682 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 22071.77557 + tps: 19759.35578 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 21007.44702 + tps: 18833.97722 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 21015.89841 + tps: 18842.42861 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 20804.36191 + tps: 18630.89211 + } +} +dps_results: { + key: "TestMM-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 20804.36191 + tps: 18630.89211 + } +} dps_results: { key: "TestMM-AllItems-ScalesofLife-68915" value: { @@ -1896,6 +2022,13 @@ dps_results: { tps: 19391.24593 } } +dps_results: { + key: "TestMM-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 21738.24377 + tps: 19474.49509 + } +} dps_results: { key: "TestMM-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1903,6 +2036,13 @@ dps_results: { tps: 18764.35748 } } +dps_results: { + key: "TestMM-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 20953.54377 + tps: 18780.07397 + } +} dps_results: { key: "TestMM-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1910,6 +2050,13 @@ dps_results: { tps: 18630.89211 } } +dps_results: { + key: "TestMM-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 20804.36191 + tps: 18630.89211 + } +} dps_results: { key: "TestMM-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1955,15 +2102,29 @@ dps_results: { dps_results: { key: "TestMM-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 21740.12197 - tps: 19455.285 + dps: 21724.12282 + tps: 19445.7229 + } +} +dps_results: { + key: "TestMM-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 21881.85027 + tps: 19586.07686 } } dps_results: { key: "TestMM-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 20810.74148 - tps: 18637.27168 + dps: 20962.14898 + tps: 18788.67918 + } +} +dps_results: { + key: "TestMM-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 20983.32073 + tps: 18809.85093 } } dps_results: { @@ -1973,6 +2134,13 @@ dps_results: { tps: 18630.89211 } } +dps_results: { + key: "TestMM-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 20804.36191 + tps: 18630.89211 + } +} dps_results: { key: "TestMM-AllItems-Vishanka,JawsoftheEarth-78359" value: { diff --git a/sim/hunter/mm_talents.go b/sim/hunter/mm_talents.go index 6c718d31b1..8b15a442da 100644 --- a/sim/hunter/mm_talents.go +++ b/sim/hunter/mm_talents.go @@ -312,14 +312,14 @@ func (hunter *Hunter) registerSicEm() { core.MakePermanent(hunter.RegisterAura(core.Aura{ Label: "Sic'Em Mod", OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if spell == hunter.ArcaneShot || spell == hunter.AimedShot || spell == hunter.ExplosiveShot { + if spell == hunter.ArcaneShot || spell == hunter.AimedShot || spell.ClassSpellMask == HunterSpellExplosiveShot { if result.DidCrit() { sicEmAura.Activate(sim) } } }, OnPeriodicDamageDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if spell == hunter.ExplosiveShot { + if spell.ClassSpellMask == HunterSpellExplosiveShot { if result.DidCrit() { sicEmAura.Activate(sim) } diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results index e14df145ad..05da9691e5 100644 --- a/sim/hunter/survival/TestSV.results +++ b/sim/hunter/survival/TestSV.results @@ -38,2058 +38,2226 @@ character_stats_results: { dps_results: { key: "TestSV-AllItems-AgileShadowspiritDiamond" value: { - dps: 25695.89141 - tps: 23152.73683 + dps: 26628.76559 + tps: 24102.26985 } } dps_results: { key: "TestSV-AllItems-AgonyandTorment" value: { - dps: 24806.29044 - tps: 22358.55197 + dps: 25594.82538 + tps: 23143.52189 } } dps_results: { key: "TestSV-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 21702.93423 - tps: 19587.05861 + dps: 22341.93416 + tps: 20229.80215 } } dps_results: { key: "TestSV-AllItems-Althor'sAbacus-50366" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 25323.10084 - tps: 22870.51725 + dps: 26274.79583 + tps: 23838.28149 } } dps_results: { key: "TestSV-AllItems-Anhuur'sHymnal-55889" value: { - dps: 24308.47047 - tps: 21911.05464 + dps: 25185.7824 + tps: 22805.73686 } } dps_results: { key: "TestSV-AllItems-Anhuur'sHymnal-56407" value: { - dps: 24308.47047 - tps: 21911.05464 + dps: 25185.7824 + tps: 22805.73686 } } dps_results: { key: "TestSV-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 23986.23498 - tps: 21631.36991 + dps: 24876.75446 + tps: 22531.65729 } } dps_results: { key: "TestSV-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 23989.6297 - tps: 21634.54212 + dps: 24879.11969 + tps: 22534.02252 } } dps_results: { key: "TestSV-AllItems-ArrowofTime-72897" value: { - dps: 25571.41219 - tps: 23025.03745 + dps: 26558.79247 + tps: 24030.17962 } } dps_results: { key: "TestSV-AllItems-AustereShadowspiritDiamond" value: { - dps: 25131.7824 - tps: 22608.85398 + dps: 26025.35165 + tps: 23520.72417 } } dps_results: { key: "TestSV-AllItems-BaubleofTrueBlood-50726" value: { - dps: 23977.25219 - tps: 21624.01141 - hps: 95.75354 + dps: 24859.39521 + tps: 22516.71662 + hps: 95.57226 } } dps_results: { key: "TestSV-AllItems-BedrockTalisman-58182" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-BellofEnragingResonance-59326" value: { - dps: 24305.41653 - tps: 21917.72826 + dps: 25177.39167 + tps: 22802.36649 } } dps_results: { key: "TestSV-AllItems-BellofEnragingResonance-65053" value: { - dps: 24344.09027 - tps: 21952.8814 + dps: 25223.72242 + tps: 22844.28894 } } dps_results: { key: "TestSV-AllItems-BindingPromise-67037" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-BlackBruise-50692" value: { - dps: 23930.99586 - tps: 21562.73109 + dps: 24776.24298 + tps: 22426.41862 } } dps_results: { key: "TestSV-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 24764.19641 - tps: 22353.71402 + dps: 25609.83406 + tps: 23214.41091 } } dps_results: { key: "TestSV-AllItems-BloodofIsiset-55995" value: { - dps: 24193.55839 - tps: 21840.24156 + dps: 25086.58691 + tps: 22743.7783 } } dps_results: { key: "TestSV-AllItems-BloodofIsiset-56414" value: { - dps: 24221.84063 - tps: 21868.47561 + dps: 25116.38984 + tps: 22773.53304 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 25035.72975 - tps: 22586.04923 + dps: 25893.75963 + tps: 23455.91043 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 24292.11185 - tps: 21905.73315 + dps: 25166.45282 + tps: 22792.60464 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 25115.86726 - tps: 22640.25336 + dps: 26046.94448 + tps: 23589.0004 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Bone-LinkFetish-77210" value: { - dps: 24857.47141 - tps: 22504.30446 + dps: 25580.69108 + tps: 23236.88696 } } dps_results: { key: "TestSV-AllItems-Bone-LinkFetish-77982" value: { - dps: 24720.64167 - tps: 22366.62156 + dps: 25519.0194 + tps: 23169.50605 } } dps_results: { key: "TestSV-AllItems-Bone-LinkFetish-78002" value: { - dps: 24875.32087 - tps: 22511.87643 + dps: 25778.22803 + tps: 23428.56803 } } dps_results: { key: "TestSV-AllItems-BottledLightning-66879" value: { - dps: 24077.37693 - tps: 21718.58143 + dps: 24956.05179 + tps: 22608.02045 } } dps_results: { key: "TestSV-AllItems-BottledWishes-77114" value: { - dps: 24409.19121 - tps: 22005.75428 + dps: 25301.51973 + tps: 22909.87487 } } dps_results: { key: "TestSV-AllItems-BottledWishes-77985" value: { - dps: 24361.73943 - tps: 21958.56421 + dps: 25177.36907 + tps: 22790.75188 } } dps_results: { key: "TestSV-AllItems-BottledWishes-78005" value: { - dps: 24328.01445 - tps: 21925.51635 + dps: 25288.63477 + tps: 22881.42478 } } dps_results: { key: "TestSV-AllItems-BracingShadowspiritDiamond" value: { - dps: 25131.7824 - tps: 22156.6769 + dps: 26025.35165 + tps: 23050.30969 } } dps_results: { key: "TestSV-AllItems-Brawler'sTrophy-232015" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 25697.02864 - tps: 23153.74572 + dps: 26629.86553 + tps: 24103.15015 } } dps_results: { key: "TestSV-AllItems-BurningShadowspiritDiamond" value: { - dps: 25521.19422 - tps: 22997.17987 + dps: 26432.65197 + tps: 23926.93857 + } +} +dps_results: { + key: "TestSV-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 26539.10531 + tps: 24060.84166 + } +} +dps_results: { + key: "TestSV-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 26650.00859 + tps: 24122.85769 + } +} +dps_results: { + key: "TestSV-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 25564.23411 - tps: 23034.23988 + dps: 26505.88309 + tps: 23993.41574 } } dps_results: { key: "TestSV-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 24759.50784 - tps: 22323.80223 + dps: 25635.05303 + tps: 23211.20984 } } dps_results: { key: "TestSV-AllItems-CoreofRipeness-58184" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-CorpseTongueCoin-50349" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-CrecheoftheFinalDragon-77205" value: { - dps: 24844.38986 - tps: 22410.68425 + dps: 25700.02042 + tps: 23280.22879 } } dps_results: { key: "TestSV-AllItems-CrecheoftheFinalDragon-77972" value: { - dps: 24734.26065 - tps: 22310.98918 + dps: 25619.70418 + tps: 23207.00317 } } dps_results: { key: "TestSV-AllItems-CrecheoftheFinalDragon-77992" value: { - dps: 24939.6791 - tps: 22505.26241 + dps: 25748.89542 + tps: 23321.09962 } } dps_results: { key: "TestSV-AllItems-CrushingWeight-59506" value: { - dps: 23976.78736 - tps: 21619.15565 + dps: 24881.48302 + tps: 22528.64971 } } dps_results: { key: "TestSV-AllItems-CrushingWeight-65118" value: { - dps: 23984.3015 - tps: 21626.19241 + dps: 24846.61356 + tps: 22496.04438 } } dps_results: { key: "TestSV-AllItems-CunningoftheCruel-77208" value: { - dps: 24430.48212 - tps: 22077.32051 + dps: 25308.72186 + tps: 22966.09378 } } dps_results: { key: "TestSV-AllItems-CunningoftheCruel-77980" value: { - dps: 24355.02796 - tps: 22001.6936 + dps: 25237.94772 + tps: 22895.21238 } } dps_results: { key: "TestSV-AllItems-CunningoftheCruel-78000" value: { - dps: 24482.63319 - tps: 22129.49969 + dps: 25359.39755 + tps: 23016.57086 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 24432.00236 - tps: 22090.53899 + dps: 25258.97151 + tps: 22900.59544 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 25458.72321 - tps: 23007.27958 + dps: 26329.51214 + tps: 23864.08081 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 24257.96969 - tps: 21904.06823 + dps: 25155.06487 + tps: 22812.1751 } } dps_results: { key: "TestSV-AllItems-Deathbringer'sWill-50363" value: { - dps: 24656.03012 - tps: 22224.9422 + dps: 25528.3111 + tps: 23109.20883 } } dps_results: { key: "TestSV-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 25172.61722 - tps: 22643.70892 + dps: 26094.50004 + tps: 23583.11862 } } dps_results: { key: "TestSV-AllItems-DislodgedForeignObject-50348" value: { - dps: 24192.76368 - tps: 21824.32965 + dps: 25078.72867 + tps: 22694.31977 } } dps_results: { key: "TestSV-AllItems-Dragonwrath,Tarecgosa'sRest-71086" value: { - dps: 25892.75175 - tps: 23313.78519 + dps: 26899.34811 + tps: 24329.99395 } } dps_results: { key: "TestSV-AllItems-Dwyer'sCaber-70141" value: { - dps: 24415.80518 - tps: 22018.72439 + dps: 25303.47847 + tps: 22917.90605 } } dps_results: { key: "TestSV-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 25131.7824 - tps: 22608.85398 + dps: 26025.35165 + tps: 23520.72417 } } dps_results: { key: "TestSV-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-EmberShadowspiritDiamond" value: { - dps: 25131.7824 - tps: 22608.85398 + dps: 26025.35165 + tps: 23520.72417 } } dps_results: { key: "TestSV-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 25172.61722 - tps: 22643.70892 + dps: 26094.50004 + tps: 23583.11862 } } dps_results: { key: "TestSV-AllItems-EssenceoftheCyclone-59473" value: { - dps: 25489.64547 - tps: 22985.14068 + dps: 26349.31409 + tps: 23853.26839 } } dps_results: { key: "TestSV-AllItems-EssenceoftheCyclone-65140" value: { - dps: 25600.94176 - tps: 23085.30373 + dps: 26537.90003 + tps: 24029.89862 } } dps_results: { key: "TestSV-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 24305.83031 - tps: 21952.32219 + dps: 25204.8955 + tps: 22861.89559 } } dps_results: { key: "TestSV-AllItems-EternalShadowspiritDiamond" value: { - dps: 25131.7824 - tps: 22608.85398 + dps: 26025.35165 + tps: 23520.72417 } } dps_results: { key: "TestSV-AllItems-EyeofUnmaking-77200" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-EyeofUnmaking-77977" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-EyeofUnmaking-77997" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-FallofMortality-59500" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-FallofMortality-65124" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-FieryQuintessence-69000" value: { - dps: 23954.38834 - tps: 21624.65153 + dps: 24791.57229 + tps: 22476.65652 } } dps_results: { key: "TestSV-AllItems-Figurine-DemonPanther-52199" value: { - dps: 25248.33087 - tps: 22773.2267 + dps: 26134.68527 + tps: 23671.44452 } } dps_results: { key: "TestSV-AllItems-Figurine-DreamOwl-52354" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Figurine-KingofBoars-52351" value: { - dps: 24221.84063 - tps: 21868.47561 + dps: 25116.38984 + tps: 22773.53304 } } dps_results: { key: "TestSV-AllItems-FireoftheDeep-77117" value: { - dps: 24370.10813 - tps: 22016.49049 + dps: 25272.62942 + tps: 22929.52 } } dps_results: { key: "TestSV-AllItems-FireoftheDeep-77988" value: { - dps: 24325.54217 - tps: 21972.00047 + dps: 25225.66723 + tps: 22882.63374 } } dps_results: { key: "TestSV-AllItems-FireoftheDeep-78008" value: { - dps: 24420.67334 - tps: 22066.96955 + dps: 25325.91344 + tps: 22982.71787 } } dps_results: { key: "TestSV-AllItems-Flamewaker'sBattlegear" value: { - dps: 26712.14042 - tps: 24152.08487 + dps: 26819.88985 + tps: 24275.461 } } dps_results: { key: "TestSV-AllItems-FleetShadowspiritDiamond" value: { - dps: 25180.29793 - tps: 22657.28106 + dps: 26076.24158 + tps: 23571.52567 } } dps_results: { key: "TestSV-AllItems-FluidDeath-58181" value: { - dps: 25515.04964 - tps: 22990.93167 + dps: 26498.57091 + tps: 23989.26686 } } dps_results: { key: "TestSV-AllItems-ForlornShadowspiritDiamond" value: { - dps: 25131.7824 - tps: 22608.85398 + dps: 26025.35165 + tps: 23520.72417 } } dps_results: { key: "TestSV-AllItems-FoulGiftoftheDemonLord-72898" value: { - dps: 24315.88241 - tps: 21962.51598 + dps: 25216.60225 + tps: 22873.74405 } } dps_results: { key: "TestSV-AllItems-FuryofAngerforge-59461" value: { - dps: 24305.41653 - tps: 21917.72826 + dps: 25177.39167 + tps: 22802.36649 } } dps_results: { key: "TestSV-AllItems-GaleofShadows-56138" value: { - dps: 24247.25394 - tps: 21873.62636 + dps: 25061.71947 + tps: 22687.32971 } } dps_results: { key: "TestSV-AllItems-GaleofShadows-56462" value: { - dps: 24298.83579 - tps: 21930.00138 + dps: 25112.19566 + tps: 22736.13881 } } dps_results: { key: "TestSV-AllItems-GearDetector-61462" value: { - dps: 24744.64822 - tps: 22306.06979 + dps: 25491.49204 + tps: 23051.46036 } } dps_results: { key: "TestSV-AllItems-Gladiator'sPursuit" value: { - dps: 22556.64123 - tps: 20303.13864 + dps: 23174.40458 + tps: 20940.88044 } } dps_results: { key: "TestSV-AllItems-GlowingTwilightScale-54589" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-GraceoftheHerald-55266" value: { - dps: 24760.18342 - tps: 22324.16128 + dps: 25658.94269 + tps: 23231.30297 } } dps_results: { key: "TestSV-AllItems-GraceoftheHerald-56295" value: { - dps: 25134.55174 - tps: 22656.89836 + dps: 26065.98599 + tps: 23595.30931 } } dps_results: { key: "TestSV-AllItems-Gurthalak,VoiceoftheDeeps-77191" value: { - dps: 25695.89141 - tps: 23152.73683 + dps: 26628.76559 + tps: 24102.26985 } } dps_results: { key: "TestSV-AllItems-Gurthalak,VoiceoftheDeeps-78478" value: { - dps: 25695.89141 - tps: 23152.73683 + dps: 26628.76559 + tps: 24102.26985 } } dps_results: { key: "TestSV-AllItems-Gurthalak,VoiceoftheDeeps-78487" value: { - dps: 25695.89141 - tps: 23152.73683 + dps: 26628.76559 + tps: 24102.26985 } } dps_results: { key: "TestSV-AllItems-HarmlightToken-63839" value: { - dps: 23984.92967 - tps: 21631.93284 + dps: 24866.41647 + tps: 22523.92408 } } dps_results: { key: "TestSV-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 23990.15492 - tps: 21637.20606 + dps: 24872.23834 + tps: 22529.79769 } } dps_results: { key: "TestSV-AllItems-HeartofIgnacious-59514" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-HeartofIgnacious-65110" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-HeartofRage-59224" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-HeartofRage-65072" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-HeartofSolace-55868" value: { - dps: 24247.25394 - tps: 21873.62636 + dps: 25061.71947 + tps: 22687.32971 } } dps_results: { key: "TestSV-AllItems-HeartofSolace-56393" value: { - dps: 24298.83579 - tps: 21930.00138 + dps: 25112.19566 + tps: 22736.13881 } } dps_results: { key: "TestSV-AllItems-HeartofThunder-55845" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-HeartofThunder-56370" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-HeartoftheVile-66969" value: { - dps: 24880.62996 - tps: 22429.54698 + dps: 25795.87922 + tps: 23355.38242 } } dps_results: { key: "TestSV-AllItems-Heartpierce-50641" value: { - dps: 25847.28672 - tps: 23286.4882 + dps: 26804.8428 + tps: 24262.22112 } } dps_results: { key: "TestSV-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 25172.61722 - tps: 22643.70892 + dps: 26094.50004 + tps: 23583.11862 } } dps_results: { key: "TestSV-AllItems-ImpatienceofYouth-62464" value: { - dps: 24252.69398 - tps: 21899.27639 + dps: 25148.90212 + tps: 22805.99275 } } dps_results: { key: "TestSV-AllItems-ImpatienceofYouth-62469" value: { - dps: 24252.69398 - tps: 21899.27639 + dps: 25148.90212 + tps: 22805.99275 } } dps_results: { key: "TestSV-AllItems-ImpetuousQuery-55881" value: { - dps: 24193.55839 - tps: 21840.24156 + dps: 25086.58691 + tps: 22743.7783 } } dps_results: { key: "TestSV-AllItems-ImpetuousQuery-56406" value: { - dps: 24221.84063 - tps: 21868.47561 + dps: 25116.38984 + tps: 22773.53304 } } dps_results: { key: "TestSV-AllItems-IndomitablePride-77211" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-IndomitablePride-77983" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-IndomitablePride-78003" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-InsigniaoftheCorruptedMind-77203" value: { - dps: 24465.9594 - tps: 22006.33148 + dps: 25302.63862 + tps: 22847.68508 } } dps_results: { key: "TestSV-AllItems-InsigniaoftheCorruptedMind-77971" value: { - dps: 24456.6465 - tps: 22020.0884 + dps: 25284.67433 + tps: 22874.38774 } } dps_results: { key: "TestSV-AllItems-InsigniaoftheCorruptedMind-77991" value: { - dps: 24603.95292 - tps: 22148.10544 + dps: 25437.13099 + tps: 22983.97103 } } dps_results: { key: "TestSV-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 24139.37401 - tps: 21789.76371 + dps: 25003.83253 + tps: 22668.46184 } } dps_results: { key: "TestSV-AllItems-JarofAncientRemedies-59354" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-JarofAncientRemedies-65029" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-JawsofDefeat-68926" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-JawsofDefeat-69111" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-JujuofNimbleness-63840" value: { - dps: 24764.19641 - tps: 22353.71402 + dps: 25609.83406 + tps: 23214.41091 } } dps_results: { key: "TestSV-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 25278.59886 - tps: 22774.41108 + dps: 26180.15634 + tps: 23700.65299 } } dps_results: { key: "TestSV-AllItems-Kiril,FuryofBeasts-77194" value: { - dps: 28373.4221 - tps: 25546.12122 + dps: 29521.43491 + tps: 26713.50875 } } dps_results: { key: "TestSV-AllItems-Kiril,FuryofBeasts-78473" value: { - dps: 28739.87223 - tps: 25878.43024 + dps: 29879.37986 + tps: 27036.91103 } } dps_results: { key: "TestSV-AllItems-Kiril,FuryofBeasts-78482" value: { - dps: 28050.28116 - tps: 25254.44456 + dps: 29169.45079 + tps: 26394.03627 } } dps_results: { key: "TestSV-AllItems-KiroptyricSigil-77113" value: { - dps: 25676.73494 - tps: 23143.46208 + dps: 26601.75191 + tps: 24081.17754 } } dps_results: { key: "TestSV-AllItems-KiroptyricSigil-77984" value: { - dps: 25483.73785 - tps: 22963.50437 + dps: 26305.18386 + tps: 23804.88848 } } dps_results: { key: "TestSV-AllItems-KiroptyricSigil-78004" value: { - dps: 25784.5482 - tps: 23231.62397 + dps: 26771.87521 + tps: 24215.45514 } } dps_results: { key: "TestSV-AllItems-KvaldirBattleStandard-59685" value: { - dps: 24182.263 - tps: 21809.96661 + dps: 25063.29421 + tps: 22688.82021 } } dps_results: { key: "TestSV-AllItems-KvaldirBattleStandard-59689" value: { - dps: 24182.263 - tps: 21809.96661 + dps: 25063.29421 + tps: 22688.82021 } } dps_results: { key: "TestSV-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 24197.96301 - tps: 21833.06997 + dps: 25004.10141 + tps: 22627.12677 } } dps_results: { key: "TestSV-AllItems-LastWord-50708" value: { - dps: 25695.89141 - tps: 23152.73683 + dps: 26628.76559 + tps: 24102.26985 } } dps_results: { key: "TestSV-AllItems-LeadenDespair-55816" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-LeadenDespair-56347" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-LeftEyeofRajh-56102" value: { - dps: 24957.40873 - tps: 22503.56777 + dps: 25901.22032 + tps: 23452.98303 } } dps_results: { key: "TestSV-AllItems-LeftEyeofRajh-56427" value: { - dps: 25141.20306 - tps: 22667.75346 + dps: 26072.27764 + tps: 23606.53268 } } dps_results: { key: "TestSV-AllItems-LicensetoSlay-58180" value: { - dps: 24308.47047 - tps: 21911.05464 + dps: 25185.7824 + tps: 22805.73686 } } dps_results: { key: "TestSV-AllItems-Lightning-ChargedBattlegear" value: { - dps: 24719.29218 - tps: 22346.17617 + dps: 25345.38058 + tps: 22979.42823 } } dps_results: { key: "TestSV-AllItems-MagnetiteMirror-55814" value: { - dps: 23973.0824 - tps: 21623.75538 + dps: 24828.81506 + tps: 22493.72765 } } dps_results: { key: "TestSV-AllItems-MagnetiteMirror-56345" value: { - dps: 23973.0824 - tps: 21623.75538 + dps: 24828.81506 + tps: 22493.72765 } } dps_results: { key: "TestSV-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-MarkofKhardros-56132" value: { - dps: 24136.65494 - tps: 21787.32792 + dps: 24994.82084 + tps: 22659.73343 } } dps_results: { key: "TestSV-AllItems-MarkofKhardros-56458" value: { - dps: 24158.07515 - tps: 21808.74813 + dps: 25016.55969 + tps: 22681.47229 } } dps_results: { key: "TestSV-AllItems-MatrixRestabilizer-68994" value: { - dps: 25994.24327 - tps: 23433.76462 + dps: 26916.78341 + tps: 24369.02935 } } dps_results: { key: "TestSV-AllItems-MatrixRestabilizer-69150" value: { - dps: 26205.84205 - tps: 23625.77516 + dps: 27143.26931 + tps: 24570.10427 } } dps_results: { key: "TestSV-AllItems-MightoftheOcean-55251" value: { - dps: 24303.2357 - tps: 21908.28505 + dps: 25179.56733 + tps: 22801.85715 } } dps_results: { key: "TestSV-AllItems-MightoftheOcean-56285" value: { - dps: 24303.2357 - tps: 21908.28505 + dps: 25179.56733 + tps: 22801.85715 } } dps_results: { key: "TestSV-AllItems-MirrorofBrokenImages-62466" value: { - dps: 24252.69398 - tps: 21899.27639 + dps: 25148.90212 + tps: 22805.99275 } } dps_results: { key: "TestSV-AllItems-MirrorofBrokenImages-62471" value: { - dps: 24252.69398 - tps: 21899.27639 + dps: 25148.90212 + tps: 22805.99275 } } dps_results: { key: "TestSV-AllItems-MithrilStopwatch-232013" value: { - dps: 24294.10139 - tps: 21907.72269 + dps: 25167.35219 + tps: 22793.12599 } } dps_results: { key: "TestSV-AllItems-MoonwellChalice-70142" value: { - dps: 24244.96905 - tps: 21892.02019 + dps: 25142.20343 + tps: 22799.76279 } } dps_results: { key: "TestSV-AllItems-MoonwellPhial-70143" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-NecromanticFocus-68982" value: { - dps: 24007.70748 - tps: 21654.75862 + dps: 24890.87911 + tps: 22548.43846 } } dps_results: { key: "TestSV-AllItems-NecromanticFocus-69139" value: { - dps: 24011.56935 - tps: 21658.62049 + dps: 24894.96605 + tps: 22552.52541 } } dps_results: { key: "TestSV-AllItems-No'Kaled,theElementsofDeath-77188" value: { - dps: 26411.36827 - tps: 23792.63388 + dps: 27427.80485 + tps: 24826.16763 } } dps_results: { key: "TestSV-AllItems-No'Kaled,theElementsofDeath-78472" value: { - dps: 26503.94484 - tps: 23875.64549 + dps: 27540.77086 + tps: 24930.33742 } } dps_results: { key: "TestSV-AllItems-No'Kaled,theElementsofDeath-78481" value: { - dps: 26327.99875 - tps: 23717.59237 + dps: 27327.01863 + tps: 24735.03204 } } dps_results: { key: "TestSV-AllItems-Oremantle'sFavor-61448" value: { - dps: 24165.38381 - tps: 21799.60099 + dps: 25052.96407 + tps: 22698.53906 } } dps_results: { key: "TestSV-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 24172.47664 - tps: 21797.00512 + dps: 25050.61039 + tps: 22685.73287 } } dps_results: { key: "TestSV-AllItems-PorcelainCrab-55237" value: { - dps: 23981.84047 - tps: 21628.89161 + dps: 24863.74402 + tps: 22521.30338 } } dps_results: { key: "TestSV-AllItems-PorcelainCrab-56280" value: { - dps: 23984.76664 - tps: 21631.81778 + dps: 24866.40549 + tps: 22523.96485 } } dps_results: { key: "TestSV-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 25131.7824 - tps: 22608.85398 + dps: 26025.35165 + tps: 23520.72417 } } dps_results: { key: "TestSV-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 25417.13943 - tps: 22886.03435 + dps: 26178.78004 + tps: 23672.18686 } } dps_results: { key: "TestSV-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 25489.29116 - tps: 22971.1912 + dps: 26450.39558 + tps: 23940.74124 } } dps_results: { key: "TestSV-AllItems-Rainsong-55854" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Rainsong-56377" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Rathrak,thePoisonousMind-77195" value: { - dps: 23874.91536 - tps: 21514.5858 + dps: 24716.9247 + tps: 22374.96278 } } dps_results: { key: "TestSV-AllItems-Rathrak,thePoisonousMind-78475" value: { - dps: 23878.17865 - tps: 21517.84909 + dps: 24720.16871 + tps: 22378.20678 } } dps_results: { key: "TestSV-AllItems-Rathrak,thePoisonousMind-78484" value: { - dps: 23869.58346 - tps: 21509.2539 + dps: 24711.58086 + tps: 22369.61893 } } dps_results: { key: "TestSV-AllItems-ReflectionoftheLight-77115" value: { - dps: 23973.0824 - tps: 21623.75538 + dps: 24828.81506 + tps: 22493.72765 } } dps_results: { key: "TestSV-AllItems-ReflectionoftheLight-77986" value: { - dps: 23973.0824 - tps: 21623.75538 + dps: 24828.81506 + tps: 22493.72765 } } dps_results: { key: "TestSV-AllItems-ReflectionoftheLight-78006" value: { - dps: 23973.0824 - tps: 21623.75538 + dps: 24828.81506 + tps: 22493.72765 } } dps_results: { key: "TestSV-AllItems-ResolveofUndying-77201" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ResolveofUndying-77978" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ResolveofUndying-77998" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 25521.19422 - tps: 22997.17987 + dps: 26432.65197 + tps: 23926.93857 } } dps_results: { key: "TestSV-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 25521.19422 - tps: 22997.17987 + dps: 26432.65197 + tps: 23926.93857 } } dps_results: { key: "TestSV-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 25462.56231 - tps: 22962.09382 + dps: 26365.09943 + tps: 23875.3912 } } dps_results: { key: "TestSV-AllItems-RightEyeofRajh-56100" value: { - dps: 24308.47047 - tps: 21911.05464 + dps: 25185.7824 + tps: 22805.73686 } } dps_results: { key: "TestSV-AllItems-RightEyeofRajh-56431" value: { - dps: 24308.47047 - tps: 21911.05464 + dps: 25185.7824 + tps: 22805.73686 } } dps_results: { key: "TestSV-AllItems-RosaryofLight-72901" value: { - dps: 24483.87367 - tps: 22076.83779 + dps: 25355.89024 + tps: 22960.30052 } } dps_results: { key: "TestSV-AllItems-RottingSkull-77116" value: { - dps: 24436.75803 - tps: 22041.15808 + dps: 25288.64246 + tps: 22904.10858 } } dps_results: { key: "TestSV-AllItems-RottingSkull-77987" value: { - dps: 24383.1409 - tps: 21993.57401 + dps: 25228.35725 + tps: 22849.62707 } } dps_results: { key: "TestSV-AllItems-RottingSkull-78007" value: { - dps: 24511.61508 - tps: 22109.31648 + dps: 25369.92379 + tps: 22979.63477 } } dps_results: { key: "TestSV-AllItems-RuneofZeth-68998" value: { - dps: 24371.64884 - tps: 21977.25466 + dps: 25242.63521 + tps: 22859.27591 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 26266.09864 + tps: 23810.9118 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 26345.57953 + tps: 23883.78854 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 26443.65644 + tps: 23939.3286 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 26505.02798 + tps: 23998.37075 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ScalesofLife-68915" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 hps: 312.86699 } } dps_results: { key: "TestSV-AllItems-ScalesofLife-69109" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 hps: 352.91104 } } dps_results: { key: "TestSV-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 24767.96587 - tps: 22329.90843 + dps: 25673.99685 + tps: 23247.23103 } } dps_results: { key: "TestSV-AllItems-SeaStar-55256" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-SeaStar-56290" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Shadowmourne-49623" value: { - dps: 25850.53252 - tps: 23301.49734 + dps: 26851.15053 + tps: 24298.11243 } } dps_results: { key: "TestSV-AllItems-ShardofWoe-60233" value: { - dps: 24234.54897 - tps: 21843.61591 + dps: 25089.41026 + tps: 22701.33918 } } dps_results: { key: "TestSV-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 24008.30314 - tps: 21650.34999 + dps: 24857.54982 + tps: 22510.17883 } } dps_results: { key: "TestSV-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Skardyn'sGrace-56115" value: { - dps: 25020.92504 - tps: 22576.66663 + dps: 25940.69682 + tps: 23507.08329 } } dps_results: { key: "TestSV-AllItems-Skardyn'sGrace-56440" value: { - dps: 25149.11976 - tps: 22693.84906 + dps: 26075.30247 + tps: 23631.53583 } } dps_results: { key: "TestSV-AllItems-Sorrowsong-55879" value: { - dps: 24193.55839 - tps: 21840.24156 + dps: 25086.58691 + tps: 22743.7783 } } dps_results: { key: "TestSV-AllItems-Sorrowsong-56400" value: { - dps: 24221.84063 - tps: 21868.47561 + dps: 25116.38984 + tps: 22773.53304 } } dps_results: { key: "TestSV-AllItems-Soul'sAnguish-66994" value: { - dps: 24303.2357 - tps: 21908.28505 + dps: 25179.56733 + tps: 22801.85715 } } dps_results: { key: "TestSV-AllItems-SoulCasket-58183" value: { - dps: 24252.69398 - tps: 21899.27639 + dps: 25148.90212 + tps: 22805.99275 } } dps_results: { key: "TestSV-AllItems-Souldrinker-77193" value: { - dps: 25700.13175 - tps: 23156.97717 + dps: 26633.00593 + tps: 24106.51019 hps: 8.48068 } } dps_results: { key: "TestSV-AllItems-Souldrinker-78479" value: { - dps: 25700.72141 - tps: 23157.56683 + dps: 26633.5956 + tps: 24107.09985 hps: 9.66001 } } dps_results: { key: "TestSV-AllItems-Souldrinker-78488" value: { - dps: 25699.54957 - tps: 23156.39499 + dps: 26632.42375 + tps: 24105.92801 hps: 7.31631 } } dps_results: { key: "TestSV-AllItems-SoulshifterVortex-77206" value: { - dps: 24615.11907 - tps: 22259.94937 + dps: 25547.80784 + tps: 23203.14635 } } dps_results: { key: "TestSV-AllItems-SoulshifterVortex-77970" value: { - dps: 24534.60559 - tps: 22180.06413 + dps: 25464.83073 + tps: 23120.79748 } } dps_results: { key: "TestSV-AllItems-SoulshifterVortex-77990" value: { - dps: 24680.91104 - tps: 22326.04226 + dps: 25602.87699 + tps: 23258.51643 } } dps_results: { key: "TestSV-AllItems-SpidersilkSpindle-68981" value: { - dps: 24305.83031 - tps: 21952.32219 + dps: 25204.8955 + tps: 22861.89559 } } dps_results: { key: "TestSV-AllItems-SpidersilkSpindle-69138" value: { - dps: 24348.68219 - tps: 21995.10106 + dps: 25250.05145 + tps: 22906.97853 } } dps_results: { key: "TestSV-AllItems-StarcatcherCompass-77202" value: { - dps: 25973.88824 - tps: 23381.00935 + dps: 26876.01383 + tps: 24279.03799 } } dps_results: { key: "TestSV-AllItems-StarcatcherCompass-77973" value: { - dps: 25780.69409 - tps: 23196.96731 + dps: 26718.59145 + tps: 24140.53397 } } dps_results: { key: "TestSV-AllItems-StarcatcherCompass-77993" value: { - dps: 26284.22979 - tps: 23649.87826 + dps: 27260.39016 + tps: 24633.50502 } } dps_results: { key: "TestSV-AllItems-StayofExecution-68996" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Stonemother'sKiss-61411" value: { - dps: 23995.5577 - tps: 21640.12129 + dps: 24876.78617 + tps: 22530.54915 } } dps_results: { key: "TestSV-AllItems-StumpofTime-62465" value: { - dps: 24308.47047 - tps: 21911.05464 + dps: 25185.7824 + tps: 22805.73686 } } dps_results: { key: "TestSV-AllItems-StumpofTime-62470" value: { - dps: 24308.47047 - tps: 21911.05464 + dps: 25185.7824 + tps: 22805.73686 } } dps_results: { key: "TestSV-AllItems-SymbioticWorm-59332" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-SymbioticWorm-65048" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 24044.00608 - tps: 21690.92543 + dps: 24928.50571 + tps: 22585.93327 } } dps_results: { key: "TestSV-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 23990.56748 - tps: 21629.92059 + dps: 24820.66657 + tps: 22485.31331 } } dps_results: { key: "TestSV-AllItems-TearofBlood-55819" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-TearofBlood-56351" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 24161.848 - tps: 21808.5852 + dps: 25053.17151 + tps: 22710.41692 } } dps_results: { key: "TestSV-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 24221.84063 - tps: 21868.47561 + dps: 25116.38984 + tps: 22773.53304 } } dps_results: { key: "TestSV-AllItems-TheHungerer-68927" value: { - dps: 25656.23269 - tps: 23115.86104 + dps: 26503.57944 + tps: 23979.36168 } } dps_results: { key: "TestSV-AllItems-TheHungerer-69112" value: { - dps: 25717.59688 - tps: 23169.72442 + dps: 26709.04276 + tps: 24152.86509 } } dps_results: { key: "TestSV-AllItems-Theralion'sMirror-59519" value: { - dps: 23985.91508 - tps: 21632.96622 + dps: 24868.63857 + tps: 22526.19793 } } dps_results: { key: "TestSV-AllItems-Theralion'sMirror-65105" value: { - dps: 24018.27991 - tps: 21664.75668 + dps: 24901.24918 + tps: 22558.23416 } } dps_results: { key: "TestSV-AllItems-Throngus'sFinger-56121" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Throngus'sFinger-56449" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Ti'tahk,theStepsofTime-77190" value: { - dps: 25748.41558 - tps: 23192.73792 + dps: 26602.38043 + tps: 24075.35654 } } dps_results: { key: "TestSV-AllItems-Ti'tahk,theStepsofTime-78477" value: { - dps: 25690.06094 - tps: 23141.31874 + dps: 26644.72718 + tps: 24111.05183 } } dps_results: { key: "TestSV-AllItems-Ti'tahk,theStepsofTime-78486" value: { - dps: 25660.65906 - tps: 23116.69005 + dps: 26607.41868 + tps: 24083.2623 } } dps_results: { key: "TestSV-AllItems-Tia'sGrace-55874" value: { - dps: 25182.15135 - tps: 22724.17906 + dps: 26106.84204 + tps: 23659.85551 } } dps_results: { key: "TestSV-AllItems-Tia'sGrace-56394" value: { - dps: 25346.30862 - tps: 22874.56746 + dps: 26269.88252 + tps: 23810.26889 } } dps_results: { key: "TestSV-AllItems-TinyAbominationinaJar-50706" value: { - dps: 24156.54889 - tps: 21775.5834 + dps: 25034.51394 + tps: 22670.83647 } } dps_results: { key: "TestSV-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 23233.02898 - tps: 20961.95424 + dps: 24074.2698 + tps: 21811.34437 } } dps_results: { key: "TestSV-AllItems-UnheededWarning-59520" value: { - dps: 25063.87588 - tps: 22594.31998 + dps: 25977.50019 + tps: 23519.76954 } } dps_results: { key: "TestSV-AllItems-UnquenchableFlame-67101" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-UnsolvableRiddle-62463" value: { - dps: 25312.20127 - tps: 22869.83381 + dps: 26250.04032 + tps: 23818.98917 } } dps_results: { key: "TestSV-AllItems-UnsolvableRiddle-62468" value: { - dps: 25312.20127 - tps: 22869.83381 + dps: 26250.04032 + tps: 23818.98917 } } dps_results: { key: "TestSV-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 23912.03291 - tps: 21555.8414 + dps: 24713.38462 + tps: 22371.06279 } } dps_results: { key: "TestSV-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 24639.56526 - tps: 22286.5333 + dps: 25515.13319 + tps: 23172.76931 } } dps_results: { key: "TestSV-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 24691.40237 - tps: 22338.06352 + dps: 25578.13358 + tps: 23235.45643 } } dps_results: { key: "TestSV-AllItems-Varo'then'sBrooch-72899" value: { - dps: 24377.07097 - tps: 22023.3699 + dps: 25282.0586 + tps: 22938.86575 } } dps_results: { key: "TestSV-AllItems-VeilofLies-72900" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-VesselofAcceleration-68995" value: { - dps: 23981.37688 - tps: 21628.42802 + dps: 24860.46682 + tps: 22518.02618 } } dps_results: { key: "TestSV-AllItems-VesselofAcceleration-69167" value: { - dps: 23983.39868 - tps: 21630.44983 + dps: 24860.46682 + tps: 22518.02618 } } dps_results: { key: "TestSV-AllItems-VialofShadows-77207" value: { - dps: 26063.98763 - tps: 23550.60026 + dps: 26917.65694 + tps: 24432.03206 } } dps_results: { key: "TestSV-AllItems-VialofShadows-77979" value: { - dps: 25763.21644 - tps: 23265.26049 + dps: 26653.36398 + tps: 24190.68266 } } dps_results: { key: "TestSV-AllItems-VialofShadows-77999" value: { - dps: 26207.86362 - tps: 23679.69717 + dps: 27180.84279 + tps: 24666.51401 } } dps_results: { key: "TestSV-AllItems-VialofStolenMemories-59515" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-VialofStolenMemories-65109" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 25024.69555 - tps: 22582.79682 + dps: 25947.3268 + tps: 23516.74437 + } +} +dps_results: { + key: "TestSV-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 26080.39908 + tps: 23638.88804 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 24308.47047 - tps: 21911.05464 + dps: 25185.7824 + tps: 22805.73686 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 24288.03519 - tps: 21920.94608 + dps: 25025.56355 + tps: 22646.1996 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 24316.2905 - tps: 21926.9445 + dps: 25205.63762 + tps: 22828.00301 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 24268.9777 - tps: 21915.53236 + dps: 25166.06138 + tps: 22823.12427 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 25184.9928 - tps: 22705.66224 + dps: 26050.65878 + tps: 23582.51249 + } +} +dps_results: { + key: "TestSV-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 26219.42315 + tps: 23738.14173 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 + } +} +dps_results: { + key: "TestSV-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-Vishanka,JawsoftheEarth-78359" value: { - dps: 27892.73406 - tps: 25371.15824 + dps: 28669.72502 + tps: 26175.33397 } } dps_results: { key: "TestSV-AllItems-Vishanka,JawsoftheEarth-78471" value: { - dps: 28560.88346 - tps: 26029.2842 + dps: 29361.90249 + tps: 26869.8128 } } dps_results: { key: "TestSV-AllItems-Vishanka,JawsoftheEarth-78480" value: { - dps: 27222.80512 - tps: 24724.2405 + dps: 28165.19075 + tps: 25683.08583 } } dps_results: { key: "TestSV-AllItems-WillofUnbinding-77198" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-WillofUnbinding-77975" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-WillofUnbinding-77995" value: { - dps: 23977.58492 - tps: 21624.63607 + dps: 24859.00094 + tps: 22516.56029 } } dps_results: { key: "TestSV-AllItems-WitchingHourglass-55787" value: { - dps: 23943.42771 - tps: 21589.03349 + dps: 24852.43449 + tps: 22504.15145 } } dps_results: { key: "TestSV-AllItems-WitchingHourglass-56320" value: { - dps: 23964.95025 - tps: 21613.29011 + dps: 24858.10521 + tps: 22511.58528 } } dps_results: { key: "TestSV-AllItems-World-QuellerFocus-63842" value: { - dps: 24165.27615 - tps: 21812.0075 + dps: 25056.78399 + tps: 22714.02356 } } dps_results: { key: "TestSV-AllItems-WrathofUnchaining-77197" value: { - dps: 26887.89805 - tps: 24235.48675 + dps: 27866.43435 + tps: 25229.06084 } } dps_results: { key: "TestSV-AllItems-WrathofUnchaining-77974" value: { - dps: 26532.8531 - tps: 23914.64149 + dps: 27498.2923 + tps: 24894.89626 } } dps_results: { key: "TestSV-AllItems-WrathofUnchaining-77994" value: { - dps: 27263.3481 - tps: 24573.77451 + dps: 28263.10724 + tps: 25589.55144 } } dps_results: { key: "TestSV-AllItems-WyrmstalkerBattlegear" value: { - dps: 27373.74584 - tps: 24879.83127 + dps: 27757.88966 + tps: 25260.04505 } } dps_results: { key: "TestSV-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 24115.23472 - tps: 21765.9077 + dps: 24973.08199 + tps: 22637.99458 } } dps_results: { key: "TestSV-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 24115.23472 - tps: 21765.9077 + dps: 24973.08199 + tps: 22637.99458 } } dps_results: { key: "TestSV-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 24309.02653 - tps: 21856.09601 + dps: 25227.30123 + tps: 22755.44255 } } dps_results: { key: "TestSV-Average-Default" value: { - dps: 25640.25311 - tps: 23118.07422 + dps: 26584.80775 + tps: 24061.4438 } } dps_results: { @@ -2137,43 +2305,43 @@ dps_results: { dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongMultiTarget" value: { - dps: 27940.83692 - tps: 25564.96781 + dps: 29046.35691 + tps: 26666.19999 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongSingleTarget" value: { - dps: 25462.54576 - tps: 23062.50199 + dps: 26459.26658 + tps: 24074.98761 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-ShortSingleTarget" value: { - dps: 32430.9024 - tps: 29278.01516 + dps: 33518.95268 + tps: 30352.86006 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongMultiTarget" value: { - dps: 19374.36119 - tps: 17723.07532 + dps: 20245.30959 + tps: 18583.70905 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongSingleTarget" value: { - dps: 17705.35705 - tps: 16037.87837 + dps: 18405.76728 + tps: 16748.31622 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-ShortSingleTarget" value: { - dps: 20282.77207 - tps: 18324.14445 + dps: 21028.38704 + tps: 19043.8287 } } dps_results: { @@ -2221,49 +2389,49 @@ dps_results: { dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongMultiTarget" value: { - dps: 28240.30555 - tps: 25723.0546 + dps: 29354.08688 + tps: 26831.73922 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongSingleTarget" value: { - dps: 25695.89141 - tps: 23152.73683 + dps: 26628.76559 + tps: 24102.26985 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-ShortSingleTarget" value: { - dps: 32938.75756 - tps: 29588.9291 + dps: 33997.5881 + tps: 30633.11037 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongMultiTarget" value: { - dps: 19618.1256 - tps: 17866.49988 + dps: 20468.24192 + tps: 18705.77491 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongSingleTarget" value: { - dps: 17842.46267 - tps: 16074.61733 + dps: 18529.58822 + tps: 16771.71665 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-ShortSingleTarget" value: { - dps: 20598.73963 - tps: 18515.58136 + dps: 21316.18122 + tps: 19205.78867 } } dps_results: { key: "TestSV-SwitchInFrontOfTarget-Default" value: { - dps: 25512.56836 - tps: 22994.95694 + dps: 26478.70304 + tps: 23976.61018 } } diff --git a/sim/hunter/survival/explosive_shot.go b/sim/hunter/survival/explosive_shot.go index 6213bb542b..7619737597 100644 --- a/sim/hunter/survival/explosive_shot.go +++ b/sim/hunter/survival/explosive_shot.go @@ -9,8 +9,36 @@ import ( func (svHunter *SurvivalHunter) registerExplosiveShotSpell() { actionID := core.ActionID{SpellID: 53301} + altActionID := core.ActionID{SpellID: 1215485} minFlatDamage := 410.708 - (76.8024 / 2) maxFlatDamage := 410.708 + (76.8024 / 2) + var explosiveShotCounter = 0 + var alternateExplosiveShot = svHunter.Hunter.RegisterSpell(core.SpellConfig{ + ActionID: altActionID, + SpellSchool: core.SpellSchoolFire, + ProcMask: core.ProcMaskRangedSpecial, + DamageMultiplier: 1, + ClassSpellMask: hunter.HunterSpellExplosiveShot, + CritMultiplier: svHunter.CritMultiplier(true, false, false), + ThreatMultiplier: 1, + Flags: core.SpellFlagMeleeMetrics, + Dot: core.DotConfig{ + Aura: core.Aura{ + ActionID: altActionID, + Label: "Explosive Shot - Dot (Second)", + OnReset: func(aura *core.Aura, sim *core.Simulation) { + explosiveShotCounter = 0 + }, + }, + NumberOfTicks: 2, + TickLength: time.Second * 1, + OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) { + rap := dot.Spell.RangedAttackPower(target) + baseDmg := sim.Roll(minFlatDamage, maxFlatDamage) + (0.273 * rap) + dot.Spell.CalcAndDealPeriodicDamage(sim, target, baseDmg, dot.OutcomeTickPhysicalCrit) + }, + }, + }) svHunter.Hunter.ExplosiveShot = svHunter.Hunter.RegisterSpell(core.SpellConfig{ ActionID: actionID, SpellSchool: core.SpellSchoolFire, @@ -39,7 +67,7 @@ func (svHunter *SurvivalHunter) registerExplosiveShotSpell() { Dot: core.DotConfig{ Aura: core.Aura{ - Label: "Explosive Shot - Dot", + Label: "Explosive Shot - Dot (First)", }, NumberOfTicks: 2, TickLength: time.Second * 1, @@ -51,16 +79,25 @@ func (svHunter *SurvivalHunter) registerExplosiveShotSpell() { }, ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + explosiveShotCounter++ + result := spell.CalcOutcome(sim, target, spell.OutcomeRangedHit) spell.WaitTravelTime(sim, func(sim *core.Simulation) { if result.Landed() { - dot := spell.Dot(target) + var dot *core.Dot + if explosiveShotCounter%2 == 0 { + dot = alternateExplosiveShot.Dot(target) + } else { + dot = spell.Dot(target) + } dot.Apply(sim) dot.TickOnce(sim) spell.DealOutcome(sim, result) + } }) }, }) + } diff --git a/sim/hunter/survival_talents.go b/sim/hunter/survival_talents.go index 6d6e8f81a5..f918543b57 100644 --- a/sim/hunter/survival_talents.go +++ b/sim/hunter/survival_talents.go @@ -82,7 +82,7 @@ func (hunter *Hunter) applyThrillOfTheHunt() { }, OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) { // mask 256 - if spell == hunter.ArcaneShot || spell == hunter.ExplosiveShot || spell == hunter.BlackArrow { + if spell == hunter.ArcaneShot || spell.ClassSpellMask == HunterSpellExplosiveShot || spell == hunter.BlackArrow { if sim.Proc(procChance, "ThrillOfTheHunt") { hunter.AddFocus(sim, spell.DefaultCast.Cost*0.4, focusMetrics) } @@ -159,14 +159,20 @@ func (hunter *Hunter) applyTNT() { hunter.ExplosiveShot.CostMultiplier += 1 } }, - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + OnApplyEffects: func(aura *core.Aura, sim *core.Simulation, target *core.Unit, spell *core.Spell) { if spell == hunter.ExplosiveShot { - hunter.ExplosiveShot.CD.Reset() - aura.RemoveStack(sim) } }, + // OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) { + // if spell == hunter.ExplosiveShot { + + // hunter.ExplosiveShot.CD.Reset() + + // aura.RemoveStack(sim) + // } + // }, }) hunter.RegisterAura(core.Aura{ diff --git a/sim/mage/arcane/TestArcane.results b/sim/mage/arcane/TestArcane.results index 722ac5623d..98f8d79236 100644 --- a/sim/mage/arcane/TestArcane.results +++ b/sim/mage/arcane/TestArcane.results @@ -288,6 +288,48 @@ dps_results: { tps: 36225.71744 } } +dps_results: { + key: "TestArcane-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 36049.38371 + tps: 32619.59037 + } +} +dps_results: { + key: "TestArcane-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 38002.86759 + tps: 34358.09701 + } +} +dps_results: { + key: "TestArcane-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 36049.38371 + tps: 32619.59037 + } +} +dps_results: { + key: "TestArcane-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 36066.54676 + tps: 32668.24355 + } +} +dps_results: { + key: "TestArcane-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 37635.53354 + tps: 34091.15603 + } +} +dps_results: { + key: "TestArcane-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 36066.54676 + tps: 32668.24355 + } +} dps_results: { key: "TestArcane-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1331,6 +1373,90 @@ dps_results: { tps: 34420.51362 } } +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 36049.38371 + tps: 32619.59037 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 36049.38371 + tps: 32619.59037 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 37687.9198 + tps: 34077.80863 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 37780.78902 + tps: 34160.45777 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 36049.38371 + tps: 32619.59037 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 36049.38371 + tps: 32619.59037 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 36066.54676 + tps: 32668.24355 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 36066.59649 + tps: 32668.29329 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 37382.39071 + tps: 33857.43252 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 37471.49818 + tps: 33938.71406 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 36066.54676 + tps: 32668.24355 + } +} +dps_results: { + key: "TestArcane-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 36066.54676 + tps: 32668.24355 + } +} dps_results: { key: "TestArcane-AllItems-ScalesofLife-68915" value: { @@ -1798,6 +1924,13 @@ dps_results: { tps: 32619.59037 } } +dps_results: { + key: "TestArcane-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 36049.38371 + tps: 32619.59037 + } +} dps_results: { key: "TestArcane-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1805,6 +1938,13 @@ dps_results: { tps: 33773.08486 } } +dps_results: { + key: "TestArcane-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 37498.14356 + tps: 33908.91692 + } +} dps_results: { key: "TestArcane-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1812,6 +1952,13 @@ dps_results: { tps: 32619.59037 } } +dps_results: { + key: "TestArcane-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 36049.38371 + tps: 32619.59037 + } +} dps_results: { key: "TestArcane-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1857,19 +2004,40 @@ dps_results: { dps_results: { key: "TestArcane-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 36066.72547 - tps: 32668.42226 + dps: 36066.54676 + tps: 32668.24355 + } +} +dps_results: { + key: "TestArcane-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 36066.49236 + tps: 32668.18915 } } dps_results: { key: "TestArcane-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 37102.27432 - tps: 33610.97174 + dps: 37111.86455 + tps: 33609.44871 + } +} +dps_results: { + key: "TestArcane-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 37217.47705 + tps: 33708.17599 } } dps_results: { key: "TestArcane-AllItems-ViciousGladiator'sInsigniaofVictory-61046" + value: { + dps: 36066.72547 + tps: 32668.42226 + } +} +dps_results: { + key: "TestArcane-AllItems-ViciousGladiator'sInsigniaofVictory-70579" value: { dps: 36066.54676 tps: 32668.24355 diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results index 1443a694c8..b14625e943 100644 --- a/sim/mage/fire/TestFire.results +++ b/sim/mage/fire/TestFire.results @@ -288,6 +288,48 @@ dps_results: { tps: 35247.96072 } } +dps_results: { + key: "TestFire-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 38450.239 + tps: 34434.97411 + } +} +dps_results: { + key: "TestFire-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 37970.5896 + tps: 33993.96715 + } +} +dps_results: { + key: "TestFire-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} dps_results: { key: "TestFire-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1324,6 +1366,90 @@ dps_results: { tps: 34043.13646 } } +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 38120.32834 + tps: 34153.45195 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 38244.50434 + tps: 34263.65866 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 37730.32381 + tps: 33796.29223 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 37788.80321 + tps: 33860.56043 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} +dps_results: { + key: "TestFire-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} dps_results: { key: "TestFire-AllItems-ScalesofLife-68915" value: { @@ -1798,6 +1924,13 @@ dps_results: { tps: 32533.88176 } } +dps_results: { + key: "TestFire-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1805,6 +1938,13 @@ dps_results: { tps: 33753.49322 } } +dps_results: { + key: "TestFire-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 37937.07142 + tps: 33986.90716 + } +} dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1812,6 +1952,13 @@ dps_results: { tps: 32533.88176 } } +dps_results: { + key: "TestFire-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1861,11 +2008,25 @@ dps_results: { tps: 32533.88176 } } +dps_results: { + key: "TestFire-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 37431.74107 - tps: 33501.50088 + dps: 37437.54775 + tps: 33529.97018 + } +} +dps_results: { + key: "TestFire-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 37608.37202 + tps: 33685.3485 } } dps_results: { @@ -1875,6 +2036,13 @@ dps_results: { tps: 32533.88176 } } +dps_results: { + key: "TestFire-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 36361.8678 + tps: 32533.88176 + } +} dps_results: { key: "TestFire-AllItems-WillofUnbinding-77198" value: { diff --git a/sim/paladin/glyphs.go b/sim/paladin/glyphs.go index c78820b207..c4f131804e 100644 --- a/sim/paladin/glyphs.go +++ b/sim/paladin/glyphs.go @@ -87,6 +87,12 @@ func registerGlyphOfExorcism(paladin *Paladin) { exorcismAverageDamage := core.CalcScalingSpellAverageEffect(proto.Class_ClassPaladin, 2.663) + // Used for checking "Is Aura Known" in the APL + glyphOfExorcismAura := paladin.GetOrRegisterAura(core.Aura{ + ActionID: core.ActionID{SpellID: 54934}, + Label: "Glyph of Exorcism (DoT)" + paladin.Label, + }) + glyphOfExorcismDot := paladin.RegisterSpell(core.SpellConfig{ ActionID: core.ActionID{SpellID: 879}.WithTag(3), // actual 54934 SpellSchool: core.SpellSchoolHoly, @@ -99,10 +105,7 @@ func registerGlyphOfExorcism(paladin *Paladin) { ThreatMultiplier: 1, Dot: core.DotConfig{ - Aura: core.Aura{ - ActionID: core.ActionID{SpellID: 54934}, - Label: "Glyph of Exorcism (DoT)", - }, + Aura: *glyphOfExorcismAura, NumberOfTicks: 3, AffectedByCastSpeed: false, TickLength: 2 * time.Second, diff --git a/sim/paladin/items.go b/sim/paladin/items.go index 18a5040be8..7b1add8024 100644 --- a/sim/paladin/items.go +++ b/sim/paladin/items.go @@ -36,7 +36,7 @@ var ItemSetBattleplateOfImmolation = core.NewItemSet(core.ItemSet{ cata.RegisterIgniteEffect(&paladin.Unit, cata.IgniteConfig{ ActionID: core.ActionID{SpellID: 35395}.WithTag(3), // actual 99092 DisableCastMetrics: true, - DotAuraLabel: "Flames of the Faithful", + DotAuraLabel: "Flames of the Faithful" + paladin.Label, IncludeAuraDelay: true, ProcTrigger: core.ProcTrigger{ @@ -66,6 +66,12 @@ var ItemSetBattleplateOfRadiantGlory = core.NewItemSet(core.ItemSet{ // Actual buff credited with the Holy Power gain is Virtuous Empowerment hpMetrics := paladin.NewHolyPowerMetrics(core.ActionID{SpellID: 105767}) + // Used for checking "Is Aura Known" in the APL + paladin.GetOrRegisterAura(core.Aura{ + ActionID: core.ActionID{SpellID: 105767}, + Label: "Virtuous Empowerment" + paladin.Label, + }) + core.MakeProcTriggerAura(&paladin.Unit, core.ProcTrigger{ Name: "T13 2pc trigger", ActionID: core.ActionID{SpellID: 105765}, @@ -103,7 +109,7 @@ var ItemSetBattleplateOfRadiantGlory = core.NewItemSet(core.ItemSet{ }) zealOfTheCrusader := paladin.RegisterAura(core.Aura{ - Label: "Zeal of the Crusader", + Label: "Zeal of the Crusader" + paladin.Label, ActionID: core.ActionID{SpellID: 105819}, Duration: time.Second * 20, OnGain: func(aura *core.Aura, sim *core.Simulation) { @@ -227,7 +233,7 @@ var ItemSetBattlearmorOfImmolation = core.NewItemSet(core.ItemSet{ paladin := agent.(PaladinAgent).GetPaladin() flamingAegis := paladin.GetOrRegisterAura(core.Aura{ - Label: "Flaming Aegis", + Label: "Flaming Aegis" + paladin.Label, ActionID: core.ActionID{SpellID: 99090}, Duration: time.Second * 10, @@ -271,7 +277,7 @@ var ItemSetArmorOfRadiantGlory = core.NewItemSet(core.ItemSet{ duration := time.Second * 6 shieldStrength := 0.0 - shield := paladin.NewDamageAbsorptionAura("Delayed Judgement", actionID, duration, func(unit *core.Unit) float64 { + shield := paladin.NewDamageAbsorptionAura("Delayed Judgement"+paladin.Label, actionID, duration, func(unit *core.Unit) float64 { return shieldStrength }) diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 176fe6d484..238808ac8f 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -38,1963 +38,2131 @@ character_stats_results: { dps_results: { key: "TestRetribution-AllItems-AgileShadowspiritDiamond" value: { - dps: 38573.72246 - tps: 38440.01751 + dps: 38483.25085 + tps: 38348.69993 } } dps_results: { key: "TestRetribution-AllItems-Althor'sAbacus-50366" value: { - dps: 36624.9406 - tps: 36498.24412 + dps: 36540.33173 + tps: 36412.49686 } } dps_results: { key: "TestRetribution-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 37242.7743 - tps: 37113.0873 + dps: 37388.7325 + tps: 37260.35061 } } dps_results: { key: "TestRetribution-AllItems-Anhuur'sHymnal-55889" value: { - dps: 36612.62856 - tps: 36483.59144 + dps: 36717.60883 + tps: 36590.21556 } } dps_results: { key: "TestRetribution-AllItems-Anhuur'sHymnal-56407" value: { - dps: 36610.33806 - tps: 36481.30094 + dps: 36712.8315 + tps: 36585.43823 } } dps_results: { key: "TestRetribution-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 38161.38561 - tps: 38031.56035 + dps: 37795.7839 + tps: 37667.35602 } } dps_results: { key: "TestRetribution-AllItems-ArmorofRadiantGlory" value: { - dps: 28488.9952 - tps: 28411.05456 + dps: 28401.09359 + tps: 28323.46485 } } dps_results: { key: "TestRetribution-AllItems-ArrowofTime-72897" value: { - dps: 37814.90142 - tps: 37681.16267 + dps: 37903.4882 + tps: 37767.20964 } } dps_results: { key: "TestRetribution-AllItems-AustereShadowspiritDiamond" value: { - dps: 38072.52815 - tps: 37938.8232 + dps: 37993.94438 + tps: 37859.39346 } } dps_results: { key: "TestRetribution-AllItems-BattlearmorofImmolation" value: { - dps: 30355.91386 - tps: 30261.88223 + dps: 30385.24186 + tps: 30292.4817 } } dps_results: { key: "TestRetribution-AllItems-BattleplateofImmolation" value: { - dps: 34695.45827 - tps: 34564.13055 + dps: 34715.58144 + tps: 34585.30888 } } dps_results: { key: "TestRetribution-AllItems-BattleplateofRadiantGlory" value: { - dps: 34811.37023 - tps: 34711.41579 + dps: 34961.04507 + tps: 34861.05281 } } dps_results: { key: "TestRetribution-AllItems-BaubleofTrueBlood-50726" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 hps: 127.67148 } } dps_results: { key: "TestRetribution-AllItems-BedrockTalisman-58182" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-BellofEnragingResonance-59326" value: { - dps: 36832.11035 - tps: 36703.07323 + dps: 36939.1482 + tps: 36811.75492 } } dps_results: { key: "TestRetribution-AllItems-BellofEnragingResonance-65053" value: { - dps: 36895.372 - tps: 36766.33488 + dps: 36995.06767 + tps: 36867.6744 } } dps_results: { key: "TestRetribution-AllItems-BindingPromise-67037" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 36863.35213 - tps: 36733.66513 + dps: 37075.58761 + tps: 36948.02137 } } dps_results: { key: "TestRetribution-AllItems-BloodofIsiset-55995" value: { - dps: 37074.30626 - tps: 36945.26914 + dps: 37182.05807 + tps: 37054.6648 } } dps_results: { key: "TestRetribution-AllItems-BloodofIsiset-56414" value: { - dps: 37137.66734 - tps: 37008.63022 + dps: 37245.78597 + tps: 37118.3927 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 36549.16764 - tps: 36418.40482 + dps: 36846.3359 + tps: 36717.90802 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 35878.46946 - tps: 35747.76848 + dps: 36551.82644 + tps: 36423.39857 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 37112.3714 - tps: 36981.67042 + dps: 37359.64856 + tps: 37231.22068 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 36724.32465 - tps: 36595.28753 + dps: 36826.98064 + tps: 36699.58736 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 37047.00559 - tps: 36917.96847 + dps: 37167.96134 + tps: 37040.56807 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 36645.09086 - tps: 36516.05374 + dps: 36751.89775 + tps: 36624.50447 } } dps_results: { key: "TestRetribution-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 37588.48146 - tps: 37459.44434 + dps: 37710.31329 + tps: 37582.92002 } } dps_results: { key: "TestRetribution-AllItems-Bone-LinkFetish-77210" value: { - dps: 38782.26082 - tps: 38653.41903 + dps: 38877.02244 + tps: 38749.678 } } dps_results: { key: "TestRetribution-AllItems-Bone-LinkFetish-77982" value: { - dps: 38367.53065 - tps: 38238.67567 + dps: 38523.27678 + tps: 38395.29751 } } dps_results: { key: "TestRetribution-AllItems-Bone-LinkFetish-78002" value: { - dps: 39156.58494 - tps: 39027.72996 + dps: 39390.50532 + tps: 39262.52605 } } dps_results: { key: "TestRetribution-AllItems-BottledLightning-66879" value: { - dps: 36093.37604 - tps: 35967.52329 + dps: 36481.31068 + tps: 36353.83067 } } dps_results: { key: "TestRetribution-AllItems-BottledWishes-77114" value: { - dps: 36942.26816 - tps: 36803.09754 + dps: 37262.06167 + tps: 37124.96842 } } dps_results: { key: "TestRetribution-AllItems-BottledWishes-77985" value: { - dps: 36608.95564 - tps: 36473.25155 + dps: 36996.48363 + tps: 36860.96386 } } dps_results: { key: "TestRetribution-AllItems-BottledWishes-78005" value: { - dps: 36686.89067 - tps: 36553.28166 + dps: 37107.86565 + tps: 36971.80614 } } dps_results: { key: "TestRetribution-AllItems-BracingShadowspiritDiamond" value: { - dps: 38082.85839 - tps: 37196.59765 + dps: 38076.43246 + tps: 37189.14808 } } dps_results: { key: "TestRetribution-AllItems-Brawler'sTrophy-232015" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 39296.28223 - tps: 39162.57728 + dps: 39209.04768 + tps: 39074.49676 } } dps_results: { key: "TestRetribution-AllItems-BurningShadowspiritDiamond" value: { - dps: 38532.80298 - tps: 38401.23298 + dps: 38523.98893 + tps: 38391.18527 + } +} +dps_results: { + key: "TestRetribution-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 37094.94454 + tps: 36966.51666 + } +} +dps_results: { + key: "TestRetribution-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 36585.50283 + tps: 36457.07495 + } +} +dps_results: { + key: "TestRetribution-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 37871.10921 + tps: 37742.68133 + } +} +dps_results: { + key: "TestRetribution-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 37479.42873 + tps: 37352.03546 + } +} +dps_results: { + key: "TestRetribution-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 36808.54672 + tps: 36681.15345 + } +} +dps_results: { + key: "TestRetribution-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 38272.73997 + tps: 38145.34669 } } dps_results: { key: "TestRetribution-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 38601.56799 - tps: 38467.86304 + dps: 38509.04903 + tps: 38374.49811 } } dps_results: { key: "TestRetribution-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 37273.23513 - tps: 37144.198 + dps: 37348.01154 + tps: 37220.61826 } } dps_results: { key: "TestRetribution-AllItems-CoreofRipeness-58184" value: { - dps: 35915.86675 - tps: 35790.08123 + dps: 36518.85512 + tps: 36390.95225 } } dps_results: { key: "TestRetribution-AllItems-CorpseTongueCoin-50349" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-CrecheoftheFinalDragon-77205" value: { - dps: 39014.11667 - tps: 38884.90328 + dps: 39111.61066 + tps: 38983.18278 } } dps_results: { key: "TestRetribution-AllItems-CrecheoftheFinalDragon-77972" value: { - dps: 38603.79042 - tps: 38474.57704 + dps: 38735.70328 + tps: 38607.2754 } } dps_results: { key: "TestRetribution-AllItems-CrecheoftheFinalDragon-77992" value: { - dps: 39322.21209 - tps: 39193.01189 + dps: 39381.015 + tps: 39253.17312 } } dps_results: { key: "TestRetribution-AllItems-CrushingWeight-59506" value: { - dps: 37798.1193 - tps: 37664.53599 + dps: 38008.35988 + tps: 37873.57381 } } dps_results: { key: "TestRetribution-AllItems-CrushingWeight-65118" value: { - dps: 38016.29239 - tps: 37878.12871 + dps: 38025.75109 + tps: 37894.71737 } } dps_results: { key: "TestRetribution-AllItems-CunningoftheCruel-77208" value: { - dps: 37422.53655 - tps: 37296.86651 + dps: 37447.79567 + tps: 37320.15558 } } dps_results: { key: "TestRetribution-AllItems-CunningoftheCruel-77980" value: { - dps: 37271.06313 - tps: 37145.74119 + dps: 37263.23546 + tps: 37134.45893 } } dps_results: { key: "TestRetribution-AllItems-CunningoftheCruel-78000" value: { - dps: 37425.29367 - tps: 37300.38886 + dps: 37484.28863 + tps: 37357.39422 } } dps_results: { key: "TestRetribution-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 37364.15321 - tps: 37230.76397 + dps: 37501.97261 + tps: 37368.80564 } } dps_results: { key: "TestRetribution-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 36817.20363 - tps: 36683.71673 + dps: 37011.17058 + tps: 36877.18376 } } dps_results: { key: "TestRetribution-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 36555.87454 - tps: 36430.66926 + dps: 36527.29737 + tps: 36400.51754 } } dps_results: { key: "TestRetribution-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 37458.61596 - tps: 37332.3918 + dps: 37382.94367 + tps: 37255.94011 } } dps_results: { key: "TestRetribution-AllItems-Deathbringer'sWill-50363" value: { - dps: 36931.05185 - tps: 36802.97661 + dps: 37029.40577 + tps: 36904.09473 } } dps_results: { key: "TestRetribution-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 38148.87515 - tps: 38015.1702 + dps: 38063.2618 + tps: 37928.71088 } } dps_results: { key: "TestRetribution-AllItems-DislodgedForeignObject-50348" value: { - dps: 36625.83462 - tps: 36494.21451 + dps: 36617.49188 + tps: 36481.89163 } } dps_results: { key: "TestRetribution-AllItems-Dwyer'sCaber-70141" value: { - dps: 38071.63028 - tps: 37942.23475 + dps: 38239.90709 + tps: 38112.51382 } } dps_results: { key: "TestRetribution-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 38072.52815 - tps: 37938.8232 + dps: 37993.94438 + tps: 37859.39346 } } dps_results: { key: "TestRetribution-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 35917.01421 - tps: 35788.62845 + dps: 36354.04285 + tps: 36225.08066 } } dps_results: { key: "TestRetribution-AllItems-EmberShadowspiritDiamond" value: { - dps: 38192.1109 - tps: 38061.33369 + dps: 38214.12146 + tps: 38084.29747 } } dps_results: { key: "TestRetribution-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 38148.87515 - tps: 38015.1702 + dps: 38063.2618 + tps: 37928.71088 } } dps_results: { key: "TestRetribution-AllItems-EssenceoftheCyclone-59473" value: { - dps: 37521.07946 - tps: 37392.22449 + dps: 37699.60437 + tps: 37572.38095 } } dps_results: { key: "TestRetribution-AllItems-EssenceoftheCyclone-65140" value: { - dps: 37659.45425 - tps: 37530.05872 + dps: 37734.0044 + tps: 37607.36698 } } dps_results: { key: "TestRetribution-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 37654.67846 - tps: 37524.99146 + dps: 37760.85959 + tps: 37632.4777 } } dps_results: { key: "TestRetribution-AllItems-EternalShadowspiritDiamond" value: { - dps: 38072.52815 - tps: 37938.8232 + dps: 37993.94438 + tps: 37859.39346 } } dps_results: { key: "TestRetribution-AllItems-EyeofUnmaking-77200" value: { - dps: 39368.30209 - tps: 39239.26497 + dps: 39480.80041 + tps: 39353.40713 } } dps_results: { key: "TestRetribution-AllItems-EyeofUnmaking-77977" value: { - dps: 39052.63799 - tps: 38923.60087 + dps: 39164.27861 + tps: 39036.88534 } } dps_results: { key: "TestRetribution-AllItems-EyeofUnmaking-77997" value: { - dps: 39715.5326 - tps: 39586.49548 + dps: 39828.97438 + tps: 39701.58111 } } dps_results: { key: "TestRetribution-AllItems-FallofMortality-59500" value: { - dps: 36555.87454 - tps: 36430.66926 + dps: 36527.29737 + tps: 36400.51754 } } dps_results: { key: "TestRetribution-AllItems-FallofMortality-65124" value: { - dps: 36718.4554 - tps: 36592.05778 + dps: 36672.70915 + tps: 36545.60179 } } dps_results: { key: "TestRetribution-AllItems-FieryQuintessence-69000" value: { - dps: 35413.21228 - tps: 35284.50053 + dps: 36323.988 + tps: 36200.18116 } } dps_results: { key: "TestRetribution-AllItems-Figurine-DemonPanther-52199" value: { - dps: 36493.59181 - tps: 36362.89083 + dps: 36850.14851 + tps: 36721.72063 } } dps_results: { key: "TestRetribution-AllItems-Figurine-DreamOwl-52354" value: { - dps: 35923.67055 - tps: 35797.20741 + dps: 36502.07014 + tps: 36375.58806 } } dps_results: { key: "TestRetribution-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 35867.40479 - tps: 35742.66509 + dps: 36528.86171 + tps: 36400.29959 } } dps_results: { key: "TestRetribution-AllItems-Figurine-KingofBoars-52351" value: { - dps: 37603.14808 - tps: 37472.4471 + dps: 37867.20372 + tps: 37738.77584 } } dps_results: { key: "TestRetribution-AllItems-FireoftheDeep-77117" value: { - dps: 37469.83301 - tps: 37340.79589 + dps: 37579.87467 + tps: 37452.4814 } } dps_results: { key: "TestRetribution-AllItems-FireoftheDeep-77988" value: { - dps: 37369.99131 - tps: 37240.95419 + dps: 37479.45495 + tps: 37352.06167 } } dps_results: { key: "TestRetribution-AllItems-FireoftheDeep-78008" value: { - dps: 37583.11495 - tps: 37454.07783 + dps: 37693.81244 + tps: 37566.41916 } } dps_results: { key: "TestRetribution-AllItems-FleetShadowspiritDiamond" value: { - dps: 38179.17355 - tps: 38045.4686 + dps: 38100.43403 + tps: 37965.88311 } } dps_results: { key: "TestRetribution-AllItems-FluidDeath-58181" value: { - dps: 37161.51141 - tps: 37032.47429 + dps: 37259.51807 + tps: 37132.1248 } } dps_results: { key: "TestRetribution-AllItems-ForlornShadowspiritDiamond" value: { - dps: 38082.85839 - tps: 37951.2884 + dps: 38076.43246 + tps: 37943.6288 } } dps_results: { key: "TestRetribution-AllItems-FoulGiftoftheDemonLord-72898" value: { - dps: 37489.74785 - tps: 37363.40988 + dps: 37435.64396 + tps: 37309.1128 } } dps_results: { key: "TestRetribution-AllItems-FuryofAngerforge-59461" value: { - dps: 37611.33334 - tps: 37482.08432 + dps: 37636.57619 + tps: 37508.78314 } } dps_results: { key: "TestRetribution-AllItems-GaleofShadows-56138" value: { - dps: 36942.34817 - tps: 36814.72176 + dps: 36785.85464 + tps: 36654.12681 } } dps_results: { key: "TestRetribution-AllItems-GaleofShadows-56462" value: { - dps: 36755.36443 - tps: 36623.10042 + dps: 36979.24853 + tps: 36844.23441 } } dps_results: { key: "TestRetribution-AllItems-GearDetector-61462" value: { - dps: 37181.08006 - tps: 37059.36246 + dps: 36978.77166 + tps: 36855.1777 } } dps_results: { key: "TestRetribution-AllItems-Gladiator'sVindication" value: { - dps: 28860.6561 - tps: 28769.72697 + dps: 28756.89859 + tps: 28666.48345 } } dps_results: { key: "TestRetribution-AllItems-GlowingTwilightScale-54589" value: { - dps: 36709.59717 - tps: 36581.29286 + dps: 36534.65123 + tps: 36408.44501 } } dps_results: { key: "TestRetribution-AllItems-GraceoftheHerald-55266" value: { - dps: 37042.28112 - tps: 36913.244 + dps: 37102.12569 + tps: 36974.73242 } } dps_results: { key: "TestRetribution-AllItems-GraceoftheHerald-56295" value: { - dps: 37237.01335 - tps: 37108.17157 + dps: 37328.88317 + tps: 37202.24575 } } dps_results: { key: "TestRetribution-AllItems-Gurthalak,VoiceoftheDeeps-77191" value: { - dps: 40364.03751 - tps: 40230.33256 + dps: 40273.79675 + tps: 40139.24582 } } dps_results: { key: "TestRetribution-AllItems-Gurthalak,VoiceoftheDeeps-78478" value: { - dps: 40581.48311 - tps: 40447.77816 + dps: 40490.63014 + tps: 40356.07922 } } dps_results: { key: "TestRetribution-AllItems-Gurthalak,VoiceoftheDeeps-78487" value: { - dps: 40172.55556 - tps: 40038.85061 + dps: 40082.8539 + tps: 39948.30298 } } dps_results: { key: "TestRetribution-AllItems-HarmlightToken-63839" value: { - dps: 36638.26189 - tps: 36513.44405 + dps: 36659.70296 + tps: 36532.56841 } } dps_results: { key: "TestRetribution-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 37793.46911 - tps: 37664.43199 + dps: 37907.52366 + tps: 37780.13039 } } dps_results: { key: "TestRetribution-AllItems-HeartofIgnacious-59514" value: { - dps: 36602.80972 - tps: 36469.16566 + dps: 36512.00608 + tps: 36382.87218 } } dps_results: { key: "TestRetribution-AllItems-HeartofIgnacious-65110" value: { - dps: 36662.18715 - tps: 36527.31858 + dps: 36550.16851 + tps: 36421.55081 } } dps_results: { key: "TestRetribution-AllItems-HeartofRage-59224" value: { - dps: 38219.87711 - tps: 38086.17215 + dps: 38138.69199 + tps: 38004.14107 } } dps_results: { key: "TestRetribution-AllItems-HeartofSolace-55868" value: { - dps: 37839.62146 - tps: 37711.99505 + dps: 37683.3445 + tps: 37551.61667 } } dps_results: { key: "TestRetribution-AllItems-HeartofSolace-56393" value: { - dps: 37797.63362 - tps: 37665.3696 + dps: 38021.84087 + tps: 37886.82676 } } dps_results: { key: "TestRetribution-AllItems-HeartofThunder-55845" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-HeartofThunder-56370" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-HeartoftheVile-66969" value: { - dps: 37039.39122 - tps: 36910.3541 + dps: 37096.39478 + tps: 36969.00151 } } dps_results: { key: "TestRetribution-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 38148.87515 - tps: 38015.1702 + dps: 38063.2618 + tps: 37928.71088 } } dps_results: { key: "TestRetribution-AllItems-ImpatienceofYouth-62464" value: { - dps: 37829.62577 - tps: 37698.92479 + dps: 38042.23366 + tps: 37913.80578 } } dps_results: { key: "TestRetribution-AllItems-ImpatienceofYouth-62469" value: { - dps: 37829.62577 - tps: 37698.92479 + dps: 38042.23366 + tps: 37913.80578 } } dps_results: { key: "TestRetribution-AllItems-ImpetuousQuery-55881" value: { - dps: 37074.30626 - tps: 36945.26914 + dps: 37182.05807 + tps: 37054.6648 } } dps_results: { key: "TestRetribution-AllItems-ImpetuousQuery-56406" value: { - dps: 37137.66734 - tps: 37008.63022 + dps: 37245.78597 + tps: 37118.3927 } } dps_results: { key: "TestRetribution-AllItems-IndomitablePride-77211" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-IndomitablePride-77983" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-IndomitablePride-78003" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-InsigniaoftheCorruptedMind-77203" value: { - dps: 37197.47543 - tps: 37058.5338 + dps: 36796.65002 + tps: 36658.2731 } } dps_results: { key: "TestRetribution-AllItems-InsigniaoftheCorruptedMind-77971" value: { - dps: 36644.80099 - tps: 36503.1183 + dps: 36563.23372 + tps: 36422.59007 } } dps_results: { key: "TestRetribution-AllItems-InsigniaoftheCorruptedMind-77991" value: { - dps: 37348.75235 - tps: 37204.31577 + dps: 36829.08774 + tps: 36686.57145 } } dps_results: { key: "TestRetribution-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 36487.70708 - tps: 36358.02008 + dps: 36872.59879 + tps: 36745.03254 } } dps_results: { key: "TestRetribution-AllItems-JarofAncientRemedies-59354" value: { - dps: 36596.56085 - tps: 36492.42519 + dps: 36604.15089 + tps: 36497.74071 } } dps_results: { key: "TestRetribution-AllItems-JarofAncientRemedies-65029" value: { - dps: 36589.41472 - tps: 36485.06096 + dps: 36613.04323 + tps: 36509.91207 } } dps_results: { key: "TestRetribution-AllItems-JawsofDefeat-68926" value: { - dps: 35919.59031 - tps: 35794.38359 + dps: 36619.68444 + tps: 36491.76195 } } dps_results: { key: "TestRetribution-AllItems-JawsofDefeat-69111" value: { - dps: 35910.90344 - tps: 35785.836 + dps: 36563.25773 + tps: 36437.20583 } } dps_results: { key: "TestRetribution-AllItems-JujuofNimbleness-63840" value: { - dps: 36863.35213 - tps: 36733.66513 + dps: 37075.58761 + tps: 36948.02137 } } dps_results: { key: "TestRetribution-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 37022.39141 - tps: 36892.99589 + dps: 37139.80679 + tps: 37012.41352 } } dps_results: { key: "TestRetribution-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 37141.31537 - tps: 37012.47358 + dps: 37273.43608 + tps: 37146.04281 } } dps_results: { key: "TestRetribution-AllItems-Kiril,FuryofBeasts-77194" value: { - dps: 39927.07352 - tps: 39794.06558 + dps: 39797.68044 + tps: 39661.95752 } } dps_results: { key: "TestRetribution-AllItems-Kiril,FuryofBeasts-78473" value: { - dps: 40098.56448 - tps: 39965.55654 + dps: 39980.03144 + tps: 39844.30852 } } dps_results: { key: "TestRetribution-AllItems-Kiril,FuryofBeasts-78482" value: { - dps: 39774.46603 - tps: 39641.4581 + dps: 39645.32488 + tps: 39509.60196 } } dps_results: { key: "TestRetribution-AllItems-KiroptyricSigil-77113" value: { - dps: 37558.59863 - tps: 37419.42801 + dps: 37678.85641 + tps: 37541.76316 } } dps_results: { key: "TestRetribution-AllItems-KiroptyricSigil-77984" value: { - dps: 37191.47011 - tps: 37055.76602 + dps: 37311.79755 + tps: 37176.27777 } } dps_results: { key: "TestRetribution-AllItems-KiroptyricSigil-78004" value: { - dps: 37494.76222 - tps: 37361.15321 + dps: 37601.49626 + tps: 37465.43676 } } dps_results: { key: "TestRetribution-AllItems-KvaldirBattleStandard-59685" value: { - dps: 36687.20493 - tps: 36556.69966 + dps: 36527.09121 + tps: 36394.52071 } } dps_results: { key: "TestRetribution-AllItems-KvaldirBattleStandard-59689" value: { - dps: 36687.20493 - tps: 36556.69966 + dps: 36527.09121 + tps: 36394.52071 } } dps_results: { key: "TestRetribution-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 35543.01837 - tps: 35419.36804 + dps: 36132.26203 + tps: 36003.34375 } } dps_results: { key: "TestRetribution-AllItems-LeadenDespair-55816" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-LeadenDespair-56347" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-LeftEyeofRajh-56102" value: { - dps: 37354.29554 - tps: 37221.2876 + dps: 37255.63727 + tps: 37119.91435 } } dps_results: { key: "TestRetribution-AllItems-LeftEyeofRajh-56427" value: { - dps: 37431.09213 - tps: 37298.0842 + dps: 37343.22942 + tps: 37207.5065 } } dps_results: { key: "TestRetribution-AllItems-LicensetoSlay-58180" value: { - dps: 37799.05168 - tps: 37670.01456 + dps: 37907.36115 + tps: 37779.96787 } } dps_results: { key: "TestRetribution-AllItems-MagnetiteMirror-55814" value: { - dps: 37132.34263 - tps: 36997.73699 + dps: 37143.19559 + tps: 37007.61127 } } dps_results: { key: "TestRetribution-AllItems-MagnetiteMirror-56345" value: { - dps: 37429.95792 - tps: 37295.98711 + dps: 37318.17274 + tps: 37182.44982 } } dps_results: { key: "TestRetribution-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-MarkofKhardros-56132" value: { - dps: 37521.36909 - tps: 37391.68209 + dps: 37617.92326 + tps: 37490.35702 } } dps_results: { key: "TestRetribution-AllItems-MarkofKhardros-56458" value: { - dps: 37710.35566 - tps: 37580.66866 + dps: 37769.56351 + tps: 37641.99726 } } dps_results: { key: "TestRetribution-AllItems-MatrixRestabilizer-68994" value: { - dps: 38370.8958 - tps: 38241.85868 + dps: 38454.79567 + tps: 38327.40239 } } dps_results: { key: "TestRetribution-AllItems-MatrixRestabilizer-69150" value: { - dps: 38578.29351 - tps: 38449.25639 + dps: 38684.63356 + tps: 38557.24029 } } dps_results: { key: "TestRetribution-AllItems-MightoftheOcean-55251" value: { - dps: 36574.59548 - tps: 36444.90848 + dps: 36814.92531 + tps: 36687.35906 } } dps_results: { key: "TestRetribution-AllItems-MightoftheOcean-56285" value: { - dps: 36990.50754 - tps: 36860.82054 + dps: 37114.22184 + tps: 36986.65559 } } dps_results: { key: "TestRetribution-AllItems-MirrorofBrokenImages-62466" value: { - dps: 37206.78852 - tps: 37077.7514 + dps: 37315.30732 + tps: 37187.91405 } } dps_results: { key: "TestRetribution-AllItems-MirrorofBrokenImages-62471" value: { - dps: 37206.78852 - tps: 37077.7514 + dps: 37315.30732 + tps: 37187.91405 } } dps_results: { key: "TestRetribution-AllItems-MithrilStopwatch-232013" value: { - dps: 36796.4013 - tps: 36667.36418 + dps: 36898.07776 + tps: 36770.68449 } } dps_results: { key: "TestRetribution-AllItems-MoonwellChalice-70142" value: { - dps: 37052.66153 - tps: 36926.62565 + dps: 37094.36629 + tps: 36969.87859 } } dps_results: { key: "TestRetribution-AllItems-MoonwellPhial-70143" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-NecromanticFocus-68982" value: { - dps: 37356.08538 - tps: 37229.7474 + dps: 37295.59767 + tps: 37169.06652 } } dps_results: { key: "TestRetribution-AllItems-NecromanticFocus-69139" value: { - dps: 37569.90817 - tps: 37443.38131 + dps: 37519.84064 + tps: 37390.27902 } } dps_results: { key: "TestRetribution-AllItems-Oremantle'sFavor-61448" value: { - dps: 36932.06117 - tps: 36801.36018 + dps: 37379.15591 + tps: 37250.72804 } } dps_results: { key: "TestRetribution-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 36649.75857 - tps: 36525.87146 + dps: 36644.39415 + tps: 36518.17864 } } dps_results: { key: "TestRetribution-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 36940.07427 - tps: 36811.03715 + dps: 37016.64547 + tps: 36889.2522 } } dps_results: { key: "TestRetribution-AllItems-PorcelainCrab-55237" value: { - dps: 37037.94008 - tps: 36908.90296 + dps: 37148.31445 + tps: 37020.92118 } } dps_results: { key: "TestRetribution-AllItems-PorcelainCrab-56280" value: { - dps: 37438.75652 - tps: 37309.7194 + dps: 37538.92611 + tps: 37411.53284 } } dps_results: { key: "TestRetribution-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 38072.52815 - tps: 37938.8232 + dps: 37993.94438 + tps: 37859.39346 } } dps_results: { key: "TestRetribution-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 37193.80672 - tps: 37057.48273 + dps: 37204.73516 + tps: 37071.70595 } } dps_results: { key: "TestRetribution-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 37315.9146 - tps: 37186.59818 + dps: 37177.30467 + tps: 37046.33995 } } dps_results: { key: "TestRetribution-AllItems-Rainsong-55854" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-Rainsong-56377" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-ReflectionoftheLight-77115" value: { - dps: 36143.05199 - tps: 36013.36499 + dps: 36539.98069 + tps: 36412.41444 } } dps_results: { key: "TestRetribution-AllItems-ReflectionoftheLight-77986" value: { - dps: 36137.29216 - tps: 36007.60516 + dps: 36531.7783 + tps: 36404.21206 } } dps_results: { key: "TestRetribution-AllItems-ReflectionoftheLight-78006" value: { - dps: 36149.56213 - tps: 36019.87513 + dps: 36549.25158 + tps: 36421.68533 } } dps_results: { key: "TestRetribution-AllItems-ReinforcedSapphiriumBattlearmor" value: { - dps: 30040.57755 - tps: 29950.35175 + dps: 29960.40213 + tps: 29869.11831 } } dps_results: { key: "TestRetribution-AllItems-ReinforcedSapphiriumBattleplate" value: { - dps: 32956.0634 - tps: 32874.08499 + dps: 32815.3896 + tps: 32736.92051 } } dps_results: { key: "TestRetribution-AllItems-ResolveofUndying-77201" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-ResolveofUndying-77978" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-ResolveofUndying-77998" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 38695.87273 - tps: 38562.16778 + dps: 38610.3286 + tps: 38475.77768 } } dps_results: { key: "TestRetribution-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 38520.61807 - tps: 38386.91311 + dps: 38435.56736 + tps: 38301.01643 } } dps_results: { key: "TestRetribution-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 37102.8604 - tps: 36972.15942 + dps: 37476.39056 + tps: 37347.96268 } } dps_results: { key: "TestRetribution-AllItems-RightEyeofRajh-56100" value: { - dps: 37414.35464 - tps: 37285.31752 + dps: 37492.4678 + tps: 37365.07453 } } dps_results: { key: "TestRetribution-AllItems-RightEyeofRajh-56431" value: { - dps: 37494.81509 - tps: 37365.77797 + dps: 37586.1241 + tps: 37458.73083 } } dps_results: { key: "TestRetribution-AllItems-RosaryofLight-72901" value: { - dps: 38415.34099 - tps: 38285.94546 + dps: 38537.2187 + tps: 38409.82543 } } dps_results: { key: "TestRetribution-AllItems-RottingSkull-77116" value: { - dps: 38072.20528 - tps: 37942.51828 + dps: 37948.72782 + tps: 37821.16158 } } dps_results: { key: "TestRetribution-AllItems-RottingSkull-77987" value: { - dps: 37842.20663 - tps: 37712.51962 + dps: 37769.45821 + tps: 37641.89197 } } dps_results: { key: "TestRetribution-AllItems-RottingSkull-78007" value: { - dps: 38328.97257 - tps: 38199.28556 + dps: 38158.87356 + tps: 38031.30731 } } dps_results: { key: "TestRetribution-AllItems-RuneofZeth-68998" value: { - dps: 36482.68554 - tps: 36356.25549 + dps: 36624.38722 + tps: 36498.34479 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 37028.28978 + tps: 36899.8619 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 37048.3901 + tps: 36919.96222 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 36570.8935 + tps: 36442.46562 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 36575.20138 + tps: 36446.7735 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 37649.22972 + tps: 37520.80185 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 37714.65573 + tps: 37586.22785 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 37307.6781 + tps: 37180.28483 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 37403.53784 + tps: 37276.14457 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 36788.13169 + tps: 36660.73842 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 36792.35922 + tps: 36664.96595 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 38043.17183 + tps: 37915.77855 + } +} +dps_results: { + key: "TestRetribution-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 38131.34641 + tps: 38003.95313 } } dps_results: { key: "TestRetribution-AllItems-ScalesofLife-68915" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 hps: 248.47725 } } dps_results: { key: "TestRetribution-AllItems-ScalesofLife-69109" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 hps: 280.28001 } } dps_results: { key: "TestRetribution-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 37394.14809 - tps: 37265.11097 + dps: 37472.30663 + tps: 37344.91335 } } dps_results: { key: "TestRetribution-AllItems-SeaStar-55256" value: { - dps: 35856.66877 - tps: 35725.96779 + dps: 36523.54427 + tps: 36395.1164 } } dps_results: { key: "TestRetribution-AllItems-SeaStar-56290" value: { - dps: 35875.72633 - tps: 35745.02534 + dps: 36548.26776 + tps: 36419.83988 } } dps_results: { key: "TestRetribution-AllItems-Shadowmourne-49623" value: { - dps: 40423.62291 - tps: 40292.2672 + dps: 40327.16519 + tps: 40198.78635 } } dps_results: { key: "TestRetribution-AllItems-ShardofWoe-60233" value: { - dps: 36381.21049 - tps: 36239.37189 + dps: 36309.31369 + tps: 36168.81759 } } dps_results: { key: "TestRetribution-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 37476.54868 - tps: 37346.97118 + dps: 37437.289 + tps: 37303.87567 } } dps_results: { key: "TestRetribution-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-Skardyn'sGrace-56115" value: { - dps: 37004.52186 - tps: 36873.82088 + dps: 37283.95231 + tps: 37155.52443 } } dps_results: { key: "TestRetribution-AllItems-Skardyn'sGrace-56440" value: { - dps: 37152.76603 - tps: 37022.06505 + dps: 37390.07207 + tps: 37261.64419 } } dps_results: { key: "TestRetribution-AllItems-Sorrowsong-55879" value: { - dps: 37123.47414 - tps: 36994.43702 + dps: 37233.03153 + tps: 37105.63825 } } dps_results: { key: "TestRetribution-AllItems-Sorrowsong-56400" value: { - dps: 37193.27387 - tps: 37064.23675 + dps: 37303.43452 + tps: 37176.04125 } } dps_results: { key: "TestRetribution-AllItems-Soul'sAnguish-66994" value: { - dps: 36574.59548 - tps: 36444.90848 + dps: 36814.92531 + tps: 36687.35906 } } dps_results: { key: "TestRetribution-AllItems-SoulCasket-58183" value: { - dps: 36508.53244 - tps: 36377.83146 + dps: 37186.23963 + tps: 37057.81175 } } dps_results: { key: "TestRetribution-AllItems-SoulshifterVortex-77206" value: { - dps: 37873.13974 - tps: 37744.10262 + dps: 38028.59396 + tps: 37901.20069 } } dps_results: { key: "TestRetribution-AllItems-SoulshifterVortex-77970" value: { - dps: 37727.85372 - tps: 37598.81659 + dps: 37870.07524 + tps: 37742.68197 } } dps_results: { key: "TestRetribution-AllItems-SoulshifterVortex-77990" value: { - dps: 38139.86799 - tps: 38010.83087 + dps: 38305.37713 + tps: 38177.98386 } } dps_results: { key: "TestRetribution-AllItems-SpidersilkSpindle-68981" value: { - dps: 37325.83055 - tps: 37196.79343 + dps: 37435.03853 + tps: 37307.64526 } } dps_results: { key: "TestRetribution-AllItems-SpidersilkSpindle-69138" value: { - dps: 37421.83219 - tps: 37292.79507 + dps: 37531.59596 + tps: 37404.20269 } } dps_results: { key: "TestRetribution-AllItems-StarcatcherCompass-77202" value: { - dps: 37526.63654 - tps: 37385.39225 + dps: 37296.93072 + tps: 37155.83388 } } dps_results: { key: "TestRetribution-AllItems-StarcatcherCompass-77973" value: { - dps: 37151.28801 - tps: 37006.46822 + dps: 37071.55465 + tps: 36927.31774 } } dps_results: { key: "TestRetribution-AllItems-StarcatcherCompass-77993" value: { - dps: 37736.16493 - tps: 37588.6018 + dps: 37401.49991 + tps: 37260.23316 } } dps_results: { key: "TestRetribution-AllItems-StayofExecution-68996" value: { - dps: 35537.04927 - tps: 35409.25126 + dps: 36109.32292 + tps: 35981.76897 } } dps_results: { key: "TestRetribution-AllItems-Stonemother'sKiss-61411" value: { - dps: 36776.2511 - tps: 36651.6728 + dps: 36676.71482 + tps: 36552.01722 } } dps_results: { key: "TestRetribution-AllItems-StumpofTime-62465" value: { - dps: 36659.19819 - tps: 36530.16107 + dps: 36764.21676 + tps: 36636.82349 } } dps_results: { key: "TestRetribution-AllItems-StumpofTime-62470" value: { - dps: 36654.74552 - tps: 36525.7084 + dps: 36758.30053 + tps: 36630.90726 } } dps_results: { key: "TestRetribution-AllItems-SymbioticWorm-59332" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-SymbioticWorm-65048" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 37047.27044 - tps: 36922.05517 + dps: 37029.91494 + tps: 36902.9985 } } dps_results: { key: "TestRetribution-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 37415.15372 - tps: 37285.75417 + dps: 37537.18816 + tps: 37402.93465 } } dps_results: { key: "TestRetribution-AllItems-TearofBlood-55819" value: { - dps: 36610.06544 - tps: 36484.73063 + dps: 36579.43588 + tps: 36452.29311 } } dps_results: { key: "TestRetribution-AllItems-TearofBlood-56351" value: { - dps: 36680.3784 - tps: 36553.24943 + dps: 36610.68522 + tps: 36481.47734 } } dps_results: { key: "TestRetribution-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 37021.47833 - tps: 36892.44121 + dps: 37130.16989 + tps: 37002.77661 } } dps_results: { key: "TestRetribution-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 37170.61573 - tps: 37041.57861 + dps: 37279.12704 + tps: 37151.73376 } } dps_results: { key: "TestRetribution-AllItems-TheHungerer-68927" value: { - dps: 37292.81689 - tps: 37145.29676 + dps: 37579.7162 + tps: 37433.24252 } } dps_results: { key: "TestRetribution-AllItems-TheHungerer-69112" value: { - dps: 37558.50527 - tps: 37412.81318 + dps: 37610.27651 + tps: 37470.7251 } } dps_results: { key: "TestRetribution-AllItems-Theralion'sMirror-59519" value: { - dps: 36812.00665 - tps: 36686.80137 + dps: 36790.94577 + tps: 36664.16593 } } dps_results: { key: "TestRetribution-AllItems-Theralion'sMirror-65105" value: { - dps: 37076.8505 - tps: 36950.45288 + dps: 37032.4427 + tps: 36905.33535 } } dps_results: { key: "TestRetribution-AllItems-Throngus'sFinger-56121" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-Throngus'sFinger-56449" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-Tia'sGrace-55874" value: { - dps: 37526.28422 - tps: 37397.2471 + dps: 37618.96404 + tps: 37491.57076 } } dps_results: { key: "TestRetribution-AllItems-Tia'sGrace-56394" value: { - dps: 37665.23714 - tps: 37536.20002 + dps: 37755.74219 + tps: 37628.34892 } } dps_results: { key: "TestRetribution-AllItems-TinyAbominationinaJar-50706" value: { - dps: 37081.39318 - tps: 36943.38399 + dps: 36973.37489 + tps: 36839.24811 } } dps_results: { key: "TestRetribution-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 35287.91322 - tps: 35177.3538 + dps: 36278.35584 + tps: 36169.82414 } } dps_results: { key: "TestRetribution-AllItems-UnheededWarning-59520" value: { - dps: 37534.75683 - tps: 37405.71971 + dps: 37618.63165 + tps: 37491.23838 } } dps_results: { key: "TestRetribution-AllItems-UnquenchableFlame-67101" value: { - dps: 35800.58227 - tps: 35672.05478 + dps: 36334.40285 + tps: 36203.22469 } } dps_results: { key: "TestRetribution-AllItems-UnsolvableRiddle-62463" value: { - dps: 37173.46363 - tps: 37042.76265 + dps: 37519.50258 + tps: 37391.07471 } } dps_results: { key: "TestRetribution-AllItems-UnsolvableRiddle-62468" value: { - dps: 37173.46363 - tps: 37042.76265 + dps: 37519.50258 + tps: 37391.07471 } } dps_results: { key: "TestRetribution-AllItems-UnsolvableRiddle-68709" value: { - dps: 37173.46363 - tps: 37042.76265 + dps: 37519.50258 + tps: 37391.07471 } } dps_results: { key: "TestRetribution-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 37020.08666 - tps: 36894.76472 + dps: 36963.88971 + tps: 36835.11319 } } dps_results: { key: "TestRetribution-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 37041.57744 - tps: 36915.9074 + dps: 37041.46682 + tps: 36913.82672 } } dps_results: { key: "TestRetribution-AllItems-Varo'then'sBrooch-72899" value: { - dps: 38741.04029 - tps: 38612.00317 + dps: 38841.79433 + tps: 38714.40106 } } dps_results: { key: "TestRetribution-AllItems-VeilofLies-72900" value: { - dps: 36590.54937 - tps: 36461.51225 + dps: 36695.49999 + tps: 36568.10672 } } dps_results: { key: "TestRetribution-AllItems-VesselofAcceleration-68995" value: { - dps: 38164.76563 - tps: 38035.72851 + dps: 38270.12658 + tps: 38142.73331 } } dps_results: { key: "TestRetribution-AllItems-VesselofAcceleration-69167" value: { - dps: 38388.47358 - tps: 38259.43646 + dps: 38506.09941 + tps: 38378.70613 } } dps_results: { key: "TestRetribution-AllItems-VialofShadows-77207" value: { - dps: 37785.77672 - tps: 37656.92174 + dps: 37829.56873 + tps: 37700.32616 } } dps_results: { key: "TestRetribution-AllItems-VialofShadows-77979" value: { - dps: 37309.35811 - tps: 37180.32098 + dps: 37362.55889 + tps: 37233.90232 } } dps_results: { key: "TestRetribution-AllItems-VialofShadows-77999" value: { - dps: 37781.8624 - tps: 37653.00742 + dps: 37888.01006 + tps: 37758.76749 } } dps_results: { key: "TestRetribution-AllItems-VialofStolenMemories-59515" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-VialofStolenMemories-65109" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 36539.40222 - tps: 36408.70124 + dps: 36892.92211 + tps: 36764.49423 + } +} +dps_results: { + key: "TestRetribution-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 36937.46067 + tps: 36809.03279 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 35880.92384 - tps: 35750.22286 + dps: 36555.01053 + tps: 36426.58265 + } +} +dps_results: { + key: "TestRetribution-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 36562.09044 + tps: 36433.66256 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 37183.82688 - tps: 37053.12589 + dps: 37408.00691 + tps: 37279.57903 + } +} +dps_results: { + key: "TestRetribution-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 37515.53311 + tps: 37387.10524 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 37049.72499 - tps: 36913.84423 + dps: 37187.36984 + tps: 37053.46086 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 36782.43788 - tps: 36653.40076 + dps: 36882.75489 + tps: 36755.36162 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 36970.23856 - tps: 36836.53361 + dps: 36880.35445 + tps: 36745.80353 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 37243.26915 - tps: 37114.23203 + dps: 37351.99914 + tps: 37224.60587 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 36590.458 - tps: 36461.42088 + dps: 36695.40863 + tps: 36568.01536 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 37100.70388 - tps: 36971.66676 + dps: 37164.62544 + tps: 37037.23216 + } +} +dps_results: { + key: "TestRetribution-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 37264.5918 + tps: 37137.19852 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 36630.13981 - tps: 36501.10269 + dps: 36768.46013 + tps: 36641.06686 + } +} +dps_results: { + key: "TestRetribution-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 36778.00465 + tps: 36650.61138 } } dps_results: { key: "TestRetribution-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 37642.30434 - tps: 37513.26722 + dps: 37755.43966 + tps: 37628.04638 + } +} +dps_results: { + key: "TestRetribution-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 37878.35783 + tps: 37750.96456 } } dps_results: { key: "TestRetribution-AllItems-WillofUnbinding-77198" value: { - dps: 36491.2041 - tps: 36364.75931 + dps: 36601.73021 + tps: 36475.70063 } } dps_results: { key: "TestRetribution-AllItems-WillofUnbinding-77975" value: { - dps: 36429.16996 - tps: 36303.65674 + dps: 36577.82957 + tps: 36451.10892 } } dps_results: { key: "TestRetribution-AllItems-WillofUnbinding-77995" value: { - dps: 36469.98966 - tps: 36343.72701 + dps: 36574.20593 + tps: 36447.44485 } } dps_results: { key: "TestRetribution-AllItems-WitchingHourglass-55787" value: { - dps: 36438.26701 - tps: 36316.16276 + dps: 36538.89859 + tps: 36416.23733 } } dps_results: { key: "TestRetribution-AllItems-WitchingHourglass-56320" value: { - dps: 36800.23775 - tps: 36665.96409 + dps: 36764.77244 + tps: 36634.60794 } } dps_results: { key: "TestRetribution-AllItems-World-QuellerFocus-63842" value: { - dps: 36256.55602 - tps: 36125.85504 + dps: 36917.4542 + tps: 36789.02632 } } dps_results: { key: "TestRetribution-AllItems-WrathofUnchaining-77197" value: { - dps: 37804.69896 - tps: 37675.66184 + dps: 37893.19259 + tps: 37765.79932 } } dps_results: { key: "TestRetribution-AllItems-WrathofUnchaining-77974" value: { - dps: 37702.20532 - tps: 37573.1682 + dps: 37778.79506 + tps: 37651.40179 } } dps_results: { key: "TestRetribution-AllItems-WrathofUnchaining-77994" value: { - dps: 37920.43066 - tps: 37791.03513 + dps: 38035.21513 + tps: 37907.82186 } } dps_results: { key: "TestRetribution-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 36631.60072 - tps: 36501.91371 + dps: 36763.57038 + tps: 36636.00413 } } dps_results: { key: "TestRetribution-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 36631.60072 - tps: 36501.91371 + dps: 36763.57038 + tps: 36636.00413 } } dps_results: { key: "TestRetribution-Average-Default" value: { - dps: 38828.20101 - tps: 38685.18419 + dps: 38824.18276 + tps: 38680.33891 } } dps_results: { key: "TestRetribution-Settings-BloodElf-p3_bis-Basic-apparatus-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 43715.72044 - tps: 47562.17227 + dps: 43610.92277 + tps: 47428.67095 } } dps_results: { key: "TestRetribution-Settings-BloodElf-p3_bis-Basic-apparatus-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 38695.87273 - tps: 38562.16778 + dps: 38610.3286 + tps: 38475.77768 } } dps_results: { key: "TestRetribution-Settings-BloodElf-p3_bis-Basic-apparatus-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 53568.13355 - tps: 51979.61117 + dps: 53566.03759 + tps: 51975.8538 } } dps_results: { key: "TestRetribution-Settings-BloodElf-p3_bis-Basic-apparatus-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 25865.09578 - tps: 29465.72458 + dps: 25877.87195 + tps: 29509.43099 } } dps_results: { key: "TestRetribution-Settings-BloodElf-p3_bis-Basic-apparatus-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 23933.8021 - tps: 23819.2986 + dps: 23809.90485 + tps: 23695.78535 } } dps_results: { key: "TestRetribution-Settings-BloodElf-p3_bis-Basic-apparatus-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 30513.0004 - tps: 29063.0192 + dps: 30507.30501 + tps: 29059.53554 } } dps_results: { key: "TestRetribution-SwitchInFrontOfTarget-Default" value: { - dps: 35608.00768 - tps: 35508.14551 + dps: 35653.22324 + tps: 35548.76809 } } diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index e492e89a06..d367f25332 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -288,6 +288,48 @@ dps_results: { tps: 34635.03559 } } +dps_results: { + key: "TestShadow-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 37557.95001 + tps: 31855.60158 + } +} +dps_results: { + key: "TestShadow-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 39270.50562 + tps: 33224.13084 + } +} +dps_results: { + key: "TestShadow-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 37557.95001 + tps: 31855.60158 + } +} +dps_results: { + key: "TestShadow-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 37470.38193 + tps: 31990.08977 + } +} +dps_results: { + key: "TestShadow-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 39055.1057 + tps: 33295.5691 + } +} +dps_results: { + key: "TestShadow-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 37470.28039 + tps: 31990.08977 + } +} dps_results: { key: "TestShadow-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1338,6 +1380,90 @@ dps_results: { tps: 33746.20567 } } +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 37557.95001 + tps: 31855.60158 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 37557.95001 + tps: 31855.60158 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 38994.40116 + tps: 33003.49156 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 39075.81658 + tps: 33068.55186 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 37557.95001 + tps: 31855.60158 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 37557.95001 + tps: 31855.60158 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 37472.77269 + tps: 31990.08977 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 37470.30833 + tps: 31990.08977 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 38789.52412 + tps: 33059.45079 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 38854.37965 + tps: 33129.2308 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 37471.38484 + tps: 31990.08977 + } +} +dps_results: { + key: "TestShadow-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 37469.73577 + tps: 31990.08977 + } +} dps_results: { key: "TestShadow-AllItems-ScalesofLife-68915" value: { @@ -1788,6 +1914,13 @@ dps_results: { tps: 31855.60158 } } +dps_results: { + key: "TestShadow-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 37557.95001 + tps: 31855.60158 + } +} dps_results: { key: "TestShadow-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1795,6 +1928,13 @@ dps_results: { tps: 32763.61707 } } +dps_results: { + key: "TestShadow-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 38828.03052 + tps: 32870.54225 + } +} dps_results: { key: "TestShadow-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1802,6 +1942,13 @@ dps_results: { tps: 31855.60158 } } +dps_results: { + key: "TestShadow-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 37557.95001 + tps: 31855.60158 + } +} dps_results: { key: "TestShadow-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1847,21 +1994,42 @@ dps_results: { dps_results: { key: "TestShadow-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 37470.95847 + dps: 37472.84479 + tps: 31990.08977 + } +} +dps_results: { + key: "TestShadow-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 37471.54775 tps: 31990.08977 } } dps_results: { key: "TestShadow-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 38498.82467 - tps: 32824.03399 + dps: 38502.90792 + tps: 32838.55792 + } +} +dps_results: { + key: "TestShadow-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 38649.71442 + tps: 32944.6986 } } dps_results: { key: "TestShadow-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 37471.40829 + dps: 37469.44238 + tps: 31990.08977 + } +} +dps_results: { + key: "TestShadow-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 37466.38376 tps: 31990.08977 } } diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results index d0e6b7f4a3..7f314de8c3 100644 --- a/sim/rogue/assassination/TestAssassination.results +++ b/sim/rogue/assassination/TestAssassination.results @@ -325,6 +325,48 @@ dps_results: { tps: 20857.57129 } } +dps_results: { + key: "TestAssassination-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 29578.93224 + tps: 21001.04189 + } +} +dps_results: { + key: "TestAssassination-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 27452.58556 + tps: 19491.33575 + } +} +dps_results: { + key: "TestAssassination-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 28314.89138 + tps: 20103.57288 + } +} +dps_results: { + key: "TestAssassination-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 29498.20622 + tps: 20943.72642 + } +} +dps_results: { + key: "TestAssassination-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 27452.58556 + tps: 19491.33575 + } +} +dps_results: { + key: "TestAssassination-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 28264.0637 + tps: 20067.48523 + } +} dps_results: { key: "TestAssassination-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1326,6 +1368,90 @@ dps_results: { tps: 19882.72752 } } +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 29213.97408 + tps: 20741.92159 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 29325.21959 + tps: 20820.90591 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 27452.58556 + tps: 19491.33575 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 27452.58556 + tps: 19491.33575 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 28175.86729 + tps: 20004.86578 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 28216.86157 + tps: 20033.97172 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 29202.67235 + tps: 20733.89737 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 29280.51226 + tps: 20789.16371 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 27452.58556 + tps: 19491.33575 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 27452.58556 + tps: 19491.33575 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 28120.19382 + tps: 19965.33761 + } +} +dps_results: { + key: "TestAssassination-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 28172.04781 + tps: 20002.15395 + } +} dps_results: { key: "TestAssassination-AllItems-ScalesofLife-68915" value: { @@ -1762,6 +1888,13 @@ dps_results: { tps: 20488.56582 } } +dps_results: { + key: "TestAssassination-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 29010.18456 + tps: 20597.23104 + } +} dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1769,6 +1902,13 @@ dps_results: { tps: 19491.33575 } } +dps_results: { + key: "TestAssassination-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 27452.58556 + tps: 19491.33575 + } +} dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1776,6 +1916,13 @@ dps_results: { tps: 19897.55344 } } +dps_results: { + key: "TestAssassination-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 28092.09637 + tps: 19945.38842 + } +} dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1821,8 +1968,15 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 28847.11988 - tps: 20481.45511 + dps: 28837.95916 + tps: 20474.951 + } +} +dps_results: { + key: "TestAssassination-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 28958.95214 + tps: 20560.85602 } } dps_results: { @@ -1832,11 +1986,25 @@ dps_results: { tps: 19491.33575 } } +dps_results: { + key: "TestAssassination-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 27452.58556 + tps: 19491.33575 + } +} dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 27989.48122 - tps: 19872.53167 + dps: 27982.89217 + tps: 19867.85344 + } +} +dps_results: { + key: "TestAssassination-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 28049.9316 + tps: 19915.45143 } } dps_results: { diff --git a/sim/rogue/combat/TestCombat.results b/sim/rogue/combat/TestCombat.results index 25264fd12d..e4d3fdf44b 100644 --- a/sim/rogue/combat/TestCombat.results +++ b/sim/rogue/combat/TestCombat.results @@ -302,6 +302,48 @@ dps_results: { tps: 21126.89579 } } +dps_results: { + key: "TestCombat-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 29907.70748 + tps: 21234.47231 + } +} +dps_results: { + key: "TestCombat-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 27844.47743 + tps: 19769.57898 + } +} +dps_results: { + key: "TestCombat-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 28618.35538 + tps: 20319.03232 + } +} +dps_results: { + key: "TestCombat-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 30135.83435 + tps: 21396.44239 + } +} +dps_results: { + key: "TestCombat-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 27844.47743 + tps: 19769.57898 + } +} +dps_results: { + key: "TestCombat-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 28742.36461 + tps: 20407.07887 + } +} dps_results: { key: "TestCombat-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1331,6 +1373,90 @@ dps_results: { tps: 20078.63697 } } +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 29567.50966 + tps: 20992.93186 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 29660.54823 + tps: 21058.98925 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 27844.47743 + tps: 19769.57898 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 27844.47743 + tps: 19769.57898 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 28493.58795 + tps: 20230.44745 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 28530.37835 + tps: 20256.56863 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 29823.5389 + tps: 21174.71262 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 29904.6229 + tps: 21232.28226 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 27844.47743 + tps: 19769.57898 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 27844.47743 + tps: 19769.57898 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 28583.83273 + tps: 20294.52124 + } +} +dps_results: { + key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 28639.6684 + tps: 20334.16457 + } +} dps_results: { key: "TestCombat-AllItems-ScalesofLife-68915" value: { @@ -1795,6 +1921,13 @@ dps_results: { tps: 20728.1196 } } +dps_results: { + key: "TestCombat-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 29353.66721 + tps: 20841.10372 + } +} dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1802,6 +1935,13 @@ dps_results: { tps: 19769.57898 } } +dps_results: { + key: "TestCombat-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 27844.47743 + tps: 19769.57898 + } +} dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1809,6 +1949,13 @@ dps_results: { tps: 20134.13979 } } +dps_results: { + key: "TestCombat-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 28418.40758 + tps: 20177.06938 + } +} dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1854,8 +2001,15 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 29392.24657 - tps: 20868.49506 + dps: 29398.75794 + tps: 20873.11814 + } +} +dps_results: { + key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 29568.95471 + tps: 20993.95785 } } dps_results: { @@ -1865,11 +2019,25 @@ dps_results: { tps: 19769.57898 } } +dps_results: { + key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 27844.47743 + tps: 19769.57898 + } +} dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 28439.79053 - tps: 20192.25127 + dps: 28430.90655 + tps: 20185.94365 + } +} +dps_results: { + key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 28509.88053 + tps: 20242.01518 } } dps_results: { diff --git a/sim/rogue/subtlety/TestSubtlety.results b/sim/rogue/subtlety/TestSubtlety.results index d9e1586e77..6c1c196bd7 100644 --- a/sim/rogue/subtlety/TestSubtlety.results +++ b/sim/rogue/subtlety/TestSubtlety.results @@ -288,6 +288,48 @@ dps_results: { tps: 16886.55478 } } +dps_results: { + key: "TestSubtlety-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 24574.18353 + tps: 17447.6703 + } +} +dps_results: { + key: "TestSubtlety-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 22185.24075 + tps: 15751.52093 + } +} +dps_results: { + key: "TestSubtlety-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 22788.83992 + tps: 16180.07634 + } +} +dps_results: { + key: "TestSubtlety-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 24214.17409 + tps: 17192.06361 + } +} +dps_results: { + key: "TestSubtlety-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 22185.24075 + tps: 15751.52093 + } +} +dps_results: { + key: "TestSubtlety-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 22759.05098 + tps: 16158.9262 + } +} dps_results: { key: "TestSubtlety-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1289,6 +1331,90 @@ dps_results: { tps: 15969.041 } } +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 24258.35022 + tps: 17223.42865 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 24355.55737 + tps: 17292.44574 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 22185.24075 + tps: 15751.52093 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 22185.24075 + tps: 15751.52093 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 22691.52546 + tps: 16110.98308 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 22720.22075 + tps: 16131.35673 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 23937.46573 + tps: 16995.60067 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 23941.76285 + tps: 16998.65162 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 22185.24075 + tps: 15751.52093 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 22185.24075 + tps: 15751.52093 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 22644.9101 + tps: 16077.88617 + } +} +dps_results: { + key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 22693.32798 + tps: 16112.26286 + } +} dps_results: { key: "TestSubtlety-AllItems-ScalesofLife-68915" value: { @@ -1725,6 +1851,13 @@ dps_results: { tps: 16889.96923 } } +dps_results: { + key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 23986.04085 + tps: 17030.089 + } +} dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1732,6 +1865,13 @@ dps_results: { tps: 15751.52093 } } +dps_results: { + key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 22185.24075 + tps: 15751.52093 + } +} dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1739,6 +1879,13 @@ dps_results: { tps: 16035.8663 } } +dps_results: { + key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 22632.88726 + tps: 16069.34996 + } +} dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1784,8 +1931,15 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 23614.13142 - tps: 16766.03331 + dps: 23584.62298 + tps: 16745.08232 + } +} +dps_results: { + key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 23654.01733 + tps: 16794.3523 } } dps_results: { @@ -1795,11 +1949,25 @@ dps_results: { tps: 15751.52093 } } +dps_results: { + key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 22185.24075 + tps: 15751.52093 + } +} dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 22559.29937 - tps: 16017.10255 + dps: 22559.78963 + tps: 16017.45064 + } +} +dps_results: { + key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 22590.7513 + tps: 16039.43343 } } dps_results: { diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index b07c72b261..dd4ada50c9 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -316,6 +316,48 @@ dps_results: { tps: 1839.8511 } } +dps_results: { + key: "TestElemental-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 39621.4288 + tps: 622.4547 + } +} +dps_results: { + key: "TestElemental-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 41531.36005 + tps: 623.71742 + } +} +dps_results: { + key: "TestElemental-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 39621.4288 + tps: 622.4547 + } +} +dps_results: { + key: "TestElemental-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 39692.33802 + tps: 626.12449 + } +} +dps_results: { + key: "TestElemental-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 41142.62816 + tps: 626.15056 + } +} +dps_results: { + key: "TestElemental-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 39692.33802 + tps: 626.12449 + } +} dps_results: { key: "TestElemental-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1352,6 +1394,90 @@ dps_results: { tps: 658.59737 } } +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 39621.4288 + tps: 622.4547 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 39621.4288 + tps: 622.4547 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 41215.55028 + tps: 623.41241 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 41308.67367 + tps: 623.50235 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 39621.4288 + tps: 622.4547 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 39621.4288 + tps: 622.4547 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 39692.33802 + tps: 626.12449 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 39692.33802 + tps: 626.12449 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 40818.72804 + tps: 626.85045 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 41016.14034 + tps: 628.28585 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 39692.33802 + tps: 626.12449 + } +} +dps_results: { + key: "TestElemental-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 39692.33802 + tps: 626.12449 + } +} dps_results: { key: "TestElemental-AllItems-ScalesofLife-68915" value: { @@ -1823,6 +1949,13 @@ dps_results: { tps: 622.4547 } } +dps_results: { + key: "TestElemental-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 39621.4288 + tps: 622.4547 + } +} dps_results: { key: "TestElemental-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1830,6 +1963,13 @@ dps_results: { tps: 623.08081 } } +dps_results: { + key: "TestElemental-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 41025.25465 + tps: 623.22862 + } +} dps_results: { key: "TestElemental-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1837,6 +1977,13 @@ dps_results: { tps: 622.4547 } } +dps_results: { + key: "TestElemental-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 39621.4288 + tps: 622.4547 + } +} dps_results: { key: "TestElemental-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1886,11 +2033,25 @@ dps_results: { tps: 626.12449 } } +dps_results: { + key: "TestElemental-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 39692.33802 + tps: 626.12449 + } +} dps_results: { key: "TestElemental-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 40702.56751 - tps: 628.06186 + dps: 40563.12619 + tps: 626.60933 + } +} +dps_results: { + key: "TestElemental-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 40615.01606 + tps: 628.49987 } } dps_results: { @@ -1900,6 +2061,13 @@ dps_results: { tps: 626.12449 } } +dps_results: { + key: "TestElemental-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 39692.33802 + tps: 626.12449 + } +} dps_results: { key: "TestElemental-AllItems-VolcanicBattlegear" value: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 28e7def48d..2ac46fabf9 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -309,6 +309,48 @@ dps_results: { tps: 23478.63713 } } +dps_results: { + key: "TestEnhancement-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 36734.24336 + tps: 23690.03738 + } +} +dps_results: { + key: "TestEnhancement-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 34485.63366 + tps: 22264.496 + } +} +dps_results: { + key: "TestEnhancement-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 35409.74258 + tps: 22817.64222 + } +} +dps_results: { + key: "TestEnhancement-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 36619.40928 + tps: 23620.21155 + } +} +dps_results: { + key: "TestEnhancement-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 34485.63366 + tps: 22264.496 + } +} +dps_results: { + key: "TestEnhancement-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 35358.64012 + tps: 22785.18116 + } +} dps_results: { key: "TestEnhancement-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1352,6 +1394,90 @@ dps_results: { tps: 22769.74 } } +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 36385.23023 + tps: 23461.0228 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 36472.79167 + tps: 23517.06295 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 34485.63366 + tps: 22264.496 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 34485.63366 + tps: 22264.496 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 35260.75437 + tps: 22728.46197 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 35304.68679 + tps: 22754.75871 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 36223.53849 + tps: 23338.57554 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 36431.76297 + tps: 23510.9183 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 34485.63366 + tps: 22264.496 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 34485.63366 + tps: 22264.496 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 35221.6315 + tps: 22706.76493 + } +} +dps_results: { + key: "TestEnhancement-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 35277.03312 + tps: 22738.16682 + } +} dps_results: { key: "TestEnhancement-AllItems-ScalesofLife-68915" value: { @@ -1830,6 +1956,13 @@ dps_results: { tps: 23190.86327 } } +dps_results: { + key: "TestEnhancement-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 36176.03202 + tps: 23329.31282 + } +} dps_results: { key: "TestEnhancement-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1837,6 +1970,13 @@ dps_results: { tps: 22264.496 } } +dps_results: { + key: "TestEnhancement-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 34485.63366 + tps: 22264.496 + } +} dps_results: { key: "TestEnhancement-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1844,6 +1984,13 @@ dps_results: { tps: 22631.50703 } } +dps_results: { + key: "TestEnhancement-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 35170.97942 + tps: 22674.72515 + } +} dps_results: { key: "TestEnhancement-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1889,8 +2036,15 @@ dps_results: { dps_results: { key: "TestEnhancement-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 35896.29027 - tps: 23181.31333 + dps: 35857.34893 + tps: 23140.07309 + } +} +dps_results: { + key: "TestEnhancement-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 36042.4733 + tps: 23228.65812 } } dps_results: { @@ -1900,11 +2054,25 @@ dps_results: { tps: 22264.496 } } +dps_results: { + key: "TestEnhancement-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 34485.63366 + tps: 22264.496 + } +} dps_results: { key: "TestEnhancement-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 35078.04216 - tps: 22619.75742 + dps: 35070.26051 + tps: 22614.99383 + } +} +dps_results: { + key: "TestEnhancement-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 35144.89539 + tps: 22661.10978 } } dps_results: { diff --git a/sim/warlock/affliction/TestAffliction.results b/sim/warlock/affliction/TestAffliction.results index 490186c2ad..729c712b71 100644 --- a/sim/warlock/affliction/TestAffliction.results +++ b/sim/warlock/affliction/TestAffliction.results @@ -295,6 +295,48 @@ dps_results: { tps: 26567.92871 } } +dps_results: { + key: "TestAffliction-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 35803.94881 + tps: 25014.61598 + } +} +dps_results: { + key: "TestAffliction-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 37400.31407 + tps: 26090.58083 + } +} +dps_results: { + key: "TestAffliction-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 35803.94881 + tps: 25014.61598 + } +} +dps_results: { + key: "TestAffliction-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 35799.37247 + tps: 24997.34123 + } +} +dps_results: { + key: "TestAffliction-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 37143.05363 + tps: 25897.66774 + } +} +dps_results: { + key: "TestAffliction-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 35799.37247 + tps: 24997.34123 + } +} dps_results: { key: "TestAffliction-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1275,6 +1317,90 @@ dps_results: { tps: 26189.17129 } } +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 35803.94881 + tps: 25014.61598 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 35803.94881 + tps: 25014.61598 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 37142.94224 + tps: 25917.10986 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 37218.83394 + tps: 25968.26156 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 35803.94881 + tps: 25014.61598 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 35803.94881 + tps: 25014.61598 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 35799.37247 + tps: 24997.34123 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 35799.37247 + tps: 24997.34123 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 36905.86236 + tps: 25735.83731 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 36981.68527 + tps: 25792.86946 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 35799.37247 + tps: 24997.34123 + } +} +dps_results: { + key: "TestAffliction-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 35799.37247 + tps: 24997.34123 + } +} dps_results: { key: "TestAffliction-AllItems-ScalesofLife-68915" value: { @@ -1704,6 +1830,13 @@ dps_results: { tps: 25014.61598 } } +dps_results: { + key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 35803.94881 + tps: 25014.61598 + } +} dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1711,6 +1844,13 @@ dps_results: { tps: 25728.51577 } } +dps_results: { + key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 36987.85922 + tps: 25812.58247 + } +} dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1718,6 +1858,13 @@ dps_results: { tps: 25014.61598 } } +dps_results: { + key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 35803.94881 + tps: 25014.61598 + } +} dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1767,11 +1914,25 @@ dps_results: { tps: 24997.34123 } } +dps_results: { + key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 35799.37247 + tps: 24997.34123 + } +} dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 36623.37536 - tps: 25538.64082 + dps: 36673.86069 + tps: 25585.04025 + } +} +dps_results: { + key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 36756.92018 + tps: 25643.95262 } } dps_results: { @@ -1781,6 +1942,13 @@ dps_results: { tps: 24997.34123 } } +dps_results: { + key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 35799.37247 + tps: 24997.34123 + } +} dps_results: { key: "TestAffliction-AllItems-WillofUnbinding-77198" value: { diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results index 81ff05a7f4..58ba74c068 100644 --- a/sim/warlock/demonology/TestDemonology.results +++ b/sim/warlock/demonology/TestDemonology.results @@ -295,6 +295,48 @@ dps_results: { tps: 19596.41726 } } +dps_results: { + key: "TestDemonology-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 38436.98299 + tps: 19259.94898 + } +} +dps_results: { + key: "TestDemonology-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 38234.13873 + tps: 18924.31371 + } +} +dps_results: { + key: "TestDemonology-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} dps_results: { key: "TestDemonology-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1275,6 +1317,90 @@ dps_results: { tps: 19170.15398 } } +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 38132.42173 + tps: 19093.42402 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 38222.22826 + tps: 19142.52753 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 36487.46435 + tps: 18209.47115 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 37762.87387 + tps: 18718.62059 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 37993.37052 + tps: 18733.87569 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} +dps_results: { + key: "TestDemonology-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} dps_results: { key: "TestDemonology-AllItems-ScalesofLife-68915" value: { @@ -1704,6 +1830,13 @@ dps_results: { tps: 18209.44855 } } +dps_results: { + key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1711,6 +1844,13 @@ dps_results: { tps: 18912.38149 } } +dps_results: { + key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 37948.90405 + tps: 18993.08205 + } +} dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1718,6 +1858,13 @@ dps_results: { tps: 18209.44855 } } +dps_results: { + key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1767,11 +1914,25 @@ dps_results: { tps: 18209.42143 } } +dps_results: { + key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 37523.1191 - tps: 18750.44033 + dps: 37550.16165 + tps: 18521.60471 + } +} +dps_results: { + key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 37584.85515 + tps: 18597.39051 } } dps_results: { @@ -1781,6 +1942,13 @@ dps_results: { tps: 18209.44855 } } +dps_results: { + key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 36487.44175 + tps: 18209.44855 + } +} dps_results: { key: "TestDemonology-AllItems-WillofUnbinding-77198" value: { diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results index a75d7f8277..6e21d1a655 100644 --- a/sim/warlock/destruction/TestDestruction.results +++ b/sim/warlock/destruction/TestDestruction.results @@ -295,6 +295,48 @@ dps_results: { tps: 23933.02854 } } +dps_results: { + key: "TestDestruction-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 37994.38135 + tps: 22426.57217 + } +} +dps_results: { + key: "TestDestruction-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 39713.03457 + tps: 23309.61119 + } +} +dps_results: { + key: "TestDestruction-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 37994.38135 + tps: 22426.57217 + } +} +dps_results: { + key: "TestDestruction-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 38042.30725 + tps: 22466.8017 + } +} +dps_results: { + key: "TestDestruction-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 39594.80894 + tps: 23314.75587 + } +} +dps_results: { + key: "TestDestruction-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 38042.30725 + tps: 22466.8017 + } +} dps_results: { key: "TestDestruction-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1275,6 +1317,90 @@ dps_results: { tps: 23580.38458 } } +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 37994.38135 + tps: 22426.57217 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 37994.38135 + tps: 22426.57217 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 39435.94703 + tps: 23167.24442 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 39517.65233 + tps: 23209.22436 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 37994.38135 + tps: 22426.57217 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 37994.38135 + tps: 22426.57217 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 38042.30725 + tps: 22466.8017 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 38042.30725 + tps: 22466.8017 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 39309.60549 + tps: 23162.70068 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 39382.98665 + tps: 23211.25153 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 38042.30725 + tps: 22466.8017 + } +} +dps_results: { + key: "TestDestruction-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 38042.30725 + tps: 22466.8017 + } +} dps_results: { key: "TestDestruction-AllItems-ScalesofLife-68915" value: { @@ -1704,6 +1830,13 @@ dps_results: { tps: 22426.57217 } } +dps_results: { + key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 37994.38135 + tps: 22426.57217 + } +} dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1711,6 +1844,13 @@ dps_results: { tps: 23012.46618 } } +dps_results: { + key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 39268.98403 + tps: 23081.45931 + } +} dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1718,6 +1858,13 @@ dps_results: { tps: 22426.57217 } } +dps_results: { + key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 37994.38135 + tps: 22426.57217 + } +} dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1767,11 +1914,25 @@ dps_results: { tps: 22466.8017 } } +dps_results: { + key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 38042.30725 + tps: 22466.8017 + } +} dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 39050.47358 - tps: 23012.43721 + dps: 39055.65618 + tps: 23017.03929 + } +} +dps_results: { + key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 39169.44638 + tps: 23093.94608 } } dps_results: { @@ -1781,6 +1942,13 @@ dps_results: { tps: 22466.8017 } } +dps_results: { + key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 38042.30725 + tps: 22466.8017 + } +} dps_results: { key: "TestDestruction-AllItems-WillofUnbinding-77198" value: { diff --git a/sim/warrior/arms/TestArms.results b/sim/warrior/arms/TestArms.results index b72a315664..f0d7bf01c1 100644 --- a/sim/warrior/arms/TestArms.results +++ b/sim/warrior/arms/TestArms.results @@ -295,6 +295,48 @@ dps_results: { tps: 21459.11912 } } +dps_results: { + key: "TestArms-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 32319.50528 + tps: 20950.56251 + } +} +dps_results: { + key: "TestArms-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 31421.69443 + tps: 20366.80255 + } +} +dps_results: { + key: "TestArms-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 33248.07437 + tps: 21468.28535 + } +} +dps_results: { + key: "TestArms-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 32176.45894 + tps: 20874.61585 + } +} +dps_results: { + key: "TestArms-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 31400.98631 + tps: 20348.68886 + } +} +dps_results: { + key: "TestArms-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 33023.93371 + tps: 21418.6143 + } +} dps_results: { key: "TestArms-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1359,6 +1401,90 @@ dps_results: { tps: 20846.88683 } } +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 32193.67735 + tps: 20866.86372 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 32217.7347 + tps: 20881.43971 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 31421.69443 + tps: 20366.80255 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 31421.69443 + tps: 20366.80255 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 32953.61874 + tps: 21290.70028 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 33040.4454 + tps: 21343.06511 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 32040.43781 + tps: 20788.83654 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 32050.47741 + tps: 20802.49614 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 31400.98631 + tps: 20348.68886 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 31400.98631 + tps: 20348.68886 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 32756.85546 + tps: 21240.90878 + } +} +dps_results: { + key: "TestArms-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 32852.77844 + tps: 21291.74406 + } +} dps_results: { key: "TestArms-AllItems-ScalesofLife-68915" value: { @@ -1826,6 +1952,13 @@ dps_results: { tps: 20754.8542 } } +dps_results: { + key: "TestArms-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 32099.54338 + tps: 20787.49025 + } +} dps_results: { key: "TestArms-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1833,6 +1966,13 @@ dps_results: { tps: 20366.80255 } } +dps_results: { + key: "TestArms-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 31421.69443 + tps: 20366.80255 + } +} dps_results: { key: "TestArms-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1840,6 +1980,13 @@ dps_results: { tps: 21097.63343 } } +dps_results: { + key: "TestArms-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 32776.19035 + tps: 21183.69389 + } +} dps_results: { key: "TestArms-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1885,8 +2032,15 @@ dps_results: { dps_results: { key: "TestArms-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 31873.84805 - tps: 20672.55307 + dps: 31921.83057 + tps: 20711.69058 + } +} +dps_results: { + key: "TestArms-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 31959.78536 + tps: 20727.99834 } } dps_results: { @@ -1896,11 +2050,25 @@ dps_results: { tps: 20348.68886 } } +dps_results: { + key: "TestArms-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 31400.98631 + tps: 20348.68886 + } +} dps_results: { key: "TestArms-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 32483.93585 - tps: 21053.52804 + dps: 32476.15117 + tps: 21048.56212 + } +} +dps_results: { + key: "TestArms-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 32590.32133 + tps: 21122.89294 } } dps_results: { diff --git a/sim/warrior/fury/TestFury.results b/sim/warrior/fury/TestFury.results index c187260011..e0dca82a06 100644 --- a/sim/warrior/fury/TestFury.results +++ b/sim/warrior/fury/TestFury.results @@ -309,6 +309,48 @@ dps_results: { tps: 26039.05768 } } +dps_results: { + key: "TestFury-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 29754.95793 + tps: 24657.24786 + } +} +dps_results: { + key: "TestFury-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 28613.10708 + tps: 23785.19572 + } +} +dps_results: { + key: "TestFury-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 30831.27669 + tps: 25499.3377 + } +} +dps_results: { + key: "TestFury-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 30009.21573 + tps: 24841.92038 + } +} +dps_results: { + key: "TestFury-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 28663.09175 + tps: 23757.76147 + } +} +dps_results: { + key: "TestFury-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 30652.087 + tps: 25382.7998 + } +} dps_results: { key: "TestFury-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1401,6 +1443,90 @@ dps_results: { tps: 24369.69022 } } +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 29647.23056 + tps: 24588.88421 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 29684.98281 + tps: 24602.16297 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 28613.10708 + tps: 23785.19572 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 28613.10708 + tps: 23785.19572 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 30473.6553 + tps: 25222.97748 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 30579.10776 + tps: 25304.46831 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 29658.04844 + tps: 24547.45222 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 29775.08191 + tps: 24659.16762 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 28663.09175 + tps: 23757.76147 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 28663.09175 + tps: 23757.76147 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 30299.43064 + tps: 25098.95241 + } +} +dps_results: { + key: "TestFury-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 30416.78936 + tps: 25199.73922 + } +} dps_results: { key: "TestFury-AllItems-ScalesofLife-68915" value: { @@ -1865,6 +1991,13 @@ dps_results: { tps: 24164.96824 } } +dps_results: { + key: "TestFury-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 29477.5221 + tps: 24418.36468 + } +} dps_results: { key: "TestFury-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1872,6 +2005,13 @@ dps_results: { tps: 23785.19572 } } +dps_results: { + key: "TestFury-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 28613.10708 + tps: 23785.19572 + } +} dps_results: { key: "TestFury-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1879,6 +2019,13 @@ dps_results: { tps: 24922.52432 } } +dps_results: { + key: "TestFury-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 30258.16549 + tps: 25056.45273 + } +} dps_results: { key: "TestFury-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1924,8 +2071,15 @@ dps_results: { dps_results: { key: "TestFury-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 29588.80821 - tps: 24466.62493 + dps: 29532.99708 + tps: 24472.33928 + } +} +dps_results: { + key: "TestFury-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 29737.70506 + tps: 24595.61143 } } dps_results: { @@ -1935,11 +2089,25 @@ dps_results: { tps: 23757.76147 } } +dps_results: { + key: "TestFury-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 28663.09175 + tps: 23757.76147 + } +} dps_results: { key: "TestFury-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 29989.79949 - tps: 24837.47184 + dps: 29969.76716 + tps: 24831.05935 + } +} +dps_results: { + key: "TestFury-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 30109.04384 + tps: 24950.83343 } } dps_results: { diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results index 1bf2371af4..60210ddde8 100644 --- a/sim/warrior/protection/TestProtectionWarrior.results +++ b/sim/warrior/protection/TestProtectionWarrior.results @@ -301,6 +301,48 @@ dps_results: { tps: 28731.39556 } } +dps_results: { + key: "TestProtectionWarrior-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" + value: { + dps: 4824.07974 + tps: 29350.90468 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" + value: { + dps: 5045.62069 + tps: 30784.62672 + } +} dps_results: { key: "TestProtectionWarrior-AllItems-ChaoticShadowspiritDiamond" value: { @@ -1386,6 +1428,90 @@ dps_results: { tps: 29340.23173 } } +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sBadgeofConquest-70399" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sBadgeofConquest-72304" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sBadgeofDominance-70401" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sBadgeofDominance-72448" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sBadgeofVictory-70400" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sBadgeofVictory-72450" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" + value: { + dps: 4798.63716 + tps: 29195.53656 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" + value: { + dps: 4807.99237 + tps: 29255.66345 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" + value: { + dps: 4988.59152 + tps: 30442.31011 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" + value: { + dps: 5000.48574 + tps: 30506.31952 + } +} dps_results: { key: "TestProtectionWarrior-AllItems-ScalesofLife-68915" value: { @@ -1827,6 +1953,13 @@ dps_results: { tps: 28597.5739 } } +dps_results: { + key: "TestProtectionWarrior-AllItems-ViciousGladiator'sBadgeofConquest-70517" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} dps_results: { key: "TestProtectionWarrior-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { @@ -1834,6 +1967,13 @@ dps_results: { tps: 28597.5739 } } +dps_results: { + key: "TestProtectionWarrior-AllItems-ViciousGladiator'sBadgeofDominance-70518" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} dps_results: { key: "TestProtectionWarrior-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { @@ -1841,6 +1981,13 @@ dps_results: { tps: 28597.5739 } } +dps_results: { + key: "TestProtectionWarrior-AllItems-ViciousGladiator'sBadgeofVictory-70519" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} dps_results: { key: "TestProtectionWarrior-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { @@ -1886,8 +2033,15 @@ dps_results: { dps_results: { key: "TestProtectionWarrior-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 4774.59278 - tps: 29066.37732 + dps: 4770.30777 + tps: 29040.91761 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-ViciousGladiator'sInsigniaofConquest-70577" + value: { + dps: 4797.61413 + tps: 29200.71884 } } dps_results: { @@ -1897,11 +2051,25 @@ dps_results: { tps: 28597.5739 } } +dps_results: { + key: "TestProtectionWarrior-AllItems-ViciousGladiator'sInsigniaofDominance-70578" + value: { + dps: 4688.32477 + tps: 28597.5739 + } +} dps_results: { key: "TestProtectionWarrior-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 4925.14006 - tps: 30044.40838 + dps: 4925.105 + tps: 30051.21194 + } +} +dps_results: { + key: "TestProtectionWarrior-AllItems-ViciousGladiator'sInsigniaofVictory-70579" + value: { + dps: 4953.89904 + tps: 30231.54253 } } dps_results: { diff --git a/ui/hunter/survival/apls/sv.apl.json b/ui/hunter/survival/apls/sv.apl.json index 776b4173d8..cd84817d22 100644 --- a/ui/hunter/survival/apls/sv.apl.json +++ b/ui/hunter/survival/apls/sv.apl.json @@ -9,16 +9,13 @@ { "action": { "castSpell": { "spellId": { "spellId": 53517 } } }, "doAtValue": { "const": { "val": "-4s" } }, "hide": true }, { "action": { "triggerIcd": { "auraId": { "spellId": 97125 } } }, "doAtValue": { "const": { "val": "-40s" } }, "hide": true } ], - "priorityList": [ + "priorityList": [ {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"3s"}}}},"autocastOtherCooldowns":{}}}, {"action":{"condition":{"or":{"vals":[{"isExecutePhase":{"threshold":"E20"}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"25s"}}}}]}},"castSpell":{"spellId":{"itemId":58145}}}}, {"hide":true,"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":1978}}}}},"castSpell":{"spellId":{"spellId":2643}}}}, {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":1978}}}}},"castSpell":{"spellId":{"spellId":1978}}}}, {"action":{"castSpell":{"spellId":{"spellId":53351}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":56343}}},{"dotIsActive":{"spellId":{"spellId":53301}}},{"auraIsActive":{"auraId":{"spellId":99060}}}]}},"castSpell":{"spellId":{"spellId":3044}}}}, - {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":53301}}},{"cmp":{"op":"OpGe","lhs":{"dotRemainingTime":{"spellId":{"spellId":53301}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTravelTime":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"1000ms"}}}}}},{"spellCanCast":{"spellId":{"spellId":53301}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":53301}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTravelTime":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"1050ms"}}}}}}]}},"wait":{"duration":{"const":{"val":"51ms"}}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"250ms"}}}},{"cmp":{"op":"OpGt","lhs":{"currentFocus":{}},"rhs":{"const":{"val":"44"}}}}]}},"waitUntil":{"condition":{"spellIsReady":{"spellId":{"spellId":53301}}}}}}, - {"action":{"condition":{"or":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":53301}}}}},{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":53301}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTravelTime":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"1000ms"}}}}}}]}},"castSpell":{"spellId":{"spellId":53301}}}}, + {"action":{"castSpell":{"spellId":{"spellId":53301}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"spellIsReady":{"spellId":{"spellId":3674}}}]}},"castSpell":{"spellId":{"spellId":3674}}}}, {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentFocus":{}},"rhs":{"const":{"val":"80"}}}},"castSpell":{"spellId":{"spellId":3044}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentFocus":{}},"rhs":{"const":{"val":"40"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"1s"}}}}]}},"castSpell":{"spellId":{"spellId":3044}}}}, diff --git a/ui/paladin/retribution/apls/apparatus.apl.json b/ui/paladin/retribution/apls/apparatus.apl.json index 3250e435e4..358e1fd66b 100644 --- a/ui/paladin/retribution/apls/apparatus.apl.json +++ b/ui/paladin/retribution/apls/apparatus.apl.json @@ -2,43 +2,48 @@ "type": "TypeAPL", "prepullActions": [ { "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-0.1s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 86150 } } }, "doAtValue": { "const": { "val": "-0.1s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 2825, "tag": -1 } } }, "doAtValue": { "const": { "val": "-0s" } } } + { "action": { "castSpell": { "spellId": { "spellId": 86150 } } }, "doAtValue": { "const": { "val": "-0.1s" } } } ], "priorityList": [ + { + "action": { + "condition": { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 31801 } } } } }, + "castSpell": { "spellId": { "spellId": 31801 } } + } + }, + { "action": { "castSpell": { "spellId": { "spellId": 2825, "tag": -1 } } } }, { "action": { "castSpell": { "spellId": { "spellId": 57933, "tag": -1 } } } }, { "action": { "condition": { - "or": { + "and": { "vals": [ + { "auraIsActive": { "auraId": { "spellId": 85696 } } }, + { "auraIsActive": { "auraId": { "spellId": 31884 } } }, { - "and": { - "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "2" } } } }, - { "spellIsReady": { "spellId": { "spellId": 85696 } } }, - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 90174 } } } } } - ] - } - }, - { - "and": { + "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 90174 } } }, - { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "2" } } } } + { + "cmp": { + "op": "OpLe", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 85696 } } }, + "rhs": { "const": { "val": "16s" } } + } + }, + { + "cmp": { + "op": "OpEq", + "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, + "rhs": { "const": { "val": "5" } } + } + } ] } } ] } }, - "castSpell": { "spellId": { "spellId": 35395 } } - } - }, - { - "action": { - "condition": { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 53657 } } } } }, - "castSpell": { "spellId": { "spellId": 20271 } } + "castSpell": { "spellId": { "itemId": 68972 } } } }, { @@ -46,19 +51,32 @@ "condition": { "and": { "vals": [ + { "auraIsActive": { "auraId": { "spellId": 85696 } } }, + { "auraIsActive": { "auraId": { "spellId": 31884 } } }, { "or": { "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, - { "auraIsActive": { "auraId": { "spellId": 90174 } } } + { + "cmp": { + "op": "OpLe", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 85696 } } }, + "rhs": { "const": { "val": "16s" } } + } + }, + { + "cmp": { + "op": "OpEq", + "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, + "rhs": { "const": { "val": "5" } } + } + } ] } - }, - { "cmp": { "op": "OpEq", "lhs": { "gcdTimeToReady": {} }, "rhs": { "const": { "val": "0s" } } } } + } ] } }, - "strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 85696 } } }, { "castSpell": { "spellId": { "spellId": 84963 } } }] } + "castSpell": { "spellId": { "itemId": 69113 } } } }, { @@ -68,16 +86,16 @@ "vals": [ { "cmp": { - "op": "OpLe", + "op": "OpGt", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, - "rhs": { "const": { "val": "10s" } } + "rhs": { "const": { "val": "55s" } } } }, - { "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, "rhs": { "remainingTime": {} } } } + { "auraIsActive": { "auraId": { "spellId": 85696 } } } ] } }, - "castSpell": { "spellId": { "spellId": 86150 } } + "castSpell": { "spellId": { "spellId": 82174 } } } }, { @@ -86,70 +104,46 @@ "or": { "vals": [ { - "cmp": { - "op": "OpGe", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 31884 } } }, - "rhs": { "const": { "val": "35s" } } + "and": { + "vals": [ + { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "2" } } } }, + { "spellIsReady": { "spellId": { "spellId": 85696 } } }, + { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 90174 } } } } } + ] } }, { "and": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 85696 } } }, { "auraIsActive": { "auraId": { "spellId": 84963 } } }] + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 90174 } } }, + { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "2" } } } } + ] } } ] } }, - "castSpell": { "spellId": { "spellId": 82174 } } + "castSpell": { "spellId": { "spellId": 35395 } } } }, { "action": { - "condition": { - "and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 85696 } } }, { "auraIsActive": { "auraId": { "spellId": 84963 } } }] } - }, - "autocastOtherCooldowns": {} + "condition": { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 53657 } } } } }, + "castSpell": { "spellId": { "spellId": 20271 } } } }, { "action": { - "condition": { - "and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 85696 } } }, { "auraIsActive": { "auraId": { "spellId": 84963 } } }] } - }, - "castSpell": { "spellId": { "spellId": 31884 } } + "condition": { "cmp": { "op": "OpLt", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "16000" } } } }, + "castSpell": { "spellId": { "spellId": 28730 } } } }, { "action": { "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 85696 } } }, - { "auraIsActive": { "auraId": { "spellId": 84963 } } }, - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 85696 } } }, - "rhs": { "const": { "val": "16s" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, - "rhs": { "const": { "val": "5" } } - } - } - ] - } - } - ] - } + "cmp": { "op": "OpLt", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 85696 } } }, "rhs": { "const": { "val": "34s" } } } }, - "castSpell": { "spellId": { "itemId": 69113 } } + "castSpell": { "spellId": { "spellId": 86150 } } } }, { @@ -157,34 +151,23 @@ "condition": { "and": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 85696 } } }, - { "auraIsActive": { "auraId": { "spellId": 84963 } } }, { "or": { "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 85696 } } }, - "rhs": { "const": { "val": "16s" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, - "rhs": { "const": { "val": "5" } } - } - } + { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, + { "auraIsActive": { "auraId": { "spellId": 90174 } } } ] } - } + }, + { "cmp": { "op": "OpEq", "lhs": { "gcdTimeToReady": {} }, "rhs": { "const": { "val": "0s" } } } } ] } }, - "castSpell": { "spellId": { "itemId": 68972 } } + "strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 85696 } } }, { "castSpell": { "spellId": { "spellId": 84963 } } }] } } }, + { "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 85696 } } }, "autocastOtherCooldowns": {} } }, + { "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 85696 } } }, "castSpell": { "spellId": { "spellId": 31884 } } } }, { "action": { "condition": { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, @@ -202,7 +185,7 @@ { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 84963 } } } } }, { "cmp": { - "op": "OpLt", + "op": "OpLe", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 84963 } } }, "rhs": { "const": { "val": "1s" } } } @@ -238,7 +221,14 @@ "rhs": { "const": { "val": "1.25s" } } } }, - { "auraIsActive": { "auraId": { "spellId": 85696 } } } + { + "and": { + "vals": [ + { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 54934 } } } } }, + { "auraIsActive": { "auraId": { "spellId": 85696 } } } + ] + } + } ] } } @@ -255,7 +245,20 @@ { "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 59578 } } }, "castSpell": { "spellId": { "spellId": 879 } } } }, { "action": { - "condition": { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, + "condition": { + "and": { + "vals": [ + { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, + { + "cmp": { + "op": "OpGt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, + "rhs": { "const": { "val": "1.25s" } } + } + } + ] + } + }, "castSpell": { "spellId": { "spellId": 85256 } } } }, @@ -264,9 +267,20 @@ { "action": { "condition": { - "cmp": { "op": "OpLt", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, "rhs": { "const": { "val": "0.4s" } } } + "and": { + "vals": [ + { + "cmp": { + "op": "OpLt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, + "rhs": { "const": { "val": "0.4s" } } + } + }, + { "cmp": { "op": "OpGt", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, "rhs": { "const": { "val": "0s" } } } } + ] + } }, - "wait": { "duration": { "const": { "val": "0.3s" } } } + "wait": { "duration": { "const": { "val": "0.1s" } } } } }, { "action": { "castSpell": { "spellId": { "spellId": 2812 } } } }, diff --git a/ui/paladin/retribution/apls/default.apl.json b/ui/paladin/retribution/apls/default.apl.json index dcfd686318..258e3b17a1 100644 --- a/ui/paladin/retribution/apls/default.apl.json +++ b/ui/paladin/retribution/apls/default.apl.json @@ -2,11 +2,83 @@ "type": "TypeAPL", "prepullActions": [ { "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-0.1s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 86150 } } }, "doAtValue": { "const": { "val": "-0.1s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 2825, "tag": -1 } } }, "doAtValue": { "const": { "val": "-0s" } } } + { "action": { "castSpell": { "spellId": { "spellId": 86150 } } }, "doAtValue": { "const": { "val": "-0.1s" } } } ], "priorityList": [ + { + "action": { + "condition": { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 31801 } } } } }, + "castSpell": { "spellId": { "spellId": 31801 } } + } + }, + { "action": { "castSpell": { "spellId": { "spellId": 2825, "tag": -1 } } } }, { "action": { "castSpell": { "spellId": { "spellId": 57933, "tag": -1 } } } }, + { "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 31884 } } }, "autocastOtherCooldowns": {} } }, + { + "action": { + "condition": { + "or": { + "vals": [ + { + "and": { + "vals": [ + { + "or": { + "vals": [ + { + "and": { + "vals": [ + { + "cmp": { + "op": "OpGt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, + "rhs": { "const": { "val": "35s" } } + } + }, + { + "or": { + "vals": [ + { "auraIsKnown": { "auraId": { "itemId": 56285 } } }, + { "auraIsKnown": { "auraId": { "itemId": 56345 } } }, + { "auraIsKnown": { "auraId": { "itemId": 52351 } } }, + { "auraIsKnown": { "auraId": { "itemId": 62464 } } }, + { "auraIsKnown": { "auraId": { "itemId": 62469 } } }, + { "auraIsKnown": { "auraId": { "itemId": 69002 } } }, + { "auraIsKnown": { "auraId": { "itemId": 77116 } } }, + { "auraIsKnown": { "auraId": { "spellId": 91836 } } }, + { "auraIsKnown": { "auraId": { "itemId": 64689 } } }, + { "auraIsKnown": { "auraId": { "itemId": 61034 } } }, + { "auraIsKnown": { "auraId": { "itemId": 70519 } } }, + { "auraIsKnown": { "auraId": { "itemId": 70400 } } }, + { "auraIsKnown": { "auraId": { "itemId": 72450 } } }, + { "auraIsKnown": { "auraId": { "itemId": 73496 } } } + ] + } + } + ] + } + }, + { + "cmp": { + "op": "OpGt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, + "rhs": { "const": { "val": "55s" } } + } + } + ] + } + }, + { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 85696 } } } } } + ] + } + }, + { "auraIsActive": { "auraId": { "spellId": 31884 } } } + ] + } + }, + "castSpell": { "spellId": { "spellId": 82174 } } + } + }, { "action": { "condition": { @@ -24,8 +96,8 @@ { "and": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 90174 } } }, - { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "2" } } } } + { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "2" } } } }, + { "auraIsActive": { "auraId": { "spellId": 90174 } } } ] } } @@ -37,10 +109,57 @@ }, { "action": { - "condition": { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 53657 } } } } }, + "condition": { + "and": { + "vals": [ + { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 53657 } } } } }, + { + "or": { + "vals": [ + { + "and": { + "vals": [ + { "auraIsKnown": { "auraId": { "spellId": 105767 } } }, + { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 90174 } } } } }, + { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } } + ] + } + }, + { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 105767 } } } } } + ] + } + } + ] + } + }, "castSpell": { "spellId": { "spellId": 20271 } } } }, + { + "action": { + "condition": { "cmp": { "op": "OpLt", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "16000" } } } }, + "castSpell": { "spellId": { "spellId": 28730 } } + } + }, + { + "action": { + "condition": { + "or": { + "vals": [ + { + "cmp": { + "op": "OpLe", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, + "rhs": { "const": { "val": "10s" } } + } + }, + { "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, "rhs": { "remainingTime": {} } } } + ] + } + }, + "castSpell": { "spellId": { "spellId": 86150 } } + } + }, { "action": { "condition": { @@ -68,7 +187,7 @@ ] } }, - { "cmp": { "op": "OpEq", "lhs": { "gcdTimeToReady": {} }, "rhs": { "const": { "val": "0s" } } } } + { "gcdIsReady": {} } ] } }, @@ -94,7 +213,8 @@ "lhs": { "auraRemainingTime": { "auraId": { "spellId": 84963 } } }, "rhs": { "const": { "val": "20s" } } } - } + }, + { "gcdIsReady": {} } ] } }, @@ -107,41 +227,6 @@ } } }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, - "rhs": { "const": { "val": "10s" } } - } - }, - { "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, "rhs": { "remainingTime": {} } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 86150 } } - } - }, - { - "action": { - "condition": { - "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 31884 } } }, "rhs": { "const": { "val": "35s" } } } - }, - "castSpell": { "spellId": { "spellId": 82174 } } - } - }, - { - "action": { - "condition": { - "and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 85696 } } }, { "auraIsActive": { "auraId": { "spellId": 84963 } } }] } - }, - "autocastOtherCooldowns": {} - } - }, { "action": { "condition": { @@ -167,7 +252,7 @@ { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 84963 } } } } }, { "cmp": { - "op": "OpLt", + "op": "OpLe", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 84963 } } }, "rhs": { "const": { "val": "1s" } } } @@ -184,6 +269,21 @@ "castSpell": { "spellId": { "spellId": 84963 } } } }, + { + "action": { + "condition": { + "and": { + "vals": [ + { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, + { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 90174 } } } } }, + { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 85696 } } } } }, + { "auraIsKnown": { "auraId": { "spellId": 105767 } } } + ] + } + }, + "castSpell": { "spellId": { "spellId": 20271 } } + } + }, { "action": { "condition": { @@ -195,10 +295,24 @@ "vals": [ { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, { - "cmp": { - "op": "OpLt", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, - "rhs": { "const": { "val": "1.25s" } } + "or": { + "vals": [ + { + "cmp": { + "op": "OpLt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, + "rhs": { "const": { "val": "1.25s" } } + } + }, + { + "and": { + "vals": [ + { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 54934 } } } } }, + { "auraIsActive": { "auraId": { "spellId": 85696 } } } + ] + } + } + ] } } ] @@ -210,27 +324,85 @@ "castSpell": { "spellId": { "spellId": 85256 } } } }, + { + "action": { + "condition": { + "and": { + "vals": [ + { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 85696 } } } } }, + { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, + { "auraIsKnown": { "auraId": { "spellId": 105767 } } } + ] + } + }, + "castSpell": { "spellId": { "spellId": 20271 } } + } + }, { "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 59578 } } }, "castSpell": { "spellId": { "spellId": 879 } } } }, { "action": { - "condition": { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, + "condition": { + "and": { + "vals": [ + { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, + { + "cmp": { + "op": "OpGt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, + "rhs": { "const": { "val": "1.25s" } } + } + } + ] + } + }, "castSpell": { "spellId": { "spellId": 85256 } } } }, { "action": { "castSpell": { "spellId": { "spellId": 24275 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 20271 } } } }, { "action": { "condition": { - "cmp": { "op": "OpLt", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, "rhs": { "const": { "val": "0.4s" } } } + "or": { + "vals": [ + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 85696 } } }, + { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, + { "auraIsKnown": { "auraId": { "spellId": 105767 } } } + ] + } + }, + { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 105767 } } } } } + ] + } + }, + "castSpell": { "spellId": { "spellId": 20271 } } + } + }, + { + "action": { + "condition": { + "and": { + "vals": [ + { + "cmp": { + "op": "OpLt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, + "rhs": { "const": { "val": "0.4s" } } + } + }, + { "cmp": { "op": "OpGt", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, "rhs": { "const": { "val": "0s" } } } } + ] + } }, - "wait": { "duration": { "const": { "val": "0.3s" } } } + "wait": { "duration": { "const": { "val": "0.1s" } } } } }, { "action": { "castSpell": { "spellId": { "spellId": 2812 } } } }, { "action": { - "condition": { "cmp": { "op": "OpGe", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "16000" } } } }, + "condition": { "cmp": { "op": "OpGt", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "16000" } } } }, "castSpell": { "spellId": { "spellId": 26573 } } } } diff --git a/ui/paladin/retribution/apls/t13.apl.json b/ui/paladin/retribution/apls/t13.apl.json deleted file mode 100644 index 76086e2315..0000000000 --- a/ui/paladin/retribution/apls/t13.apl.json +++ /dev/null @@ -1,300 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - { "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-0.1s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 86150 } } }, "doAtValue": { "const": { "val": "-0.1s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 2825, "tag": -1 } } }, "doAtValue": { "const": { "val": "-0s" } } } - ], - "priorityList": [ - { "action": { "castSpell": { "spellId": { "spellId": 57933, "tag": -1 } } } }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "2" } } } }, - { "spellIsReady": { "spellId": { "spellId": 85696 } } }, - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 85696 } } } } } - ] - } - }, - { - "and": { - "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "2" } } } }, - { "auraIsActive": { "auraId": { "spellId": 90174 } } } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 35395 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 53657 } } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 90174 } } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 20271 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "or": { - "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, - { "auraIsActive": { "auraId": { "spellId": 90174 } } } - ] - } - }, - { - "or": { - "vals": [ - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 84963 } } } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 84963 } } }, - "rhs": { "const": { "val": "20s" } } - } - } - ] - } - }, - { "gcdIsReady": {} } - ] - } - }, - "strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 85696 } } }, { "castSpell": { "spellId": { "spellId": 84963 } } }] } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "or": { - "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, - { "auraIsActive": { "auraId": { "spellId": 90174 } } } - ] - } - }, - { - "cmp": { - "op": "OpGe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 84963 } } }, - "rhs": { "const": { "val": "20s" } } - } - }, - { "gcdIsReady": {} } - ] - } - }, - "strictSequence": { - "actions": [ - { "castSpell": { "spellId": { "spellId": 85696 } } }, - { "castSpell": { "spellId": { "spellId": 31884 } } }, - { "autocastOtherCooldowns": {} } - ] - } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, - "rhs": { "const": { "val": "10s" } } - } - }, - { "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } }, "rhs": { "remainingTime": {} } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 86150 } } - } - }, - { - "action": { - "condition": { - "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 31884 } } }, "rhs": { "const": { "val": "35s" } } } - }, - "castSpell": { "spellId": { "spellId": 82174 } } - } - }, - { - "action": { - "condition": { - "and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 85696 } } }, { "auraIsActive": { "auraId": { "spellId": 84963 } } }] } - }, - "autocastOtherCooldowns": {} - } - }, - { - "action": { - "condition": { - "and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 85696 } } }, { "auraIsActive": { "auraId": { "spellId": 84963 } } }] } - }, - "castSpell": { "spellId": { "spellId": 31884 } } - } - }, - { - "action": { - "condition": { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, - "castSpell": { "spellId": { "spellId": 35395 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "or": { - "vals": [ - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 84963 } } } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 84963 } } }, - "rhs": { "const": { "val": "1s" } } - } - } - ] - } - }, - { "not": { "val": { "spellCanCast": { "spellId": { "spellId": 85696 } } } } }, - { "not": { "val": { "spellIsReady": { "spellId": { "spellId": 85696 } } } } }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "6s" } } } }, - { - "or": { - "vals": [ - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 85696 } } } } }, - { - "cmp": { - "op": "OpGe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 85696 } } }, - "rhs": { "const": { "val": "7s" } } - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 84963 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 90174 } } } } }, - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 85696 } } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 20271 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 90174 } } }, - { - "and": { - "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, - "rhs": { "const": { "val": "1.25s" } } - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 85256 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 85696 } } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 20271 } } - } - }, - { "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 59578 } } }, "castSpell": { "spellId": { "spellId": 879 } } } }, - { - "action": { - "condition": { "cmp": { "op": "OpEq", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } }, - "castSpell": { "spellId": { "spellId": 85256 } } - } - }, - { "action": { "castSpell": { "spellId": { "spellId": 24275 } } } }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 85696 } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentHolyPower": {} }, "rhs": { "const": { "val": "3" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 20271 } } - } - }, - { - "action": { - "condition": { - "cmp": { "op": "OpLt", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 35395 } } }, "rhs": { "const": { "val": "0.4s" } } } - }, - "wait": { "duration": { "const": { "val": "0.3s" } } } - } - }, - { "action": { "castSpell": { "spellId": { "spellId": 2812 } } } }, - { - "action": { - "condition": { "cmp": { "op": "OpGe", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "16000" } } } }, - "castSpell": { "spellId": { "spellId": 26573 } } - } - } - ] -} diff --git a/ui/paladin/retribution/gear_sets/p2_bis.gear.json b/ui/paladin/retribution/gear_sets/p2_bis.gear.json index 70c98cef95..a8bbfb83ef 100644 --- a/ui/paladin/retribution/gear_sets/p2_bis.gear.json +++ b/ui/paladin/retribution/gear_sets/p2_bis.gear.json @@ -1,21 +1,21 @@ { "items": [ - {"id":65216,"enchant":4208,"gems":[68779,52240],"reforging":161}, - {"id":65025}, - {"id":65142,"enchant":4202,"gems":[52206]}, - {"id":69879,"randomSuffix":-120,"enchant":4118,"reforging":147}, - {"id":65214,"enchant":4102,"gems":[52206,52213],"reforging":154}, - {"id":60228,"enchant":4256,"gems":[52240,0],"reforging":154}, - {"id":65215,"enchant":4106,"gems":[52206,0],"reforging":152}, - {"id":65040,"gems":[52206,52206],"reforging":147}, - {"id":65217,"enchant":4126,"gems":[52206,52206]}, - {"id":65075,"enchant":4094,"gems":[52206],"reforging":159}, - {"id":60226,"gems":[52240],"reforging":144}, - {"id":65382,"randomSuffix":-118,"reforging":151}, - {"id":65072,"reforging":161}, - {"id":62469}, - {"id":65003,"enchant":4099,"reforging":140}, + { "id": 65216, "enchant": 4208, "gems": [68779, 52240], "reforging": 161 }, + { "id": 65025, "reforging": 137 }, + { "id": 65142, "enchant": 4202, "gems": [52206] }, + { "id": 69879, "randomSuffix": -120, "enchant": 4118, "reforging": 140 }, + { "id": 65214, "enchant": 4102, "gems": [52206, 52213], "reforging": 154 }, + { "id": 60228, "enchant": 4256, "gems": [52240, 0], "reforging": 154 }, + { "id": 65215, "enchant": 4106, "gems": [52206, 0], "reforging": 151 }, + { "id": 65040, "gems": [52206, 52206], "reforging": 147 }, + { "id": 65217, "enchant": 4126, "gems": [52206, 52206], "reforging": 137 }, + { "id": 65075, "enchant": 4094, "gems": [52206], "reforging": 158 }, + { "id": 60226, "gems": [52240] }, + { "id": 65382, "randomSuffix": -118, "reforging": 151 }, + { "id": 65072, "reforging": 161 }, + { "id": 62469 }, + { "id": 65003, "enchant": 4099, "reforging": 147 }, {}, - {"id":64674,"gems":[52206],"reforging":161} + { "id": 64674, "gems": [52206], "reforging": 161 } ] } diff --git a/ui/paladin/retribution/gear_sets/p3_bis.gear.json b/ui/paladin/retribution/gear_sets/p3_bis.gear.json index ac4d472412..c6d09986cc 100644 --- a/ui/paladin/retribution/gear_sets/p3_bis.gear.json +++ b/ui/paladin/retribution/gear_sets/p3_bis.gear.json @@ -1,21 +1,21 @@ { "items": [ - {"id":71514,"enchant":4208,"gems":[68779,52206],"reforging":147}, - {"id":71446,"reforging":147}, - {"id":71516,"enchant":4202,"gems":[52240],"reforging":154}, - {"id":69879,"randomSuffix":-120,"enchant":4118,"reforging":140}, - {"id":71469,"enchant":4102,"gems":[52206,52213],"reforging":151}, - {"id":71418,"enchant":4256,"gems":[0],"reforging":154}, - {"id":71513,"enchant":4106,"gems":[52206,0]}, - {"id":71443,"gems":[52206,52206],"reforging":158}, - {"id":71515,"enchant":4126,"gems":[52206,52240]}, - {"id":71404,"enchant":4094,"gems":[52206],"reforging":154}, - {"id":71433,"gems":[52206],"reforging":154}, - {"id":71215,"gems":[52206],"reforging":147}, - {"id":69113}, - {"id":65072,"reforging":161}, - {"id":70723,"enchant":4099,"gems":[52206,52206]}, + { "id": 71514, "enchant": 4208, "gems": [68779, 52206], "reforging": 147 }, + { "id": 71446, "reforging": 147 }, + { "id": 71516, "enchant": 4202, "gems": [52240], "reforging": 154 }, + { "id": 69879, "randomSuffix": -120, "enchant": 4118, "reforging": 140 }, + { "id": 71469, "enchant": 4102, "gems": [52206, 52213], "reforging": 151 }, + { "id": 71418, "enchant": 4256, "gems": [0], "reforging": 154 }, + { "id": 71513, "enchant": 4106, "gems": [52206, 0] }, + { "id": 71443, "gems": [52206, 52206], "reforging": 158 }, + { "id": 71515, "enchant": 4126, "gems": [52206, 52240] }, + { "id": 71404, "enchant": 4094, "gems": [52206], "reforging": 154 }, + { "id": 71433, "gems": [52206], "reforging": 154 }, + { "id": 71215, "gems": [52206], "reforging": 147 }, + { "id": 69113 }, + { "id": 65072, "reforging": 161 }, + { "id": 70723, "enchant": 4099, "gems": [52206, 52206] }, {}, - {"id":71587,"gems":[52206],"reforging":154} + { "id": 71587, "gems": [52206], "reforging": 154 } ] } diff --git a/ui/paladin/retribution/gear_sets/p4_bis.gear.json b/ui/paladin/retribution/gear_sets/p4_bis.gear.json index 50cdaf1382..ede905379e 100644 --- a/ui/paladin/retribution/gear_sets/p4_bis.gear.json +++ b/ui/paladin/retribution/gear_sets/p4_bis.gear.json @@ -1,21 +1,21 @@ { "items": [ - {"id":78693,"enchant":4208,"gems":[68779,71883],"reforging":161}, - {"id":78543,"reforging":140}, - {"id":78465,"enchant":4202,"gems":[71883,71883],"reforging":144}, - {"id":78506,"enchant":4118,"reforging":147}, - {"id":78727,"enchant":4102,"gems":[71883,71883,71883],"reforging":152}, - {"id":78373,"enchant":4256,"gems":[71883,0],"reforging":146}, - {"id":78675,"enchant":4106,"gems":[71883,0],"reforging":154}, - {"id":78416,"gems":[71883,71883,71883],"reforging":153}, - {"id":78712,"enchant":4126,"gems":[71883,71883,71856],"reforging":144}, - {"id":78389,"enchant":4094,"gems":[71883,71883],"reforging":146}, - {"id":78492,"gems":[71883],"reforging":152}, - {"id":78432,"gems":[71883],"reforging":137}, - {"id":77992}, - {"id":77997}, - {"id":78478,"enchant":4099}, + { "id": 78693, "enchant": 4208, "gems": [68779, 71883], "reforging": 161 }, + { "id": 78543, "reforging": 140 }, + { "id": 78465, "enchant": 4202, "gems": [71883, 71883], "reforging": 144 }, + { "id": 78506, "enchant": 4118, "reforging": 147 }, + { "id": 78727, "enchant": 4102, "gems": [71883, 71883, 71883], "reforging": 152 }, + { "id": 78373, "enchant": 4256, "gems": [71883, 0], "reforging": 146 }, + { "id": 78675, "enchant": 4106, "gems": [71883, 0], "reforging": 154 }, + { "id": 78416, "gems": [71883, 71883, 71883], "reforging": 153 }, + { "id": 78712, "enchant": 4126, "gems": [71883, 71883, 71856], "reforging": 144 }, + { "id": 78389, "enchant": 4094, "gems": [71883, 71883], "reforging": 146 }, + { "id": 78492, "gems": [71883], "reforging": 152 }, + { "id": 78432, "gems": [71883], "reforging": 137 }, + { "id": 77992 }, + { "id": 77997 }, + { "id": 78478, "enchant": 4099 }, {}, - {"id":78550,"gems":[71883],"reforging":151} + { "id": 78550, "gems": [71883], "reforging": 151 } ] } diff --git a/ui/paladin/retribution/gear_sets/preraid.gear.json b/ui/paladin/retribution/gear_sets/preraid.gear.json index 731ac8a5d1..c04c72b255 100644 --- a/ui/paladin/retribution/gear_sets/preraid.gear.json +++ b/ui/paladin/retribution/gear_sets/preraid.gear.json @@ -1,21 +1,21 @@ { - "items": [ - {"id":60346,"enchant":4208,"gems":[68779,52240],"reforging":161}, - {"id":65025}, - {"id":60348,"enchant":4202,"gems":[52206],"reforging":154}, - {"id":69879,"randomSuffix":-120,"enchant":4118,"reforging":140}, - {"id":71063,"enchant":4102,"gems":[52206,52213],"reforging":161}, - {"id":60228,"enchant":4256,"gems":[52240,0],"reforging":154}, - {"id":71064,"enchant":4106,"gems":[52206,0]}, - {"id":65369,"randomSuffix":-220,"gems":[52206,52206],"reforging":147}, - {"id":71066,"enchant":4126,"gems":[52206,52240],"reforging":144}, - {"id":59464,"enchant":4092,"gems":[52206],"reforging":144}, - {"id":71208,"reforging":154}, - {"id":60226,"gems":[52240]}, - {"id":62464}, - {"id":65072,"reforging":161}, - {"id":70224,"enchant":4099,"reforging":147}, + "items": [ + { "id": 60346, "enchant": 4208, "gems": [68779, 52240], "reforging": 161 }, + { "id": 65025 }, + { "id": 60348, "enchant": 4202, "gems": [52206], "reforging": 154 }, + { "id": 69879, "randomSuffix": -120, "enchant": 4118, "reforging": 140 }, + { "id": 71063, "enchant": 4102, "gems": [52206, 52213], "reforging": 161 }, + { "id": 60228, "enchant": 4256, "gems": [52240, 0], "reforging": 154 }, + { "id": 71064, "enchant": 4106, "gems": [52206, 0] }, + { "id": 65369, "randomSuffix": -220, "gems": [52206, 52206], "reforging": 147 }, + { "id": 71066, "enchant": 4126, "gems": [52206, 52240], "reforging": 144 }, + { "id": 59464, "enchant": 4092, "gems": [52206], "reforging": 144 }, + { "id": 71208, "reforging": 154 }, + { "id": 60226, "gems": [52240] }, + { "id": 62464 }, + { "id": 65072, "reforging": 161 }, + { "id": 70224, "enchant": 4099, "reforging": 147 }, {}, - {"id":71147,"gems":[52206],"reforging":154} + { "id": 71147, "gems": [52206], "reforging": 154 } ] } diff --git a/ui/paladin/retribution/presets.ts b/ui/paladin/retribution/presets.ts index 534e6baefe..6d85c07210 100644 --- a/ui/paladin/retribution/presets.ts +++ b/ui/paladin/retribution/presets.ts @@ -13,7 +13,6 @@ import { SavedTalents } from '../../core/proto/ui.js'; import { Stats } from '../../core/proto_utils/stats'; import ApparatusApl from './apls/apparatus.apl.json'; import DefaultApl from './apls/default.apl.json'; -import T13_2Pc_Apl from './apls/t13.apl.json'; import P2_BisRetGear from './gear_sets/p2_bis.gear.json'; import P3_BisRetGear from './gear_sets/p3_bis.gear.json'; import P4_BisRetGear from './gear_sets/p4_bis.gear.json'; @@ -30,7 +29,6 @@ export const P4_BIS_RET_PRESET = PresetUtils.makePresetGear('P4', P4_BisRetGear) export const ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); export const ROTATION_PRESET_APPARATUS = PresetUtils.makePresetAPLRotation('Apparatus', ApparatusApl); -export const ROTATION_PRESET_T13 = PresetUtils.makePresetAPLRotation('T13 2pc', T13_2Pc_Apl); // Preset options for EP weights export const P2_EP_PRESET = PresetUtils.makePresetEpWeights( @@ -38,17 +36,17 @@ export const P2_EP_PRESET = PresetUtils.makePresetEpWeights( Stats.fromMap( { [Stat.StatAttackPower]: 1, - [Stat.StatStrength]: 2.32, + [Stat.StatStrength]: 2.28, - [Stat.StatCritRating]: 1.14, - [Stat.StatHasteRating]: 1.06, - [Stat.StatMasteryRating]: 1.31, + [Stat.StatCritRating]: 1.10, + [Stat.StatHasteRating]: 1.05, + [Stat.StatMasteryRating]: 1.23, - [Stat.StatHitRating]: 2.30, - [Stat.StatExpertiseRating]: 1.94, + [Stat.StatHitRating]: 2.32, + [Stat.StatExpertiseRating]: 1.89, }, { - [PseudoStat.PseudoStatMainHandDps]: 8.26, + [PseudoStat.PseudoStatMainHandDps]: 8.15, }, ), ); @@ -60,14 +58,14 @@ export const P3_EP_PRESET = PresetUtils.makePresetEpWeights( [Stat.StatStrength]: 2.29, [Stat.StatCritRating]: 1.29, - [Stat.StatHasteRating]: 1.05, - [Stat.StatMasteryRating]: 1.42, + [Stat.StatHasteRating]: 1.14, + [Stat.StatMasteryRating]: 1.35, - [Stat.StatHitRating]: 2.65, - [Stat.StatExpertiseRating]: 2.25, + [Stat.StatHitRating]: 2.68, + [Stat.StatExpertiseRating]: 2.24, }, { - [PseudoStat.PseudoStatMainHandDps]: 8.75, + [PseudoStat.PseudoStatMainHandDps]: 8.45, }, ), ); @@ -79,23 +77,23 @@ export const P4_EP_PRESET = PresetUtils.makePresetEpWeights( [Stat.StatAttackPower]: 1, [Stat.StatStrength]: 2.28, - [Stat.StatCritRating]: 1.51, + [Stat.StatCritRating]: 1.50, [Stat.StatHasteRating]: 1.23, [Stat.StatMasteryRating]: 1.69, - [Stat.StatHitRating]: 3.11, + [Stat.StatHitRating]: 3.12, [Stat.StatExpertiseRating]: 2.51, }, { - [PseudoStat.PseudoStatMainHandDps]: 8.10, + [PseudoStat.PseudoStatMainHandDps]: 8.08, }, ), ); // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/cata/talent-calc and copy the numbers in the url. -export const P2_P4_Talents = { - name: 'P2 / P4', +export const DefaultTalents = { + name: 'Default', data: SavedTalents.create({ talentsString: '203002-02-23203213211113002311', glyphs: Glyphs.create({ @@ -112,42 +110,24 @@ export const P2_P4_Talents = { }), }; -export const P3_Talents = { - name: 'P3', - data: SavedTalents.create({ - talentsString: '203002-02-23203213211113002311', - glyphs: Glyphs.create({ - prime1: PaladinPrimeGlyph.GlyphOfSealOfTruth, - prime2: PaladinPrimeGlyph.GlyphOfCrusaderStrike, - prime3: PaladinPrimeGlyph.GlyphOfTemplarSVerdict, - major1: PaladinMajorGlyph.GlyphOfTheAsceticCrusader, - major2: PaladinMajorGlyph.GlyphOfHammerOfWrath, - major3: PaladinMajorGlyph.GlyphOfConsecration, - minor1: PaladinMinorGlyph.GlyphOfRighteousness, - minor2: PaladinMinorGlyph.GlyphOfTruth, - minor3: PaladinMinorGlyph.GlyphOfBlessingOfMight, - }), - }), -}; - export const P2_PRESET = PresetUtils.makePresetBuild('P2', { gear: P2_BIS_RET_PRESET, epWeights: P2_EP_PRESET, - talents: P2_P4_Talents, + talents: DefaultTalents, rotationType: APLRotationType.TypeAuto, }); export const P3_PRESET = PresetUtils.makePresetBuild('P3', { gear: P3_BIS_RET_PRESET, epWeights: P3_EP_PRESET, - talents: P3_Talents, + talents: DefaultTalents, rotationType: APLRotationType.TypeAuto, }); export const P4_PRESET = PresetUtils.makePresetBuild('P4', { gear: P4_BIS_RET_PRESET, epWeights: P4_EP_PRESET, - talents: P2_P4_Talents, + talents: DefaultTalents, rotationType: APLRotationType.TypeAuto, }); diff --git a/ui/paladin/retribution/sim.ts b/ui/paladin/retribution/sim.ts index 6b431231d0..20371d802e 100644 --- a/ui/paladin/retribution/sim.ts +++ b/ui/paladin/retribution/sim.ts @@ -44,14 +44,11 @@ const getStatCaps = () => { }; const pickRotation = (player: Player): APLRotation => { - const has2pcT13 = player.getEquippedItems().filter(x => x?.item.setName === 'Battleplate of Radiant Glory').length >= 2; const hasApparatus = player.getEquippedItem(ItemSlot.ItemSlotTrinket1)?.item.name === "Apparatus of Khaz'goroth" || player.getEquippedItem(ItemSlot.ItemSlotTrinket2)?.item.name === "Apparatus of Khaz'goroth"; - if (has2pcT13) { - return Presets.ROTATION_PRESET_T13.rotation.rotation!; - } else if (hasApparatus) { + if (hasApparatus) { return Presets.ROTATION_PRESET_APPARATUS.rotation.rotation!; } else { return Presets.ROTATION_PRESET_DEFAULT.rotation.rotation!; @@ -137,7 +134,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, { // Default consumes settings. consumes: Presets.DefaultConsumes, // Default talents. - talents: Presets.P3_Talents.data, + talents: Presets.DefaultTalents.data, // Default spec-specific settings. specOptions: Presets.DefaultOptions, other: Presets.OtherDefaults, @@ -184,6 +181,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, { BuffDebuffInputs.ManaBuff, BuffDebuffInputs.SpellHasteBuff, BuffDebuffInputs.PowerInfusion, + BuffDebuffInputs.SpellCritDebuff, ], excludeBuffDebuffInputs: [BuffDebuffInputs.BleedDebuff, BuffDebuffInputs.DamagePercentBuff], // Inputs to include in the 'Other' section on the settings tab. @@ -197,9 +195,9 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, { presets: { epWeights: [Presets.P2_EP_PRESET, Presets.P3_EP_PRESET, Presets.P4_EP_PRESET], - rotations: [Presets.ROTATION_PRESET_DEFAULT, Presets.ROTATION_PRESET_APPARATUS, Presets.ROTATION_PRESET_T13], + rotations: [Presets.ROTATION_PRESET_DEFAULT, Presets.ROTATION_PRESET_APPARATUS], // Preset talents that the user can quickly select. - talents: [Presets.P2_P4_Talents, Presets.P3_Talents], + talents: [Presets.DefaultTalents], // Preset gear configurations that the user can quickly select. gear: [Presets.PRERAID_RET_PRESET, Presets.P2_BIS_RET_PRESET, Presets.P3_BIS_RET_PRESET, Presets.P4_BIS_RET_PRESET], builds: [Presets.P2_PRESET, Presets.P3_PRESET, Presets.P4_PRESET], @@ -210,7 +208,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, { raidSimPresets: [ { spec: Spec.SpecRetributionPaladin, - talents: Presets.P3_Talents.data, + talents: Presets.DefaultTalents.data, specOptions: Presets.DefaultOptions, consumes: Presets.DefaultConsumes, defaultFactionRaces: {