diff --git a/sim/rogue/dps_rogue/TestDaggers.results b/sim/rogue/dps_rogue/TestDaggers.results new file mode 100644 index 000000000..3617db17f --- /dev/null +++ b/sim/rogue/dps_rogue/TestDaggers.results @@ -0,0 +1,210 @@ +character_stats_results: { + key: "TestDaggers-Phase5-Lvl60-CharacterStats-Default" + value: { + final_stats: 223.3 + final_stats: 465.3 + final_stats: 343.2 + final_stats: 94.6 + final_stats: 80.85 + final_stats: 150 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 39.6 + final_stats: 4 + final_stats: 2 + final_stats: 0 + final_stats: 0 + final_stats: 1644.6 + final_stats: 11 + final_stats: 28.05285 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 2337.6 + final_stats: 809.3 + final_stats: 7 + final_stats: 5.28 + final_stats: 0 + final_stats: 37.3857 + final_stats: 5.28 + final_stats: 0 + final_stats: 4775 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 384 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestDaggers-Phase5-Lvl60-StatWeights-Default" + value: { + weights: 0.30367 + weights: 0.51983 + 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.27607 + weights: 4.92834 + weights: 6.98928 + 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: "TestDaggers-Phase5-Lvl60-AllItems-BloodCorruptedLeathers" + value: { + dps: 701.28929 + tps: 497.91539 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-AllItems-DarkmantleArmor" + value: { + dps: 744.06019 + tps: 528.28273 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Average-Default" + value: { + dps: 701.70545 + tps: 498.21087 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 240.64916 + tps: 170.86091 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 204.22951 + tps: 145.00295 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 262.0931 + tps: 186.0861 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 128.37565 + tps: 91.14671 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 111.07043 + tps: 78.86001 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 141.91119 + tps: 100.75694 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 236.86317 + tps: 168.17285 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 196.97329 + tps: 139.85103 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 251.5496 + tps: 178.60021 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 131.51355 + tps: 93.37462 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 111.6404 + tps: 79.26468 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 140.43962 + tps: 99.71213 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 610.21842 + tps: 433.25508 + } +} diff --git a/sim/rogue/dps_rogue/TestSwords.results b/sim/rogue/dps_rogue/TestSwords.results new file mode 100644 index 000000000..2e4803784 --- /dev/null +++ b/sim/rogue/dps_rogue/TestSwords.results @@ -0,0 +1,210 @@ +character_stats_results: { + key: "TestSwords-Phase5-Lvl60-CharacterStats-Default" + value: { + final_stats: 223.3 + final_stats: 465.3 + final_stats: 343.2 + final_stats: 94.6 + final_stats: 80.85 + final_stats: 150 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 39.6 + final_stats: 4 + final_stats: 2 + final_stats: 0 + final_stats: 0 + final_stats: 1644.6 + final_stats: 11 + final_stats: 28.05285 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 2337.6 + final_stats: 809.3 + final_stats: 7 + final_stats: 5.28 + final_stats: 0 + final_stats: 35.3857 + final_stats: 7.28 + final_stats: 0 + final_stats: 4775 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 384 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestSwords-Phase5-Lvl60-StatWeights-Default" + value: { + weights: 0.31972 + weights: 0.55706 + 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.29065 + weights: 6.14493 + weights: 7.28395 + 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: "TestSwords-Phase5-Lvl60-AllItems-BloodCorruptedLeathers" + value: { + dps: 741.76681 + tps: 526.65444 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-AllItems-DarkmantleArmor" + value: { + dps: 782.42826 + tps: 555.52406 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Average-Default" + value: { + dps: 739.83692 + tps: 525.28422 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 255.03671 + tps: 181.07606 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 216.44009 + tps: 153.67247 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 277.76124 + tps: 197.21048 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 136.07819 + tps: 96.61552 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 117.73466 + tps: 83.59161 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 150.42586 + tps: 106.80236 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 251.02319 + tps: 178.22647 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 208.74866 + tps: 148.21155 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 266.58632 + tps: 189.27629 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 139.40437 + tps: 98.9771 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 118.33882 + tps: 84.02056 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 148.86599 + tps: 105.69486 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 635.5103 + tps: 451.21232 + } +} diff --git a/sim/rogue/dps_rogue/dps_rogue_test.go b/sim/rogue/dps_rogue/dps_rogue_test.go index dff395faf..3ad5f2626 100644 --- a/sim/rogue/dps_rogue/dps_rogue_test.go +++ b/sim/rogue/dps_rogue/dps_rogue_test.go @@ -11,19 +11,20 @@ func init() { RegisterDpsRogue() } -func TestCombat(t *testing.T) { +func TestDaggers(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassRogue, - Level: 40, + Level: 60, + Phase: 5, Race: proto.Race_RaceHuman, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - Talents: CombatDagger40Talents, - GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../../ui/rogue/apls", "mutilate"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, + Talents: CombatDaggers60Talents, + GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "combat_daggers_60"), + Rotation: core.GetAplRotation("../../../ui/rogue/apls", "combat_daggers_60"), + Buffs: core.FullBuffsPhase1, + Consumes: Phase1Consumes, SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultCombatRogue}, ItemFilter: ItemFilters, @@ -33,20 +34,21 @@ func TestCombat(t *testing.T) { })) } -func TestAssassination(t *testing.T) { +func TestSwords(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassRogue, - Level: 40, + Level: 60, + Phase: 5, Race: proto.Race_RaceHuman, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - Talents: Assassination40Talents, - GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../../ui/rogue/apls", "mutilate"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultAssassinationRogue}, + Talents: CombatSwords60Talents, + GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "combat_swords_60"), + Rotation: core.GetAplRotation("../../../ui/rogue/apls", "combat_swords_60"), + Buffs: core.FullBuffsPhase1, + Consumes: Phase1Consumes, + SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultCombatRogue}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatAttackPower, @@ -55,10 +57,8 @@ func TestAssassination(t *testing.T) { })) } -var CombatDagger25Talents = "-025305000001" -var CombatDagger40Talents = "-0053052020550100201" -var Assassination25Talents = "0053021--05" -var Assassination40Talents = "005303103551--05" +var CombatSwords60Talents = "005323105-0230251020050150231" +var CombatDaggers60Talents = "005323105-0253051020550100201" var ItemFilters = core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeLeather, @@ -98,21 +98,16 @@ var DefaultCombatRogue = &proto.Player_Rogue{ var DefaultDeadlyBrewOptions = &proto.RogueOptions{} var Phase1Consumes = core.ConsumesCombo{ - Label: "P1-Consumes", - Consumes: &proto.Consumes{ - AgilityElixir: proto.AgilityElixir_ElixirOfLesserAgility, - MainHandImbue: proto.WeaponImbue_WildStrikes, - OffHandImbue: proto.WeaponImbue_BlackfathomSharpeningStone, - StrengthBuff: proto.StrengthBuff_ElixirOfOgresStrength, - }, -} - -var Phase2Consumes = core.ConsumesCombo{ - Label: "P2-Consumes", + Label: "Classic Consumes", Consumes: &proto.Consumes{ - AgilityElixir: proto.AgilityElixir_ElixirOfAgility, - MainHandImbue: proto.WeaponImbue_WildStrikes, - OffHandImbue: proto.WeaponImbue_SolidSharpeningStone, - StrengthBuff: proto.StrengthBuff_ElixirOfOgresStrength, + AgilityElixir: proto.AgilityElixir_ElixirOfTheMongoose, + AttackPowerBuff: proto.AttackPowerBuff_JujuMight, + DefaultConjured: proto.Conjured_ConjuredRogueThistleTea, + Flask: proto.Flask_FlaskOfSupremePower, + Food: proto.Food_FoodGrilledSquid, + MainHandImbue: proto.WeaponImbue_Windfury, + OffHandImbue: proto.WeaponImbue_InstantPoison, + StrengthBuff: proto.StrengthBuff_JujuPower, + ZanzaBuff: proto.ZanzaBuff_GroundScorpokAssay, }, -} +} \ No newline at end of file diff --git a/ui/rogue/apls/combat_daggers_60.apl.json b/ui/rogue/apls/combat_daggers_60.apl.json new file mode 100644 index 000000000..d767ac0be --- /dev/null +++ b/ui/rogue/apls/combat_daggers_60.apl.json @@ -0,0 +1,12 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":1856,"rank":1}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"10"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3"}}}}]}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}}]}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"or":{}},"castSpell":{"spellId":{"spellId":11294,"rank":8}}}} + ] +} \ No newline at end of file diff --git a/ui/rogue/apls/combat_swords_60.apl.json b/ui/rogue/apls/combat_swords_60.apl.json new file mode 100644 index 000000000..d767ac0be --- /dev/null +++ b/ui/rogue/apls/combat_swords_60.apl.json @@ -0,0 +1,12 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":1856,"rank":1}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"10"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3"}}}}]}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}}]}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"or":{}},"castSpell":{"spellId":{"spellId":11294,"rank":8}}}} + ] +} \ No newline at end of file diff --git a/ui/rogue/gear_sets/combat_daggers_60.gear.json b/ui/rogue/gear_sets/combat_daggers_60.gear.json new file mode 100644 index 000000000..c2864d7dd --- /dev/null +++ b/ui/rogue/gear_sets/combat_daggers_60.gear.json @@ -0,0 +1,22 @@ +{ + "items": [ + {"id":226707,"enchant":1508}, + {"id":15411}, + {"id":226706}, + {"id":13340,"enchant":849,"rune":412096}, + {"id":226700,"enchant":1891}, + {"id":226704,"enchant":927}, + {"id":226702,"enchant":1887}, + {"id":226701}, + {"id":226705,"enchant":1508}, + {"id":226703,"enchant":1887}, + {"id":17713}, + {"id":228667}, + {"id":19120}, + {"id":13965}, + {"id":228653,"enchant":1900}, + {"id":228652,"enchant":1900}, + {"id":228559} + ] +} + diff --git a/ui/rogue/gear_sets/combat_swords_60.gear.json b/ui/rogue/gear_sets/combat_swords_60.gear.json new file mode 100644 index 000000000..c2864d7dd --- /dev/null +++ b/ui/rogue/gear_sets/combat_swords_60.gear.json @@ -0,0 +1,22 @@ +{ + "items": [ + {"id":226707,"enchant":1508}, + {"id":15411}, + {"id":226706}, + {"id":13340,"enchant":849,"rune":412096}, + {"id":226700,"enchant":1891}, + {"id":226704,"enchant":927}, + {"id":226702,"enchant":1887}, + {"id":226701}, + {"id":226705,"enchant":1508}, + {"id":226703,"enchant":1887}, + {"id":17713}, + {"id":228667}, + {"id":19120}, + {"id":13965}, + {"id":228653,"enchant":1900}, + {"id":228652,"enchant":1900}, + {"id":228559} + ] +} +