From 7cbbccad87e68493dc5545181fe94f33fa0048a8 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Thu, 24 Nov 2022 19:55:57 -0800 Subject: [PATCH] Fix bug where duration used for computing metrics was slightly too short --- sim/core/raid.go | 8 +- sim/core/sim.go | 10 +- sim/deathknight/dps/TestFrost.results | 4 +- sim/deathknight/dps/TestUnholy.results | 6 +- sim/deathknight/tank/TestBloodTank.results | 400 +++++++-------- sim/druid/balance/TestBalance.results | 4 +- sim/druid/feral/TestFeral.results | 4 +- sim/druid/tank/TestFeralTank.results | 6 +- sim/hunter/TestHunter.results | 4 +- sim/mage/TestArcane.results | 4 +- sim/mage/TestFire.results | 4 +- sim/mage/TestFrost.results | 4 +- sim/paladin/protection/TestProtection.results | 6 +- .../retribution/TestRetribution.results | 6 +- sim/priest/healing/TestDisc.results | 6 +- sim/priest/healing/TestHoly.results | 6 +- sim/priest/shadow/TestShadow.results | 4 +- sim/priest/smite/TestSmite.results | 4 +- sim/rogue/TestAssassination.results | 436 ++++++++-------- sim/rogue/TestCombat.results | 464 +++++++++--------- sim/shaman/elemental/TestElemental.results | 4 +- .../enhancement/TestEnhancement.results | 4 +- sim/warlock/TestWarlock.results | 4 +- sim/warrior/demoralizing_shout.go | 3 +- sim/warrior/dps/TestArms.results | 4 +- sim/warrior/dps/TestFury.results | 4 +- sim/warrior/heroic_strike_cleave.go | 11 +- .../protection/TestProtectionWarrior.results | 384 +++++++-------- sim/warrior/thunder_clap.go | 3 +- ui/core/components/raid_sim_action.ts | 7 +- ui/core/proto_utils/sim_result.ts | 14 +- 31 files changed, 920 insertions(+), 912 deletions(-) diff --git a/sim/core/raid.go b/sim/core/raid.go index 776bf31d0f..954a189ff4 100644 --- a/sim/core/raid.go +++ b/sim/core/raid.go @@ -86,8 +86,8 @@ func (party *Party) doneIteration(sim *Simulation) { party.hpsMetrics.Total += agent.GetCharacter().Metrics.hps.Total } - party.dpsMetrics.doneIteration(sim.rand.GetSeed(), sim.CurrentTime.Seconds()) - party.hpsMetrics.doneIteration(sim.rand.GetSeed(), sim.CurrentTime.Seconds()) + party.dpsMetrics.doneIteration(sim.rand.GetSeed(), sim.Duration.Seconds()) + party.hpsMetrics.doneIteration(sim.rand.GetSeed(), sim.Duration.Seconds()) } func (party *Party) GetMetrics(numIterations int32) *proto.PartyMetrics { @@ -405,8 +405,8 @@ func (raid *Raid) doneIteration(sim *Simulation) { raid.hpsMetrics.Total += party.hpsMetrics.Total } - raid.dpsMetrics.doneIteration(sim.rand.GetSeed(), sim.CurrentTime.Seconds()) - raid.hpsMetrics.doneIteration(sim.rand.GetSeed(), sim.CurrentTime.Seconds()) + raid.dpsMetrics.doneIteration(sim.rand.GetSeed(), sim.Duration.Seconds()) + raid.hpsMetrics.doneIteration(sim.rand.GetSeed(), sim.Duration.Seconds()) } func (raid *Raid) GetMetrics(numIterations int32) *proto.RaidMetrics { diff --git a/sim/core/sim.go b/sim/core/sim.go index eb455e2c6a..ce07d5b5b0 100644 --- a/sim/core/sim.go +++ b/sim/core/sim.go @@ -350,6 +350,12 @@ func (sim *Simulation) runOnce() { pa.OnAction(sim) } + // The last event loop will leave CurrentTime at some value close to but not + // quite at the Duration. Explicitly set this so that accesses to CurrentTime + // during the doneIteration phase will return the Duration value, which is + // intuitive. + sim.CurrentTime = sim.Duration + for _, pa := range sim.pendingActions { if pa.CleanUp != nil { pa.CleanUp(sim) @@ -360,10 +366,10 @@ func (sim *Simulation) runOnce() { sim.Encounter.doneIteration(sim) for _, unit := range sim.Raid.AllUnits { - unit.Metrics.doneIteration(unit, sim.rand.GetSeed(), sim.CurrentTime.Seconds()) + unit.Metrics.doneIteration(unit, sim.rand.GetSeed(), sim.Duration.Seconds()) } for _, target := range sim.Encounter.Targets { - target.Metrics.doneIteration(&target.Unit, sim.rand.GetSeed(), sim.CurrentTime.Seconds()) + target.Metrics.doneIteration(&target.Unit, sim.rand.GetSeed(), sim.Duration.Seconds()) } } diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results index e90ad449f1..ea66cb95b2 100644 --- a/sim/deathknight/dps/TestFrost.results +++ b/sim/deathknight/dps/TestFrost.results @@ -633,8 +633,8 @@ dps_results: { dps_results: { key: "TestFrost-Average-Default" value: { - dps: 7935.52774 - tps: 4691.1326 + dps: 7928.30373 + tps: 4686.86215 } } dps_results: { diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results index 8124a7f020..cca72809f8 100644 --- a/sim/deathknight/dps/TestUnholy.results +++ b/sim/deathknight/dps/TestUnholy.results @@ -701,9 +701,9 @@ dps_results: { dps_results: { key: "TestUnholy-Average-Default" value: { - dps: 8157.02672 - tps: 5095.55902 - hps: 273.24719 + dps: 8153.96429 + tps: 5093.64555 + hps: 273.14462 } } dps_results: { diff --git a/sim/deathknight/tank/TestBloodTank.results b/sim/deathknight/tank/TestBloodTank.results index 4180d3bbac..8ea7ee3c98 100644 --- a/sim/deathknight/tank/TestBloodTank.results +++ b/sim/deathknight/tank/TestBloodTank.results @@ -45,695 +45,695 @@ character_stats_results: { dps_results: { key: "TestBloodTank-AllItems-AustereEarthsiegeDiamond" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-Bandit'sInsignia-40371" value: { - dps: 1502.70299 - tps: 4795.58799 + dps: 1499.7072 + tps: 4786.04622 } } dps_results: { key: "TestBloodTank-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 1434.43932 - tps: 4650.00329 + dps: 1431.24264 + tps: 4639.67262 } } dps_results: { key: "TestBloodTank-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 1402.83607 - tps: 4536.74635 + dps: 1400.26633 + tps: 4528.50781 } } dps_results: { key: "TestBloodTank-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 1328.55146 - tps: 4242.92165 + dps: 1326.70661 + tps: 4237.00064 } } dps_results: { key: "TestBloodTank-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 1278.18771 - tps: 4093.44851 + dps: 1275.38452 + tps: 4084.4662 } } dps_results: { key: "TestBloodTank-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 1202.00719 - tps: 3882.9959 + dps: 1200.02468 + tps: 3876.63802 } } dps_results: { key: "TestBloodTank-AllItems-BracingEarthsiegeDiamond" value: { - dps: 1428.06135 - tps: 4528.98862 + dps: 1424.87914 + tps: 4518.93418 } } dps_results: { key: "TestBloodTank-AllItems-ChaoticSkyflareDiamond" value: { - dps: 1446.30216 - tps: 4689.84883 + dps: 1443.07934 + tps: 4679.43204 } } dps_results: { key: "TestBloodTank-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 1452.2112 - tps: 4708.13532 + dps: 1448.97634 + tps: 4697.68413 } } dps_results: { key: "TestBloodTank-AllItems-DarkmoonCard:Death-42990" value: { - dps: 1493.6838 - tps: 4781.27919 + dps: 1490.21827 + tps: 4770.25654 } } dps_results: { key: "TestBloodTank-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 1526.14604 - tps: 4948.31214 + dps: 1522.74447 + tps: 4937.32609 } } dps_results: { key: "TestBloodTank-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 1497.43137 - tps: 4840.70498 + dps: 1494.09504 + tps: 4829.96018 } } dps_results: { key: "TestBloodTank-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 1481.90503 - tps: 4806.53304 + dps: 1478.60202 + tps: 4795.86169 } } dps_results: { key: "TestBloodTank-AllItems-DarkrunedBattlegear" value: { - dps: 1588.53814 - tps: 5064.09632 + dps: 1585.85333 + tps: 5055.51612 } } dps_results: { key: "TestBloodTank-AllItems-DarkrunedPlate" value: { - dps: 1417.08666 - tps: 4579.89959 + dps: 1413.96404 + tps: 4569.86879 } } dps_results: { key: "TestBloodTank-AllItems-DeadlyGladiator'sSigilofStrife-42620" value: { - dps: 1448.01383 - tps: 4681.57556 + dps: 1444.78687 + tps: 4671.18072 } } dps_results: { key: "TestBloodTank-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 1443.83338 - tps: 4680.80465 + dps: 1440.61717 + tps: 4670.41136 } } dps_results: { key: "TestBloodTank-AllItems-Defender'sCode-40257" value: { - dps: 1439.10505 - tps: 4656.8087 + dps: 1435.89824 + tps: 4646.47051 } } dps_results: { key: "TestBloodTank-AllItems-DestructiveSkyflareDiamond" value: { - dps: 1435.21541 - tps: 4651.6125 + dps: 1432.01707 + tps: 4641.27841 } } dps_results: { key: "TestBloodTank-AllItems-EffulgentSkyflareDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-EmberSkyflareDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 1434.43932 - tps: 4650.00329 + dps: 1431.24264 + tps: 4639.67262 } } dps_results: { key: "TestBloodTank-AllItems-EnigmaticStarflareDiamond" value: { - dps: 1434.24118 - tps: 4647.12732 + dps: 1431.04495 + tps: 4636.80329 } } dps_results: { key: "TestBloodTank-AllItems-EternalEarthsiegeDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 1480.69812 - tps: 4761.62119 + dps: 1477.09036 + tps: 4749.92322 } } dps_results: { key: "TestBloodTank-AllItems-EyeoftheBroodmother-45308" value: { - dps: 1450.21297 - tps: 4712.10592 + dps: 1446.98308 + tps: 4701.6478 } } dps_results: { key: "TestBloodTank-AllItems-ForgeEmber-37660" value: { - dps: 1447.77014 - tps: 4707.04071 + dps: 1444.54545 + tps: 4696.59338 } } dps_results: { key: "TestBloodTank-AllItems-ForlornSkyflareDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-ForlornStarflareDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-FuriousGladiator'sSigilofStrife-42621" value: { - dps: 1451.47712 - tps: 4691.91773 + dps: 1448.24239 + tps: 4681.49961 } } dps_results: { key: "TestBloodTank-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 1489.6337 - tps: 4809.27799 + dps: 1486.31436 + tps: 4798.60177 } } dps_results: { key: "TestBloodTank-AllItems-FuturesightRune-38763" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-HatefulGladiator'sSigilofStrife-42619" value: { - dps: 1441.07205 - tps: 4657.32419 + dps: 1437.86045 + tps: 4646.98244 } } dps_results: { key: "TestBloodTank-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 1434.43932 - tps: 4650.00329 + dps: 1431.24264 + tps: 4639.67262 } } dps_results: { key: "TestBloodTank-AllItems-ImpassiveStarflareDiamond" value: { - dps: 1434.24118 - tps: 4647.12732 + dps: 1431.04495 + tps: 4636.80329 } } dps_results: { key: "TestBloodTank-AllItems-IncisorFragment-37723" value: { - dps: 1474.60674 - tps: 4754.1783 + dps: 1471.32105 + tps: 4743.62416 } } dps_results: { key: "TestBloodTank-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 1436.40718 - tps: 4648.16285 + dps: 1433.20638 + tps: 4637.84384 } } dps_results: { key: "TestBloodTank-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-MajesticDragonFigurine-40430" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-MeteoriteWhetstone-37390" value: { - dps: 1475.83411 - tps: 4741.20187 + dps: 1473.23149 + tps: 4732.84099 } } dps_results: { key: "TestBloodTank-AllItems-OfferingofSacrifice-37638" value: { - dps: 1460.06782 - tps: 4682.17981 + dps: 1456.82395 + tps: 4671.75772 } } dps_results: { key: "TestBloodTank-AllItems-PersistentEarthshatterDiamond" value: { - dps: 1434.8175 - tps: 4643.06839 + dps: 1431.62024 + tps: 4632.7607 } } dps_results: { key: "TestBloodTank-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 1436.40718 - tps: 4648.16285 + dps: 1433.20638 + tps: 4637.84384 } } dps_results: { key: "TestBloodTank-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-PurifiedShardoftheGods" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-ReignoftheDead-47316" value: { - dps: 1434.41518 - tps: 4615.52777 + dps: 1430.44126 + tps: 4602.78332 } } dps_results: { key: "TestBloodTank-AllItems-ReignoftheDead-47477" value: { - dps: 1435.34187 - tps: 4617.44926 + dps: 1431.36528 + tps: 4604.69928 } } dps_results: { key: "TestBloodTank-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 1445.17518 - tps: 4671.6943 + dps: 1441.95546 + tps: 4661.32636 } } dps_results: { key: "TestBloodTank-AllItems-RelentlessGladiator'sSigilofStrife-42622" value: { - dps: 1455.51762 - tps: 4703.98359 + dps: 1452.27382 + tps: 4693.5383 } } dps_results: { key: "TestBloodTank-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-RuneofRepulsion-40372" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-SavageGladiator'sSigilofStrife-42618" value: { - dps: 1439.89756 - tps: 4654.21556 + dps: 1436.68862 + tps: 4643.881 } } dps_results: { key: "TestBloodTank-AllItems-ScourgeborneBattlegear" value: { - dps: 1536.89737 - tps: 4953.79631 + dps: 1533.79172 + tps: 4943.77216 } } dps_results: { key: "TestBloodTank-AllItems-ScourgebornePlate" value: { - dps: 1404.66448 - tps: 4552.1175 + dps: 1402.08937 + tps: 4543.84713 } } dps_results: { key: "TestBloodTank-AllItems-Scourgelord'sBattlegear" value: { - dps: 1713.07037 - tps: 5501.80569 + dps: 1709.39207 + tps: 5490.03524 } } dps_results: { key: "TestBloodTank-AllItems-Scourgelord'sPlate" value: { - dps: 1517.14871 - tps: 4903.22606 + dps: 1513.84774 + tps: 4892.60482 } } dps_results: { key: "TestBloodTank-AllItems-SealofthePantheon-36993" value: { - dps: 1437.0545 - tps: 4647.46674 + dps: 1433.8525 + tps: 4637.15021 } } dps_results: { key: "TestBloodTank-AllItems-ShinyShardoftheGods" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-SigilofHauntedDreams-40715" value: { - dps: 1434.19301 - tps: 4637.11286 + dps: 1430.99619 + tps: 4626.81634 } } dps_results: { key: "TestBloodTank-AllItems-SigilofVirulence-47673" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-SigiloftheHangedMan-50459" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-SparkofLife-37657" value: { - dps: 1445.07577 - tps: 4589.03866 + dps: 1443.802 + tps: 4585.00003 } } dps_results: { key: "TestBloodTank-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 1465.55049 - tps: 4763.98089 + dps: 1461.74704 + tps: 4751.63287 } } dps_results: { key: "TestBloodTank-AllItems-StormshroudArmor" value: { - dps: 1185.15246 - tps: 3844.92873 + dps: 1182.34541 + tps: 3835.8785 } } dps_results: { key: "TestBloodTank-AllItems-SwiftSkyflareDiamond" value: { - dps: 1436.40718 - tps: 4648.16285 + dps: 1433.20638 + tps: 4637.84384 } } dps_results: { key: "TestBloodTank-AllItems-SwiftStarflareDiamond" value: { - dps: 1434.8175 - tps: 4643.06839 + dps: 1431.62024 + tps: 4632.7607 } } dps_results: { key: "TestBloodTank-AllItems-SwiftWindfireDiamond" value: { - dps: 1432.03555 - tps: 4634.1531 + dps: 1428.8445 + tps: 4623.86519 } } dps_results: { key: "TestBloodTank-AllItems-Thassarian'sBattlegear" value: { - dps: 1680.26809 - tps: 5282.51972 + dps: 1679.42846 + tps: 5279.86756 } } dps_results: { key: "TestBloodTank-AllItems-Thassarian'sPlate" value: { - dps: 1420.50435 - tps: 4616.76025 + dps: 1417.68205 + tps: 4607.61435 } } dps_results: { key: "TestBloodTank-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 1426.13317 - tps: 4612.03288 + dps: 1424.7706 + tps: 4607.63795 } } dps_results: { key: "TestBloodTank-AllItems-ThunderingSkyflareDiamond" value: { - dps: 1428.4601 - tps: 4609.92514 + dps: 1426.29004 + tps: 4602.8711 } } dps_results: { key: "TestBloodTank-AllItems-TinyAbominationinaJar-50351" value: { - dps: 1472.82223 - tps: 4730.35895 + dps: 1469.52631 + tps: 4719.8089 } } dps_results: { key: "TestBloodTank-AllItems-TinyAbominationinaJar-50706" value: { - dps: 1475.17314 - tps: 4730.0791 + dps: 1472.29431 + tps: 4720.83805 } } dps_results: { key: "TestBloodTank-AllItems-TirelessSkyflareDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-TirelessStarflareDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 1428.06135 - tps: 4621.41696 + dps: 1424.87914 + tps: 4611.15733 } } dps_results: { key: "TestBloodTank-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 1272.85854 - tps: 4083.22782 + dps: 1270.50435 + tps: 4075.67451 } } dps_results: { key: "TestBloodTank-AllItems-WingedTalisman-37844" value: { - dps: 1430.69739 - tps: 4629.8647 + dps: 1427.50932 + tps: 4619.58631 } } dps_results: { key: "TestBloodTank-AllItems-WrathfulGladiator'sSigilofStrife-51417" value: { - dps: 1460.13533 - tps: 4717.77316 + dps: 1456.88116 + tps: 4707.29681 } } dps_results: { key: "TestBloodTank-Average-Default" value: { - dps: 1825.47903 - tps: 6350.74107 - dtps: 252.58101 + dps: 1822.94347 + tps: 6341.91876 + dtps: 252.2295 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 5217.6532 - tps: 12455.34074 + dps: 5206.45729 + tps: 12428.61573 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 1453.71434 - tps: 4646.23339 + dps: 1449.35599 + tps: 4632.32154 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 1750.1577 - tps: 6312.44588 + dps: 1748.44823 + tps: 6306.20337 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3501.51894 - tps: 8225.1686 + dps: 3496.99877 + tps: 8214.54546 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 817.99019 - tps: 2658.30162 + dps: 816.59725 + tps: 2653.77118 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 894.06894 - tps: 3500.32478 + dps: 890.50308 + tps: 3486.55664 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 5254.07414 - tps: 12558.39175 + dps: 5242.79667 + tps: 12531.43834 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 1466.29231 - tps: 4699.56825 + dps: 1461.89625 + tps: 4685.49744 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 1775.28422 - tps: 6447.1136 + dps: 1773.54922 + tps: 6440.73807 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3527.42889 - tps: 8299.0652 + dps: 3522.87738 + tps: 8288.35079 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 825.94678 - tps: 2694.20915 + dps: 824.54054 + tps: 2689.61811 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 909.56347 - tps: 3595.39319 + dps: 905.93461 + tps: 3581.24934 } } dps_results: { key: "TestBloodTank-SwitchInFrontOfTarget-Default" value: { - dps: 1829.96904 - tps: 6298.84752 - dtps: 253.17977 + dps: 1827.72052 + tps: 6291.09997 + dtps: 252.87285 } } diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 6fdfa1cc8a..b5539d2390 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -647,8 +647,8 @@ dps_results: { dps_results: { key: "TestBalance-Average-Default" value: { - dps: 7532.45159 - tps: 7373.27058 + dps: 7521.76793 + tps: 7362.81356 } } dps_results: { diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index eab28a62e1..80e10fbc26 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -647,8 +647,8 @@ dps_results: { dps_results: { key: "TestFeral-Average-Default" value: { - dps: 7424.30905 - tps: 5641.7667 + dps: 7423.20692 + tps: 5640.92913 } } dps_results: { diff --git a/sim/druid/tank/TestFeralTank.results b/sim/druid/tank/TestFeralTank.results index 5e34a63825..75f9acd065 100644 --- a/sim/druid/tank/TestFeralTank.results +++ b/sim/druid/tank/TestFeralTank.results @@ -647,9 +647,9 @@ dps_results: { dps_results: { key: "TestFeralTank-Average-Default" value: { - dps: 1279.55876 - tps: 1761.48664 - dtps: 547.97742 + dps: 1278.1136 + tps: 1759.4971 + dtps: 547.35887 } } dps_results: { diff --git a/sim/hunter/TestHunter.results b/sim/hunter/TestHunter.results index daaf147aaf..1c0c3b9db1 100644 --- a/sim/hunter/TestHunter.results +++ b/sim/hunter/TestHunter.results @@ -584,8 +584,8 @@ dps_results: { dps_results: { key: "TestHunter-Average-Default" value: { - dps: 7122.12126 - tps: 6129.07913 + dps: 7115.54207 + tps: 6123.41837 } } dps_results: { diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index bc4e6d60cc..4de3f3776a 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -521,8 +521,8 @@ dps_results: { dps_results: { key: "TestArcane-Average-Default" value: { - dps: 6747.56573 - tps: 4047.20502 + dps: 6736.55032 + tps: 4040.59769 } } dps_results: { diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index 9a595f443d..343b184655 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -521,8 +521,8 @@ dps_results: { dps_results: { key: "TestFire-Average-Default" value: { - dps: 5746.00994 - tps: 5147.41397 + dps: 5738.09422 + tps: 5140.3235 } } dps_results: { diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index 4ea17a9e55..537532627c 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -521,8 +521,8 @@ dps_results: { dps_results: { key: "TestFrost-Average-Default" value: { - dps: 4385.24702 - tps: 3684.53687 + dps: 4377.13085 + tps: 3677.71826 } } dps_results: { diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 74c9692e79..367411bd8c 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -696,9 +696,9 @@ dps_results: { dps_results: { key: "TestProtection-Average-Default" value: { - dps: 3572.57342 - tps: 8569.30422 - dtps: 15.02952 + dps: 3569.61228 + tps: 8562.2014 + dtps: 15.01709 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 8b1e4d51d2..23fb05c675 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -773,9 +773,9 @@ dps_results: { dps_results: { key: "TestRetribution-Average-Default" value: { - dps: 5947.86301 - tps: 6048.51679 - dtps: 9.3945 + dps: 5942.02951 + tps: 6042.58437 + dtps: 9.38519 } } dps_results: { diff --git a/sim/priest/healing/TestDisc.results b/sim/priest/healing/TestDisc.results index 2490ea0a2c..9696ff7a3a 100644 --- a/sim/priest/healing/TestDisc.results +++ b/sim/priest/healing/TestDisc.results @@ -645,9 +645,9 @@ dps_results: { dps_results: { key: "TestDisc-Average-Default" value: { - dps: 96.96815 - tps: 53.69062 - hps: 5591.12892 + dps: 96.79165 + tps: 53.59264 + hps: 5580.92036 } } dps_results: { diff --git a/sim/priest/healing/TestHoly.results b/sim/priest/healing/TestHoly.results index a0a3b4e0b7..793f9eac47 100644 --- a/sim/priest/healing/TestHoly.results +++ b/sim/priest/healing/TestHoly.results @@ -645,9 +645,9 @@ dps_results: { dps_results: { key: "TestHoly-Average-Default" value: { - dps: 102.22553 - tps: 48.15232 - hps: 4596.82793 + dps: 102.02521 + tps: 48.05818 + hps: 4587.83877 } } dps_results: { diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index f0448b15f7..89480184cc 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -563,8 +563,8 @@ dps_results: { dps_results: { key: "TestShadow-Average-Default" value: { - dps: 5415.95447 - tps: 4174.30504 + dps: 5411.11934 + tps: 4170.57867 } } dps_results: { diff --git a/sim/priest/smite/TestSmite.results b/sim/priest/smite/TestSmite.results index ae9ee1d54f..b95f881837 100644 --- a/sim/priest/smite/TestSmite.results +++ b/sim/priest/smite/TestSmite.results @@ -563,8 +563,8 @@ dps_results: { dps_results: { key: "TestSmite-Average-Default" value: { - dps: 3532.75978 - tps: 2992.84897 + dps: 3526.34232 + tps: 2987.41266 } } dps_results: { diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index 6681d73340..cdfc4bb13e 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -45,631 +45,631 @@ character_stats_results: { dps_results: { key: "TestAssassination-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 7167.65028 - tps: 5089.0317 + dps: 7167.5417 + tps: 5088.95461 } } dps_results: { key: "TestAssassination-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-Bandit'sInsignia-40371" value: { - dps: 7236.96954 - tps: 5138.24837 + dps: 7236.85888 + tps: 5138.16981 } } dps_results: { key: "TestAssassination-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7201.61622 - tps: 5113.14752 + dps: 7201.50684 + tps: 5113.06985 } } dps_results: { key: "TestAssassination-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5443.20927 - tps: 3864.67858 + dps: 5443.09783 + tps: 3864.59946 } } dps_results: { key: "TestAssassination-AllItems-BonescytheBattlegear" value: { - dps: 6540.65654 - tps: 4643.86614 + dps: 6540.60967 + tps: 4643.83287 } } dps_results: { key: "TestAssassination-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7171.59859 - tps: 4989.9983 + dps: 7171.4895 + tps: 4989.92239 } } dps_results: { key: "TestAssassination-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7316.37204 - tps: 5194.62415 + dps: 7316.2609 + tps: 5194.54524 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7140.92152 - tps: 5070.05428 + dps: 7140.81239 + tps: 5069.9768 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7189.10118 - tps: 5104.26184 + dps: 7188.99125 + tps: 5104.18379 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 7294.35575 - tps: 5178.99258 + dps: 7294.24449 + tps: 5178.91359 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 7207.84468 - tps: 5117.56973 + dps: 7207.73474 + tps: 5117.49167 } } dps_results: { key: "TestAssassination-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7132.88418 - tps: 5064.34777 + dps: 7132.77571 + tps: 5064.27075 } } dps_results: { key: "TestAssassination-AllItems-Defender'sCode-40257" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7207.75487 - tps: 5117.50596 + dps: 7207.64546 + tps: 5117.42828 } } dps_results: { key: "TestAssassination-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-EmberSkyflareDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7201.61622 - tps: 5113.14752 + dps: 7201.50684 + tps: 5113.06985 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7198.58828 - tps: 5110.99768 + dps: 7198.47896 + tps: 5110.92006 } } dps_results: { key: "TestAssassination-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7133.58858 - tps: 5064.84789 + dps: 7133.47945 + tps: 5064.77041 } } dps_results: { key: "TestAssassination-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7128.96787 - tps: 5061.56719 + dps: 7128.85931 + tps: 5061.49011 } } dps_results: { key: "TestAssassination-AllItems-ForgeEmber-37660" value: { - dps: 7110.11542 - tps: 5048.18195 + dps: 7110.00666 + tps: 5048.10473 } } dps_results: { key: "TestAssassination-AllItems-ForlornSkyflareDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-ForlornStarflareDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7283.02009 - tps: 5170.94426 + dps: 7282.90906 + tps: 5170.86543 } } dps_results: { key: "TestAssassination-AllItems-FuturesightRune-38763" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-Gladiator'sVestments" value: { - dps: 7049.4787 - tps: 5005.12987 + dps: 7049.33544 + tps: 5005.02817 } } dps_results: { key: "TestAssassination-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7201.61622 - tps: 5113.14752 + dps: 7201.50684 + tps: 5113.06985 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7198.58828 - tps: 5110.99768 + dps: 7198.47896 + tps: 5110.92006 } } dps_results: { key: "TestAssassination-AllItems-IncisorFragment-37723" value: { - dps: 7186.72031 - tps: 5102.57142 + dps: 7186.6108 + tps: 5102.49367 } } dps_results: { key: "TestAssassination-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7207.89171 - tps: 5117.60311 + dps: 7207.78206 + tps: 5117.52526 } } dps_results: { key: "TestAssassination-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7245.192 - tps: 5144.08632 + dps: 7245.04387 + tps: 5143.98115 } } dps_results: { key: "TestAssassination-AllItems-OfferingofSacrifice-37638" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7200.97873 - tps: 5112.6949 + dps: 7200.86919 + tps: 5112.61713 } } dps_results: { key: "TestAssassination-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7207.89171 - tps: 5117.60311 + dps: 7207.78206 + tps: 5117.52526 } } dps_results: { key: "TestAssassination-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-PurifiedShardoftheGods" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-ReignoftheDead-47316" value: { - dps: 7207.59845 - tps: 5117.3949 + dps: 7207.48861 + tps: 5117.31691 } } dps_results: { key: "TestAssassination-AllItems-ReignoftheDead-47477" value: { - dps: 7231.90431 - tps: 5134.65206 + dps: 7231.79411 + tps: 5134.57382 } } dps_results: { key: "TestAssassination-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7328.02066 - tps: 5202.89467 + dps: 7327.90929 + tps: 5202.81559 } } dps_results: { key: "TestAssassination-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-RuneofRepulsion-40372" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-SealofthePantheon-36993" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-Shadowblade'sBattlegear" value: { - dps: 7494.40465 - tps: 5321.0273 + dps: 7494.25516 + tps: 5320.92116 } } dps_results: { key: "TestAssassination-AllItems-ShinyShardoftheGods" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-AllItems-Slayer'sArmor" value: { - dps: 5365.24601 - tps: 3809.32467 + dps: 5365.13568 + tps: 3809.24634 } } dps_results: { key: "TestAssassination-AllItems-SparkofLife-37657" value: { - dps: 7087.42491 - tps: 5032.07169 + dps: 7087.31547 + tps: 5031.99398 } } dps_results: { key: "TestAssassination-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7203.93019 - tps: 5114.79043 + dps: 7203.82014 + tps: 5114.7123 } } dps_results: { key: "TestAssassination-AllItems-StormshroudArmor" value: { - dps: 5683.01502 - tps: 4034.94067 + dps: 5682.90015 + tps: 4034.85911 } } dps_results: { key: "TestAssassination-AllItems-SwiftSkyflareDiamond" value: { - dps: 7207.89171 - tps: 5117.60311 + dps: 7207.78206 + tps: 5117.52526 } } dps_results: { key: "TestAssassination-AllItems-SwiftStarflareDiamond" value: { - dps: 7200.97873 - tps: 5112.6949 + dps: 7200.86919 + tps: 5112.61713 } } dps_results: { key: "TestAssassination-AllItems-SwiftWindfireDiamond" value: { - dps: 7188.88103 - tps: 5104.10553 + dps: 7188.77167 + tps: 5104.02789 } } dps_results: { key: "TestAssassination-AllItems-TerrorbladeBattlegear" value: { - dps: 6697.91294 - tps: 4755.51819 + dps: 6697.91018 + tps: 4755.51623 } } dps_results: { key: "TestAssassination-AllItems-TheFistsofFury" value: { - dps: 4959.1329 - tps: 3520.98436 + dps: 4958.87683 + tps: 3520.80255 } } dps_results: { key: "TestAssassination-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7252.79911 - tps: 5149.48737 + dps: 7252.6507 + tps: 5149.382 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7345.17334 - tps: 5215.07307 + dps: 7345.06133 + tps: 5214.99354 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7390.34121 - tps: 5247.14226 + dps: 7390.20551 + tps: 5247.04591 } } dps_results: { key: "TestAssassination-AllItems-TirelessSkyflareDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-TirelessStarflareDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7171.59859 - tps: 5091.835 + dps: 7171.4895 + tps: 5091.75754 } } dps_results: { key: "TestAssassination-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5785.4363 - tps: 4107.65977 + dps: 5785.31725 + tps: 4107.57524 } } dps_results: { key: "TestAssassination-AllItems-VanCleef'sBattlegear" value: { - dps: 6717.87683 - tps: 4769.69255 + dps: 6717.74068 + tps: 4769.59589 } } dps_results: { key: "TestAssassination-AllItems-WingedTalisman-37844" value: { - dps: 7008.9319 - tps: 4976.34165 + dps: 7008.82506 + tps: 4976.26579 } } dps_results: { key: "TestAssassination-Average-Default" value: { - dps: 7332.40287 - tps: 5206.00604 + dps: 7331.29372 + tps: 5205.21854 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-LongMultiTarget" value: { - dps: 25818.45164 - tps: 18331.10066 + dps: 25817.76852 + tps: 18330.61565 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-LongSingleTarget" value: { - dps: 7328.02066 - tps: 5202.89467 + dps: 7327.90929 + tps: 5202.81559 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-ShortSingleTarget" value: { - dps: 8332.94105 - tps: 5916.38814 + dps: 8332.92308 + tps: 5916.37539 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-LongMultiTarget" value: { - dps: 15189.52007 - tps: 10784.55925 + dps: 15189.2114 + tps: 10784.3401 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-LongSingleTarget" value: { - dps: 3586.56835 - tps: 2546.46353 + dps: 3586.49533 + tps: 2546.41169 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-ShortSingleTarget" value: { - dps: 3624.88404 - tps: 2573.66767 + dps: 3624.53288 + tps: 2573.41835 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 15756.18257 - tps: 11186.88963 + dps: 15753.88222 + tps: 11185.25638 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5733.30701 - tps: 4070.64798 + dps: 5732.552 + tps: 4070.11192 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6690.64032 - tps: 4750.35463 + dps: 6689.86597 + tps: 4749.80484 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8989.44714 - tps: 6382.50747 + dps: 8987.98618 + tps: 6381.47019 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2601.80079 - tps: 1847.27856 + dps: 2601.39312 + tps: 1846.98912 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2656.42678 - tps: 1886.06302 + dps: 2654.25681 + tps: 1884.52233 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 25818.45164 - tps: 18331.10066 + dps: 25817.76852 + tps: 18330.61565 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 7328.02066 - tps: 5202.89467 + dps: 7327.90929 + tps: 5202.81559 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 8332.94105 - tps: 5916.38814 + dps: 8332.92308 + tps: 5916.37539 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 15189.52007 - tps: 10784.55925 + dps: 15189.2114 + tps: 10784.3401 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3586.56835 - tps: 2546.46353 + dps: 3586.49533 + tps: 2546.41169 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3624.88404 - tps: 2573.66767 + dps: 3624.53288 + tps: 2573.41835 } } dps_results: { @@ -717,127 +717,127 @@ dps_results: { dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-LongMultiTarget" value: { - dps: 25849.77677 - tps: 18353.34151 + dps: 25848.99333 + tps: 18352.78526 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-LongSingleTarget" value: { - dps: 7343.6619 - tps: 5213.99995 + dps: 7343.55003 + tps: 5213.92052 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-ShortSingleTarget" value: { - dps: 8395.17432 - tps: 5960.57376 + dps: 8395.15617 + tps: 5960.56088 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-LongMultiTarget" value: { - dps: 15179.38901 - tps: 10777.36619 + dps: 15178.98765 + tps: 10777.08123 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-LongSingleTarget" value: { - dps: 3593.19907 - tps: 2551.17134 + dps: 3593.12577 + tps: 2551.1193 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-ShortSingleTarget" value: { - dps: 3657.6739 - tps: 2596.94847 + dps: 3657.3198 + tps: 2596.69706 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 15745.47723 - tps: 11179.28884 + dps: 15743.31226 + tps: 11177.7517 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5747.41521 - tps: 4080.6648 + dps: 5746.65897 + tps: 4080.12787 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6738.80142 - tps: 4784.54901 + dps: 6738.0226 + tps: 4783.99604 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8987.94714 - tps: 6381.44247 + dps: 8986.48757 + tps: 6380.40618 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2606.3537 - tps: 1850.51113 + dps: 2605.94533 + tps: 1850.22118 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2677.01463 - tps: 1900.68039 + dps: 2674.82383 + tps: 1899.12492 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 25849.77677 - tps: 18353.34151 + dps: 25848.99333 + tps: 18352.78526 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 7343.6619 - tps: 5213.99995 + dps: 7343.55003 + tps: 5213.92052 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 8395.17432 - tps: 5960.57376 + dps: 8395.15617 + tps: 5960.56088 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 15179.38901 - tps: 10777.36619 + dps: 15178.98765 + tps: 10777.08123 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3593.19907 - tps: 2551.17134 + dps: 3593.12577 + tps: 2551.1193 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3657.6739 - tps: 2596.94847 + dps: 3657.3198 + tps: 2596.69706 } } dps_results: { @@ -885,7 +885,7 @@ dps_results: { dps_results: { key: "TestAssassination-SwitchInFrontOfTarget-Default" value: { - dps: 6867.89844 - tps: 4876.20789 + dps: 6867.79315 + tps: 4876.13314 } } diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index c9d4e501f9..9f791db213 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -45,29 +45,29 @@ character_stats_results: { dps_results: { key: "TestCombat-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 6249.2119 - tps: 4436.94045 + dps: 6249.09742 + tps: 4436.85917 } } dps_results: { key: "TestCombat-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-Bandit'sInsignia-40371" value: { - dps: 6362.30803 - tps: 4517.2387 + dps: 6362.19141 + tps: 4517.1559 } } dps_results: { key: "TestCombat-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6318.54534 - tps: 4486.16719 + dps: 6318.42927 + tps: 4486.08478 } } dps_results: { @@ -80,309 +80,309 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-BonescytheBattlegear" value: { - dps: 5844.2987 - tps: 4149.45208 + dps: 5844.14519 + tps: 4149.34308 } } dps_results: { key: "TestCombat-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6295.59027 - tps: 4380.47171 + dps: 6295.47454 + tps: 4380.39119 } } dps_results: { key: "TestCombat-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6430.63446 - tps: 4565.75047 + dps: 6430.51635 + tps: 4565.66661 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6289.50731 - tps: 4465.55019 + dps: 6289.39186 + tps: 4465.46822 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6328.45225 - tps: 4493.2011 + dps: 6328.33588 + tps: 4493.11848 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 6379.40629 - tps: 4529.37846 + dps: 6379.28914 + tps: 4529.29529 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 6303.44865 - tps: 4475.44854 + dps: 6303.3329 + tps: 4475.36636 } } dps_results: { key: "TestCombat-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6265.91238 - tps: 4448.79779 + dps: 6265.79729 + tps: 4448.71608 } } dps_results: { key: "TestCombat-AllItems-Defender'sCode-40257" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6324.26437 - tps: 4490.2277 + dps: 6324.14815 + tps: 4490.14518 } } dps_results: { key: "TestCombat-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-EmberSkyflareDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6318.54534 - tps: 4486.16719 + dps: 6318.42927 + tps: 4486.08478 } } dps_results: { key: "TestCombat-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6312.80816 - tps: 4482.09379 + dps: 6312.69222 + tps: 4482.01148 } } dps_results: { key: "TestCombat-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6312.26879 - tps: 4481.71084 + dps: 6312.1529 + tps: 4481.62856 } } dps_results: { key: "TestCombat-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6277.97116 - tps: 4457.35952 + dps: 6277.85585 + tps: 4457.27765 } } dps_results: { key: "TestCombat-AllItems-ForgeEmber-37660" value: { - dps: 6251.15374 - tps: 4438.31915 + dps: 6251.03894 + tps: 4438.23765 } } dps_results: { key: "TestCombat-AllItems-ForlornSkyflareDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-ForlornStarflareDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6404.39099 - tps: 4547.1176 + dps: 6404.27361 + tps: 4547.03426 } } dps_results: { key: "TestCombat-AllItems-FuturesightRune-38763" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-Gladiator'sVestments" value: { - dps: 6243.25845 - tps: 4432.7135 + dps: 6243.1545 + tps: 4432.63969 } } dps_results: { key: "TestCombat-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6318.54534 - tps: 4486.16719 + dps: 6318.42927 + tps: 4486.08478 } } dps_results: { key: "TestCombat-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6312.80816 - tps: 4482.09379 + dps: 6312.69222 + tps: 4482.01148 } } dps_results: { key: "TestCombat-AllItems-IncisorFragment-37723" value: { - dps: 6347.789 - tps: 4506.93019 + dps: 6347.67264 + tps: 4506.84758 } } dps_results: { key: "TestCombat-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6327.4788 - tps: 4492.50995 + dps: 6327.36249 + tps: 4492.42737 } } dps_results: { key: "TestCombat-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6390.62557 - tps: 4537.34415 + dps: 6390.39925 + tps: 4537.18346 } } dps_results: { key: "TestCombat-AllItems-OfferingofSacrifice-37638" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6321.4048 - tps: 4488.19741 + dps: 6321.2886 + tps: 4488.11491 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6327.4788 - tps: 4492.50995 + dps: 6327.36249 + tps: 4492.42737 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-PurifiedShardoftheGods" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47316" value: { - dps: 6307.35526 - tps: 4478.22224 + dps: 6307.23983 + tps: 4478.14028 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47477" value: { - dps: 6325.58539 - tps: 4491.16563 + dps: 6325.46963 + tps: 4491.08344 } } dps_results: { key: "TestCombat-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6436.08993 - tps: 4569.62385 + dps: 6435.97172 + tps: 4569.53992 } } dps_results: { key: "TestCombat-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-RuneofRepulsion-40372" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-SealofthePantheon-36993" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { @@ -395,15 +395,15 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-ShinyShardoftheGods" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { @@ -416,43 +416,43 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-SparkofLife-37657" value: { - dps: 6272.24728 - tps: 4453.29557 + dps: 6272.08356 + tps: 4453.17933 } } dps_results: { key: "TestCombat-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6368.87882 - tps: 4521.90396 + dps: 6368.71235 + tps: 4521.78577 } } dps_results: { key: "TestCombat-AllItems-StormshroudArmor" value: { - dps: 4939.11156 - tps: 3506.7692 + dps: 4939.04279 + tps: 3506.72038 } } dps_results: { key: "TestCombat-AllItems-SwiftSkyflareDiamond" value: { - dps: 6327.4788 - tps: 4492.50995 + dps: 6327.36249 + tps: 4492.42737 } } dps_results: { key: "TestCombat-AllItems-SwiftStarflareDiamond" value: { - dps: 6321.4048 - tps: 4488.19741 + dps: 6321.2886 + tps: 4488.11491 } } dps_results: { key: "TestCombat-AllItems-SwiftWindfireDiamond" value: { - dps: 6310.77528 - tps: 4480.65045 + dps: 6310.65928 + tps: 4480.56809 } } dps_results: { @@ -465,64 +465,64 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-TheFistsofFury" value: { - dps: 5630.43126 - tps: 3997.6062 + dps: 5630.26222 + tps: 3997.48618 } } dps_results: { key: "TestCombat-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5725.62121 - tps: 4065.19106 + dps: 5725.36584 + tps: 4065.00975 } } dps_results: { key: "TestCombat-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6376.79869 - tps: 4527.52707 + dps: 6376.64616 + tps: 4527.41877 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6452.30293 - tps: 4581.13508 + dps: 6452.03314 + tps: 4580.94353 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6482.96374 - tps: 4602.90426 + dps: 6482.63267 + tps: 4602.66919 } } dps_results: { key: "TestCombat-AllItems-TirelessSkyflareDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-TirelessStarflareDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6295.59027 - tps: 4469.86909 + dps: 6295.47454 + tps: 4469.78693 } } dps_results: { @@ -542,357 +542,357 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-WingedTalisman-37844" value: { - dps: 6163.16709 - tps: 4375.84864 + dps: 6163.05415 + tps: 4375.76845 } } dps_results: { key: "TestCombat-Average-Default" value: { - dps: 6427.32617 - tps: 4563.40158 + dps: 6426.35961 + tps: 4562.71532 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 14109.95125 - tps: 10018.06539 + dps: 14107.50908 + tps: 10016.33145 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5449.97955 - tps: 3869.48548 + dps: 5449.74047 + tps: 3869.31573 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6391.39592 - tps: 4537.89111 + dps: 6389.82968 + tps: 4536.77907 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8603.13826 - tps: 6108.22816 + dps: 8601.78527 + tps: 6107.26754 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2534.26335 - tps: 1799.32698 + dps: 2534.07815 + tps: 1799.19549 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2649.95293 - tps: 1881.46658 + dps: 2649.23655 + tps: 1880.95795 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 19336.92108 - tps: 13729.21396 + dps: 19334.84022 + tps: 13727.73656 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 6436.08993 - tps: 4569.62385 + dps: 6435.97172 + tps: 4569.53992 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 7361.81435 - tps: 5226.88819 + dps: 7360.82913 + tps: 5226.18868 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 12093.82529 - tps: 8586.61596 + dps: 12092.70099 + tps: 8585.81771 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 3174.06521 - tps: 2253.5863 + dps: 3173.97685 + tps: 2253.52357 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 3234.82095 - tps: 2296.72287 + dps: 3234.6092 + tps: 2296.57253 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 19336.92108 - tps: 13729.21396 + dps: 19334.84022 + tps: 13727.73656 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 6436.08993 - tps: 4569.62385 + dps: 6435.97172 + tps: 4569.53992 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 7361.81435 - tps: 5226.88819 + dps: 7360.82913 + tps: 5226.18868 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 12093.82529 - tps: 8586.61596 + dps: 12092.70099 + tps: 8585.81771 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3174.06521 - tps: 2253.5863 + dps: 3173.97685 + tps: 2253.52357 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3234.82095 - tps: 2296.72287 + dps: 3234.6092 + tps: 2296.57253 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 18077.94222 - tps: 12835.33898 + dps: 18076.83793 + tps: 12834.55493 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 4742.67231 - tps: 3367.29734 + dps: 4742.58552 + tps: 3367.23572 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 5404.53276 - tps: 3837.21826 + dps: 5403.82361 + tps: 3836.71476 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 11858.36923 - tps: 8419.44215 + dps: 11857.86826 + tps: 8419.08646 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 2361.54356 - tps: 1676.69593 + dps: 2361.51414 + tps: 1676.67504 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 2444.09367 - tps: 1735.30651 + dps: 2443.9411 + tps: 1735.19818 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 14187.9497 - tps: 10073.44428 + dps: 14185.49367 + tps: 10071.70051 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5470.75176 - tps: 3884.23375 + dps: 5470.51176 + tps: 3884.06335 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6459.08891 - tps: 4585.95313 + dps: 6457.50579 + tps: 4584.82911 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8660.05491 - tps: 6148.63898 + dps: 8658.69305 + tps: 6147.67206 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2548.36708 - tps: 1809.34063 + dps: 2548.1809 + tps: 1809.20844 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2679.16426 - tps: 1902.20663 + dps: 2678.4404 + tps: 1901.69268 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 19431.77749 - tps: 13796.56201 + dps: 19429.6861 + tps: 13795.07713 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 6462.31403 - tps: 4588.24296 + dps: 6462.19523 + tps: 4588.15861 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 7440.44747 - tps: 5282.7177 + dps: 7439.4511 + tps: 5282.01028 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 12163.64315 - tps: 8636.18664 + dps: 12162.51245 + tps: 8635.38384 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 3191.62129 - tps: 2266.05111 + dps: 3191.5324 + tps: 2265.988 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 3272.6094 - tps: 2323.55267 + dps: 3272.39477 + tps: 2323.40028 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 19431.77749 - tps: 13796.56201 + dps: 19429.6861 + tps: 13795.07713 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 6462.31403 - tps: 4588.24296 + dps: 6462.19523 + tps: 4588.15861 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 7440.44747 - tps: 5282.7177 + dps: 7439.4511 + tps: 5282.01028 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 12163.64315 - tps: 8636.18664 + dps: 12162.51245 + tps: 8635.38384 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3191.62129 - tps: 2266.05111 + dps: 3191.5324 + tps: 2265.988 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3272.6094 - tps: 2323.55267 + dps: 3272.39477 + tps: 2323.40028 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 18163.26684 - tps: 12895.91946 + dps: 18162.15718 + tps: 12895.1316 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 4758.64612 - tps: 3378.63874 + dps: 4758.55894 + tps: 3378.57685 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 5459.08033 - tps: 3875.94703 + dps: 5458.36375 + tps: 3875.43826 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 11926.92536 - tps: 8468.11701 + dps: 11926.42131 + tps: 8467.75913 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 2373.08564 - tps: 1684.8908 + dps: 2373.05606 + tps: 1684.8698 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 2470.17151 - tps: 1753.82177 + dps: 2470.01689 + tps: 1753.712 } } dps_results: { key: "TestCombat-SwitchInFrontOfTarget-Default" value: { - dps: 6187.57073 - tps: 4393.17522 + dps: 6187.4681 + tps: 4393.10235 } } diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index d58023a68e..19b2124d7c 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -733,8 +733,8 @@ dps_results: { dps_results: { key: "TestElemental-Average-Default" value: { - dps: 4551.31711 - tps: 2700.49579 + dps: 4545.29381 + tps: 2696.92134 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 8e789295cf..ee608a91df 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -689,8 +689,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Average-Default" value: { - dps: 6805.25335 - tps: 3852.70867 + dps: 6798.88007 + tps: 3849.10068 } } dps_results: { diff --git a/sim/warlock/TestWarlock.results b/sim/warlock/TestWarlock.results index cd1fce6390..78cb725384 100644 --- a/sim/warlock/TestWarlock.results +++ b/sim/warlock/TestWarlock.results @@ -304,8 +304,8 @@ dps_results: { dps_results: { key: "TestWarlock-Average-Default" value: { - dps: 7045.32445 - tps: 6308.30124 + dps: 7039.24562 + tps: 6302.85882 } } dps_results: { diff --git a/sim/warrior/demoralizing_shout.go b/sim/warrior/demoralizing_shout.go index 1d8f9808b6..0617cde4b8 100644 --- a/sim/warrior/demoralizing_shout.go +++ b/sim/warrior/demoralizing_shout.go @@ -37,8 +37,7 @@ func (warrior *Warrior) registerDemoralizingShoutSpell() { ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { for _, aoeTarget := range sim.Encounter.Targets { - result := spell.CalcDamage(sim, &aoeTarget.Unit, 0, spell.OutcomeMagicHit) - spell.DealDamage(sim, result) + result := spell.CalcAndDealOutcome(sim, &aoeTarget.Unit, spell.OutcomeMagicHit) if result.Landed() { dsAuras[aoeTarget.Index].Activate(sim) } diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results index e1a44c399a..e07cadebdb 100644 --- a/sim/warrior/dps/TestArms.results +++ b/sim/warrior/dps/TestArms.results @@ -605,8 +605,8 @@ dps_results: { dps_results: { key: "TestArms-Average-Default" value: { - dps: 8362.36341 - tps: 6844.14681 + dps: 8354.17053 + tps: 6837.44232 } } dps_results: { diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results index 2d577588cf..5be1df195d 100644 --- a/sim/warrior/dps/TestFury.results +++ b/sim/warrior/dps/TestFury.results @@ -605,8 +605,8 @@ dps_results: { dps_results: { key: "TestFury-Average-Default" value: { - dps: 6881.71157 - tps: 5061.7718 + dps: 6875.5254 + tps: 5057.22187 } } dps_results: { diff --git a/sim/warrior/heroic_strike_cleave.go b/sim/warrior/heroic_strike_cleave.go index 02e8b3011c..d18fe2fe9d 100644 --- a/sim/warrior/heroic_strike_cleave.go +++ b/sim/warrior/heroic_strike_cleave.go @@ -31,17 +31,14 @@ func (warrior *Warrior) registerHeroicStrikeSpell() { }, ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) { - if warrior.glyphOfRevengeProcAura != nil { - if warrior.glyphOfRevengeProcAura.IsActive() { - cast.Cost = 0 - - warrior.glyphOfRevengeProcAura.Deactivate(sim) - } + if warrior.glyphOfRevengeProcAura.IsActive() { + cast.Cost = 0 + warrior.glyphOfRevengeProcAura.Deactivate(sim) } }, }, - BonusCritRating: (float64(warrior.Talents.Incite)*5 + core.TernaryFloat64(warrior.HasSetBonus(ItemSetWrynnsBattlegear, 4), 5, 0)) * core.CritRatingPerCritChance, + BonusCritRating: (5*float64(warrior.Talents.Incite) + core.TernaryFloat64(warrior.HasSetBonus(ItemSetWrynnsBattlegear, 4), 5, 0)) * core.CritRatingPerCritChance, DamageMultiplier: 1, CritMultiplier: warrior.critMultiplier(mh), ThreatMultiplier: 1, diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results index 164a83ace5..c2f33f79ad 100644 --- a/sim/warrior/protection/TestProtectionWarrior.results +++ b/sim/warrior/protection/TestProtectionWarrior.results @@ -45,7 +45,7 @@ character_stats_results: { stat_weights_results: { key: "TestProtectionWarrior-StatWeights-Default" value: { - weights: 0.83641 + weights: 0.84442 weights: 0 weights: 0 weights: 0 @@ -56,7 +56,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.15484 + weights: 0.15401 weights: 0 weights: 0 weights: 0 @@ -65,12 +65,12 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -0.02152 + weights: -0.01995 weights: 0 weights: 0 weights: 0 - weights: 0.46991 - weights: 0.10658 + weights: 0.46949 + weights: 0.10933 weights: 0 weights: 0 weights: 0 @@ -89,653 +89,653 @@ stat_weights_results: { dps_results: { key: "TestProtectionWarrior-AllItems-AshtongueTalismanofValor-32485" value: { - dps: 2058.69884 - tps: 5951.13791 + dps: 2057.50575 + tps: 5947.6898 } } dps_results: { key: "TestProtectionWarrior-AllItems-AustereEarthsiegeDiamond" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-Bandit'sInsignia-40371" value: { - dps: 2118.83923 - tps: 6090.76667 + dps: 2117.6584 + tps: 6087.37342 } } dps_results: { key: "TestProtectionWarrior-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 2043.47293 - tps: 5905.22206 + dps: 2042.39299 + tps: 5902.09874 } } dps_results: { key: "TestProtectionWarrior-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 2000.45937 - tps: 5786.78943 + dps: 1999.28854 + tps: 5783.4036 } } dps_results: { key: "TestProtectionWarrior-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 1757.19871 - tps: 5125.83229 + dps: 1754.64932 + tps: 5118.4188 } } dps_results: { key: "TestProtectionWarrior-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 1736.83211 - tps: 5061.9779 + dps: 1735.99044 + tps: 5059.52327 } } dps_results: { key: "TestProtectionWarrior-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 1625.39817 - tps: 4778.01729 + dps: 1623.72694 + tps: 4773.10695 } } dps_results: { key: "TestProtectionWarrior-AllItems-BracingEarthsiegeDiamond" value: { - dps: 2028.37746 - tps: 5750.9898 + dps: 2027.35122 + tps: 5748.07804 } } dps_results: { key: "TestProtectionWarrior-AllItems-ChaoticSkyflareDiamond" value: { - dps: 2068.24883 - tps: 5966.95686 + dps: 2067.09469 + tps: 5963.62853 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 2100.74896 - tps: 6047.74233 + dps: 2099.60854 + tps: 6044.45512 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Death-42990" value: { - dps: 2133.46287 - tps: 6114.11061 + dps: 2132.38006 + tps: 6111.01148 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 2155.25728 - tps: 6214.97526 + dps: 2154.0603 + tps: 6211.52471 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 2158.45748 - tps: 6207.11965 + dps: 2157.38453 + tps: 6204.03082 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 2097.11343 - tps: 6064.71752 + dps: 2096.03294 + tps: 6061.59679 } } dps_results: { key: "TestProtectionWarrior-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 2092.90749 - tps: 6042.61478 + dps: 2091.96244 + tps: 6039.8868 } } dps_results: { key: "TestProtectionWarrior-AllItems-DestructiveSkyflareDiamond" value: { - dps: 2048.19795 - tps: 5917.22343 + dps: 2047.11613 + tps: 5914.09536 } } dps_results: { key: "TestProtectionWarrior-AllItems-DreadnaughtBattlegear" value: { - dps: 2206.2909 - tps: 6298.13959 + dps: 2205.09035 + tps: 6294.71973 } } dps_results: { key: "TestProtectionWarrior-AllItems-DreadnaughtPlate" value: { - dps: 1916.1572 - tps: 5563.4158 + dps: 1915.05327 + tps: 5560.20869 } } dps_results: { key: "TestProtectionWarrior-AllItems-EffulgentSkyflareDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-EmberSkyflareDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 2043.47293 - tps: 5905.22206 + dps: 2042.39299 + tps: 5902.09874 } } dps_results: { key: "TestProtectionWarrior-AllItems-EnigmaticStarflareDiamond" value: { - dps: 2040.0759 - tps: 5897.33753 + dps: 2038.97464 + tps: 5894.15266 } } dps_results: { key: "TestProtectionWarrior-AllItems-EternalEarthsiegeDiamond" value: { - dps: 2042.62349 - tps: 5906.70677 + dps: 2041.59003 + tps: 5903.71616 } } dps_results: { key: "TestProtectionWarrior-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 2122.2846 - tps: 6086.86628 + dps: 2121.26702 + tps: 6083.94805 } } dps_results: { key: "TestProtectionWarrior-AllItems-EyeoftheBroodmother-45308" value: { - dps: 2083.47333 - tps: 6003.17677 + dps: 2082.43003 + tps: 6000.17261 } } dps_results: { key: "TestProtectionWarrior-AllItems-ForgeEmber-37660" value: { - dps: 2073.81355 - tps: 5982.33626 + dps: 2072.80836 + tps: 5979.43775 } } dps_results: { key: "TestProtectionWarrior-AllItems-ForlornSkyflareDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-ForlornStarflareDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 2096.84375 - tps: 6055.38307 + dps: 2095.7125 + tps: 6052.11808 } } dps_results: { key: "TestProtectionWarrior-AllItems-FuturesightRune-38763" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-Gladiator'sBattlegear" value: { - dps: 2344.78171 - tps: 6585.83579 + dps: 2343.56598 + tps: 6582.4187 } } dps_results: { key: "TestProtectionWarrior-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 2043.47293 - tps: 5905.22206 + dps: 2042.39299 + tps: 5902.09874 } } dps_results: { key: "TestProtectionWarrior-AllItems-ImpassiveStarflareDiamond" value: { - dps: 2040.0759 - tps: 5897.33753 + dps: 2038.97464 + tps: 5894.15266 } } dps_results: { key: "TestProtectionWarrior-AllItems-IncisorFragment-37723" value: { - dps: 2118.67221 - tps: 6107.82407 + dps: 2117.62527 + tps: 6104.79822 } } dps_results: { key: "TestProtectionWarrior-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 2029.76375 - tps: 5865.93543 + dps: 2028.53175 + tps: 5862.37508 } } dps_results: { key: "TestProtectionWarrior-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 2042.73082 - tps: 5913.94617 + dps: 2041.69142 + tps: 5910.93126 } } dps_results: { key: "TestProtectionWarrior-AllItems-MajesticDragonFigurine-40430" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-MeteoriteWhetstone-37390" value: { - dps: 2116.80668 - tps: 6099.95133 + dps: 2113.09377 + tps: 6089.27098 } } dps_results: { key: "TestProtectionWarrior-AllItems-OfferingofSacrifice-37638" value: { - dps: 2037.82528 - tps: 5894.8634 + dps: 2036.65094 + tps: 5891.45864 } } dps_results: { key: "TestProtectionWarrior-AllItems-OnslaughtArmor" value: { - dps: 1590.34406 - tps: 4668.84018 + dps: 1589.44895 + tps: 4666.21525 } } dps_results: { key: "TestProtectionWarrior-AllItems-OnslaughtBattlegear" value: { - dps: 1787.28887 - tps: 5155.68233 + dps: 1786.28909 + tps: 5152.8002 } } dps_results: { key: "TestProtectionWarrior-AllItems-PersistentEarthshatterDiamond" value: { - dps: 2037.44332 - tps: 5894.6108 + dps: 2036.26576 + tps: 5891.20619 } } dps_results: { key: "TestProtectionWarrior-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 2029.76375 - tps: 5865.93543 + dps: 2028.53175 + tps: 5862.37508 } } dps_results: { key: "TestProtectionWarrior-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-PurifiedShardoftheGods" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-ReignoftheDead-47316" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-ReignoftheDead-47477" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 2055.09725 - tps: 5932.18477 + dps: 2053.86842 + tps: 5928.63372 } } dps_results: { key: "TestProtectionWarrior-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-RuneofRepulsion-40372" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-SealofthePantheon-36993" value: { - dps: 2026.67133 - tps: 5866.49692 + dps: 2025.51702 + tps: 5863.15536 } } dps_results: { key: "TestProtectionWarrior-AllItems-ShinyShardoftheGods" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-SiegebreakerBattlegear" value: { - dps: 2193.02238 - tps: 6274.20294 + dps: 2190.69255 + tps: 6267.54049 } } dps_results: { key: "TestProtectionWarrior-AllItems-SiegebreakerPlate" value: { - dps: 2006.78571 - tps: 5774.77578 + dps: 2005.54496 + tps: 5771.20754 } } dps_results: { key: "TestProtectionWarrior-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-SparkofLife-37657" value: { - dps: 2042.95333 - tps: 5906.45314 + dps: 2039.94815 + tps: 5897.75982 } } dps_results: { key: "TestProtectionWarrior-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 2104.32424 - tps: 6092.77153 + dps: 2103.39239 + tps: 6090.07282 } } dps_results: { key: "TestProtectionWarrior-AllItems-StormshroudArmor" value: { - dps: 1594.83072 - tps: 4687.45643 + dps: 1593.99651 + tps: 4685.00704 } } dps_results: { key: "TestProtectionWarrior-AllItems-SwiftSkyflareDiamond" value: { - dps: 2029.76375 - tps: 5865.93543 + dps: 2028.53175 + tps: 5862.37508 } } dps_results: { key: "TestProtectionWarrior-AllItems-SwiftStarflareDiamond" value: { - dps: 2037.44332 - tps: 5894.6108 + dps: 2036.26576 + tps: 5891.20619 } } dps_results: { key: "TestProtectionWarrior-AllItems-SwiftWindfireDiamond" value: { - dps: 2033.96841 - tps: 5887.47343 + dps: 2032.74296 + tps: 5883.92471 } } dps_results: { key: "TestProtectionWarrior-AllItems-TheFistsofFury" value: { - dps: 1571.97541 - tps: 4516.8015 + dps: 1570.20148 + tps: 4511.69454 } } dps_results: { key: "TestProtectionWarrior-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 1728.5351 - tps: 4919.72833 + dps: 1726.9209 + tps: 4915.12397 } } dps_results: { key: "TestProtectionWarrior-AllItems-ThunderingSkyflareDiamond" value: { - dps: 2047.85078 - tps: 5922.44547 + dps: 2045.38856 + tps: 5915.33034 } } dps_results: { key: "TestProtectionWarrior-AllItems-TinyAbominationinaJar-50351" value: { - dps: 2141.13252 - tps: 6184.39641 + dps: 2140.06866 + tps: 6181.31769 } } dps_results: { key: "TestProtectionWarrior-AllItems-TinyAbominationinaJar-50706" value: { - dps: 2159.03543 - tps: 6228.45644 + dps: 2157.73203 + tps: 6224.69841 } } dps_results: { key: "TestProtectionWarrior-AllItems-TirelessSkyflareDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-TirelessStarflareDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 2028.37746 - tps: 5868.3059 + dps: 2027.35122 + tps: 5865.33473 } } dps_results: { key: "TestProtectionWarrior-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 1723.31409 - tps: 5024.80639 + dps: 1720.98985 + tps: 5018.04092 } } dps_results: { key: "TestProtectionWarrior-AllItems-WingedTalisman-37844" value: { - dps: 2029.72668 - tps: 5878.89286 + dps: 2028.69407 + tps: 5875.89625 } } dps_results: { key: "TestProtectionWarrior-AllItems-Wrynn'sBattlegear" value: { - dps: 2305.80536 - tps: 6530.963 + dps: 2304.63078 + tps: 6527.62953 } } dps_results: { key: "TestProtectionWarrior-AllItems-Wrynn'sPlate" value: { - dps: 1977.50387 - tps: 5711.80826 + dps: 1976.36842 + tps: 5708.52937 } } dps_results: { key: "TestProtectionWarrior-AllItems-YmirjarLord'sBattlegear" value: { - dps: 2607.31799 - tps: 7295.28323 + dps: 2605.99471 + tps: 7291.57513 } } dps_results: { key: "TestProtectionWarrior-AllItems-YmirjarLord'sPlate" value: { - dps: 2121.17197 - tps: 6122.04867 + dps: 2119.99543 + tps: 6118.64951 } } dps_results: { key: "TestProtectionWarrior-Average-Default" value: { - dps: 3203.72162 - tps: 8335.42532 - dtps: 118.81923 + dps: 3200.83277 + tps: 8327.9087 + dtps: 118.71201 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 2079.48577 - tps: 5571.85457 + dps: 2078.37588 + tps: 5568.8801 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 2079.48577 - tps: 5524.32915 + dps: 2078.37588 + tps: 5521.3801 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 2237.69886 - tps: 5903.23213 + dps: 2223.92603 + tps: 5866.89265 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 1116.11363 - tps: 2989.44337 + dps: 1113.62873 + tps: 2982.79326 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 1116.11363 - tps: 2941.83623 + dps: 1113.62873 + tps: 2935.29326 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 1042.27299 - tps: 2771.68505 + dps: 1030.41932 + tps: 2740.17121 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 2112.48381 - tps: 5663.20038 + dps: 2111.31659 + tps: 5660.07036 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 2112.48381 - tps: 5615.67406 + dps: 2111.31659 + tps: 5612.57036 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 2319.50326 - tps: 6113.15326 + dps: 2305.4128 + tps: 6076.11763 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 1124.62687 - tps: 3020.29726 + dps: 1122.1823 + tps: 3013.72926 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 1124.62687 - tps: 2972.6941 + dps: 1122.1823 + tps: 2966.22926 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 1044.96251 - tps: 2791.70259 + dps: 1031.56252 + tps: 2755.91964 } } dps_results: { diff --git a/sim/warrior/thunder_clap.go b/sim/warrior/thunder_clap.go index 08bce5c333..57585587c0 100644 --- a/sim/warrior/thunder_clap.go +++ b/sim/warrior/thunder_clap.go @@ -52,8 +52,7 @@ func (warrior *Warrior) registerThunderClapSpell() { baseDamage *= sim.Encounter.AOECapMultiplier() for _, aoeTarget := range sim.Encounter.Targets { - result := spell.CalcDamage(sim, &aoeTarget.Unit, baseDamage, spell.OutcomeRangedHitAndCrit) - spell.DealDamage(sim, result) + result := spell.CalcAndDealDamage(sim, &aoeTarget.Unit, baseDamage, spell.OutcomeRangedHitAndCrit) if result.Landed() { tcAuras[aoeTarget.Index].Activate(sim) } diff --git a/ui/core/components/raid_sim_action.ts b/ui/core/components/raid_sim_action.ts index 1823b38e2f..ac63f276fd 100644 --- a/ui/core/components/raid_sim_action.ts +++ b/ui/core/components/raid_sim_action.ts @@ -272,10 +272,10 @@ export class RaidSimResultsManager { static makeToplineResultsContent(simResult: SimResult, filter?: SimResultFilter): string { const players = simResult.getPlayers(filter); - const playerMetrics = players.length == 1 ? players[0] : null; let content = ''; - if (playerMetrics) { + if (players.length == 1) { + const playerMetrics = players[0]; if (playerMetrics.getTargetIndex(filter) == null) { const dpsMetrics = simResult.raidMetrics.dps; const tpsMetrics = playerMetrics.tps; @@ -299,7 +299,6 @@ export class RaidSimResultsManager { `; } else { const actions = simResult.getActionMetrics(filter); - const targetActions = simResult.getTargets(filter)[0].actions.map(action => action.forTarget(filter)); if (actions.length > 0) { const mergedActions = ActionMetrics.merge(actions); content += ` @@ -311,6 +310,8 @@ export class RaidSimResultsManager { `; } + + const targetActions = simResult.getTargets(filter)[0].actions.map(action => action.forTarget(filter)); if (targetActions.length > 0) { const mergedTargetActions = ActionMetrics.merge(targetActions); content += ` diff --git a/ui/core/proto_utils/sim_result.ts b/ui/core/proto_utils/sim_result.ts index 037f050a5c..6472eb85b9 100644 --- a/ui/core/proto_utils/sim_result.ts +++ b/ui/core/proto_utils/sim_result.ts @@ -77,17 +77,23 @@ export class SimResult { readonly encounterMetrics: EncounterMetrics; readonly logs: Array; + private players: Array; + private units: Array; + private constructor(request: RaidSimRequest, result: RaidSimResult, raidMetrics: RaidMetrics, encounterMetrics: EncounterMetrics, logs: Array) { this.request = request; this.result = result; this.raidMetrics = raidMetrics; this.encounterMetrics = encounterMetrics; this.logs = logs; + + this.players = raidMetrics.parties.map(party => party.players).flat(); + this.units = this.players.concat(encounterMetrics.targets); } getPlayers(filter?: SimResultFilter): Array { if (filter?.player || filter?.player === 0) { - const player = this.getPlayerWithIndex(filter.player); + const player = this.getUnitWithIndex(filter.player); return player ? [player] : []; } else { return this.raidMetrics.parties.map(party => party.players).flat(); @@ -100,12 +106,12 @@ export class SimResult { } getPlayerWithIndex(unitIndex: number): UnitMetrics | null { - return this.raidMetrics.parties[Math.floor(unitIndex / MAX_PARTY_SIZE)].players[unitIndex % MAX_PARTY_SIZE] + return this.players.find(player => player.unitIndex == unitIndex) || null; } getTargets(filter?: SimResultFilter): Array { if (filter?.target || filter?.target === 0) { - const target = this.getTargetWithIndex(filter.target); + const target = this.getUnitWithIndex(filter.target); return target ? [target] : []; } else { return this.encounterMetrics.targets.slice(); @@ -116,7 +122,7 @@ export class SimResult { return this.getTargets().find(target => target.unitIndex == unitIndex) || null; } getUnitWithIndex(unitIndex: number): UnitMetrics | null { - return this.getPlayerWithIndex(unitIndex) || this.getTargetWithIndex(unitIndex); + return this.units.find(unit => unit.unitIndex == unitIndex) || null; } getDamageMetrics(filter: SimResultFilter): DistributionMetricsProto {