Updated Warrior tests

wowsims · Nov 24, 2024 · e7e4043 · e7e4043
1 parent bc4f8fa
commit e7e4043
Show file tree

Hide file tree

Showing 4 changed files with 406 additions and 46 deletions.
diff --git a/sim/warrior/dps_warrior/TestP1DPSWarrior.results b/sim/warrior/dps_warrior/TestP1DPSWarrior.results
@@ -0,0 +1,190 @@
+character_stats_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-CharacterStats-Default"
+ value: {
+  final_stats: 462.3
+  final_stats: 318.55
+  final_stats: 526.355
+  final_stats: 102.35
+  final_stats: 177.1
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 41.25
+  final_stats: 0
+  final_stats: 21
+  final_stats: 0
+  final_stats: 0
+  final_stats: 1794.6
+  final_stats: 0
+  final_stats: 37.9275
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 4843.1
+  final_stats: 620
+  final_stats: 0
+  final_stats: 5
+  final_stats: 0
+  final_stats: 15.9275
+  final_stats: 5
+  final_stats: 0
+  final_stats: 7072.55
+  final_stats: 35
+  final_stats: 68
+  final_stats: 68
+  final_stats: 68
+  final_stats: 68
+  final_stats: 384
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+ }
+}
+stat_weights_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-StatWeights-Default"
+ value: {
+  weights: 0.35282
+  weights: 0.21439
+  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.14747
+  weights: 0
+  weights: 3.90983
+  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: "TestP1DPSWarrior-Phase1-Lvl60-Average-Default"
+ value: {
+  dps: 279.75214
+  tps: 224.23004
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  tps: 23.33333
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  tps: 1.16667
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  tps: 5
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 2.41
+  tps: 105.05542
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 0.115
+  tps: 17.71199
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 0.1875
+  tps: 29.18709
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  tps: 23.33333
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  tps: 1.16667
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  tps: 5
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 2.41
+  tps: 105.05542
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 0.115
+  tps: 17.71199
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 0.1875
+  tps: 29.18709
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-SwitchInFrontOfTarget-Default"
+ value: {
+  dps: 209.40635
+  tps: 168.01212
+ }
+}
diff --git a/sim/warrior/dps_warrior/dps_warrior_test.go b/sim/warrior/dps_warrior/dps_warrior_test.go
@@ -12,21 +12,21 @@ func init() {
 	RegisterDpsWarrior()
 }
 
-func TestDualWieldWarrior(t *testing.T) {
+func TestP1DPSWarrior(t *testing.T) {
 	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{
 		{
 			Class:      proto.Class_ClassWarrior,
-			Phase:      5,
+			Phase:      1,
 			Level:      60,
 			Race:       proto.Race_RaceOrc,
 			OtherRaces: []proto.Race{proto.Race_RaceHuman},
 
-			Talents:     P4FuryTalents,
-			GearSet:     core.GetGearSet("../../../ui/warrior/gear_sets", "blank"),
-			Rotation:    core.GetAplRotation("../../../ui/warrior/apls", "phase_5_dw"),
+			Talents:     P1Talents,
+			GearSet:     core.GetGearSet("../../../ui/warrior/gear_sets", "p0.bis"),
+			Rotation:    core.GetAplRotation("../../../ui/warrior/apls", "p1"),
 			Buffs:       core.FullBuffs,
-			Consumes:    Phase4Consumes,
-			SpecOptions: core.SpecOptionsCombo{Label: "Fury", SpecOptions: PlayerOptionsFury},
+			Consumes:    P1Consumes,
+			SpecOptions: core.SpecOptionsCombo{Label: "DPS", SpecOptions: PlayerOptionsFury},
 
 			ItemFilter:      ItemFilters,
 			EPReferenceStat: proto.Stat_StatAttackPower,
@@ -35,36 +35,10 @@ func TestDualWieldWarrior(t *testing.T) {
 	}))
 }
 
-func TestTwoHandedWarrior(t *testing.T) {
-	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{
-		{
-			Class:      proto.Class_ClassWarrior,
-			Phase:      5,
-			Level:      60,
-			Race:       proto.Race_RaceOrc,
-			OtherRaces: []proto.Race{proto.Race_RaceHuman},
-
-			Talents:     P4FuryTalents,
-			GearSet:     core.GetGearSet("../../../ui/warrior/gear_sets", "blank"),
-			Rotation:    core.GetAplRotation("../../../ui/warrior/apls", "phase_5_2h"),
-			Buffs:       core.FullBuffs,
-			Consumes:    Phase4Consumes,
-			SpecOptions: core.SpecOptionsCombo{Label: "Arms", SpecOptions: PlayerOptionsArms},
-
-			ItemFilter:      ItemFilters,
-			EPReferenceStat: proto.Stat_StatAttackPower,
-			StatsToWeigh:    Stats,
-		},
-	}))
-}
-
-var P2ArmsTalents = "303050213525100001"
-var P2FuryTalents = "-05050005405010051"
-var P3ArmsTalents = "303050213520105001-0505"
-var P4FuryTalents = "20305020302-05050005525010051"
+var P1Talents = "20305020302-05050005525010051"
 
-var Phase4Consumes = core.ConsumesCombo{
-	Label: "P4-Consumes",
+var P1Consumes = core.ConsumesCombo{
+	Label: "P1-Consumes",
 	Consumes: &proto.Consumes{
 		AgilityElixir:     proto.AgilityElixir_ElixirOfTheMongoose,
 		AttackPowerBuff:   proto.AttackPowerBuff_JujuMight,