diff --git a/sim/hunter/TestP1Hunter.results b/sim/hunter/TestP1Hunter.results new file mode 100644 index 000000000..af9b53656 --- /dev/null +++ b/sim/hunter/TestP1Hunter.results @@ -0,0 +1,198 @@ +character_stats_results: { + key: "TestP1Hunter-Phase1-Lvl60-CharacterStats-Default" + value: { + final_stats: 287.155 + final_stats: 511.06 + final_stats: 490.25075 + final_stats: 217.58 + final_stats: 244.145 + final_stats: 150 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 47.25 + final_stats: 3 + final_stats: 28.19007 + final_stats: 0 + final_stats: 0 + final_stats: 1608.215 + final_stats: 3 + final_stats: 31.65903 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 4703.7 + final_stats: 0 + final_stats: 0 + final_stats: 3269.12 + final_stats: 1842.12 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 6878.87795 + final_stats: 35 + final_stats: 68 + final_stats: 68 + final_stats: 68 + final_stats: 68 + final_stats: 384 + final_stats: 0 + final_stats: 35 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestP1Hunter-Phase1-Lvl60-StatWeights-Default" + value: { + weights: 0 + weights: 0.25006 + 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.09121 + weights: 6.47715 + weights: 1.9727 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.04107 + 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: "TestP1Hunter-Phase1-Lvl60-AllItems-DevilsaurEye-19991" + value: { + dps: 494.9685 + tps: 164.58742 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-AllItems-DevilsaurTooth-19992" + value: { + dps: 489.7566 + tps: 161.18148 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Average-Default" + value: { + dps: 485.54398 + tps: 160.63978 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 309.29052 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 309.29052 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 324.81294 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 82.02021 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 82.02021 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 88.52133 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 326.50738 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 326.50738 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 343.60282 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 86.22379 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 86.22379 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 93.06899 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 465.4777 + tps: 138.30025 + } +} diff --git a/sim/hunter/hunter_test.go b/sim/hunter/hunter_test.go index 188920b0f..c3b9d0d99 100644 --- a/sim/hunter/hunter_test.go +++ b/sim/hunter/hunter_test.go @@ -12,68 +12,21 @@ func init() { RegisterHunter() } -func TestBM(t *testing.T) { +func TestP1Hunter(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassHunter, - Level: 40, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase2BMTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), - Rotation: core.GetAplRotation("../../ui/hunter/apls", "p2_melee"), - Buffs: core.FullBuffs, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase2PlayerOptions}, - - OtherRotations: []core.RotationCombo{core.GetAplRotation("../../ui/hunter/apls", "p2_ranged_bm")}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - })) -} - -func TestMM(t *testing.T) { - core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassHunter, - Phase: 4, - Level: 60, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase4RangedMMTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), - Rotation: core.GetAplRotation("../../ui/hunter/apls", "p4_ranged"), - Buffs: core.FullBuffs, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Weave", SpecOptions: Phase4PlayerOptions}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - })) -} - -func TestSV(t *testing.T) { - core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassHunter, - Phase: 4, + Phase: 1, Level: 60, Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - Talents: Phase4WeaveTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), - Rotation: core.GetAplRotation("../../ui/hunter/apls", "p4_weave"), + Talents: P1Talents, + GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p0.bis"), + Rotation: core.GetAplRotation("../../ui/hunter/apls", "p1"), Buffs: core.FullBuffs, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Weave", SpecOptions: Phase4PlayerOptions}, + Consumes: P1Consumes, + SpecOptions: core.SpecOptionsCombo{Label: "Hunter", SpecOptions: P1PlayerOptions}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatAttackPower, @@ -82,20 +35,10 @@ func TestSV(t *testing.T) { })) } -var Phase1BMTalents = "53000200501" -var Phase1MMTalents = "-050515" -var Phase1SVTalents = "--33502001101" - -var Phase2BMTalents = "5300021150501251" -var Phase2MMTalents = "-05551001503051" -var Phase2SVTalents = "--335020051030315" - -var Phase4WeaveTalents = "-055500005-3305202202303051" -var Phase4RangedMMTalents = "-05451002503051-33400023023" -var Phase4RangedSVTalents = "1-054510005-334000250230305" +var P1Talents = "-05451002503051-33400023023" -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, @@ -110,7 +53,7 @@ var Phase4Consumes = core.ConsumesCombo{ }, } -var Phase1PlayerOptions = &proto.Player_Hunter{ +var P1PlayerOptions = &proto.Player_Hunter{ Hunter: &proto.Hunter{ Options: &proto.Hunter_Options{ Ammo: proto.Hunter_Options_RazorArrow, @@ -121,29 +64,6 @@ var Phase1PlayerOptions = &proto.Player_Hunter{ }, } -var Phase2PlayerOptions = &proto.Player_Hunter{ - Hunter: &proto.Hunter{ - Options: &proto.Hunter_Options{ - Ammo: proto.Hunter_Options_JaggedArrow, - PetType: proto.Hunter_Options_Cat, - PetUptime: 1, - PetAttackSpeed: 2.0, - }, - }, -} - -var Phase4PlayerOptions = &proto.Player_Hunter{ - Hunter: &proto.Hunter{ - Options: &proto.Hunter_Options{ - Ammo: proto.Hunter_Options_JaggedArrow, - PetType: proto.Hunter_Options_PetNone, - PetUptime: 1, - PetAttackSpeed: 2.0, - SniperTrainingUptime: 1.0, - }, - }, -} - var ItemFilters = core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeMail, WeaponTypes: []proto.WeaponType{