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.

Sign up for GitHub

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

Warrior baseline presets cleanup #21

Merged
merged 5 commits into from
Nov 25, 2024
+555 −568
Merged

Warrior baseline presets cleanup #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba0729a
Initial Tank cleanup
ericbtaylorjr Nov 24, 2024
bc4f8fa
Initial DPS cleanup
ericbtaylorjr Nov 24, 2024
e7e4043
Updated Warrior tests
ericbtaylorjr Nov 24, 2024
ba50ab5
Adjusted Warrior APL to avoid a use case bug found. Bug documented se…
ericbtaylorjr Nov 24, 2024
09b36e7
Fixed spacing inconsistency in APL JSONs
ericbtaylorjr Nov 24, 2024
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
2 changes: 1 addition & 1 deletion sim/core/simsignals/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAbort(t *testing.T) {
Level: 60,
Race: proto.Race_RaceOrc,
Class: proto.Class_ClassWarrior,
Equipment: core.GetGearSet("../../../ui/tank_warrior/gear_sets", "placeholder").GearSet,
Equipment: core.GetGearSet("../../../ui/tank_warrior/gear_sets", "p0.bis").GearSet,
Rotation: &proto.APLRotation{},
Consumes: &proto.Consumes{},
Spec: &proto.Player_Warrior{
Expand Down
196 changes: 196 additions & 0 deletions sim/warrior/dps_warrior/TestP1DPSWarrior.results
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
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.49761
weights: 0.26243
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.09142
weights: 0
weights: 3.0773
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: 252.15479
tps: 220.34291
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
value: {
dps: 33.99834
tps: 119.61369
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
value: {
dps: 30.8644
tps: 31.88411
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
value: {
dps: 78.32938
tps: 73.13359
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget"
value: {
dps: 15.19081
tps: 104.56766
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget"
value: {
dps: 12.89581
tps: 17.50924
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget"
value: {
dps: 32.9784
tps: 36.85281
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
value: {
dps: 36.5712
tps: 121.67198
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
value: {
dps: 33.43726
tps: 33.9424
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
value: {
dps: 83.96505
tps: 77.64213
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget"
value: {
dps: 16.24178
tps: 105.40844
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget"
value: {
dps: 13.94678
tps: 18.35001
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget"
value: {
dps: 35.86584
tps: 39.16276
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Lvl60-SwitchInFrontOfTarget-Default"
value: {
dps: 200.34625
tps: 176.81359
}
}
46 changes: 10 additions & 36 deletions sim/warrior/dps_warrior/dps_warrior_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Loading
Loading