Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Initial Hunter cleanup for early PR feedback before rest #11

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,113 changes: 1,050 additions & 63 deletions sim/druid/balance/TestBalance.results

Large diffs are not rendered by default.

1,925 changes: 1,792 additions & 133 deletions sim/druid/feral/TestFeral.results

Large diffs are not rendered by default.

382 changes: 282 additions & 100 deletions sim/hunter/TestBM.results

Large diffs are not rendered by default.

417 changes: 352 additions & 65 deletions sim/hunter/TestMM.results

Large diffs are not rendered by default.

417 changes: 352 additions & 65 deletions sim/hunter/TestSV.results

Large diffs are not rendered by default.

76 changes: 22 additions & 54 deletions sim/hunter/hunter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ func TestBM(t *testing.T) {
core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{
{
Class: proto.Class_ClassHunter,
Level: 40,
Phase: 5,
Level: 60,
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"),
Talents: Phase1Talents,
GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "pre-bis"),
Rotation: core.GetAplRotation("../../ui/hunter/apls", "basic-apl"),
Buffs: core.FullBuffs,
Consumes: Phase4Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase2PlayerOptions},
Consumes: Phase1Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "BM", SpecOptions: Phase1PlayerOptions},

OtherRotations: []core.RotationCombo{core.GetAplRotation("../../ui/hunter/apls", "p2_ranged_bm")},
OtherRotations: []core.RotationCombo{core.GetAplRotation("../../ui/hunter/apls", "basic-apl")},

ItemFilter: ItemFilters,
EPReferenceStat: proto.Stat_StatAttackPower,
Expand All @@ -40,17 +41,17 @@ func TestMM(t *testing.T) {
core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{
{
Class: proto.Class_ClassHunter,
Phase: 4,
Phase: 5,
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"),
Talents: Phase1Talents,
GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "pre-bis"),
Rotation: core.GetAplRotation("../../ui/hunter/apls", "basic-apl"),
Buffs: core.FullBuffs,
Consumes: Phase4Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "Weave", SpecOptions: Phase4PlayerOptions},
Consumes: Phase1Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "MM", SpecOptions: Phase1PlayerOptions},

ItemFilter: ItemFilters,
EPReferenceStat: proto.Stat_StatAttackPower,
Expand All @@ -68,12 +69,12 @@ func TestSV(t *testing.T) {
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: Phase1Talents,
GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "pre-bis"),
Rotation: core.GetAplRotation("../../ui/hunter/apls", "basic-apl"),
Buffs: core.FullBuffs,
Consumes: Phase4Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "Weave", SpecOptions: Phase4PlayerOptions},
Consumes: Phase1Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "SV", SpecOptions: Phase1PlayerOptions},

ItemFilter: ItemFilters,
EPReferenceStat: proto.Stat_StatAttackPower,
Expand All @@ -82,20 +83,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 Phase1Talents = "50003201504-05251030513051"

var Phase4WeaveTalents = "-055500005-3305202202303051"
var Phase4RangedMMTalents = "-05451002503051-33400023023"
var Phase4RangedSVTalents = "1-054510005-334000250230305"

var Phase4Consumes = core.ConsumesCombo{
Label: "P4-Consumes",
var Phase1Consumes = core.ConsumesCombo{
Label: "P1-Consumes",
Consumes: &proto.Consumes{
AgilityElixir: proto.AgilityElixir_ElixirOfTheMongoose,
AttackPowerBuff: proto.AttackPowerBuff_JujuMight,
Expand All @@ -121,29 +112,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{
Expand Down
Loading
Loading