From 4c26f73b23ff5ab10f97144dec0e5b3abf8aaa70 Mon Sep 17 00:00:00 2001 From: sanguinerarogue Date: Sun, 11 Aug 2024 23:28:05 -0600 Subject: [PATCH 1/2] DB chili, needs metrics looked at --- sim/core/consumes.go | 32 ++- sim/druid/feral/TestFeral.results | 168 +++++++-------- sim/hunter/TestBM.results | 32 +-- sim/hunter/TestSV.results | 40 ++-- .../retribution/TestRetribution.results | 32 +-- sim/paladin/retribution/TestShockadin.results | 16 +- sim/shaman/warden/TestWardenShaman.results | 16 +- sim/warrior/dps/TestArms.results | 203 ++++++++++++++++++ sim/warrior/dps/TestFury.results | 203 ++++++++++++++++++ sim/warrior/dps_warrior/TestArms.results | 16 +- .../tank_warrior/TestTankWarrior.results | 16 +- 11 files changed, 604 insertions(+), 170 deletions(-) create mode 100644 sim/warrior/dps/TestArms.results create mode 100644 sim/warrior/dps/TestFury.results diff --git a/sim/core/consumes.go b/sim/core/consumes.go index ad4403b5d3..f417d1fdab 100644 --- a/sim/core/consumes.go +++ b/sim/core/consumes.go @@ -2,7 +2,7 @@ package core import ( "time" - + "github.com/wowsims/sod/sim/core/proto" "github.com/wowsims/sod/sim/core/stats" ) @@ -395,10 +395,38 @@ func DragonBreathChiliAura(character *Character) *Aura { BonusCoefficient: 1, ApplyEffects: func(sim *Simulation, target *Unit, spell *Spell) { - spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) + results := make([]*SpellResult, character.Env.GetNumTargets()) + for idx := range results { + results[idx] = spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) + target = sim.Environment.NextTargetUnit(target) + } + for _, result := range results { + if result.Landed() { + spell.DealDamage(sim, result) + } + } }, }) +//molten copy +//ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { +// for idx := range results { +// // Molten Blast is a magic ability but scales off of Attack Power +// baseDamage := sim.Roll(baseDamageLow, baseDamageHigh) + apCoef*spell.MeleeAttackPower() +// results[idx] = spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) +// target = sim.Environment.NextTargetUnit(target) +// } +// +// for _, result := range results { +// if result.Landed() { +// spell.DealDamage(sim, result) +// } +// } +//}, +//molten copy end + + + aura := character.GetOrRegisterAura(Aura{ Label: "Dragonbreath Chili", ActionID: ActionID{SpellID: 15852}, diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 011ff266a1..a7d10fa60e 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -680,8 +680,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 460.72429 - tps: 367.37396 + dps: 500.56598 + tps: 396.01828 } } dps_results: { @@ -701,8 +701,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 275.2919 - tps: 200.69296 + dps: 294.54815 + tps: 214.54772 } } dps_results: { @@ -722,8 +722,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 460.72429 - tps: 367.37396 + dps: 500.56598 + tps: 396.01828 } } dps_results: { @@ -743,8 +743,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 275.2919 - tps: 200.69296 + dps: 294.54815 + tps: 214.54772 } } dps_results: { @@ -764,8 +764,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 460.72429 - tps: 367.37396 + dps: 500.56598 + tps: 396.01828 } } dps_results: { @@ -785,8 +785,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 275.2919 - tps: 200.69296 + dps: 294.54815 + tps: 214.54772 } } dps_results: { @@ -806,8 +806,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 460.62915 - tps: 366.47331 + dps: 499.78514 + tps: 394.63078 } } dps_results: { @@ -827,8 +827,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 277.35467 - tps: 208.01407 + dps: 296.59717 + tps: 221.85907 } } dps_results: { @@ -848,8 +848,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 460.62915 - tps: 366.47331 + dps: 499.78514 + tps: 394.63078 } } dps_results: { @@ -869,8 +869,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 277.35467 - tps: 208.01407 + dps: 296.59717 + tps: 221.85907 } } dps_results: { @@ -890,8 +890,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 460.62915 - tps: 366.47331 + dps: 499.78514 + tps: 394.63078 } } dps_results: { @@ -911,8 +911,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 277.35467 - tps: 208.01407 + dps: 296.59717 + tps: 221.85907 } } dps_results: { @@ -955,9 +955,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1364.13822 - tps: 1086.86567 - hps: 7.0812 + dps: 1453.61751 + tps: 1150.39597 + hps: 7.00305 } } dps_results: { @@ -979,9 +979,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 685.0344 - tps: 568.3131 - hps: 4.31933 + dps: 716.16087 + tps: 590.41289 + hps: 4.268 } } dps_results: { @@ -1003,9 +1003,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1364.13822 - tps: 1086.86567 - hps: 7.0812 + dps: 1453.61751 + tps: 1150.39597 + hps: 7.00305 } } dps_results: { @@ -1027,9 +1027,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 685.0344 - tps: 568.3131 - hps: 4.31933 + dps: 716.16087 + tps: 590.41289 + hps: 4.268 } } dps_results: { @@ -1051,9 +1051,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1364.13822 - tps: 1086.86567 - hps: 7.0812 + dps: 1453.61751 + tps: 1150.39597 + hps: 7.00305 } } dps_results: { @@ -1075,9 +1075,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 685.0344 - tps: 568.3131 - hps: 4.31933 + dps: 716.16087 + tps: 590.41289 + hps: 4.268 } } dps_results: { @@ -1099,9 +1099,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1396.08802 - tps: 1114.86597 - hps: 7.07319 + dps: 1485.52393 + tps: 1178.36546 + hps: 6.99304 } } dps_results: { @@ -1123,9 +1123,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 682.43199 - tps: 565.10958 - hps: 4.31933 + dps: 713.64441 + tps: 587.2704 + hps: 4.26067 } } dps_results: { @@ -1147,9 +1147,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1396.08802 - tps: 1114.86597 - hps: 7.07319 + dps: 1485.52393 + tps: 1178.36546 + hps: 6.99304 } } dps_results: { @@ -1171,9 +1171,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 682.43199 - tps: 565.10958 - hps: 4.31933 + dps: 713.64441 + tps: 587.2704 + hps: 4.26067 } } dps_results: { @@ -1195,9 +1195,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1396.08802 - tps: 1114.86597 - hps: 7.07319 + dps: 1485.52393 + tps: 1178.36546 + hps: 6.99304 } } dps_results: { @@ -1219,9 +1219,9 @@ dps_results: { dps_results: { key: "TestFeral-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 682.43199 - tps: 565.10958 - hps: 4.31933 + dps: 713.64441 + tps: 587.2704 + hps: 4.26067 } } dps_results: { @@ -1349,8 +1349,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 2648.75244 - tps: 2167.444 + dps: 2700.78753 + tps: 2204.38861 } } dps_results: { @@ -1370,8 +1370,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 1354.39986 - tps: 1116.22052 + dps: 1383.65992 + tps: 1136.99437 } } dps_results: { @@ -1391,8 +1391,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 2648.75244 - tps: 2167.444 + dps: 2700.78753 + tps: 2204.38861 } } dps_results: { @@ -1412,8 +1412,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 1354.39986 - tps: 1116.22052 + dps: 1383.65992 + tps: 1136.99437 } } dps_results: { @@ -1433,8 +1433,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 2648.75244 - tps: 2167.444 + dps: 2700.78753 + tps: 2204.38861 } } dps_results: { @@ -1454,8 +1454,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 1354.39986 - tps: 1116.22052 + dps: 1383.65992 + tps: 1136.99437 } } dps_results: { @@ -1475,8 +1475,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 2783.53836 - tps: 2267.45666 + dps: 2834.8651 + tps: 2303.89772 } } dps_results: { @@ -1496,8 +1496,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 1350.19924 - tps: 1116.289 + dps: 1379.4832 + tps: 1137.07981 } } dps_results: { @@ -1517,8 +1517,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 2783.53836 - tps: 2267.45666 + dps: 2834.8651 + tps: 2303.89772 } } dps_results: { @@ -1538,8 +1538,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 1350.19924 - tps: 1116.289 + dps: 1379.4832 + tps: 1137.07981 } } dps_results: { @@ -1559,8 +1559,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 2783.53836 - tps: 2267.45666 + dps: 2834.8651 + tps: 2303.89772 } } dps_results: { @@ -1580,8 +1580,8 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 1350.19924 - tps: 1116.289 + dps: 1379.4832 + tps: 1137.07981 } } dps_results: { diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results index 100d68fb30..c3307dbb40 100644 --- a/sim/hunter/TestBM.results +++ b/sim/hunter/TestBM.results @@ -120,8 +120,8 @@ dps_results: { dps_results: { key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 1933.6414 - tps: 1719.07109 + dps: 2792.68605 + tps: 2578.11574 } } dps_results: { @@ -141,8 +141,8 @@ dps_results: { dps_results: { key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 1088.24795 - tps: 1100.20868 + dps: 1526.13042 + tps: 1538.09115 } } dps_results: { @@ -204,8 +204,8 @@ dps_results: { dps_results: { key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 514.07538 - tps: 558.44087 + dps: 683.46102 + tps: 729.05433 } } dps_results: { @@ -225,8 +225,8 @@ dps_results: { dps_results: { key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 251.51403 - tps: 449.54526 + dps: 335.88913 + tps: 534.60055 } } dps_results: { @@ -288,8 +288,8 @@ dps_results: { dps_results: { key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 1851.17138 - tps: 1628.15847 + dps: 2675.40153 + tps: 2452.38862 } } dps_results: { @@ -309,8 +309,8 @@ dps_results: { dps_results: { key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 1082.11487 - tps: 1093.48824 + dps: 1512.4581 + tps: 1523.83147 } } dps_results: { @@ -372,8 +372,8 @@ dps_results: { dps_results: { key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 522.96597 - tps: 554.39406 + dps: 691.90078 + tps: 724.64438 } } dps_results: { @@ -393,8 +393,8 @@ dps_results: { dps_results: { key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 258.80012 - tps: 447.1994 + dps: 342.80955 + tps: 531.98582 } } dps_results: { diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results index 75a2002003..cb69ee0dad 100644 --- a/sim/hunter/TestSV.results +++ b/sim/hunter/TestSV.results @@ -218,8 +218,8 @@ dps_results: { dps_results: { key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 1952.45287 - tps: 1825.28209 + dps: 2847.85759 + tps: 2720.68681 } } dps_results: { @@ -239,8 +239,8 @@ dps_results: { dps_results: { key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 1133.45646 - tps: 1185.96693 + dps: 1596.18784 + tps: 1648.69831 } } dps_results: { @@ -260,8 +260,8 @@ dps_results: { dps_results: { key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 1924.89021 - tps: 1799.16723 + dps: 2818.78787 + tps: 2693.06489 } } dps_results: { @@ -281,8 +281,8 @@ dps_results: { dps_results: { key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 1134.67825 - tps: 1180.15061 + dps: 1591.43243 + tps: 1636.90479 } } dps_results: { @@ -405,9 +405,9 @@ dps_results: { dps_results: { key: "TestSV-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 8001.89283 - tps: 8086.89309 - hps: 20.29481 + dps: 8206.28368 + tps: 8291.44334 + hps: 20.40394 } } dps_results: { @@ -429,9 +429,9 @@ dps_results: { dps_results: { key: "TestSV-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 4164.54786 - tps: 4452.80126 - hps: 11.14454 + dps: 4301.78971 + tps: 4590.04311 + hps: 11.27153 } } dps_results: { @@ -453,9 +453,9 @@ dps_results: { dps_results: { key: "TestSV-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 8487.73211 - tps: 8559.58087 - hps: 20.19748 + dps: 8703.73506 + tps: 8775.68216 + hps: 20.36855 } } dps_results: { @@ -477,9 +477,9 @@ dps_results: { dps_results: { key: "TestSV-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 4176.70141 - tps: 4447.26969 - hps: 11.01087 + dps: 4307.89732 + tps: 4578.46559 + hps: 11.09203 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 79eebb9f16..6d191419c6 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -414,8 +414,8 @@ dps_results: { dps_results: { key: "TestRetribution-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 360.69055 - tps: 604.97463 + dps: 441.03594 + tps: 685.21563 } } dps_results: { @@ -435,8 +435,8 @@ dps_results: { dps_results: { key: "TestRetribution-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 201.66489 - tps: 364.25761 + dps: 243.73928 + tps: 406.50435 } } dps_results: { @@ -456,8 +456,8 @@ dps_results: { dps_results: { key: "TestRetribution-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 360.3402 - tps: 603.98665 + dps: 441.09307 + tps: 684.27866 } } dps_results: { @@ -477,8 +477,8 @@ dps_results: { dps_results: { key: "TestRetribution-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 200.88112 - tps: 361.7774 + dps: 243.77053 + tps: 404.53789 } } dps_results: { @@ -519,8 +519,8 @@ dps_results: { dps_results: { key: "TestRetribution-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1374.34865 - tps: 1915.95051 + dps: 1445.20907 + tps: 1987.04093 } } dps_results: { @@ -540,8 +540,8 @@ dps_results: { dps_results: { key: "TestRetribution-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 485.61314 - tps: 759.49102 + dps: 509.68007 + tps: 783.55795 } } dps_results: { @@ -561,8 +561,8 @@ dps_results: { dps_results: { key: "TestRetribution-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1383.64332 - tps: 1928.9181 + dps: 1455.36769 + tps: 2000.39473 } } dps_results: { @@ -582,8 +582,8 @@ dps_results: { dps_results: { key: "TestRetribution-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 473.98478 - tps: 749.028 + dps: 499.46841 + tps: 774.51162 } } dps_results: { diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results index 76029b5f42..e335c58d48 100644 --- a/sim/paladin/retribution/TestShockadin.results +++ b/sim/paladin/retribution/TestShockadin.results @@ -113,8 +113,8 @@ dps_results: { dps_results: { key: "TestShockadin-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 511.38331 - tps: 790.27801 + dps: 543.95799 + tps: 822.82752 } } dps_results: { @@ -134,8 +134,8 @@ dps_results: { dps_results: { key: "TestShockadin-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 242.06285 - tps: 427.00913 + dps: 256.00745 + tps: 440.95373 } } dps_results: { @@ -155,8 +155,8 @@ dps_results: { dps_results: { key: "TestShockadin-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 529.97278 - tps: 809.15765 + dps: 557.73424 + tps: 837.15554 } } dps_results: { @@ -176,8 +176,8 @@ dps_results: { dps_results: { key: "TestShockadin-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 248.90445 - tps: 435.18173 + dps: 262.4299 + tps: 448.70718 } } dps_results: { diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results index ec344634f6..20d9e83f51 100644 --- a/sim/shaman/warden/TestWardenShaman.results +++ b/sim/shaman/warden/TestWardenShaman.results @@ -162,8 +162,8 @@ dps_results: { dps_results: { key: "TestWardenShaman-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 1363.43383 - tps: 2112.449 + dps: 1519.90038 + tps: 2210.96611 } } dps_results: { @@ -183,8 +183,8 @@ dps_results: { dps_results: { key: "TestWardenShaman-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 484.23603 - tps: 995.8574 + dps: 549.15203 + tps: 1039.56083 } } dps_results: { @@ -204,8 +204,8 @@ dps_results: { dps_results: { key: "TestWardenShaman-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 1341.1331 - tps: 2089.32108 + dps: 1501.13062 + tps: 2204.38549 } } dps_results: { @@ -225,8 +225,8 @@ dps_results: { dps_results: { key: "TestWardenShaman-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 474.23928 - tps: 986.24883 + dps: 536.99735 + tps: 1028.4137 } } dps_results: { diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results new file mode 100644 index 0000000000..0109605739 --- /dev/null +++ b/sim/warrior/dps/TestArms.results @@ -0,0 +1,203 @@ +character_stats_results: { + key: "TestArms-Lvl50-CharacterStats-Default" + value: { + final_stats: 382.536 + final_stats: 324.324 + final_stats: 419.364 + final_stats: 92.664 + final_stats: 125.928 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 30 + final_stats: 4 + final_stats: 21 + final_stats: 0 + final_stats: 0 + final_stats: 1400.656 + final_stats: 5 + final_stats: 47.22183 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 2871.224 + final_stats: 201 + final_stats: 0 + final_stats: 0 + final_stats: 18.7414 + final_stats: 19.22183 + final_stats: 0 + final_stats: 0 + final_stats: 5092.64 + final_stats: 20 + final_stats: 30 + final_stats: 45 + final_stats: 50 + final_stats: 45 + final_stats: 324 + final_stats: 0 + final_stats: 65 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestArms-Lvl50-StatWeights-Default" + value: { + weights: 1.41739 + weights: 1.09972 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.659 + weights: 15.02491 + weights: 14.35635 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + } +} +dps_results: { + key: "TestArms-Lvl50-AllItems-BattlegearofHeroism" + value: { + dps: 890.63446 + tps: 762.91666 + } +} +dps_results: { + key: "TestArms-Lvl50-Average-Default" + value: { + dps: 1379.25118 + tps: 1166.292 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-Phase 3 Consumes-LongMultiTarget" + value: { + dps: 174.82804 + tps: 282.48545 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-Phase 3 Consumes-LongSingleTarget" + value: { + dps: 121.23273 + tps: 108.54683 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-Phase 3 Consumes-ShortSingleTarget" + value: { + dps: 225.64442 + tps: 197.45015 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-Phase 3 Consumes-LongMultiTarget" + value: { + dps: 79.52628 + tps: 200.40606 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-Phase 3 Consumes-LongSingleTarget" + value: { + dps: 54.88899 + tps: 53.58 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-Phase 3 Consumes-ShortSingleTarget" + value: { + dps: 116.19461 + tps: 106.88139 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-Phase 3 Consumes-LongMultiTarget" + value: { + dps: 184.82997 + tps: 291.62361 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-Phase 3 Consumes-LongSingleTarget" + value: { + dps: 127.57006 + tps: 113.90688 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-Phase 3 Consumes-ShortSingleTarget" + value: { + dps: 237.00463 + tps: 206.88729 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-Phase 3 Consumes-LongMultiTarget" + value: { + dps: 83.88691 + tps: 204.25437 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-Phase 3 Consumes-LongSingleTarget" + value: { + dps: 57.53134 + tps: 55.81903 + } +} +dps_results: { + key: "TestArms-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-Phase 3 Consumes-ShortSingleTarget" + value: { + dps: 122.54845 + tps: 112.02504 + } +} +dps_results: { + key: "TestArms-Lvl50-SwitchInFrontOfTarget-Default" + value: { + dps: 1268.23792 + tps: 1074.1097 + } +} diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results new file mode 100644 index 0000000000..65c7fb96a8 --- /dev/null +++ b/sim/warrior/dps/TestFury.results @@ -0,0 +1,203 @@ +character_stats_results: { + key: "TestFury-Lvl40-CharacterStats-Default" + value: { + final_stats: 288.2 + final_stats: 188.1 + final_stats: 281.6 + final_stats: 60.5 + final_stats: 79.2 + final_stats: 42 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 24 + final_stats: 3 + final_stats: 9 + final_stats: 0 + final_stats: 0 + final_stats: 1108.2 + final_stats: 5 + final_stats: 27.25798 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 2128.2 + final_stats: 202 + final_stats: 0 + final_stats: 0 + final_stats: 14.205 + final_stats: 14.25798 + final_stats: 0 + final_stats: 0 + final_stats: 3285 + final_stats: 18 + final_stats: 30 + final_stats: 40 + final_stats: 35 + final_stats: 40 + final_stats: 263 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestFury-Lvl40-StatWeights-Default" + value: { + weights: 1.32697 + weights: 0.77615 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 1.88699 + weights: 11.77632 + weights: 11.4492 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + } +} +dps_results: { + key: "TestFury-Lvl40-AllItems-BattlegearofHeroism" + value: { + dps: 556.25992 + tps: 494.21026 + } +} +dps_results: { + key: "TestFury-Lvl40-Average-Default" + value: { + dps: 821.32029 + tps: 716.9316 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-FullBuffs-Phase 1 Consumes-LongMultiTarget" + value: { + dps: 20.61331 + tps: 55.27695 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-FullBuffs-Phase 1 Consumes-LongSingleTarget" + value: { + dps: 16.9391 + tps: 16.52309 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-FullBuffs-Phase 1 Consumes-ShortSingleTarget" + value: { + dps: 32.97049 + tps: 30.04883 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-NoBuffs-Phase 1 Consumes-LongMultiTarget" + value: { + dps: 10.06521 + tps: 46.10528 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-NoBuffs-Phase 1 Consumes-LongSingleTarget" + value: { + dps: 8.31915 + tps: 9.44631 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-NoBuffs-Phase 1 Consumes-ShortSingleTarget" + value: { + dps: 14.52074 + tps: 15.18964 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-FullBuffs-Phase 1 Consumes-LongMultiTarget" + value: { + dps: 22.18988 + tps: 56.69102 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-FullBuffs-Phase 1 Consumes-LongSingleTarget" + value: { + dps: 18.22962 + tps: 17.56959 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-FullBuffs-Phase 1 Consumes-ShortSingleTarget" + value: { + dps: 38.00017 + tps: 34.09535 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-NoBuffs-Phase 1 Consumes-LongMultiTarget" + value: { + dps: 10.85473 + tps: 46.81395 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-NoBuffs-Phase 1 Consumes-LongSingleTarget" + value: { + dps: 8.89801 + tps: 9.91828 + } +} +dps_results: { + key: "TestFury-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-NoBuffs-Phase 1 Consumes-ShortSingleTarget" + value: { + dps: 16.67627 + tps: 16.92653 + } +} +dps_results: { + key: "TestFury-Lvl40-SwitchInFrontOfTarget-Default" + value: { + dps: 769.25434 + tps: 674.18571 + } +} diff --git a/sim/warrior/dps_warrior/TestArms.results b/sim/warrior/dps_warrior/TestArms.results index fe4ecc310e..48f43619f5 100644 --- a/sim/warrior/dps_warrior/TestArms.results +++ b/sim/warrior/dps_warrior/TestArms.results @@ -113,8 +113,8 @@ dps_results: { dps_results: { key: "TestArms-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 293.35509 - tps: 408.60675 + dps: 331.57282 + tps: 439.18093 } } dps_results: { @@ -134,8 +134,8 @@ dps_results: { dps_results: { key: "TestArms-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 137.61886 - tps: 261.37709 + dps: 151.88928 + tps: 272.79342 } } dps_results: { @@ -155,8 +155,8 @@ dps_results: { dps_results: { key: "TestArms-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 329.67008 - tps: 443.35313 + dps: 371.42867 + tps: 476.76001 } } dps_results: { @@ -176,8 +176,8 @@ dps_results: { dps_results: { key: "TestArms-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 154.80354 - tps: 277.70972 + dps: 170.38938 + tps: 290.17839 } } dps_results: { diff --git a/sim/warrior/tank_warrior/TestTankWarrior.results b/sim/warrior/tank_warrior/TestTankWarrior.results index d9bb04a129..e5eaf0d698 100644 --- a/sim/warrior/tank_warrior/TestTankWarrior.results +++ b/sim/warrior/tank_warrior/TestTankWarrior.results @@ -148,8 +148,8 @@ dps_results: { dps_results: { key: "TestTankWarrior-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 441.64596 - tps: 1204.43508 + dps: 448.44277 + tps: 1220.94623 } } dps_results: { @@ -169,8 +169,8 @@ dps_results: { dps_results: { key: "TestTankWarrior-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 145.4241 - tps: 552.8629 + dps: 148.98201 + tps: 560.3156 } } dps_results: { @@ -190,8 +190,8 @@ dps_results: { dps_results: { key: "TestTankWarrior-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 459.52149 - tps: 1236.36817 + dps: 466.31334 + tps: 1252.85868 } } dps_results: { @@ -211,8 +211,8 @@ dps_results: { dps_results: { key: "TestTankWarrior-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 145.69217 - tps: 553.62132 + dps: 149.25081 + tps: 561.07857 } } dps_results: { From c8f05491ebd57052fad8232423acd546aac3603e Mon Sep 17 00:00:00 2001 From: sanguinerarogue Date: Thu, 15 Aug 2024 23:24:52 -0600 Subject: [PATCH 2/2] cleaned up commented out code --- sim/core/consumes.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/sim/core/consumes.go b/sim/core/consumes.go index f417d1fdab..2b89199f53 100644 --- a/sim/core/consumes.go +++ b/sim/core/consumes.go @@ -408,25 +408,6 @@ func DragonBreathChiliAura(character *Character) *Aura { }, }) -//molten copy -//ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { -// for idx := range results { -// // Molten Blast is a magic ability but scales off of Attack Power -// baseDamage := sim.Roll(baseDamageLow, baseDamageHigh) + apCoef*spell.MeleeAttackPower() -// results[idx] = spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) -// target = sim.Environment.NextTargetUnit(target) -// } -// -// for _, result := range results { -// if result.Landed() { -// spell.DealDamage(sim, result) -// } -// } -//}, -//molten copy end - - - aura := character.GetOrRegisterAura(Aura{ Label: "Dragonbreath Chili", ActionID: ActionID{SpellID: 15852},