diff --git a/.gitignore b/.gitignore index 676414bbcc..ff4742dd68 100644 --- a/.gitignore +++ b/.gitignore @@ -21,8 +21,9 @@ sim/web/__debug_bin wowsimwotlk # old result file -TestDestruction.results -sim/priest/healing/TestHealing.results +TestHunter.results +TestRotation.results +TestWarlock.results #macos .DS_Store diff --git a/proto/api.proto b/proto/api.proto index c68395ec7f..a88bec7172 100644 --- a/proto/api.proto +++ b/proto/api.proto @@ -52,7 +52,8 @@ message Player { TankDeathknight tank_deathknight = 32; } - string talentsString = 17; + // Talents in wowhead format, e.g. '01102123133-12312312-' + string talents_string = 17; Glyphs glyphs = 28; Profession profession1 = 29; Profession profession2 = 30; diff --git a/proto/deathknight.proto b/proto/deathknight.proto index 411419e2ca..115fd9cc3e 100644 --- a/proto/deathknight.proto +++ b/proto/deathknight.proto @@ -240,8 +240,6 @@ message Deathknight { bool use_gargoyle = 23; } Rotation rotation = 1; - - DeathknightTalents talents = 2; message Options { double starting_runic_power = 1; @@ -287,8 +285,6 @@ message TankDeathknight { BloodSpell blood_spell = 3; } Rotation rotation = 1; - - DeathknightTalents talents = 2; message Options { double starting_runic_power = 1; diff --git a/proto/druid.proto b/proto/druid.proto index 48da67690a..dc2792eacc 100644 --- a/proto/druid.proto +++ b/proto/druid.proto @@ -175,9 +175,7 @@ message BalanceDruid { bool maintain_faerie_fire = 10; int32 player_latency = 11; } - Rotation rotation = 1; - DruidTalents talents = 2; message Options { RaidTarget innervate_target = 1; @@ -192,33 +190,31 @@ message FeralDruid { Mangle = 1; Lacerate = 2; } - enum BiteModeType { + enum BiteModeType { Emperical = 0; Analytical = 1; } BearweaveType bear_weave_type = 1; - bool maintain_faerie_fire = 2; - int32 min_combos_for_rip = 3; - bool use_rake = 4; - bool use_bite = 5; - bool mangle_spam = 6; - float bite_time = 7; - int32 min_combos_for_bite = 8; - int32 berserk_bite_thresh = 9; - bool powerbear = 10; - float min_roar_offset = 11; - BiteModeType bite_mode_type = 12; - float hot_uptime = 13; - bool snek_weave = 14; - bool flower_weave = 15; - int32 raid_targets = 16; - bool manual_params = 17; + bool maintain_faerie_fire = 2; + int32 min_combos_for_rip = 3; + bool use_rake = 4; + bool use_bite = 5; + bool mangle_spam = 6; + float bite_time = 7; + int32 min_combos_for_bite = 8; + int32 berserk_bite_thresh = 9; + bool powerbear = 10; + float min_roar_offset = 11; + BiteModeType bite_mode_type = 12; + float hot_uptime = 13; + bool snek_weave = 14; + bool flower_weave = 15; + int32 raid_targets = 16; + bool manual_params = 17; } Rotation rotation = 1; - DruidTalents talents = 2; - message Options { RaidTarget innervate_target = 1; int32 latency_ms = 2; @@ -238,8 +234,6 @@ message FeralTankDruid { } Rotation rotation = 1; - DruidTalents talents = 2; - message Options { RaidTarget innervate_target = 1; double starting_rage = 2; @@ -252,8 +246,6 @@ message RestorationDruid { } Rotation rotation = 1; - DruidTalents talents = 2; - message Options { RaidTarget innervate_target = 1; } diff --git a/proto/hunter.proto b/proto/hunter.proto index 82083ac30e..d375dcf139 100644 --- a/proto/hunter.proto +++ b/proto/hunter.proto @@ -226,8 +226,6 @@ message Hunter { bool allow_explosive_shot_downrank = 10; } Rotation rotation = 1; - - HunterTalents talents = 2; message Options { enum Ammo { diff --git a/proto/mage.proto b/proto/mage.proto index d657ba7267..f642f24af9 100644 --- a/proto/mage.proto +++ b/proto/mage.proto @@ -186,8 +186,6 @@ message Mage { AoeRotation aoe = 7; } Rotation rotation = 1; - - MageTalents talents = 2; message Options { enum ArmorType { diff --git a/proto/paladin.proto b/proto/paladin.proto index a4b4163ca5..7241489a38 100644 --- a/proto/paladin.proto +++ b/proto/paladin.proto @@ -191,25 +191,16 @@ message RetributionPaladin { RotationType type = 9; bool use_divine_plea = 11; - bool avoid_clipping_consecration = 12; - bool hold_last_avenging_wrath_until_execution = 13; } - Rotation rotation = 1; - - PaladinTalents talents = 2; message Options { PaladinJudgement judgement = 1; - PaladinSeal seal = 2; - PaladinAura aura = 3; - double damage_taken_per_second = 4; - bool use_avenging_wrath = 5; } Options options = 3; @@ -238,17 +229,11 @@ message ProtectionPaladin { } Rotation rotation = 1; - PaladinTalents talents = 2; - message Options { PaladinJudgement judgement = 1; - PaladinSeal seal = 2; - PaladinAura aura = 3; - double damage_taken_per_second = 4; - bool use_avenging_wrath = 5; } Options options = 3; @@ -259,8 +244,6 @@ message HolyPaladin { } Rotation rotation = 1; - PaladinTalents talents = 2; - message Options { PaladinJudgement judgement = 1; PaladinAura aura = 2; diff --git a/proto/priest.proto b/proto/priest.proto index 8f065cc2b0..c59fa83610 100644 --- a/proto/priest.proto +++ b/proto/priest.proto @@ -151,8 +151,6 @@ message ShadowPriest { double latency = 3; // Latency between actions } Rotation rotation = 1; - - PriestTalents talents = 2; message Options { enum Armor { @@ -178,8 +176,6 @@ message SmitePriest { double allowed_holy_fire_delay_ms = 6; } Rotation rotation = 1; - - PriestTalents talents = 2; message Options { bool use_inner_fire = 3; @@ -213,8 +209,6 @@ message HealingPriest { CustomRotation custom_rotation = 2; } Rotation rotation = 1; - - PriestTalents talents = 2; message Options { bool use_inner_fire = 3; diff --git a/proto/rogue.proto b/proto/rogue.proto index a458f55aec..7a89ecb740 100644 --- a/proto/rogue.proto +++ b/proto/rogue.proto @@ -191,8 +191,6 @@ message Rogue { int32 envenom_energy_threshold = 16; } Rotation rotation = 1; - - RogueTalents talents = 2; message Options { RaidTarget tricks_of_the_trade_target = 1; diff --git a/proto/shaman.proto b/proto/shaman.proto index 0c28117449..c460e25a5d 100644 --- a/proto/shaman.proto +++ b/proto/shaman.proto @@ -235,7 +235,6 @@ message ElementalShaman { } Rotation rotation = 1; - ShamanTalents talents = 2; Options options = 3; } @@ -303,7 +302,6 @@ message EnhancementShaman { } Rotation rotation = 1; - ShamanTalents talents = 2; Options options = 3; } @@ -319,6 +317,5 @@ message RestorationShaman { } Rotation rotation = 1; - ShamanTalents talents = 2; Options options = 3; } diff --git a/proto/warlock.proto b/proto/warlock.proto index 4a5a48ac28..c47178a427 100644 --- a/proto/warlock.proto +++ b/proto/warlock.proto @@ -180,10 +180,7 @@ message Warlock { Type type = 8; bool use_infernal = 9; } - Rotation rotation = 1; - - WarlockTalents talents = 2; message Options { enum Summon { diff --git a/proto/warrior.proto b/proto/warrior.proto index 4912d4aa68..7f246fbbda 100644 --- a/proto/warrior.proto +++ b/proto/warrior.proto @@ -20,7 +20,7 @@ message WarriorTalents { int32 two_handed_weapon_specialization = 11; int32 taste_for_blood = 12; int32 poleaxe_specialization = 13; - bool sweeping_strikes = 14; + bool sweeping_strikes = 14; int32 mace_specialization = 15; int32 sword_specialization = 16; int32 weapon_mastery = 17; @@ -193,8 +193,6 @@ message Warrior { } Rotation rotation = 1; - WarriorTalents talents = 2; - message Options { double starting_rage = 1; bool use_recklessness = 2; @@ -241,8 +239,6 @@ message ProtectionWarrior { } Rotation rotation = 1; - WarriorTalents talents = 2; - message Options { double starting_rage = 1; diff --git a/sim/core/character.go b/sim/core/character.go index aa7de56142..cf0b160c29 100644 --- a/sim/core/character.go +++ b/sim/core/character.go @@ -8,6 +8,8 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" "github.com/wowsims/wotlk/sim/core/stats" + "google.golang.org/protobuf/encoding/protowire" + "google.golang.org/protobuf/reflect/protoreflect" ) type CharacterBuildPhase uint8 @@ -637,3 +639,27 @@ func GetPrimaryTalentTreeIndex(talentStr string) uint8 { return uint8(bestTree) } + +// Uses proto reflection to set fields in a talents proto (e.g. MageTalents, +// WarriorTalents) based on a talentsStr. treeSizes should contain the number +// of talents in each tree, usually around 30. This is needed because talent +// strings truncate 0's at the end of each tree so we can't infer the start index +// of the tree from the string. +func FillTalentsProto(data protoreflect.Message, talentsStr string, treeSizes [3]int) { + treeStrs := strings.Split(talentsStr, "-") + fieldDescriptors := data.Descriptor().Fields() + + var offset int + for treeIdx, treeStr := range treeStrs { + for talentIdx, talentValStr := range treeStr { + talentVal, _ := strconv.Atoi(string(talentValStr)) + fd := fieldDescriptors.ByNumber(protowire.Number(offset + talentIdx + 1)) + if fd.Kind() == protoreflect.BoolKind { + data.Set(fd, protoreflect.ValueOfBool(talentVal == 1)) + } else { // Int32Kind + data.Set(fd, protoreflect.ValueOfInt32(int32(talentVal))) + } + } + offset += treeSizes[treeIdx] + } +} diff --git a/sim/core/test_generators.go b/sim/core/test_generators.go index ae56eff95e..78f8a885ca 100644 --- a/sim/core/test_generators.go +++ b/sim/core/test_generators.go @@ -76,6 +76,11 @@ type GearSetCombo struct { Label string GearSet *proto.EquipmentSpec } +type TalentsCombo struct { + Label string + Talents string + Glyphs *proto.Glyphs +} type SpecOptionsCombo struct { Label string SpecOptions interface{} @@ -96,6 +101,7 @@ type SettingsCombos struct { Class proto.Class Races []proto.Race GearSets []GearSetCombo + TalentSets []TalentsCombo SpecOptions []SpecOptionsCombo Buffs []BuffsCombo Encounters []EncounterCombo @@ -104,7 +110,7 @@ type SettingsCombos struct { } func (combos *SettingsCombos) NumTests() int { - return len(combos.Races) * len(combos.GearSets) * len(combos.SpecOptions) * len(combos.Buffs) * len(combos.Encounters) + return len(combos.Races) * len(combos.GearSets) * len(combos.TalentSets) * len(combos.SpecOptions) * len(combos.Buffs) * len(combos.Encounters) } func (combos *SettingsCombos) GetTest(testIdx int) (string, *proto.ComputeStatsRequest, *proto.StatWeightsRequest, *proto.RaidSimRequest) { @@ -120,6 +126,12 @@ func (combos *SettingsCombos) GetTest(testIdx int) (string, *proto.ComputeStatsR gearSetCombo := combos.GearSets[gearSetIdx] testNameParts = append(testNameParts, gearSetCombo.Label) + talentSetIdx := testIdx % len(combos.TalentSets) + testIdx /= len(combos.TalentSets) + talentSetCombo := combos.TalentSets[talentSetIdx] + // We never use more than 1 talent combo, so it just makes the names longer. + //testNameParts = append(testNameParts, talentSetCombo.Label) + specOptionsIdx := testIdx % len(combos.SpecOptions) testIdx /= len(combos.SpecOptions) specOptionsCombo := combos.SpecOptions[specOptionsIdx] @@ -137,27 +149,14 @@ func (combos *SettingsCombos) GetTest(testIdx int) (string, *proto.ComputeStatsR rsr := &proto.RaidSimRequest{ Raid: SinglePlayerRaidProto( WithSpec(&proto.Player{ - Race: race, - Class: combos.Class, - Equipment: gearSetCombo.GearSet, - Consumes: buffsCombo.Consumes, - Buffs: buffsCombo.Player, - Profession1: proto.Profession_Engineering, - // TODO: Allow cooldowns in tests - //Cooldowns: &proto.Cooldowns{ - // Cooldowns: []*proto.Cooldown{ - // &proto.Cooldown{ - // Id: &proto.ActionID{ - // RawId: &proto.ActionID_SpellId{ - // SpellId: 12043, - // }, - // }, - // Timings: []float64{ - // 5, - // }, - // }, - // }, - //}, + Race: race, + Class: combos.Class, + Equipment: gearSetCombo.GearSet, + TalentsString: talentSetCombo.Talents, + Glyphs: talentSetCombo.Glyphs, + Consumes: buffsCombo.Consumes, + Buffs: buffsCombo.Player, + Profession1: proto.Profession_Engineering, }, specOptionsCombo.SpecOptions), buffsCombo.Party, buffsCombo.Raid, @@ -439,11 +438,11 @@ func (generator *CombinedTestGenerator) GetTest(testIdx int) (string, *proto.Com type CharacterSuiteConfig struct { Class proto.Class - Race proto.Race - GearSet GearSetCombo - SpecOptions SpecOptionsCombo - Glyphs *proto.Glyphs - TalentsString string + Race proto.Race + GearSet GearSetCombo + SpecOptions SpecOptionsCombo + Glyphs *proto.Glyphs + Talents string Consumes *proto.Consumes @@ -464,6 +463,11 @@ type CharacterSuiteConfig struct { func FullCharacterTestSuiteGenerator(config CharacterSuiteConfig) TestGenerator { allRaces := append(config.OtherRaces, config.Race) allGearSets := append(config.OtherGearSets, config.GearSet) + allTalentSets := []TalentsCombo{TalentsCombo{ + Label: "Talents", + Talents: config.Talents, + Glyphs: config.Glyphs, + }} allSpecOptions := append(config.OtherSpecOptions, config.SpecOptions) defaultPlayer := WithSpec( @@ -473,7 +477,7 @@ func FullCharacterTestSuiteGenerator(config CharacterSuiteConfig) TestGenerator Equipment: config.GearSet.GearSet, Consumes: config.Consumes, Buffs: FullIndividualBuffs, - TalentsString: config.TalentsString, + TalentsString: config.Talents, Glyphs: config.Glyphs, Profession1: proto.Profession_Engineering, @@ -507,6 +511,7 @@ func FullCharacterTestSuiteGenerator(config CharacterSuiteConfig) TestGenerator Class: config.Class, Races: allRaces, GearSets: allGearSets, + TalentSets: allTalentSets, SpecOptions: allSpecOptions, Buffs: []BuffsCombo{ { diff --git a/sim/deathknight/deathknight.go b/sim/deathknight/deathknight.go index 52bf7311e2..ca0d90e648 100644 --- a/sim/deathknight/deathknight.go +++ b/sim/deathknight/deathknight.go @@ -17,6 +17,8 @@ const ( FuStrike_Obliterate Rotation_FuStrike = 2 ) +var TalentTreeSizes = [3]int{28, 29, 31} + type DeathknightInputs struct { // Option Vars IsDps bool @@ -358,13 +360,14 @@ func (dk *Deathknight) HasMinorGlyph(glyph proto.DeathknightMinorGlyph) bool { return dk.HasGlyph(int32(glyph)) } -func NewDeathknight(character core.Character, talents *proto.DeathknightTalents, inputs DeathknightInputs) *Deathknight { +func NewDeathknight(character core.Character, inputs DeathknightInputs, talents string) *Deathknight { dk := &Deathknight{ Character: character, - Talents: talents, + Talents: &proto.DeathknightTalents{}, Inputs: inputs, RoRTSBonus: func(u *core.Unit) float64 { return 1.0 }, // default to no bonus for RoR/TS } + core.FillTalentsProto(dk.Talents.ProtoReflect(), talents, TalentTreeSizes) maxRunicPower := 100.0 + 15.0*float64(dk.Talents.RunicPowerMastery) currentRunicPower := math.Min(maxRunicPower, dk.Inputs.StartingRunicPower+core.TernaryFloat64(dk.Inputs.PrecastHornOfWinter, 10.0, 0.0)) diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results index e51ccaafe7..1e2ddf0b2d 100644 --- a/sim/deathknight/dps/TestFrost.results +++ b/sim/deathknight/dps/TestFrost.results @@ -860,85 +860,85 @@ dps_results: { dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 11292.67219 - tps: 6663.10769 + dps: 15470.82051 + tps: 9170.99372 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 5961.41561 - tps: 3465.06833 + dps: 7993.60628 + tps: 4684.62315 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 6770.91672 - tps: 3767.62754 + dps: 8768.47331 + tps: 4964.59398 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 7237.92159 - tps: 4271.90802 + dps: 9781.84558 + tps: 5797.47094 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3518.22301 - tps: 2039.48365 + dps: 4769.31331 + tps: 2789.82971 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3790.08467 - tps: 2107.32536 + dps: 4957.31382 + tps: 2809.14241 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 11284.03348 - tps: 6652.57282 + dps: 15492.03256 + tps: 9177.96776 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 5930.41743 - tps: 3441.09371 + dps: 8028.43529 + tps: 4700.2722 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 6779.49921 - tps: 3758.05268 + dps: 8905.96567 + tps: 5033.77059 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 7298.98931 - tps: 4304.98102 + dps: 9628.45551 + tps: 5701.89517 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3535.76101 - tps: 2046.14066 + dps: 4791.96127 + tps: 2799.63075 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3816.30185 - tps: 2114.60612 + dps: 5010.7519 + tps: 2831.76476 } } dps_results: { diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results index 25a512848a..901cf32b9a 100644 --- a/sim/deathknight/dps/TestUnholy.results +++ b/sim/deathknight/dps/TestUnholy.results @@ -46,1016 +46,1016 @@ character_stats_results: { dps_results: { key: "TestUnholy-AllItems-Althor'sAbacus-50359" value: { - dps: 7526.1665 - tps: 4734.85854 - hps: 380.08541 + dps: 7658.69571 + tps: 4938.49665 + hps: 380.80252 } } dps_results: { key: "TestUnholy-AllItems-Althor'sAbacus-50366" value: { - dps: 7526.1665 - tps: 4734.85854 - hps: 393.97309 + dps: 7658.69571 + tps: 4938.49665 + hps: 394.78461 } } dps_results: { key: "TestUnholy-AllItems-AustereEarthsiegeDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 279.57362 } } dps_results: { key: "TestUnholy-AllItems-Bandit'sInsignia-40371" value: { - dps: 7748.49443 - tps: 4910.68167 - hps: 271.94125 + dps: 7888.0363 + tps: 5129.10531 + hps: 271.30735 } } dps_results: { key: "TestUnholy-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7526.2575 - tps: 20497.03243 + dps: 7658.74465 + tps: 20457.7451 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7526.2575 - tps: 20497.03243 + dps: 7658.74465 + tps: 20457.7451 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 8083.71945 - tps: 5022.35188 + dps: 8224.67555 + tps: 5245.27605 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7833.7647 - tps: 4840.18716 - hps: 262.83591 + dps: 7983.68101 + tps: 5050.20432 + hps: 264.38019 } } dps_results: { key: "TestUnholy-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 6609.80161 - tps: 4165.00152 - hps: 240.69822 + dps: 6699.86845 + tps: 4303.74973 + hps: 241.2659 } } dps_results: { key: "TestUnholy-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6423.7007 - tps: 4074.22415 + dps: 6533.70009 + tps: 4228.73716 hps: 229.7677 } } dps_results: { key: "TestUnholy-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6217.46577 - tps: 3911.89228 - hps: 228.53247 + dps: 6328.51976 + tps: 4054.8065 + hps: 228.26518 } } dps_results: { key: "TestUnholy-AllItems-BracingEarthsiegeDiamond" value: { - dps: 8064.41236 - tps: 4902.55155 + dps: 8202.11636 + tps: 5118.94511 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ChaoticSkyflareDiamond" value: { - dps: 8151.4869 - tps: 5088.30183 + dps: 8293.30605 + tps: 5313.43561 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-CorpseTongueCoin-50349" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-CorpseTongueCoin-50352" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 374.79147 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7617.29854 - tps: 4823.72852 + dps: 7754.94155 + tps: 5034.3665 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7685.78008 - tps: 4876.42976 - hps: 273.20904 + dps: 7819.21912 + tps: 5088.56338 + hps: 271.6243 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7897.46028 - tps: 4918.76866 + dps: 8030.97897 + tps: 5132.96964 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-DarkrunedBattlegear" value: { - dps: 7687.41291 - tps: 4891.76967 - hps: 283.65253 + dps: 7800.47052 + tps: 5035.54166 + hps: 284.31916 } } dps_results: { key: "TestUnholy-AllItems-DarkrunedPlate" value: { - dps: 6755.39894 - tps: 4244.6129 - hps: 298.15193 + dps: 6867.47535 + tps: 4390.07718 + hps: 299.92243 } } dps_results: { key: "TestUnholy-AllItems-Death'sChoice-47464" value: { - dps: 8399.05366 - tps: 5237.42908 + dps: 8538.78015 + tps: 5469.14061 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7603.61927 - tps: 4810.70607 + dps: 7742.51951 + tps: 5019.58817 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-Deathbringer'sWill-50362" value: { - dps: 7895.78362 - tps: 5013.27163 - hps: 278.2802 + dps: 8029.1476 + tps: 5220.37479 + hps: 275.11073 } } dps_results: { key: "TestUnholy-AllItems-Deathbringer'sWill-50363" value: { - dps: 7923.21277 - tps: 5044.07483 - hps: 281.76663 + dps: 8055.99755 + tps: 5259.99142 + hps: 275.74462 } } dps_results: { key: "TestUnholy-AllItems-Defender'sCode-40257" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-DestructiveSkyflareDiamond" value: { - dps: 8085.42192 - tps: 5024.303 + dps: 8227.63124 + tps: 5247.33331 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-DislodgedForeignObject-50348" value: { - dps: 7755.02578 - tps: 4844.59837 - hps: 272.25819 + dps: 7909.23338 + tps: 5065.55283 + hps: 272.89209 } } dps_results: { key: "TestUnholy-AllItems-DislodgedForeignObject-50353" value: { - dps: 7743.5113 - tps: 4831.01502 - hps: 274.47683 + dps: 7887.36497 + tps: 5048.39841 + hps: 273.84293 } } dps_results: { key: "TestUnholy-AllItems-EffulgentSkyflareDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 279.57362 } } dps_results: { key: "TestUnholy-AllItems-EmberSkyflareDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 8083.71945 - tps: 5022.35188 + dps: 8224.67555 + tps: 5245.27605 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-EnigmaticStarflareDiamond" value: { - dps: 8080.5447 - tps: 5019.08535 + dps: 8220.76258 + tps: 5241.13788 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-EphemeralSnowflake-50260" value: { - dps: 7749.66763 - tps: 4786.68663 - hps: 272.25819 + dps: 7865.6046 + tps: 4981.69018 + hps: 268.77177 } } dps_results: { key: "TestUnholy-AllItems-EssenceofGossamer-37220" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 292.15632 } } dps_results: { key: "TestUnholy-AllItems-EternalEarthsiegeDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7694.04533 - tps: 4892.20878 - hps: 272.57514 + dps: 7814.22145 + tps: 5096.45929 + hps: 270.35651 } } dps_results: { key: "TestUnholy-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7608.81413 - tps: 4815.1818 + dps: 7747.55525 + tps: 5026.98421 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ForethoughtTalisman-40258" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ForgeEmber-37660" value: { - dps: 7592.92886 - tps: 4801.85415 + dps: 7729.56663 + tps: 5011.0106 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ForlornSkyflareDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ForlornStarflareDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-FuriousGladiator'sSigilofStrife-42621" value: { - dps: 8157.3475 - tps: 5089.13416 + dps: 8297.25963 + tps: 5312.29977 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7787.99462 - tps: 4941.02369 + dps: 7928.37297 + tps: 5156.26318 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-FuturesightRune-38763" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-GlowingTwilightScale-54573" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-GlowingTwilightScale-54589" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7640.15153 - tps: 4838.91383 - hps: 270.03956 + dps: 7744.5493 + tps: 5034.706 + hps: 274.15988 } } dps_results: { key: "TestUnholy-AllItems-HatefulGladiator'sSigilofStrife-42619" value: { - dps: 8097.77336 - tps: 5040.86715 + dps: 8245.89285 + tps: 5270.01327 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7520.4785 - tps: 4730.8445 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 8083.71945 - tps: 5022.35188 + dps: 8224.67555 + tps: 5245.27605 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ImpassiveStarflareDiamond" value: { - dps: 8080.5447 - tps: 5019.08535 + dps: 8220.76258 + tps: 5241.13788 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-IncisorFragment-37723" value: { - dps: 7691.2389 - tps: 4869.77693 + dps: 7825.92771 + tps: 5077.48063 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 8099.00102 - tps: 5029.83427 + dps: 8237.56827 + tps: 5252.03414 hps: 287.3455 } } dps_results: { key: "TestUnholy-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7614.71482 - tps: 4823.85286 + dps: 7753.27655 + tps: 5033.23851 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-OfferingofSacrifice-37638" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-PersistentEarthshatterDiamond" value: { - dps: 8092.281 - tps: 5024.52094 + dps: 8230.7601 + tps: 5246.53231 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 8098.83833 - tps: 5029.67796 + dps: 8237.49981 + tps: 5251.97206 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 278.61797 } } dps_results: { key: "TestUnholy-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 279.57362 } } dps_results: { key: "TestUnholy-AllItems-PurifiedShardoftheGods" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ReignoftheDead-47316" value: { - dps: 7607.10885 - tps: 4796.07499 - hps: 273.84293 + dps: 7703.79194 + tps: 4981.46831 + hps: 271.30735 } } dps_results: { key: "TestUnholy-AllItems-ReignoftheDead-47477" value: { - dps: 7616.46188 - tps: 4804.25141 - hps: 273.84293 + dps: 7713.47704 + tps: 4989.90795 + hps: 271.30735 } } dps_results: { key: "TestUnholy-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 8140.48003 - tps: 5075.93057 + dps: 8279.95056 + tps: 5298.67836 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-RelentlessGladiator'sSigilofStrife-42622" value: { - dps: 8177.02622 - tps: 5104.53835 + dps: 8317.45355 + tps: 5328.19141 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-RuneofRepulsion-40372" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SavageGladiator'sSigilofStrife-42618" value: { - dps: 8093.06045 - tps: 5037.36287 + dps: 8239.95009 + tps: 5265.54698 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ScourgeborneBattlegear" value: { - dps: 7327.13407 - tps: 4635.69394 - hps: 267.00994 + dps: 7424.78837 + tps: 4790.16421 + hps: 262.99243 } } dps_results: { key: "TestUnholy-AllItems-ScourgebornePlate" value: { - dps: 6703.07071 - tps: 4186.48963 - hps: 276.94563 + dps: 6843.23984 + tps: 4354.2903 + hps: 274.34825 } } dps_results: { key: "TestUnholy-AllItems-Scourgelord'sBattlegear" value: { - dps: 8058.70447 - tps: 5274.50309 - hps: 301.06613 + dps: 8183.28544 + tps: 5464.0539 + hps: 297.88585 } } dps_results: { key: "TestUnholy-AllItems-Scourgelord'sPlate" value: { - dps: 7283.02483 - tps: 4697.75757 - hps: 317.7731 + dps: 7429.00322 + tps: 4893.88608 + hps: 318.52434 } } dps_results: { key: "TestUnholy-AllItems-SealofthePantheon-36993" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-Shadowmourne-49623" value: { - dps: 8140.48003 - tps: 5075.93057 + dps: 8279.95056 + tps: 5298.67836 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-ShinyShardoftheGods" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SigilofHauntedDreams-40715" value: { - dps: 8066.65561 - tps: 5022.49704 + dps: 8205.27463 + tps: 5242.77868 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SigilofVirulence-47673" value: { - dps: 8273.42981 - tps: 5165.83547 + dps: 8193.40521 + tps: 5230.57133 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SigiloftheHangedMan-50459" value: { - dps: 8143.74045 - tps: 5072.14486 + dps: 8193.40521 + tps: 5230.57133 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 310.79147 } } dps_results: { key: "TestUnholy-AllItems-SliverofPureIce-50339" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SliverofPureIce-50346" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SouloftheDead-40382" value: { - dps: 7611.01463 - tps: 4817.27906 + dps: 7749.84321 + tps: 5029.43409 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SparkofHope-45703" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SparkofLife-37657" value: { - dps: 7627.55748 - tps: 4777.73149 - hps: 277.01241 + dps: 7781.25545 + tps: 5005.16951 + hps: 274.79378 } } dps_results: { key: "TestUnholy-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7783.99506 - tps: 4860.5707 - hps: 271.94125 + dps: 7900.6198 + tps: 5051.04061 + hps: 271.30735 } } dps_results: { key: "TestUnholy-AllItems-StormshroudArmor" value: { - dps: 6131.36144 - tps: 3899.63667 - hps: 213.01296 + dps: 6243.50466 + tps: 4031.25657 + hps: 211.77308 } } dps_results: { key: "TestUnholy-AllItems-SwiftSkyflareDiamond" value: { - dps: 8098.83833 - tps: 5029.67796 + dps: 8237.49981 + tps: 5251.97206 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SwiftStarflareDiamond" value: { - dps: 8092.281 - tps: 5024.52094 + dps: 8230.7601 + tps: 5246.53231 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-SwiftWindfireDiamond" value: { - dps: 8080.80568 - tps: 5015.49616 + dps: 8218.96562 + tps: 5237.01275 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-TearsoftheVanquished-47215" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-Thassarian'sBattlegear" value: { - dps: 7829.59129 - tps: 5019.48062 - hps: 277.46991 + dps: 7979.25103 + tps: 5221.24691 + hps: 280.4499 } } dps_results: { key: "TestUnholy-AllItems-Thassarian'sPlate" value: { - dps: 6820.81237 - tps: 4249.11413 - hps: 292.76938 + dps: 6933.28852 + tps: 4404.20583 + hps: 293.11668 } } dps_results: { key: "TestUnholy-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.61952 + tps: 4938.47528 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 7481.31582 - tps: 4603.91887 - hps: 260.19374 + dps: 7644.84319 + tps: 4824.73872 + hps: 259.88691 } } dps_results: { key: "TestUnholy-AllItems-ThunderingSkyflareDiamond" value: { - dps: 8114.13519 - tps: 5024.1425 - hps: 278.59715 + dps: 8270.08998 + tps: 5260.47103 + hps: 273.20904 } } dps_results: { key: "TestUnholy-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7730.03356 - tps: 4904.67065 + dps: 7844.31664 + tps: 5081.60926 hps: 271.94125 } } dps_results: { key: "TestUnholy-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7736.06181 - tps: 4909.90818 - hps: 270.9904 + dps: 7881.56426 + tps: 5125.59952 + hps: 271.30735 } } dps_results: { key: "TestUnholy-AllItems-TirelessSkyflareDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-TirelessStarflareDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7649.92877 - tps: 4758.55286 - hps: 273.52599 + dps: 7752.08839 + tps: 4944.54047 + hps: 272.89209 } } dps_results: { key: "TestUnholy-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 8064.41236 - tps: 5002.60362 + dps: 8202.11636 + tps: 5223.41338 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6464.49529 - tps: 4129.42503 - hps: 236.98641 + dps: 6566.89713 + tps: 4254.25325 + hps: 238.09382 } } dps_results: { key: "TestUnholy-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7838.40944 - tps: 4877.69366 - hps: 277.05502 + dps: 7968.89387 + tps: 5071.34663 + hps: 276.55114 } } dps_results: { key: "TestUnholy-AllItems-WingedTalisman-37844" value: { - dps: 7526.14786 - tps: 4734.8568 + dps: 7658.62619 + tps: 4938.48541 hps: 274.47683 } } dps_results: { key: "TestUnholy-AllItems-WrathfulGladiator'sSigilofStrife-51417" value: { - dps: 8199.51619 - tps: 5122.14314 + dps: 8340.53231 + tps: 5346.35329 hps: 274.47683 } } dps_results: { key: "TestUnholy-Average-Default" value: { - dps: 8136.52113 - tps: 5080.43706 - hps: 272.08092 + dps: 8288.15041 + tps: 5305.93299 + hps: 271.85141 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-FullBuffs-LongMultiTarget" value: { - dps: 30666.17766 - tps: 32079.95058 - hps: 199.38186 + dps: 35283.67612 + tps: 39105.86646 + hps: 270.51639 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-FullBuffs-LongSingleTarget" value: { - dps: 7558.90151 - tps: 4820.60124 - hps: 207.33785 + dps: 8049.46111 + tps: 5256.12051 + hps: 273.68403 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-FullBuffs-ShortSingleTarget" value: { - dps: 11554.44439 - tps: 4933.9172 - hps: 200.10513 + dps: 12145.71407 + tps: 5310.38524 + hps: 239.15676 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-NoBuffs-LongMultiTarget" value: { - dps: 17832.93701 - tps: 20424.78329 - hps: 121.59325 + dps: 20378.59097 + tps: 24596.01881 + hps: 161.76874 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-NoBuffs-LongSingleTarget" value: { - dps: 3669.34138 - tps: 2724.92098 - hps: 120.32518 + dps: 3900.4192 + tps: 2977.10935 + hps: 161.00387 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-NoBuffs-ShortSingleTarget" value: { - dps: 5027.0363 - tps: 2617.56924 - hps: 110.60336 + dps: 5259.32278 + tps: 2833.15886 + hps: 151.06064 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-FullBuffs-LongMultiTarget" value: { - dps: 30839.16692 - tps: 32074.63318 - hps: 202.14742 + dps: 35629.13523 + tps: 39309.35624 + hps: 270.35651 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-FullBuffs-LongSingleTarget" value: { - dps: 7766.55041 - tps: 4850.48992 - hps: 208.90175 + dps: 8279.95056 + tps: 5298.67836 + hps: 274.47683 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-FullBuffs-ShortSingleTarget" value: { - dps: 12068.79646 - tps: 4978.11246 - hps: 200.21761 + dps: 12689.35846 + tps: 5374.3591 + hps: 239.29562 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-NoBuffs-LongMultiTarget" value: { - dps: 18007.19079 - tps: 20578.36418 - hps: 120.13882 + dps: 20625.86008 + tps: 24805.65099 + hps: 161.51459 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-NoBuffs-LongSingleTarget" value: { - dps: 3763.97768 - tps: 2743.72861 - hps: 121.40789 + dps: 4003.07634 + tps: 2992.67142 + hps: 161.89733 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-NoBuffs-ShortSingleTarget" value: { - dps: 5243.06273 - tps: 2640.86888 - hps: 111.39632 + dps: 5479.96822 + tps: 2860.02303 + hps: 151.18072 } } dps_results: { key: "TestUnholy-SwitchInFrontOfTarget-Default" value: { - dps: 7772.58335 - tps: 4915.97186 - hps: 267.18703 + dps: 7898.44384 + tps: 5086.75808 + hps: 270.67346 } } diff --git a/sim/deathknight/dps/dps_deathknight.go b/sim/deathknight/dps/dps_deathknight.go index 0fea991957..de8a882895 100644 --- a/sim/deathknight/dps/dps_deathknight.go +++ b/sim/deathknight/dps/dps_deathknight.go @@ -40,7 +40,7 @@ func NewDpsDeathknight(character core.Character, player *proto.Player) *DpsDeath dk := player.GetDeathknight() dpsDk := &DpsDeathknight{ - Deathknight: deathknight.NewDeathknight(character, dk.Talents, deathknight.DeathknightInputs{ + Deathknight: deathknight.NewDeathknight(character, deathknight.DeathknightInputs{ StartingRunicPower: dk.Options.StartingRunicPower, PrecastGhoulFrenzy: dk.Options.PrecastGhoulFrenzy, PrecastHornOfWinter: dk.Options.PrecastHornOfWinter, @@ -53,7 +53,7 @@ func NewDpsDeathknight(character core.Character, player *proto.Player) *DpsDeath UseAMS: dk.Rotation.UseAms, AvgAMSSuccessRate: dk.Rotation.AvgAmsSuccessRate, AvgAMSHit: dk.Rotation.AvgAmsHit, - }), + }, player.TalentsString), Rotation: dk.Rotation, } diff --git a/sim/deathknight/dps/dps_deathknight_test.go b/sim/deathknight/dps/dps_deathknight_test.go index acd7de6a17..bcdee01e73 100644 --- a/sim/deathknight/dps/dps_deathknight_test.go +++ b/sim/deathknight/dps/dps_deathknight_test.go @@ -19,11 +19,11 @@ func TestUnholy(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceHuman}, GearSet: core.GearSetCombo{Label: "Unholy P1 ", GearSet: UnholyDwP1Gear}, + Talents: UnholyTalents, + Glyphs: UnholyDefaultGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsUnholy}, - Glyphs: UnholyDefaultGlyphs, - Consumes: FullConsumes, - ItemFilter: core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypePlate, @@ -43,11 +43,11 @@ func TestFrost(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceHuman}, GearSet: core.GearSetCombo{Label: "Frost P1", GearSet: FrostP1Gear}, + Talents: FrostTalents, + Glyphs: FrostDefaultGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsFrost}, - Glyphs: FrostDefaultGlyphs, - Consumes: FullConsumes, - ItemFilter: core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypePlate, diff --git a/sim/deathknight/dps/presets.go b/sim/deathknight/dps/presets.go index 1bb04d1403..8915d87205 100644 --- a/sim/deathknight/dps/presets.go +++ b/sim/deathknight/dps/presets.go @@ -5,6 +5,7 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) +var FrostTalents = "23050005-32005350352203012300033101351" var FrostDefaultGlyphs = &proto.Glyphs{ Major1: int32(proto.DeathknightMajorGlyph_GlyphOfFrostStrike), Major2: int32(proto.DeathknightMajorGlyph_GlyphOfObliterate), @@ -12,6 +13,7 @@ var FrostDefaultGlyphs = &proto.Glyphs{ // No interesting minor glyphs. } +var UnholyTalents = "-320043500002-2300303050032152000150013133051" var UnholyDefaultGlyphs = &proto.Glyphs{ Major1: int32(proto.DeathknightMajorGlyph_GlyphOfTheGhoul), Major2: int32(proto.DeathknightMajorGlyph_GlyphOfDarkDeath), @@ -21,7 +23,6 @@ var UnholyDefaultGlyphs = &proto.Glyphs{ var PlayerOptionsUnholy = &proto.Player_Deathknight{ Deathknight: &proto.Deathknight{ - Talents: UnholyTalents, Options: deathKnightOptions, Rotation: unholyRotation, }, @@ -29,70 +30,11 @@ var PlayerOptionsUnholy = &proto.Player_Deathknight{ var PlayerOptionsFrost = &proto.Player_Deathknight{ Deathknight: &proto.Deathknight{ - Talents: FrostTalents, Options: deathKnightOptions, Rotation: frostRotation, }, } -var UnholyTalents = &proto.DeathknightTalents{ - ImprovedIcyTouch: 3, - RunicPowerMastery: 2, - BlackIce: 3, - NervesOfColdSteel: 3, - IcyTalons: 5, - EndlessWinter: 2, - - ViciousStrikes: 2, - Virulence: 3, - Morbidity: 3, - RavenousDead: 3, - Outbreak: 0, - Necrosis: 5, - BloodCakedBlade: 3, - NightOfTheDead: 2, - Impurity: 5, - Dirge: 2, - MasterOfGhouls: true, - Desolation: 5, - GhoulFrenzy: true, - CryptFever: 3, - BoneShield: true, - WanderingPlague: 3, - EbonPlaguebringer: 3, - ScourgeStrike: true, - RageOfRivendare: 5, - SummonGargoyle: true, -} - -var FrostTalents = &proto.DeathknightTalents{ - Butchery: 2, - Subversion: 3, - BladedArmor: 5, - DarkConviction: 5, - - ImprovedIcyTouch: 3, - RunicPowerMastery: 2, - BlackIce: 5, - NervesOfColdSteel: 3, - IcyTalons: 5, - Annihilation: 3, - KillingMachine: 5, - ChillOfTheGrave: 2, - EndlessWinter: 2, - GlacierRot: 3, - ImprovedIcyTalons: true, - MercilessCombat: 2, - Rime: 3, - ThreatOfThassarian: 3, - BloodOfTheNorth: 3, - UnbreakableArmor: true, - FrostStrike: true, - GuileOfGorefiend: 3, - TundraStalker: 5, - HowlingBlast: true, -} - var unholyRotation = &proto.Deathknight_Rotation{ UseDeathAndDecay: true, StartingPresence: proto.Deathknight_Rotation_Unholy, diff --git a/sim/deathknight/tank/TestBloodTank.results b/sim/deathknight/tank/TestBloodTank.results index c54d997b12..d9f469ea34 100644 --- a/sim/deathknight/tank/TestBloodTank.results +++ b/sim/deathknight/tank/TestBloodTank.results @@ -46,907 +46,907 @@ character_stats_results: { dps_results: { key: "TestBloodTank-AllItems-Althor'sAbacus-50359" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-Althor'sAbacus-50366" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-AustereEarthsiegeDiamond" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-Bandit'sInsignia-40371" value: { - dps: 1500.78158 - tps: 4798.78328 + dps: 1493.92583 + tps: 4699.27551 } } dps_results: { key: "TestBloodTank-AllItems-BaubleofTrueBlood-50354" value: { - dps: 1423.23384 - tps: 20101.61278 + dps: 1416.6076 + tps: 20005.43627 } } dps_results: { key: "TestBloodTank-AllItems-BaubleofTrueBlood-50726" value: { - dps: 1423.23384 - tps: 20101.61278 + dps: 1416.6076 + tps: 20005.43627 } } dps_results: { key: "TestBloodTank-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 1427.16991 - tps: 4622.93962 + dps: 1420.50904 + tps: 4526.26037 } } dps_results: { key: "TestBloodTank-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 1395.65225 - tps: 4514.84538 + dps: 1389.12704 + tps: 4420.13511 } } dps_results: { key: "TestBloodTank-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 1321.9344 - tps: 4243.29843 + dps: 1315.87126 + tps: 4155.29504 } } dps_results: { key: "TestBloodTank-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 1282.2105 - tps: 4097.2789 + dps: 1276.47879 + tps: 4014.08599 } } dps_results: { key: "TestBloodTank-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 1192.33395 - tps: 3864.19533 + dps: 1186.71652 + tps: 3782.66123 } } dps_results: { key: "TestBloodTank-AllItems-BracingEarthsiegeDiamond" value: { - dps: 1420.6554 - tps: 4502.19475 + dps: 1414.03831 + tps: 4408.07187 } } dps_results: { key: "TestBloodTank-AllItems-ChaoticSkyflareDiamond" value: { - dps: 1439.06241 - tps: 4662.8914 + dps: 1432.33915 + tps: 4565.30666 } } dps_results: { key: "TestBloodTank-AllItems-CorpseTongueCoin-50349" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-CorpseTongueCoin-50352" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 hps: 64 } } dps_results: { key: "TestBloodTank-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 1444.72754 - tps: 4680.84698 + dps: 1437.97568 + tps: 4582.84708 } } dps_results: { key: "TestBloodTank-AllItems-DarkmoonCard:Death-42990" value: { - dps: 1486.39326 - tps: 4757.69985 + dps: 1479.60794 + tps: 4659.21434 } } dps_results: { key: "TestBloodTank-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 1473.62582 - tps: 4776.58287 + dps: 1466.71006 + tps: 4676.20398 } } dps_results: { key: "TestBloodTank-AllItems-DarkrunedBattlegear" value: { - dps: 1619.92196 - tps: 5168.37684 + dps: 1612.74805 + tps: 5064.25107 } } dps_results: { key: "TestBloodTank-AllItems-DarkrunedPlate" value: { - dps: 1429.14622 - tps: 4620.82444 + dps: 1422.52599 + tps: 4524.73507 } } dps_results: { key: "TestBloodTank-AllItems-DeadlyGladiator'sSigilofStrife-42620" value: { - dps: 1436.02474 - tps: 4644.32749 + dps: 1429.33042 + tps: 4547.16272 } } dps_results: { key: "TestBloodTank-AllItems-Death'sChoice-47464" value: { - dps: 1566.39886 - tps: 5078.45136 + dps: 1559.03863 + tps: 4971.62136 } } dps_results: { key: "TestBloodTank-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 1436.35837 - tps: 4653.27778 + dps: 1429.65011 + tps: 4555.91072 } } dps_results: { key: "TestBloodTank-AllItems-Deathbringer'sWill-50362" value: { - dps: 1524.25069 - tps: 4857.89178 + dps: 1517.38089 + tps: 4758.18005 } } dps_results: { key: "TestBloodTank-AllItems-Deathbringer'sWill-50363" value: { - dps: 1541.33503 - tps: 4904.23135 + dps: 1534.45158 + tps: 4804.32152 } } dps_results: { key: "TestBloodTank-AllItems-Defender'sCode-40257" value: { - dps: 1431.64689 - tps: 4629.27041 + dps: 1424.97997 + tps: 4532.50339 } } dps_results: { key: "TestBloodTank-AllItems-DestructiveSkyflareDiamond" value: { - dps: 1427.94434 - tps: 4624.5454 + dps: 1421.28347 + tps: 4527.86615 } } dps_results: { key: "TestBloodTank-AllItems-DislodgedForeignObject-50348" value: { - dps: 1464.81397 - tps: 4669.01399 + dps: 1458.19838 + tps: 4572.99205 } } dps_results: { key: "TestBloodTank-AllItems-DislodgedForeignObject-50353" value: { - dps: 1461.6699 - tps: 4682.38557 + dps: 1454.94001 + tps: 4584.70452 } } dps_results: { key: "TestBloodTank-AllItems-EffulgentSkyflareDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-EmberSkyflareDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 1427.16991 - tps: 4622.93962 + dps: 1420.50904 + tps: 4526.26037 } } dps_results: { key: "TestBloodTank-AllItems-EnigmaticStarflareDiamond" value: { - dps: 1426.97222 - tps: 4620.07029 + dps: 1420.32185 + tps: 4523.5434 } } dps_results: { key: "TestBloodTank-AllItems-EphemeralSnowflake-50260" value: { - dps: 1462.00379 - tps: 4662.10776 + dps: 1455.46137 + tps: 4567.1477 } } dps_results: { key: "TestBloodTank-AllItems-EssenceofGossamer-37220" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-EternalEarthsiegeDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 1482.28901 - tps: 4759.52938 + dps: 1475.49252 + tps: 4660.88176 } } dps_results: { key: "TestBloodTank-AllItems-EyeoftheBroodmother-45308" value: { - dps: 1442.86797 - tps: 4685.08786 + dps: 1436.09248 + tps: 4586.745 } } dps_results: { key: "TestBloodTank-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-ForethoughtTalisman-40258" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-ForgeEmber-37660" value: { - dps: 1440.39509 - tps: 4679.96033 + dps: 1433.6196 + tps: 4581.61748 } } dps_results: { key: "TestBloodTank-AllItems-ForlornSkyflareDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-ForlornStarflareDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-FuriousGladiator'sSigilofStrife-42621" value: { - dps: 1438.57389 - tps: 4652.69761 + dps: 1431.8665 + tps: 4555.34317 } } dps_results: { key: "TestBloodTank-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 1481.92504 - tps: 4780.80684 + dps: 1475.06249 + tps: 4681.20044 } } dps_results: { key: "TestBloodTank-AllItems-FuturesightRune-38763" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-GlowingTwilightScale-54573" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-GlowingTwilightScale-54589" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-GnomishLightningGenerator-41121" value: { - dps: 1469.25917 - tps: 4743.06641 + dps: 1462.37856 + tps: 4643.19773 } } dps_results: { key: "TestBloodTank-AllItems-HatefulGladiator'sSigilofStrife-42619" value: { - dps: 1429.72928 - tps: 4622.02507 + dps: 1423.07438 + tps: 4525.43242 } } dps_results: { key: "TestBloodTank-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 1427.16991 - tps: 4622.93962 + dps: 1420.50904 + tps: 4526.26037 } } dps_results: { key: "TestBloodTank-AllItems-ImpassiveStarflareDiamond" value: { - dps: 1426.97222 - tps: 4620.07029 + dps: 1420.32185 + tps: 4523.5434 } } dps_results: { key: "TestBloodTank-AllItems-IncisorFragment-37723" value: { - dps: 1467.17172 - tps: 4726.51809 + dps: 1460.41004 + tps: 4628.37569 } } dps_results: { key: "TestBloodTank-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 1428.96177 - tps: 4620.67283 + dps: 1422.30703 + tps: 4524.0825 hps: 14.51228 } } dps_results: { key: "TestBloodTank-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-MajesticDragonFigurine-40430" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-MeteoriteWhetstone-37390" value: { - dps: 1475.21725 - tps: 4716.53339 + dps: 1468.58245 + tps: 4620.23263 } } dps_results: { key: "TestBloodTank-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 1445.1866 - tps: 4721.61361 + dps: 1438.32521 + tps: 4622.02396 } } dps_results: { key: "TestBloodTank-AllItems-OfferingofSacrifice-37638" value: { - dps: 1450.42194 - tps: 4655.15436 + dps: 1443.77284 + tps: 4558.64604 } } dps_results: { key: "TestBloodTank-AllItems-PersistentEarthshatterDiamond" value: { - dps: 1427.37961 - tps: 4615.60682 + dps: 1420.73203 + tps: 4519.1206 } } dps_results: { key: "TestBloodTank-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 1428.96177 - tps: 4620.67283 + dps: 1422.30703 + tps: 4524.0825 } } dps_results: { key: "TestBloodTank-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 1445.74434 - tps: 4674.40967 + dps: 1439.01351 + tps: 4576.71503 } } dps_results: { key: "TestBloodTank-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 1448.63865 - tps: 4683.67709 + dps: 1441.8947 + tps: 4585.792 } } dps_results: { key: "TestBloodTank-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-PurifiedShardoftheGods" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-ReignoftheDead-47316" value: { - dps: 1429.51433 - tps: 4601.44399 + dps: 1422.92834 + tps: 4505.85164 } } dps_results: { key: "TestBloodTank-AllItems-ReignoftheDead-47477" value: { - dps: 1430.43244 - tps: 4603.34767 + dps: 1423.84644 + tps: 4507.75532 } } dps_results: { key: "TestBloodTank-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 1437.94646 - tps: 4644.76289 + dps: 1431.26775 + tps: 4547.82481 } } dps_results: { key: "TestBloodTank-AllItems-RelentlessGladiator'sSigilofStrife-42622" value: { - dps: 1441.5479 - tps: 4662.46276 + dps: 1434.82526 + tps: 4564.88703 } } dps_results: { key: "TestBloodTank-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-RuneofRepulsion-40372" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-SavageGladiator'sSigilofStrife-42618" value: { - dps: 1428.99906 - tps: 4619.81206 + dps: 1422.34709 + tps: 4523.26201 } } dps_results: { key: "TestBloodTank-AllItems-ScourgeborneBattlegear" value: { - dps: 1529.21592 - tps: 4917.39754 + dps: 1522.1319 + tps: 4814.57647 } } dps_results: { key: "TestBloodTank-AllItems-ScourgebornePlate" value: { - dps: 1398.37436 - tps: 4532.02347 + dps: 1391.80268 + tps: 4436.63875 } } dps_results: { key: "TestBloodTank-AllItems-Scourgelord'sBattlegear" value: { - dps: 1705.67596 - tps: 5476.14997 + dps: 1697.92529 + tps: 5363.65299 } } dps_results: { key: "TestBloodTank-AllItems-Scourgelord'sPlate" value: { - dps: 1508.30735 - tps: 4885.61451 + dps: 1501.2416 + tps: 4783.05868 } } dps_results: { key: "TestBloodTank-AllItems-SealofthePantheon-36993" value: { - dps: 1429.6685 - tps: 4619.93097 + dps: 1423.02464 + tps: 4523.49862 } } dps_results: { key: "TestBloodTank-AllItems-Shadowmourne-49623" value: { - dps: 2049.85243 - tps: 6156.83399 + dps: 2042.17942 + tps: 6045.4642 } } dps_results: { key: "TestBloodTank-AllItems-ShinyShardoftheGods" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-SigilofHauntedDreams-40715" value: { - dps: 1426.14179 - tps: 4608.41287 + dps: 1419.5128 + tps: 4512.19648 } } dps_results: { key: "TestBloodTank-AllItems-SigilofVirulence-47673" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-SigiloftheHangedMan-50459" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-SliverofPureIce-50339" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-SliverofPureIce-50346" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-SouloftheDead-40382" value: { - dps: 1444.13944 - tps: 4687.72426 + dps: 1437.36395 + tps: 4589.3814 } } dps_results: { key: "TestBloodTank-AllItems-SparkofHope-45703" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-SparkofLife-37657" value: { - dps: 1441.44261 - tps: 4594.4237 + dps: 1434.90011 + tps: 4499.46254 } } dps_results: { key: "TestBloodTank-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 1457.71551 - tps: 4734.17208 + dps: 1450.81994 + tps: 4634.0863 } } dps_results: { key: "TestBloodTank-AllItems-StormshroudArmor" value: { - dps: 1185.33199 - tps: 3836.65219 + dps: 1179.91171 + tps: 3757.97948 } } dps_results: { key: "TestBloodTank-AllItems-SwiftSkyflareDiamond" value: { - dps: 1428.96177 - tps: 4620.67283 + dps: 1422.30703 + tps: 4524.0825 } } dps_results: { key: "TestBloodTank-AllItems-SwiftStarflareDiamond" value: { - dps: 1427.37961 - tps: 4615.60682 + dps: 1420.73203 + tps: 4519.1206 } } dps_results: { key: "TestBloodTank-AllItems-SwiftWindfireDiamond" value: { - dps: 1424.61082 - tps: 4606.7413 + dps: 1417.97579 + tps: 4510.43727 } } dps_results: { key: "TestBloodTank-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-TearsoftheVanquished-47215" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-Thassarian'sBattlegear" value: { - dps: 1672.48616 - tps: 5281.48448 + dps: 1665.14833 + tps: 5174.97958 } } dps_results: { key: "TestBloodTank-AllItems-Thassarian'sPlate" value: { - dps: 1415.05697 - tps: 4595.30728 + dps: 1408.37121 + tps: 4498.26679 } } dps_results: { key: "TestBloodTank-AllItems-TheGeneral'sHeart-45507" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 1423.71214 - tps: 4573.56157 + dps: 1417.10705 + tps: 4477.69197 } } dps_results: { key: "TestBloodTank-AllItems-ThunderingSkyflareDiamond" value: { - dps: 1435.28411 - tps: 4621.73117 + dps: 1428.64299 + tps: 4525.3386 } } dps_results: { key: "TestBloodTank-AllItems-TinyAbominationinaJar-50351" value: { - dps: 1470.73898 - tps: 4719.42816 + dps: 1463.98356 + tps: 4621.37664 } } dps_results: { key: "TestBloodTank-AllItems-TinyAbominationinaJar-50706" value: { - dps: 1474.52273 - tps: 4723.86878 + dps: 1467.78185 + tps: 4626.02819 } } dps_results: { key: "TestBloodTank-AllItems-TirelessSkyflareDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-TirelessStarflareDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 1456.7182 - tps: 4660.73494 + dps: 1450.16514 + tps: 4565.6206 } } dps_results: { key: "TestBloodTank-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 1420.6554 - tps: 4594.07628 + dps: 1414.03831 + tps: 4498.03252 } } dps_results: { key: "TestBloodTank-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 1262.01842 - tps: 4051.85177 + dps: 1256.2072 + tps: 3967.50495 } } dps_results: { key: "TestBloodTank-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 1213.17416 - tps: 4106.40117 + dps: 1206.73905 + tps: 4012.99875 } } dps_results: { key: "TestBloodTank-AllItems-WingedTalisman-37844" value: { - dps: 1423.27898 - tps: 4602.47685 + dps: 1416.65 + tps: 4506.26045 } } dps_results: { key: "TestBloodTank-AllItems-WrathfulGladiator'sSigilofStrife-51417" value: { - dps: 1444.94677 - tps: 4673.62293 + dps: 1438.20671 + tps: 4575.7943 } } dps_results: { key: "TestBloodTank-Average-Default" value: { - dps: 1821.41335 - tps: 6337.93628 + dps: 1814.80237 + tps: 6241.98118 dtps: 261.20585 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 5228.52206 - tps: 12478.66642 + dps: 5221.95196 + tps: 12383.30479 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 1446.97717 - tps: 4625.22441 + dps: 1440.44122 + tps: 4530.35841 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 1748.44823 - tps: 6306.20337 + dps: 1738.95582 + tps: 6168.42586 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3494.34815 - tps: 8211.13526 + dps: 3490.43031 + tps: 8154.26986 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 810.69838 - tps: 2638.63955 + dps: 806.82303 + tps: 2582.39077 } } dps_results: { key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 890.50308 - tps: 3486.55664 + dps: 884.39859 + tps: 3397.95304 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 5264.83485 - tps: 12581.55853 + dps: 5258.15647 + tps: 12484.62518 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 1459.50842 - tps: 4678.2084 + dps: 1452.86626 + tps: 4581.80069 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 1773.54922 - tps: 6440.73807 + dps: 1763.74981 + tps: 6298.50451 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3520.94906 - tps: 8285.93663 + dps: 3516.95502 + tps: 8227.96524 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 818.60918 - tps: 2674.39478 + dps: 814.65889 + tps: 2617.05825 } } dps_results: { key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 905.93461 - tps: 3581.24934 + dps: 899.60062 + tps: 3489.3146 } } dps_results: { key: "TestBloodTank-SwitchInFrontOfTarget-Default" value: { - dps: 1836.78805 - tps: 6355.98608 + dps: 1830.20103 + tps: 6260.37879 dtps: 262.15577 } } diff --git a/sim/deathknight/tank/presets.go b/sim/deathknight/tank/presets.go index bdd0cb6489..c0ff9b3cf4 100644 --- a/sim/deathknight/tank/presets.go +++ b/sim/deathknight/tank/presets.go @@ -5,43 +5,20 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) +var BloodTankTalents = "005510153330330220102013-3050505100023101-002" +var Glyphs = &proto.Glyphs{ + Major1: int32(proto.DeathknightMajorGlyph_GlyphOfDarkCommand), + Major2: int32(proto.DeathknightMajorGlyph_GlyphOfObliterate), + Major3: int32(proto.DeathknightMajorGlyph_GlyphOfVampiricBlood), +} + var PlayerOptionsBloodTank = &proto.Player_TankDeathknight{ TankDeathknight: &proto.TankDeathknight{ - Talents: BloodTankTalents, Options: deathKnightOptions, Rotation: bloodTankRotation, }, } -var BloodTankTalents = &proto.DeathknightTalents{ - BladeBarrier: 5, - BladedArmor: 5, - ScentOfBlood: 1, - RuneTap: true, - DarkConviction: 5, - DeathRuneMastery: 3, - ImprovedRuneTap: 3, - SpellDeflection: 3, - BloodyStrikes: 3, - VeteranOfTheThirdWar: 3, - BloodyVengeance: 2, - AbominationsMight: 2, - Hysteria: true, - ImprovedDeathStrike: 2, - VampiricBlood: true, - WillOfTheNecropolis: 3, - ImprovedIcyTouch: 3, - Toughness: 5, - BlackIce: 5, - IcyTalons: 5, - Lichborne: true, - EndlessWinter: 2, - FrigidDreadplate: 3, - GlacierRot: 2, - ImprovedIcyTalons: true, - Anticipation: 2, -} - var bloodTankRotation = &proto.TankDeathknight_Rotation{ Presence: proto.TankDeathknight_Rotation_Frost, Opener: proto.TankDeathknight_Rotation_Threat, @@ -95,12 +72,6 @@ var FullDebuffs = &proto.Debuffs{ HeartOfTheCrusader: true, } -var Glyphs = &proto.Glyphs{ - Major1: int32(proto.DeathknightMajorGlyph_GlyphOfDarkCommand), - Major2: int32(proto.DeathknightMajorGlyph_GlyphOfObliterate), - Major3: int32(proto.DeathknightMajorGlyph_GlyphOfVampiricBlood), -} - var BloodP1Gear = core.EquipmentSpecFromJsonString(`{"items": [ { "id": 40565, diff --git a/sim/deathknight/tank/tank_deathknight.go b/sim/deathknight/tank/tank_deathknight.go index 3325e3953d..91d6fe780c 100644 --- a/sim/deathknight/tank/tank_deathknight.go +++ b/sim/deathknight/tank/tank_deathknight.go @@ -36,10 +36,10 @@ func NewTankDeathknight(character core.Character, options *proto.Player) *TankDe dkOptions := options.GetTankDeathknight() tankDk := &TankDeathknight{ - Deathknight: deathknight.NewDeathknight(character, dkOptions.Talents, deathknight.DeathknightInputs{ + Deathknight: deathknight.NewDeathknight(character, deathknight.DeathknightInputs{ IsDps: false, StartingRunicPower: dkOptions.Options.StartingRunicPower, - }), + }, options.TalentsString), Rotation: dkOptions.Rotation, } diff --git a/sim/deathknight/tank/tank_deathknight_test.go b/sim/deathknight/tank/tank_deathknight_test.go index 7862ddb2c8..072c43cd95 100644 --- a/sim/deathknight/tank/tank_deathknight_test.go +++ b/sim/deathknight/tank/tank_deathknight_test.go @@ -14,18 +14,16 @@ func init() { func TestBloodTank(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ - Class: proto.Class_ClassDeathknight, - + Class: proto.Class_ClassDeathknight, Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "Blood Tank P1", GearSet: BloodP1Gear}, - + GearSet: core.GearSetCombo{Label: "Blood Tank P1", GearSet: BloodP1Gear}, + Talents: BloodTankTalents, + Glyphs: Glyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBloodTank}, - Consumes: FullConsumes, - Glyphs: Glyphs, - IsTank: true, InFrontOfTarget: true, diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 7a1b1694bd..1591d2d502 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -46,911 +46,911 @@ character_stats_results: { dps_results: { key: "TestBalance-AllItems-Althor'sAbacus-50359" value: { - dps: 7435.23334 - tps: 7274.51175 + dps: 7461.16777 + tps: 7295.69774 } } dps_results: { key: "TestBalance-AllItems-Althor'sAbacus-50366" value: { - dps: 7474.17766 - tps: 7312.53995 + dps: 7500.25512 + tps: 7333.86898 } } dps_results: { key: "TestBalance-AllItems-AshtongueTalismanofEquilibrium-32486" value: { - dps: 7212.7298 - tps: 7059.46206 + dps: 7237.689 + tps: 7079.67282 } } dps_results: { key: "TestBalance-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-Bandit'sInsignia-40371" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7117.92685 - tps: 7173.19497 + dps: 7142.69134 + tps: 7193.21102 } } dps_results: { key: "TestBalance-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7117.92685 - tps: 7173.19497 + dps: 7142.69134 + tps: 7193.21102 } } dps_results: { key: "TestBalance-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7250.39257 - tps: 7097.79761 + dps: 7275.74905 + tps: 7118.17992 } } dps_results: { key: "TestBalance-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5670.73117 - tps: 5520.07861 + dps: 5689.48577 + tps: 5533.90882 } } dps_results: { key: "TestBalance-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7266.65633 - tps: 6971.9239 + dps: 7291.97882 + tps: 6991.93883 } } dps_results: { key: "TestBalance-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7456.14374 - tps: 7302.87599 + dps: 7482.18977 + tps: 7324.17358 } } dps_results: { key: "TestBalance-AllItems-CorpseTongueCoin-50349" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-CorpseTongueCoin-50352" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 hps: 64 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7240.5895 - tps: 7089.40062 + dps: 7266.11465 + tps: 7109.76953 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7306.55364 - tps: 7156.28497 + dps: 7331.68838 + tps: 7176.05432 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7223.20937 - tps: 7078.10508 + dps: 7248.34323 + tps: 7098.38464 } } dps_results: { key: "TestBalance-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-Death'sChoice-47464" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7155.64978 - tps: 7003.0932 + dps: 7180.68624 + tps: 7023.00516 } } dps_results: { key: "TestBalance-AllItems-Deathbringer'sWill-50362" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-Deathbringer'sWill-50363" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-Defender'sCode-40257" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7255.15425 - tps: 7101.8735 + dps: 7280.54882 + tps: 7122.63239 } } dps_results: { key: "TestBalance-AllItems-DislodgedForeignObject-50348" value: { - dps: 7675.60108 - tps: 7524.4802 + dps: 7701.83729 + tps: 7545.39489 } } dps_results: { key: "TestBalance-AllItems-DislodgedForeignObject-50353" value: { - dps: 7595.71993 - tps: 7444.35964 + dps: 7621.52094 + tps: 7465.1524 } } dps_results: { key: "TestBalance-AllItems-DreamwalkerBattlegear" value: { - dps: 4853.70602 - tps: 4714.83819 + dps: 4901.12702 + tps: 4757.04128 } } dps_results: { key: "TestBalance-AllItems-DreamwalkerGarb" value: { - dps: 6306.94682 - tps: 6159.4999 + dps: 6328.67469 + tps: 6176.75527 } } dps_results: { key: "TestBalance-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-EmberSkyflareDiamond" value: { - dps: 7280.79117 - tps: 7126.50341 + dps: 7306.2267 + tps: 7147.06059 } } dps_results: { key: "TestBalance-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7250.39257 - tps: 7097.12482 + dps: 7275.74905 + tps: 7117.73287 } } dps_results: { key: "TestBalance-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7246.28343 - tps: 7092.97442 + dps: 7271.60229 + tps: 7113.55074 } } dps_results: { key: "TestBalance-AllItems-EphemeralSnowflake-50260" value: { - dps: 7198.89317 - tps: 7048.16624 + dps: 7223.19688 + tps: 7067.21924 } } dps_results: { key: "TestBalance-AllItems-EssenceofGossamer-37220" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7261.42701 - tps: 7110.9356 + dps: 7286.63392 + tps: 7131.85078 } } dps_results: { key: "TestBalance-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7454.96238 - tps: 7303.67469 + dps: 7481.26623 + tps: 7324.86358 } } dps_results: { key: "TestBalance-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7147.51679 - tps: 6996.01018 + dps: 7172.41495 + tps: 7016.66723 } } dps_results: { key: "TestBalance-AllItems-ForethoughtTalisman-40258" value: { - dps: 7314.85998 - tps: 7156.97001 + dps: 7340.35233 + tps: 7177.71393 } } dps_results: { key: "TestBalance-AllItems-ForgeEmber-37660" value: { - dps: 7399.39557 - tps: 7248.1562 + dps: 7425.62389 + tps: 7269.25523 } } dps_results: { key: "TestBalance-AllItems-ForlornSkyflareDiamond" value: { - dps: 7266.65633 - tps: 7111.83346 + dps: 7291.97882 + tps: 7132.35484 } } dps_results: { key: "TestBalance-AllItems-ForlornStarflareDiamond" value: { - dps: 7258.08648 - tps: 7103.47182 + dps: 7283.37756 + tps: 7123.96179 } } dps_results: { key: "TestBalance-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-FuturesightRune-38763" value: { - dps: 7254.81627 - tps: 7096.3877 + dps: 7280.05569 + tps: 7116.87868 } } dps_results: { key: "TestBalance-AllItems-Gladiator'sSanctuary" value: { - dps: 4983.36387 - tps: 4846.38598 + dps: 5021.43111 + tps: 4878.8801 } } dps_results: { key: "TestBalance-AllItems-Gladiator'sWildhide" value: { - dps: 6745.43622 - tps: 6577.78309 + dps: 6768.37793 + tps: 6595.65951 } } dps_results: { key: "TestBalance-AllItems-GlowingTwilightScale-54573" value: { - dps: 7454.7055 - tps: 7293.52585 + dps: 7480.71145 + tps: 7314.78336 } } dps_results: { key: "TestBalance-AllItems-GlowingTwilightScale-54589" value: { - dps: 7498.96041 - tps: 7336.73972 + dps: 7525.12889 + tps: 7358.15976 } } dps_results: { key: "TestBalance-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7239.16885 - tps: 7087.88092 + dps: 7264.39982 + tps: 7108.37434 } } dps_results: { key: "TestBalance-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-Heartpierce-49982" value: { - dps: 7456.14374 - tps: 7302.87599 + dps: 7482.18977 + tps: 7324.17358 } } dps_results: { key: "TestBalance-AllItems-Heartpierce-50641" value: { - dps: 7456.14374 - tps: 7302.87599 + dps: 7482.18977 + tps: 7324.17358 } } dps_results: { key: "TestBalance-AllItems-IdolofMutilation-47668" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-IdoloftheCorruptor-45509" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 7630.21554 - tps: 7481.36861 + dps: 7657.57319 + tps: 7504.52356 } } dps_results: { key: "TestBalance-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 7402.16711 - tps: 7249.74779 + dps: 7428.58676 + tps: 7271.00553 } } dps_results: { key: "TestBalance-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7250.39257 - tps: 7097.12482 + dps: 7275.74905 + tps: 7117.73287 } } dps_results: { key: "TestBalance-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7246.28343 - tps: 7092.97442 + dps: 7271.60229 + tps: 7113.55074 } } dps_results: { key: "TestBalance-AllItems-IncisorFragment-37723" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7237.89007 - tps: 7087.53631 + dps: 7263.16803 + tps: 7107.71432 } } dps_results: { key: "TestBalance-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-LasherweaveBattlegear" value: { - dps: 4910.50139 - tps: 4773.93891 + dps: 4954.27371 + tps: 4813.26997 } } dps_results: { key: "TestBalance-AllItems-LasherweaveRegalia" value: { - dps: 7377.85501 - tps: 7228.90162 + dps: 7403.53008 + tps: 7249.38669 } } dps_results: { key: "TestBalance-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7221.21667 - tps: 7067.94083 + dps: 7246.37509 + tps: 7088.3508 } } dps_results: { key: "TestBalance-AllItems-Malfurion'sBattlegear" value: { - dps: 5237.99171 - tps: 5103.46305 + dps: 5283.18599 + tps: 5142.53357 } } dps_results: { key: "TestBalance-AllItems-Malfurion'sRegalia" value: { - dps: 6645.62262 - tps: 6491.22911 + dps: 6668.38063 + tps: 6508.65055 } } dps_results: { key: "TestBalance-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7219.18127 - tps: 7067.97963 + dps: 7244.78796 + tps: 7088.44559 } } dps_results: { key: "TestBalance-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7328.67212 - tps: 7171.37996 + dps: 7354.2794 + tps: 7191.99671 } } dps_results: { key: "TestBalance-AllItems-NightsongBattlegear" value: { - dps: 5027.90604 - tps: 4890.871 + dps: 5093.79554 + tps: 4952.34063 } } dps_results: { key: "TestBalance-AllItems-NightsongGarb" value: { - dps: 6708.30755 - tps: 6555.28079 + dps: 6730.44868 + tps: 6572.60711 } } dps_results: { key: "TestBalance-AllItems-OfferingofSacrifice-37638" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-PurifiedShardoftheGods" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-ReignoftheDead-47316" value: { - dps: 7556.78243 - tps: 7398.28909 + dps: 7582.13573 + tps: 7418.86314 } } dps_results: { key: "TestBalance-AllItems-ReignoftheDead-47477" value: { - dps: 7617.60831 - tps: 7458.36543 + dps: 7643.07724 + tps: 7479.0551 } } dps_results: { key: "TestBalance-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7427.3865 - tps: 7273.60466 + dps: 7453.231 + tps: 7294.64806 } } dps_results: { key: "TestBalance-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7223.80708 - tps: 7069.44955 + dps: 7248.97255 + tps: 7090.04742 } } dps_results: { key: "TestBalance-AllItems-RuneofRepulsion-40372" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-SealofthePantheon-36993" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-ShinyShardoftheGods" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-SliverofPureIce-50339" value: { - dps: 7398.05921 - tps: 7240.73155 + dps: 7423.85712 + tps: 7261.47236 } } dps_results: { key: "TestBalance-AllItems-SliverofPureIce-50346" value: { - dps: 7433.46314 - tps: 7275.51518 + dps: 7459.39107 + tps: 7296.31912 } } dps_results: { key: "TestBalance-AllItems-SouloftheDead-40382" value: { - dps: 7238.24795 - tps: 7090.42456 + dps: 7263.86089 + tps: 7110.68913 } } dps_results: { key: "TestBalance-AllItems-SparkofHope-45703" value: { - dps: 7181.52807 - tps: 7026.7698 + dps: 7206.53075 + tps: 7047.02404 } } dps_results: { key: "TestBalance-AllItems-SparkofLife-37657" value: { - dps: 7194.24221 - tps: 7040.51541 + dps: 7219.22289 + tps: 7060.95237 } } dps_results: { key: "TestBalance-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-StormshroudArmor" value: { - dps: 5265.56847 - tps: 5118.20761 + dps: 5282.7489 + tps: 5132.25898 } } dps_results: { key: "TestBalance-AllItems-SwiftSkyflareDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-SwiftStarflareDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-SwiftWindfireDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7161.86508 - tps: 7007.57084 + dps: 7186.79555 + tps: 7027.75287 } } dps_results: { key: "TestBalance-AllItems-TearsoftheVanquished-47215" value: { - dps: 7176.9182 - tps: 7025.66332 + dps: 7202.03639 + tps: 7045.75348 } } dps_results: { key: "TestBalance-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-ThunderheartHarness" value: { - dps: 3949.53853 - tps: 3814.85804 + dps: 4037.94124 + tps: 3901.06978 } } dps_results: { key: "TestBalance-AllItems-ThunderheartRegalia" value: { - dps: 5054.15303 - tps: 4908.64009 + dps: 5070.54492 + tps: 4920.44065 } } dps_results: { key: "TestBalance-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7223.80708 - tps: 7070.02524 + dps: 7248.97255 + tps: 7090.38961 } } dps_results: { key: "TestBalance-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7118.36817 - tps: 6965.10042 + dps: 7143.13889 + tps: 6985.1227 } } dps_results: { key: "TestBalance-AllItems-TirelessSkyflareDiamond" value: { - dps: 7266.65633 - tps: 7111.83346 + dps: 7291.97882 + tps: 7132.35484 } } dps_results: { key: "TestBalance-AllItems-TirelessStarflareDiamond" value: { - dps: 7258.08648 - tps: 7103.47182 + dps: 7283.37756 + tps: 7123.96179 } } dps_results: { key: "TestBalance-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7204.5483 - tps: 7048.38155 + dps: 7229.15173 + tps: 7068.32269 } } dps_results: { key: "TestBalance-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7258.08648 - tps: 7103.47182 + dps: 7283.37756 + tps: 7123.96179 } } dps_results: { key: "TestBalance-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7266.65633 - tps: 7111.83346 + dps: 7291.97882 + tps: 7132.35484 } } dps_results: { key: "TestBalance-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5301.0097 - tps: 5155.73241 + dps: 5317.73616 + tps: 5168.67031 } } dps_results: { key: "TestBalance-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7755.0075 - tps: 7599.42449 + dps: 7782.44236 + tps: 7621.90888 } } dps_results: { key: "TestBalance-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-AllItems-WingedTalisman-37844" value: { - dps: 7267.50642 - tps: 7099.83069 + dps: 7292.64375 + tps: 7120.21958 } } dps_results: { key: "TestBalance-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 7352.5904 - tps: 7199.32265 + dps: 7378.63642 + tps: 7220.62024 } } dps_results: { key: "TestBalance-Average-Default" value: { - dps: 7502.14308 - tps: 7351.09214 + dps: 7528.09996 + tps: 7372.06423 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-FullBuffs-LongMultiTarget" value: { - dps: 9278.4168 - tps: 11320.26772 + dps: 10412.96523 + tps: 12387.48056 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-FullBuffs-LongSingleTarget" value: { - dps: 7143.70653 - tps: 6986.84921 + dps: 7406.79365 + tps: 7246.05089 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-FullBuffs-ShortSingleTarget" value: { - dps: 8164.44663 - tps: 7625.48086 + dps: 8352.43749 + tps: 7807.3438 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-NoBuffs-LongMultiTarget" value: { - dps: 3972.13472 - tps: 4573.932 + dps: 5503.65011 + tps: 6124.83498 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-NoBuffs-LongSingleTarget" value: { - dps: 2635.85562 - tps: 2544.08612 + dps: 3065.61252 + tps: 2975.04423 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-NoBuffs-ShortSingleTarget" value: { - dps: 4944.10632 - tps: 4680.91075 + dps: 5113.7561 + tps: 4850.72603 } } dps_results: { key: "TestBalance-SwitchInFrontOfTarget-Default" value: { - dps: 7424.75219 - tps: 7302.87599 + dps: 7450.79822 + tps: 7324.17358 } } diff --git a/sim/druid/balance/balance.go b/sim/druid/balance/balance.go index 4301e546cb..f59a322163 100644 --- a/sim/druid/balance/balance.go +++ b/sim/druid/balance/balance.go @@ -28,16 +28,16 @@ func NewBalanceDruid(character core.Character, options *proto.Player) *BalanceDr balanceOptions := options.GetBalanceDruid() selfBuffs := druid.SelfBuffs{} - selfBuffs.InnervateTarget = &proto.RaidTarget{TargetIndex: -1} - if balanceOptions.Options.InnervateTarget != nil { - selfBuffs.InnervateTarget = balanceOptions.Options.InnervateTarget - } - moonkin := &BalanceDruid{ - Druid: druid.New(character, druid.Moonkin, selfBuffs, balanceOptions.Talents), + Druid: druid.New(character, druid.Moonkin, selfBuffs, options.TalentsString), Rotation: balanceOptions.Rotation, } + moonkin.SelfBuffs.InnervateTarget = &proto.RaidTarget{TargetIndex: -1} + if balanceOptions.Options.InnervateTarget != nil { + moonkin.SelfBuffs.InnervateTarget = balanceOptions.Options.InnervateTarget + } + moonkin.EnableResumeAfterManaWait(moonkin.tryUseGCD) return moonkin } diff --git a/sim/druid/balance/balance_test.go b/sim/druid/balance/balance_test.go index d10ca79590..debb87650b 100644 --- a/sim/druid/balance/balance_test.go +++ b/sim/druid/balance/balance_test.go @@ -18,11 +18,11 @@ func TestBalance(t *testing.T) { Race: proto.Race_RaceTauren, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Starfire", SpecOptions: PlayerOptionsAdaptive}, - Consumes: FullConsumes, - Glyphs: StandardGlyphs, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeDagger, diff --git a/sim/druid/balance/presets.go b/sim/druid/balance/presets.go index dc35d0ef31..5ae1dcf2b9 100644 --- a/sim/druid/balance/presets.go +++ b/sim/druid/balance/presets.go @@ -5,38 +5,7 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var StandardTalents = &proto.DruidTalents{ - StarlightWrath: 5, - Moonglow: 1, - NaturesMajesty: 2, - ImprovedMoonfire: 2, - NaturesGrace: 3, - NaturesSplendor: true, - NaturesReach: 2, - Vengeance: 5, - CelestialFocus: 3, - LunarGuidance: 3, - InsectSwarm: true, - ImprovedInsectSwarm: 2, - Moonfury: 3, - BalanceOfPower: 2, - MoonkinForm: true, - ImprovedMoonkinForm: 3, - ImprovedFaerieFire: 3, - WrathOfCenarius: 5, - Eclipse: 3, - Typhoon: true, - ForceOfNature: true, - GaleWinds: 2, - EarthAndMoon: 3, - Starfall: true, - ImprovedMarkOfTheWild: 2, - Furor: 5, - NaturalShapeshifter: 3, - MasterShapeshifter: 2, - OmenOfClarity: true, -} - +var StandardTalents = "5032003115331303213305311231--205003012" var StandardGlyphs = &proto.Glyphs{ Major1: int32(proto.DruidMajorGlyph_GlyphOfFocus), Major2: int32(proto.DruidMajorGlyph_GlyphOfInsectSwarm), @@ -54,7 +23,6 @@ var FullConsumes = &proto.Consumes{ var PlayerOptionsAdaptive = &proto.Player_BalanceDruid{ BalanceDruid: &proto.BalanceDruid{ - Talents: StandardTalents, Options: &proto.BalanceDruid_Options{ InnervateTarget: &proto.RaidTarget{TargetIndex: 0}, // self innervate }, @@ -66,7 +34,6 @@ var PlayerOptionsAdaptive = &proto.Player_BalanceDruid{ var PlayerOptionsAOE = &proto.Player_BalanceDruid{ BalanceDruid: &proto.BalanceDruid{ - Talents: StandardTalents, Options: &proto.BalanceDruid_Options{ InnervateTarget: &proto.RaidTarget{TargetIndex: 0}, // self innervate }, diff --git a/sim/druid/druid.go b/sim/druid/druid.go index 970a25fb21..f33a026d22 100644 --- a/sim/druid/druid.go +++ b/sim/druid/druid.go @@ -13,6 +13,8 @@ const ( SpellFlagOmenTrigger = core.SpellFlagAgentReserved2 ) +var TalentTreeSizes = [3]int{28, 30, 27} + type Druid struct { core.Character SelfBuffs @@ -256,14 +258,15 @@ func (druid *Druid) Reset(_ *core.Simulation) { druid.SolarICD.Timer.Reset() } -func New(char core.Character, form DruidForm, selfBuffs SelfBuffs, talents *proto.DruidTalents) *Druid { +func New(char core.Character, form DruidForm, selfBuffs SelfBuffs, talents string) *Druid { druid := &Druid{ Character: char, SelfBuffs: selfBuffs, - Talents: talents, + Talents: &proto.DruidTalents{}, StartingForm: form, form: form, } + core.FillTalentsProto(druid.Talents.ProtoReflect(), talents, TalentTreeSizes) druid.EnableManaBar() druid.AddStatDependency(stats.Strength, stats.AttackPower, 2) diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 1db98d4ff7..02d240925f 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -916,85 +916,85 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-FullBuffs-LongMultiTarget" value: { - dps: 6920.85926 - tps: 7831.83258 + dps: 7367.59999 + tps: 8414.8072 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-FullBuffs-LongSingleTarget" value: { - dps: 6920.85926 - tps: 7377.62663 + dps: 7367.59999 + tps: 7948.89968 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-FullBuffs-ShortSingleTarget" value: { - dps: 7768.15828 - tps: 7506.76295 + dps: 8294.03922 + tps: 7963.95289 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBuffs-LongMultiTarget" value: { - dps: 4295.65576 - tps: 5169.81153 + dps: 4627.44868 + tps: 5582.20955 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBuffs-LongSingleTarget" value: { - dps: 4295.65576 - tps: 4581.40873 + dps: 4627.44868 + tps: 4979.8136 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBuffs-ShortSingleTarget" value: { - dps: 4401.02633 - tps: 4169.81351 + dps: 4832.95054 + tps: 4555.94628 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-FlowerWeave-FullBuffs-LongMultiTarget" value: { - dps: 6603.62613 - tps: 6089.1708 + dps: 7114.81019 + tps: 6256.78502 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-FlowerWeave-FullBuffs-LongSingleTarget" value: { - dps: 6603.62613 - tps: 4815.34822 + dps: 7114.81019 + tps: 5195.30229 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-FlowerWeave-FullBuffs-ShortSingleTarget" value: { - dps: 7581.28286 - tps: 5486.33798 + dps: 8195.08347 + tps: 5913.50184 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-FlowerWeave-NoBuffs-LongMultiTarget" value: { - dps: 3982.5336 - tps: 3605.08471 + dps: 4397.10765 + tps: 3906.1222 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-FlowerWeave-NoBuffs-LongSingleTarget" value: { - dps: 3982.5336 - tps: 2893.73005 + dps: 4397.10765 + tps: 3206.3853 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-FlowerWeave-NoBuffs-ShortSingleTarget" value: { - dps: 4252.47194 - tps: 3073.20982 + dps: 4845.21135 + tps: 3510.8341 } } dps_results: { diff --git a/sim/druid/feral/feral.go b/sim/druid/feral/feral.go index 349f5e0f4b..0bba6de195 100644 --- a/sim/druid/feral/feral.go +++ b/sim/druid/feral/feral.go @@ -29,16 +29,16 @@ func NewFeralDruid(character core.Character, options *proto.Player) *FeralDruid feralOptions := options.GetFeralDruid() selfBuffs := druid.SelfBuffs{} - selfBuffs.InnervateTarget = &proto.RaidTarget{TargetIndex: -1} - if feralOptions.Options.InnervateTarget != nil { - selfBuffs.InnervateTarget = feralOptions.Options.InnervateTarget - } - cat := &FeralDruid{ - Druid: druid.New(character, druid.Cat, selfBuffs, feralOptions.Talents), + Druid: druid.New(character, druid.Cat, selfBuffs, options.TalentsString), latency: time.Duration(core.MaxInt32(feralOptions.Options.LatencyMs, 1)) * time.Millisecond, } + cat.SelfBuffs.InnervateTarget = &proto.RaidTarget{TargetIndex: -1} + if feralOptions.Options.InnervateTarget != nil { + cat.SelfBuffs.InnervateTarget = feralOptions.Options.InnervateTarget + } + cat.AssumeBleedActive = feralOptions.Options.AssumeBleedActive cat.maxRipTicks = cat.MaxRipTicks() cat.prepopOoc = feralOptions.Options.PrepopOoc diff --git a/sim/druid/feral/feral_test.go b/sim/druid/feral/feral_test.go index 0ce8856ebf..90cb2a5b88 100644 --- a/sim/druid/feral/feral_test.go +++ b/sim/druid/feral/feral_test.go @@ -18,14 +18,14 @@ func TestFeral(t *testing.T) { Race: proto.Race_RaceTauren, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsBearweaveLacerate}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "FlowerWeave", SpecOptions: PlayerOptionsMonoCatFlowerWeave}, }, - Consumes: FullConsumes, - Glyphs: StandardGlyphs, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeDagger, diff --git a/sim/druid/feral/presets.go b/sim/druid/feral/presets.go index 28d87e3e3e..9bce4aeb41 100644 --- a/sim/druid/feral/presets.go +++ b/sim/druid/feral/presets.go @@ -5,47 +5,16 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var StandardTalents = &proto.DruidTalents{ - Ferocity: 5, - FeralInstinct: 3, - SavageFury: 2, - FeralSwiftness: 2, - SurvivalInstincts: true, - SharpenedClaws: 3, - ShreddingAttacks: 2, - PredatoryStrikes: 3, - PrimalFury: 2, - PrimalPrecision: 2, - HeartOfTheWild: 5, - SurvivalOfTheFittest: 3, - LeaderOfThePack: true, - ImprovedLeaderOfThePack: 2, - ProtectorOfThePack: 2, - PredatoryInstincts: 3, - KingOfTheJungle: 3, - Mangle: true, - RendAndTear: 5, - PrimalGore: true, - Berserk: true, - ImprovedMarkOfTheWild: 2, - Furor: 5, - Naturalist: 5, - NaturalShapeshifter: 3, - MasterShapeshifter: 2, - OmenOfClarity: true, -} - +var StandardTalents = "-503202132322010053120230310511-205503012" var StandardGlyphs = &proto.Glyphs{ Major1: int32(proto.DruidMajorGlyph_GlyphOfRip), Major2: int32(proto.DruidMajorGlyph_GlyphOfShred), Major3: int32(proto.DruidMajorGlyph_GlyphOfBerserk), - Minor1: int32(proto.DruidMinorGlyph_GlyphOfTheWild), } var PlayerOptionsBearweaveLacerate = &proto.Player_FeralDruid{ FeralDruid: &proto.FeralDruid{ - Talents: StandardTalents, Options: &proto.FeralDruid_Options{ InnervateTarget: &proto.RaidTarget{TargetIndex: -1}, // no Innervate LatencyMs: 100, @@ -70,7 +39,6 @@ var PlayerOptionsBearweaveLacerate = &proto.Player_FeralDruid{ var PlayerOptionsMonoCatFlowerWeave = &proto.Player_FeralDruid{ FeralDruid: &proto.FeralDruid{ - Talents: StandardTalents, Options: &proto.FeralDruid_Options{ InnervateTarget: &proto.RaidTarget{TargetIndex: -1}, // no Innervate LatencyMs: 100, diff --git a/sim/druid/restoration/presets.go b/sim/druid/restoration/presets.go index d75ec0b675..cbec088840 100644 --- a/sim/druid/restoration/presets.go +++ b/sim/druid/restoration/presets.go @@ -5,38 +5,7 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var CelestialFocusTalents = &proto.DruidTalents{ - Genesis: 5, - Moonglow: 3, - NaturesMajesty: 2, - NaturesGrace: 3, - NaturesSplendor: true, - NaturesReach: 1, - CelestialFocus: 3, - - ImprovedMarkOfTheWild: 2, - NaturesFocus: 3, - Subtlety: 2, - NaturalShapeshifter: 3, - Intensity: 3, - OmenOfClarity: true, - MasterShapeshifter: 2, - TranquilSpirit: 1, - ImprovedRejuvenation: 3, - NaturesSwiftness: true, - GiftOfNature: 5, - EmpoweredTouch: 2, - NaturesBounty: 3, - LivingSpirit: 3, - Swiftmend: true, - EmpoweredRejuvenation: 5, - Revitalize: 3, - TreeOfLife: true, - ImprovedTreeOfLife: 3, - GiftOfTheEarthmother: 5, - WildGrowth: true, -} - +var StandardTalents = "05320031103--230023312131502331050313051" var StandardGlyphs = &proto.Glyphs{ Major1: int32(proto.DruidMajorGlyph_GlyphOfWildGrowth), Major2: int32(proto.DruidMajorGlyph_GlyphOfSwiftmend), @@ -53,7 +22,6 @@ var FullConsumes = &proto.Consumes{ var PlayerOptionsStandard = &proto.Player_RestorationDruid{ RestorationDruid: &proto.RestorationDruid{ - Talents: CelestialFocusTalents, Options: &proto.RestorationDruid_Options{ InnervateTarget: &proto.RaidTarget{TargetIndex: 0}, // self innervate }, diff --git a/sim/druid/restoration/restoration.go b/sim/druid/restoration/restoration.go index 7e105cce5a..f635e74c85 100644 --- a/sim/druid/restoration/restoration.go +++ b/sim/druid/restoration/restoration.go @@ -27,16 +27,16 @@ func NewRestorationDruid(character core.Character, options *proto.Player) *Resto restoOptions := options.GetRestorationDruid() selfBuffs := druid.SelfBuffs{} - selfBuffs.InnervateTarget = &proto.RaidTarget{TargetIndex: -1} - if restoOptions.Options.InnervateTarget != nil { - selfBuffs.InnervateTarget = restoOptions.Options.InnervateTarget - } - resto := &RestorationDruid{ - Druid: druid.New(character, druid.Tree, selfBuffs, restoOptions.Talents), + Druid: druid.New(character, druid.Tree, selfBuffs, options.TalentsString), Rotation: restoOptions.Rotation, } + resto.SelfBuffs.InnervateTarget = &proto.RaidTarget{TargetIndex: -1} + if restoOptions.Options.InnervateTarget != nil { + resto.SelfBuffs.InnervateTarget = restoOptions.Options.InnervateTarget + } + resto.EnableResumeAfterManaWait(resto.tryUseGCD) return resto } diff --git a/sim/druid/restoration/restoration_test.go b/sim/druid/restoration/restoration_test.go index 244a83a9a6..12781f07b1 100644 --- a/sim/druid/restoration/restoration_test.go +++ b/sim/druid/restoration/restoration_test.go @@ -18,11 +18,11 @@ func TestRestoration(t *testing.T) { Race: proto.Race_RaceTauren, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Standard", SpecOptions: PlayerOptionsStandard}, - Consumes: FullConsumes, - Glyphs: StandardGlyphs, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeDagger, diff --git a/sim/druid/tank/TestFeralTank.results b/sim/druid/tank/TestFeralTank.results index c748be812a..d54bcc2717 100644 --- a/sim/druid/tank/TestFeralTank.results +++ b/sim/druid/tank/TestFeralTank.results @@ -570,7 +570,7 @@ dps_results: { dps: 2496.44715 tps: 5186.42983 dtps: 2.18293 - hps: 21.32438 + hps: 22.80431 } } dps_results: { @@ -1032,8 +1032,8 @@ dps_results: { dps_results: { key: "TestFeralTank-Settings-Tauren-P1-Default-FullBuffs-LongMultiTarget" value: { - dps: 3183.08228 - tps: 6975.58528 + dps: 4261.86599 + tps: 9541.53937 dtps: 3.70915 } } @@ -1056,8 +1056,8 @@ dps_results: { dps_results: { key: "TestFeralTank-Settings-Tauren-P1-Default-NoBuffs-LongMultiTarget" value: { - dps: 1260.20231 - tps: 2970.0832 + dps: 1501.8413 + tps: 3570.84756 } } dps_results: { diff --git a/sim/druid/tank/presets.go b/sim/druid/tank/presets.go index 7f9f733322..a0e00de497 100644 --- a/sim/druid/tank/presets.go +++ b/sim/druid/tank/presets.go @@ -5,41 +5,15 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var StandardTalents = &proto.DruidTalents{ - Ferocity: 5, - FeralInstinct: 3, - SavageFury: 2, - ThickHide: 3, - FeralSwiftness: 2, - SurvivalInstincts: true, - SharpenedClaws: 3, - ShreddingAttacks: 2, - PredatoryStrikes: 3, - PrimalFury: 2, - PrimalPrecision: 2, - FeralCharge: true, - NaturalReaction: 3, - HeartOfTheWild: 5, - SurvivalOfTheFittest: 3, - LeaderOfThePack: true, - ImprovedLeaderOfThePack: 2, - ProtectorOfThePack: 3, - KingOfTheJungle: 3, - Mangle: true, - ImprovedMangle: 3, - RendAndTear: 5, - PrimalGore: true, - Berserk: true, - - ImprovedMarkOfTheWild: 2, - Furor: 3, - Naturalist: 5, - OmenOfClarity: true, +var StandardTalents = "-503232132322010353120300313511-20350001" +var StandardGlyphs = &proto.Glyphs{ + Major1: int32(proto.DruidMajorGlyph_GlyphOfMaul), + Major2: int32(proto.DruidMajorGlyph_GlyphOfSurvivalInstincts), + Major3: int32(proto.DruidMajorGlyph_GlyphOfFrenziedRegeneration), } var PlayerOptionsDefault = &proto.Player_FeralTankDruid{ FeralTankDruid: &proto.FeralTankDruid{ - Talents: StandardTalents, Options: &proto.FeralTankDruid_Options{ InnervateTarget: &proto.RaidTarget{TargetIndex: -1}, // no Innervate StartingRage: 20, diff --git a/sim/druid/tank/tank.go b/sim/druid/tank/tank.go index f40c24d4ce..992516964f 100644 --- a/sim/druid/tank/tank.go +++ b/sim/druid/tank/tank.go @@ -27,17 +27,17 @@ func NewFeralTankDruid(character core.Character, options *proto.Player) *FeralTa tankOptions := options.GetFeralTankDruid() selfBuffs := druid.SelfBuffs{} - selfBuffs.InnervateTarget = &proto.RaidTarget{TargetIndex: -1} - if tankOptions.Options.InnervateTarget != nil { - selfBuffs.InnervateTarget = tankOptions.Options.InnervateTarget - } - bear := &FeralTankDruid{ - Druid: druid.New(character, druid.Bear, selfBuffs, tankOptions.Talents), + Druid: druid.New(character, druid.Bear, selfBuffs, options.TalentsString), Rotation: tankOptions.Rotation, Options: tankOptions.Options, } + bear.SelfBuffs.InnervateTarget = &proto.RaidTarget{TargetIndex: -1} + if tankOptions.Options.InnervateTarget != nil { + bear.SelfBuffs.InnervateTarget = tankOptions.Options.InnervateTarget + } + rbo := core.RageBarOptions{ StartingRage: bear.Options.StartingRage, RageMultiplier: 1, diff --git a/sim/druid/tank/tank_test.go b/sim/druid/tank/tank_test.go index ade45c230a..cba8b557e7 100644 --- a/sim/druid/tank/tank_test.go +++ b/sim/druid/tank/tank_test.go @@ -18,9 +18,11 @@ func TestFeralTank(t *testing.T) { Race: proto.Race_RaceTauren, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsDefault}, - Consumes: FullConsumes, IsTank: true, InFrontOfTarget: true, diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results new file mode 100644 index 0000000000..5e1d0f7a67 --- /dev/null +++ b/sim/hunter/TestBM.results @@ -0,0 +1,915 @@ +character_stats_results: { + key: "TestBM-CharacterStats-Default" + value: { + final_stats: 358.6 + final_stats: 1746.8 + final_stats: 1453.65 + final_stats: 589.6 + final_stats: 276.1 + final_stats: 280 + final_stats: 109 + final_stats: 232 + final_stats: 1181.96121 + final_stats: 225 + final_stats: 0 + final_stats: 5684.14 + final_stats: 232 + final_stats: 1911.69325 + final_stats: 225 + final_stats: 68 + final_stats: 0 + final_stats: 13610 + final_stats: 0 + final_stats: 0 + final_stats: 13507.1 + final_stats: 5949.24 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 45.25 + final_stats: 0 + final_stats: 0 + final_stats: 22079.105 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 130 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +dps_results: { + key: "TestBM-AllItems-Ahn'KaharBloodHunter'sBattlegear" + value: { + dps: 6539.18358 + tps: 4580.09868 + } +} +dps_results: { + key: "TestBM-AllItems-Althor'sAbacus-50359" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-Althor'sAbacus-50366" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-AshtongueTalismanofSwiftness-32487" + value: { + dps: 6294.17015 + tps: 4203.52733 + } +} +dps_results: { + key: "TestBM-AllItems-AustereEarthsiegeDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-Bandit'sInsignia-40371" + value: { + dps: 6401.42657 + tps: 4298.59177 + } +} +dps_results: { + key: "TestBM-AllItems-BaubleofTrueBlood-50354" + value: { + dps: 6242.88865 + tps: 14472.18712 + } +} +dps_results: { + key: "TestBM-AllItems-BaubleofTrueBlood-50726" + value: { + dps: 6242.88865 + tps: 14472.18712 + } +} +dps_results: { + key: "TestBM-AllItems-BeamingEarthsiegeDiamond" + value: { + dps: 6344.14406 + tps: 4230.43189 + } +} +dps_results: { + key: "TestBM-AllItems-Beast-tamer'sShoulders-30892" + value: { + dps: 6202.60538 + tps: 4137.29459 + } +} +dps_results: { + key: "TestBM-AllItems-BlackBowoftheBetrayer-32336" + value: { + dps: 5938.0941 + tps: 3859.26746 + } +} +dps_results: { + key: "TestBM-AllItems-BlessedGarboftheUndeadSlayer" + value: { + dps: 5250.46683 + tps: 3486.82494 + } +} +dps_results: { + key: "TestBM-AllItems-BlessedRegaliaofUndeadCleansing" + value: { + dps: 5103.6766 + tps: 3384.05182 + } +} +dps_results: { + key: "TestBM-AllItems-BracingEarthsiegeDiamond" + value: { + dps: 6334.30747 + tps: 4137.73567 + } +} +dps_results: { + key: "TestBM-AllItems-ChaoticSkyflareDiamond" + value: { + dps: 6420.69586 + tps: 4307.00679 + } +} +dps_results: { + key: "TestBM-AllItems-CorpseTongueCoin-50349" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-CorpseTongueCoin-50352" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-CorrodedSkeletonKey-50356" + value: { + dps: 6242.63701 + tps: 4164.88351 + hps: 64 + } +} +dps_results: { + key: "TestBM-AllItems-CryptstalkerBattlegear" + value: { + dps: 5824.00048 + tps: 3858.03186 + } +} +dps_results: { + key: "TestBM-AllItems-DarkmoonCard:Berserker!-42989" + value: { + dps: 6306.25176 + tps: 4229.5932 + } +} +dps_results: { + key: "TestBM-AllItems-DarkmoonCard:Death-42990" + value: { + dps: 6368.6375 + tps: 4286.18944 + } +} +dps_results: { + key: "TestBM-AllItems-DarkmoonCard:Greatness-44255" + value: { + dps: 6403.46367 + tps: 4291.62925 + } +} +dps_results: { + key: "TestBM-AllItems-Death'sChoice-47464" + value: { + dps: 6564.57072 + tps: 4413.72601 + } +} +dps_results: { + key: "TestBM-AllItems-DeathKnight'sAnguish-38212" + value: { + dps: 6300.49459 + tps: 4222.62618 + } +} +dps_results: { + key: "TestBM-AllItems-Deathbringer'sWill-50362" + value: { + dps: 6544.18918 + tps: 4437.21028 + } +} +dps_results: { + key: "TestBM-AllItems-Deathbringer'sWill-50363" + value: { + dps: 6601.88375 + tps: 4492.86345 + } +} +dps_results: { + key: "TestBM-AllItems-Defender'sCode-40257" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-DestructiveSkyflareDiamond" + value: { + dps: 6342.75724 + tps: 4229.13417 + } +} +dps_results: { + key: "TestBM-AllItems-DislodgedForeignObject-50348" + value: { + dps: 6317.54555 + tps: 4250.09819 + } +} +dps_results: { + key: "TestBM-AllItems-DislodgedForeignObject-50353" + value: { + dps: 6289.01934 + tps: 4212.56621 + } +} +dps_results: { + key: "TestBM-AllItems-EffulgentSkyflareDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-EmberSkyflareDiamond" + value: { + dps: 6347.80021 + tps: 4233.04501 + } +} +dps_results: { + key: "TestBM-AllItems-EnigmaticSkyflareDiamond" + value: { + dps: 6337.77262 + tps: 4224.08355 + } +} +dps_results: { + key: "TestBM-AllItems-EnigmaticStarflareDiamond" + value: { + dps: 6342.83938 + tps: 4228.94505 + } +} +dps_results: { + key: "TestBM-AllItems-EphemeralSnowflake-50260" + value: { + dps: 6278.10577 + tps: 4213.10855 + } +} +dps_results: { + key: "TestBM-AllItems-EssenceofGossamer-37220" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-EternalEarthsiegeDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-ExtractofNecromanticPower-40373" + value: { + dps: 6340.44676 + tps: 4258.98398 + } +} +dps_results: { + key: "TestBM-AllItems-EyeoftheBroodmother-45308" + value: { + dps: 6304.69463 + tps: 4223.36098 + } +} +dps_results: { + key: "TestBM-AllItems-Figurine-SapphireOwl-42413" + value: { + dps: 6278.97218 + tps: 4195.85646 + } +} +dps_results: { + key: "TestBM-AllItems-ForethoughtTalisman-40258" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-ForgeEmber-37660" + value: { + dps: 6292.25771 + tps: 4209.43929 + } +} +dps_results: { + key: "TestBM-AllItems-ForlornSkyflareDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-ForlornStarflareDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-FuryoftheFiveFlights-40431" + value: { + dps: 6401.22442 + tps: 4282.63727 + } +} +dps_results: { + key: "TestBM-AllItems-FuturesightRune-38763" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-Gladiator'sPursuit" + value: { + dps: 6168.7724 + tps: 4236.743 + } +} +dps_results: { + key: "TestBM-AllItems-GlowingTwilightScale-54573" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-GlowingTwilightScale-54589" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-GnomishLightningGenerator-41121" + value: { + dps: 6346.2275 + tps: 4263.57181 + } +} +dps_results: { + key: "TestBM-AllItems-Gronnstalker'sArmor" + value: { + dps: 4872.66967 + tps: 3184.10021 + } +} +dps_results: { + key: "TestBM-AllItems-Heartpierce-49982" + value: { + dps: 6482.52226 + tps: 4353.69691 + } +} +dps_results: { + key: "TestBM-AllItems-Heartpierce-50641" + value: { + dps: 6483.55606 + tps: 4354.46647 + } +} +dps_results: { + key: "TestBM-AllItems-IllustrationoftheDragonSoul-40432" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-ImpassiveSkyflareDiamond" + value: { + dps: 6337.77262 + tps: 4224.08355 + } +} +dps_results: { + key: "TestBM-AllItems-ImpassiveStarflareDiamond" + value: { + dps: 6342.83938 + tps: 4228.94505 + } +} +dps_results: { + key: "TestBM-AllItems-IncisorFragment-37723" + value: { + dps: 6382.90365 + tps: 4285.71137 + } +} +dps_results: { + key: "TestBM-AllItems-InsightfulEarthsiegeDiamond" + value: { + dps: 6364.18568 + tps: 4254.20534 + } +} +dps_results: { + key: "TestBM-AllItems-InvigoratingEarthsiegeDiamond" + value: { + dps: 6356.11154 + tps: 4237.3223 + hps: 11.26034 + } +} +dps_results: { + key: "TestBM-AllItems-Lavanthor'sTalisman-37872" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-MajesticDragonFigurine-40430" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-MeteoriteWhetstone-37390" + value: { + dps: 6342.5183 + tps: 4256.95182 + } +} +dps_results: { + key: "TestBM-AllItems-NevermeltingIceCrystal-50259" + value: { + dps: 6353.02589 + tps: 4264.80046 + } +} +dps_results: { + key: "TestBM-AllItems-OfferingofSacrifice-37638" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-PersistentEarthshatterDiamond" + value: { + dps: 6351.62449 + tps: 4233.92907 + } +} +dps_results: { + key: "TestBM-AllItems-PersistentEarthsiegeDiamond" + value: { + dps: 6355.69908 + tps: 4236.94692 + } +} +dps_results: { + key: "TestBM-AllItems-PetrifiedTwilightScale-54571" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-PetrifiedTwilightScale-54591" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-PowerfulEarthshatterDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-PowerfulEarthsiegeDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-PurifiedShardoftheGods" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-ReignoftheDead-47316" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-ReignoftheDead-47477" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-RelentlessEarthsiegeDiamond" + value: { + dps: 6434.45072 + tps: 4317.91221 + } +} +dps_results: { + key: "TestBM-AllItems-RevitalizingSkyflareDiamond" + value: { + dps: 6340.82302 + tps: 4227.36672 + } +} +dps_results: { + key: "TestBM-AllItems-RuneofRepulsion-40372" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-ScourgestalkerBattlegear" + value: { + dps: 6275.12104 + tps: 4224.42049 + } +} +dps_results: { + key: "TestBM-AllItems-SealofthePantheon-36993" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-Shadowmourne-49623" + value: { + dps: 6623.8476 + tps: 4502.36872 + } +} +dps_results: { + key: "TestBM-AllItems-ShinyShardoftheGods" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-Sindragosa'sFlawlessFang-50361" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-SliverofPureIce-50339" + value: { + dps: 6262.27719 + tps: 4188.94619 + } +} +dps_results: { + key: "TestBM-AllItems-SliverofPureIce-50346" + value: { + dps: 6262.6597 + tps: 4189.91335 + } +} +dps_results: { + key: "TestBM-AllItems-SouloftheDead-40382" + value: { + dps: 6306.51706 + tps: 4225.19753 + } +} +dps_results: { + key: "TestBM-AllItems-SparkofHope-45703" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-SparkofLife-37657" + value: { + dps: 6246.26376 + tps: 4185.17408 + } +} +dps_results: { + key: "TestBM-AllItems-SphereofRedDragon'sBlood-37166" + value: { + dps: 6372.34625 + tps: 4240.97726 + } +} +dps_results: { + key: "TestBM-AllItems-StormshroudArmor" + value: { + dps: 4925.66244 + tps: 3212.02453 + } +} +dps_results: { + key: "TestBM-AllItems-SwiftSkyflareDiamond" + value: { + dps: 6355.69908 + tps: 4236.94692 + } +} +dps_results: { + key: "TestBM-AllItems-SwiftStarflareDiamond" + value: { + dps: 6351.62449 + tps: 4233.92907 + } +} +dps_results: { + key: "TestBM-AllItems-SwiftWindfireDiamond" + value: { + dps: 6344.49395 + tps: 4228.64782 + } +} +dps_results: { + key: "TestBM-AllItems-TalismanofTrollDivinity-37734" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-TearsoftheVanquished-47215" + value: { + dps: 6305.19263 + tps: 4214.70867 + } +} +dps_results: { + key: "TestBM-AllItems-TheFistsofFury" + value: { + dps: 6127.98422 + tps: 4080.64558 + } +} +dps_results: { + key: "TestBM-AllItems-TheGeneral'sHeart-45507" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-TheTwinBladesofAzzinoth" + value: { + dps: 6283.25786 + tps: 4199.47823 + } +} +dps_results: { + key: "TestBM-AllItems-ThunderingSkyflareDiamond" + value: { + dps: 6337.45482 + tps: 4231.30314 + } +} +dps_results: { + key: "TestBM-AllItems-TinyAbominationinaJar-50351" + value: { + dps: 6287.78207 + tps: 4178.8574 + } +} +dps_results: { + key: "TestBM-AllItems-TinyAbominationinaJar-50706" + value: { + dps: 6287.78207 + tps: 4178.8574 + } +} +dps_results: { + key: "TestBM-AllItems-TirelessSkyflareDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-TirelessStarflareDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-TomeofArcanePhenomena-36972" + value: { + dps: 6263.57397 + tps: 4195.30968 + } +} +dps_results: { + key: "TestBM-AllItems-TrenchantEarthshatterDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-TrenchantEarthsiegeDiamond" + value: { + dps: 6334.30747 + tps: 4221.10317 + } +} +dps_results: { + key: "TestBM-AllItems-UndeadSlayer'sBlessedArmor" + value: { + dps: 5197.67387 + tps: 3443.29903 + } +} +dps_results: { + key: "TestBM-AllItems-Val'anyr,HammerofAncientKings-46017" + value: { + dps: 6209.16502 + tps: 4153.36054 + } +} +dps_results: { + key: "TestBM-AllItems-Windrunner'sPursuit" + value: { + dps: 6311.6284 + tps: 4251.80707 + } +} +dps_results: { + key: "TestBM-AllItems-WingedTalisman-37844" + value: { + dps: 6242.63701 + tps: 4164.88351 + } +} +dps_results: { + key: "TestBM-AllItems-Zod'sRepeatingLongbow-50034" + value: { + dps: 6754.19606 + tps: 4668.27608 + } +} +dps_results: { + key: "TestBM-AllItems-Zod'sRepeatingLongbow-50638" + value: { + dps: 6928.30139 + tps: 4857.27256 + } +} +dps_results: { + key: "TestBM-Average-Default" + value: { + dps: 6364.14032 + tps: 4268.84905 + } +} +dps_results: { + key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-LongMultiTarget" + value: { + dps: 6904.19669 + tps: 5934.17706 + } +} +dps_results: { + key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-LongSingleTarget" + value: { + dps: 6331.82457 + tps: 4327.9373 + } +} +dps_results: { + key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-ShortSingleTarget" + value: { + dps: 7544.20457 + tps: 5077.80327 + } +} +dps_results: { + key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-LongMultiTarget" + value: { + dps: 3531.71334 + tps: 4387.78964 + } +} +dps_results: { + key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-LongSingleTarget" + value: { + dps: 3077.58764 + tps: 2423.07377 + } +} +dps_results: { + key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-ShortSingleTarget" + value: { + dps: 3612.47823 + tps: 2827.94613 + } +} +dps_results: { + key: "TestBM-Settings-Orc-P1-BM-FullBuffs-LongMultiTarget" + value: { + dps: 7012.38879 + tps: 5928.73462 + } +} +dps_results: { + key: "TestBM-Settings-Orc-P1-BM-FullBuffs-LongSingleTarget" + value: { + dps: 6434.45072 + tps: 4317.91221 + } +} +dps_results: { + key: "TestBM-Settings-Orc-P1-BM-FullBuffs-ShortSingleTarget" + value: { + dps: 7716.30481 + tps: 5104.72454 + } +} +dps_results: { + key: "TestBM-Settings-Orc-P1-BM-NoBuffs-LongMultiTarget" + value: { + dps: 3558.16116 + tps: 4377.10139 + } +} +dps_results: { + key: "TestBM-Settings-Orc-P1-BM-NoBuffs-LongSingleTarget" + value: { + dps: 3101.04604 + tps: 2410.45759 + } +} +dps_results: { + key: "TestBM-Settings-Orc-P1-BM-NoBuffs-ShortSingleTarget" + value: { + dps: 3669.01107 + tps: 2837.12906 + } +} +dps_results: { + key: "TestBM-SwitchInFrontOfTarget-Default" + value: { + dps: 6232.66285 + tps: 4304.53826 + } +} diff --git a/sim/hunter/TestHunter.results b/sim/hunter/TestHunter.results deleted file mode 100644 index a85b8144e9..0000000000 --- a/sim/hunter/TestHunter.results +++ /dev/null @@ -1,1167 +0,0 @@ -character_stats_results: { - key: "TestHunter-CharacterStats-Default" - value: { - final_stats: 358.6 - final_stats: 1816.672 - final_stats: 1453.65 - final_stats: 613.184 - final_stats: 276.1 - final_stats: 280 - final_stats: 109 - final_stats: 232 - final_stats: 1188.45766 - final_stats: 225 - final_stats: 0 - final_stats: 5760.9992 - final_stats: 330.37 - final_stats: 2179.73867 - final_stats: 225 - final_stats: 68 - final_stats: 0 - final_stats: 13963.76 - final_stats: 0 - final_stats: 0 - final_stats: 13646.844 - final_stats: 6052.0416 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 21860.5 - final_stats: 75 - final_stats: 75 - final_stats: 75 - final_stats: 75 - final_stats: 130 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -dps_results: { - key: "TestHunter-AllItems-Ahn'KaharBloodHunter'sBattlegear" - value: { - dps: 7512.44466 - tps: 6613.98186 - } -} -dps_results: { - key: "TestHunter-AllItems-Althor'sAbacus-50359" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-Althor'sAbacus-50366" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-AshtongueTalismanofSwiftness-32487" - value: { - dps: 6845.21303 - tps: 5927.64874 - } -} -dps_results: { - key: "TestHunter-AllItems-AustereEarthsiegeDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-Bandit'sInsignia-40371" - value: { - dps: 6959.25632 - tps: 6036.011 - } -} -dps_results: { - key: "TestHunter-AllItems-BaubleofTrueBlood-50354" - value: { - dps: 6791.97772 - tps: 15576.44902 - } -} -dps_results: { - key: "TestHunter-AllItems-BaubleofTrueBlood-50726" - value: { - dps: 6791.97772 - tps: 15576.44902 - } -} -dps_results: { - key: "TestHunter-AllItems-BeamingEarthsiegeDiamond" - value: { - dps: 6897.86728 - tps: 5971.53777 - } -} -dps_results: { - key: "TestHunter-AllItems-Beast-tamer'sShoulders-30892" - value: { - dps: 6829.61793 - tps: 5912.19627 - } -} -dps_results: { - key: "TestHunter-AllItems-BlackBowoftheBetrayer-32336" - value: { - dps: 6459.54171 - tps: 5548.09768 - } -} -dps_results: { - key: "TestHunter-AllItems-BlessedGarboftheUndeadSlayer" - value: { - dps: 5881.88932 - tps: 5076.74322 - } -} -dps_results: { - key: "TestHunter-AllItems-BlessedRegaliaofUndeadCleansing" - value: { - dps: 5667.29408 - tps: 4883.1795 - } -} -dps_results: { - key: "TestHunter-AllItems-BracingEarthsiegeDiamond" - value: { - dps: 6880.92882 - tps: 5836.99649 - } -} -dps_results: { - key: "TestHunter-AllItems-ChaoticSkyflareDiamond" - value: { - dps: 7040.90878 - tps: 6114.63422 - } -} -dps_results: { - key: "TestHunter-AllItems-CorpseTongueCoin-50349" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-CorpseTongueCoin-50352" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-CorrodedSkeletonKey-50356" - value: { - dps: 6792.08194 - tps: 5879.50705 - hps: 64 - } -} -dps_results: { - key: "TestHunter-AllItems-CryptstalkerBattlegear" - value: { - dps: 6483.1277 - tps: 5589.42625 - } -} -dps_results: { - key: "TestHunter-AllItems-DarkmoonCard:Berserker!-42989" - value: { - dps: 6893.06482 - tps: 5978.37197 - } -} -dps_results: { - key: "TestHunter-AllItems-DarkmoonCard:Death-42990" - value: { - dps: 6930.18161 - tps: 6015.50361 - } -} -dps_results: { - key: "TestHunter-AllItems-DarkmoonCard:Greatness-44255" - value: { - dps: 6988.00518 - tps: 6060.50178 - } -} -dps_results: { - key: "TestHunter-AllItems-Death'sChoice-47464" - value: { - dps: 7211.25948 - tps: 6268.55235 - } -} -dps_results: { - key: "TestHunter-AllItems-DeathKnight'sAnguish-38212" - value: { - dps: 6865.10919 - tps: 5952.3513 - } -} -dps_results: { - key: "TestHunter-AllItems-Deathbringer'sWill-50362" - value: { - dps: 7143.6124 - tps: 6216.75162 - } -} -dps_results: { - key: "TestHunter-AllItems-Deathbringer'sWill-50363" - value: { - dps: 7183.90268 - tps: 6255.60272 - } -} -dps_results: { - key: "TestHunter-AllItems-Defender'sCode-40257" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-DestructiveSkyflareDiamond" - value: { - dps: 6901.66511 - tps: 5975.39205 - } -} -dps_results: { - key: "TestHunter-AllItems-DislodgedForeignObject-50348" - value: { - dps: 6939.00997 - tps: 6025.20274 - } -} -dps_results: { - key: "TestHunter-AllItems-DislodgedForeignObject-50353" - value: { - dps: 6951.37683 - tps: 6041.9429 - } -} -dps_results: { - key: "TestHunter-AllItems-EffulgentSkyflareDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-EmberSkyflareDiamond" - value: { - dps: 6888.26234 - tps: 5961.58036 - } -} -dps_results: { - key: "TestHunter-AllItems-EnigmaticSkyflareDiamond" - value: { - dps: 6897.86728 - tps: 5971.59272 - } -} -dps_results: { - key: "TestHunter-AllItems-EnigmaticStarflareDiamond" - value: { - dps: 6898.93198 - tps: 5972.58747 - } -} -dps_results: { - key: "TestHunter-AllItems-EphemeralSnowflake-50260" - value: { - dps: 6868.07786 - tps: 5954.37827 - } -} -dps_results: { - key: "TestHunter-AllItems-EssenceofGossamer-37220" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-EternalEarthsiegeDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-ExtractofNecromanticPower-40373" - value: { - dps: 6938.16535 - tps: 6023.29158 - } -} -dps_results: { - key: "TestHunter-AllItems-EyeoftheBroodmother-45308" - value: { - dps: 6876.9483 - tps: 5962.25991 - } -} -dps_results: { - key: "TestHunter-AllItems-Figurine-SapphireOwl-42413" - value: { - dps: 6820.94609 - tps: 5905.87623 - } -} -dps_results: { - key: "TestHunter-AllItems-ForethoughtTalisman-40258" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-ForgeEmber-37660" - value: { - dps: 6856.46717 - tps: 5941.79216 - } -} -dps_results: { - key: "TestHunter-AllItems-ForlornSkyflareDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-ForlornStarflareDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-FuryoftheFiveFlights-40431" - value: { - dps: 6979.3665 - tps: 6049.08326 - } -} -dps_results: { - key: "TestHunter-AllItems-FuturesightRune-38763" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-Gladiator'sPursuit" - value: { - dps: 6984.05585 - tps: 6113.76816 - } -} -dps_results: { - key: "TestHunter-AllItems-GlowingTwilightScale-54573" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-GlowingTwilightScale-54589" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-GnomishLightningGenerator-41121" - value: { - dps: 6902.55777 - tps: 5987.98485 - } -} -dps_results: { - key: "TestHunter-AllItems-Gronnstalker'sArmor" - value: { - dps: 5332.56306 - tps: 4570.06025 - } -} -dps_results: { - key: "TestHunter-AllItems-Heartpierce-49982" - value: { - dps: 7113.38239 - tps: 6180.57565 - } -} -dps_results: { - key: "TestHunter-AllItems-Heartpierce-50641" - value: { - dps: 7114.60681 - tps: 6181.68614 - } -} -dps_results: { - key: "TestHunter-AllItems-IllustrationoftheDragonSoul-40432" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-ImpassiveSkyflareDiamond" - value: { - dps: 6897.86728 - tps: 5971.59272 - } -} -dps_results: { - key: "TestHunter-AllItems-ImpassiveStarflareDiamond" - value: { - dps: 6898.93198 - tps: 5972.58747 - } -} -dps_results: { - key: "TestHunter-AllItems-IncisorFragment-37723" - value: { - dps: 6948.27925 - tps: 6027.29849 - } -} -dps_results: { - key: "TestHunter-AllItems-InsightfulEarthsiegeDiamond" - value: { - dps: 6895.29075 - tps: 5975.36413 - } -} -dps_results: { - key: "TestHunter-AllItems-InvigoratingEarthsiegeDiamond" - value: { - dps: 6903.42499 - tps: 5975.09739 - hps: 11.22172 - } -} -dps_results: { - key: "TestHunter-AllItems-Lavanthor'sTalisman-37872" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-MajesticDragonFigurine-40430" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-MeteoriteWhetstone-37390" - value: { - dps: 6917.70263 - tps: 5999.30309 - } -} -dps_results: { - key: "TestHunter-AllItems-NevermeltingIceCrystal-50259" - value: { - dps: 6947.66034 - tps: 6034.02267 - } -} -dps_results: { - key: "TestHunter-AllItems-OfferingofSacrifice-37638" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-PersistentEarthshatterDiamond" - value: { - dps: 6901.2485 - tps: 5973.36453 - } -} -dps_results: { - key: "TestHunter-AllItems-PersistentEarthsiegeDiamond" - value: { - dps: 6906.02961 - tps: 5977.69004 - } -} -dps_results: { - key: "TestHunter-AllItems-PetrifiedTwilightScale-54571" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-PetrifiedTwilightScale-54591" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-PowerfulEarthshatterDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-PowerfulEarthsiegeDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-PurifiedShardoftheGods" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-ReignoftheDead-47316" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-ReignoftheDead-47477" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-RelentlessEarthsiegeDiamond" - value: { - dps: 7056.44711 - tps: 6128.93775 - } -} -dps_results: { - key: "TestHunter-AllItems-RevitalizingSkyflareDiamond" - value: { - dps: 6880.92882 - tps: 5954.7386 - } -} -dps_results: { - key: "TestHunter-AllItems-RuneofRepulsion-40372" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-ScourgestalkerBattlegear" - value: { - dps: 6831.50745 - tps: 5938.98763 - } -} -dps_results: { - key: "TestHunter-AllItems-SealofthePantheon-36993" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-Shadowmourne-49623" - value: { - dps: 7287.0168 - tps: 6357.94134 - } -} -dps_results: { - key: "TestHunter-AllItems-ShinyShardoftheGods" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-Sindragosa'sFlawlessFang-50361" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-SliverofPureIce-50339" - value: { - dps: 6792.08194 - tps: 5884.70193 - } -} -dps_results: { - key: "TestHunter-AllItems-SliverofPureIce-50346" - value: { - dps: 6792.08194 - tps: 5885.28014 - } -} -dps_results: { - key: "TestHunter-AllItems-SouloftheDead-40382" - value: { - dps: 6879.459 - tps: 5964.75704 - } -} -dps_results: { - key: "TestHunter-AllItems-SparkofHope-45703" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-SparkofLife-37657" - value: { - dps: 6849.5508 - tps: 5937.09219 - } -} -dps_results: { - key: "TestHunter-AllItems-SphereofRedDragon'sBlood-37166" - value: { - dps: 6884.85539 - tps: 5962.66584 - } -} -dps_results: { - key: "TestHunter-AllItems-StormshroudArmor" - value: { - dps: 5543.46136 - tps: 4769.59634 - } -} -dps_results: { - key: "TestHunter-AllItems-SwiftSkyflareDiamond" - value: { - dps: 6906.02961 - tps: 5977.69004 - } -} -dps_results: { - key: "TestHunter-AllItems-SwiftStarflareDiamond" - value: { - dps: 6901.2485 - tps: 5973.36453 - } -} -dps_results: { - key: "TestHunter-AllItems-SwiftWindfireDiamond" - value: { - dps: 6892.88157 - tps: 5965.79489 - } -} -dps_results: { - key: "TestHunter-AllItems-TalismanofTrollDivinity-37734" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-TearsoftheVanquished-47215" - value: { - dps: 6849.80558 - tps: 5931.45612 - } -} -dps_results: { - key: "TestHunter-AllItems-TheFistsofFury" - value: { - dps: 6710.73727 - tps: 5802.67485 - } -} -dps_results: { - key: "TestHunter-AllItems-TheGeneral'sHeart-45507" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-TheTwinBladesofAzzinoth" - value: { - dps: 6840.33819 - tps: 5930.66594 - } -} -dps_results: { - key: "TestHunter-AllItems-ThunderingSkyflareDiamond" - value: { - dps: 6910.26347 - tps: 5974.14749 - } -} -dps_results: { - key: "TestHunter-AllItems-TinyAbominationinaJar-50351" - value: { - dps: 6792.32412 - tps: 5879.74924 - } -} -dps_results: { - key: "TestHunter-AllItems-TinyAbominationinaJar-50706" - value: { - dps: 6792.32412 - tps: 5879.74924 - } -} -dps_results: { - key: "TestHunter-AllItems-TirelessSkyflareDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-TirelessStarflareDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-TomeofArcanePhenomena-36972" - value: { - dps: 6828.71554 - tps: 5917.24779 - } -} -dps_results: { - key: "TestHunter-AllItems-TrenchantEarthshatterDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-TrenchantEarthsiegeDiamond" - value: { - dps: 6880.92882 - tps: 5954.98112 - } -} -dps_results: { - key: "TestHunter-AllItems-UndeadSlayer'sBlessedArmor" - value: { - dps: 5859.14828 - tps: 5061.62904 - } -} -dps_results: { - key: "TestHunter-AllItems-Val'anyr,HammerofAncientKings-46017" - value: { - dps: 6740.57813 - tps: 5833.98169 - } -} -dps_results: { - key: "TestHunter-AllItems-Windrunner'sPursuit" - value: { - dps: 6952.58445 - tps: 6044.3092 - } -} -dps_results: { - key: "TestHunter-AllItems-WingedTalisman-37844" - value: { - dps: 6792.08194 - tps: 5879.50705 - } -} -dps_results: { - key: "TestHunter-AllItems-Zod'sRepeatingLongbow-50034" - value: { - dps: 7547.08568 - tps: 6627.78846 - } -} -dps_results: { - key: "TestHunter-AllItems-Zod'sRepeatingLongbow-50638" - value: { - dps: 7745.36956 - tps: 6826.65943 - } -} -dps_results: { - key: "TestHunter-Average-Default" - value: { - dps: 7040.53696 - tps: 6118.68879 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-AOE-FullBuffs-LongMultiTarget" - value: { - dps: 16813.14269 - tps: 17029.90619 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-AOE-FullBuffs-LongSingleTarget" - value: { - dps: 6951.16131 - tps: 5965.82593 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-AOE-FullBuffs-ShortSingleTarget" - value: { - dps: 7723.81099 - tps: 6601.17948 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-AOE-NoBuffs-LongMultiTarget" - value: { - dps: 9693.06774 - tps: 10690.42037 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-AOE-NoBuffs-LongSingleTarget" - value: { - dps: 3533.94132 - tps: 3206.10273 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-AOE-NoBuffs-ShortSingleTarget" - value: { - dps: 4092.75133 - tps: 3695.44351 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-BM-FullBuffs-LongMultiTarget" - value: { - dps: 6257.28766 - tps: 5008.60809 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-BM-FullBuffs-LongSingleTarget" - value: { - dps: 6257.28766 - tps: 4023.91268 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-BM-FullBuffs-ShortSingleTarget" - value: { - dps: 7419.70139 - tps: 4730.55874 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-BM-NoBuffs-LongMultiTarget" - value: { - dps: 3005.9684 - tps: 3734.65648 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-BM-NoBuffs-LongSingleTarget" - value: { - dps: 3005.9684 - tps: 2236.97447 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-BM-NoBuffs-ShortSingleTarget" - value: { - dps: 3584.69126 - tps: 2667.87748 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-Marksman-FullBuffs-LongMultiTarget" - value: { - dps: 6724.69304 - tps: 6904.85121 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-Marksman-FullBuffs-LongSingleTarget" - value: { - dps: 6724.69304 - tps: 5845.40173 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-Marksman-FullBuffs-ShortSingleTarget" - value: { - dps: 7636.25542 - tps: 6621.76365 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-Marksman-NoBuffs-LongMultiTarget" - value: { - dps: 3484.36598 - tps: 4622.52477 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-Marksman-NoBuffs-LongSingleTarget" - value: { - dps: 3484.36598 - tps: 3177.44963 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-Marksman-NoBuffs-ShortSingleTarget" - value: { - dps: 4200.70784 - tps: 3811.19947 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-SV-FullBuffs-LongMultiTarget" - value: { - dps: 6897.75755 - tps: 7090.59624 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-SV-FullBuffs-LongSingleTarget" - value: { - dps: 6897.75755 - tps: 5897.70164 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-SV-FullBuffs-ShortSingleTarget" - value: { - dps: 7676.14797 - tps: 6535.69624 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-SV-NoBuffs-LongMultiTarget" - value: { - dps: 3489.43542 - tps: 4571.31915 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-SV-NoBuffs-LongSingleTarget" - value: { - dps: 3489.43542 - tps: 3166.31872 - } -} -dps_results: { - key: "TestHunter-Settings-Dwarf-P1-SV-NoBuffs-ShortSingleTarget" - value: { - dps: 4070.3518 - tps: 3673.37596 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-AOE-FullBuffs-LongMultiTarget" - value: { - dps: 16908.52839 - tps: 17062.7415 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-AOE-FullBuffs-LongSingleTarget" - value: { - dps: 6995.18422 - tps: 5954.89012 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-AOE-FullBuffs-ShortSingleTarget" - value: { - dps: 7806.10781 - tps: 6616.87587 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-AOE-NoBuffs-LongMultiTarget" - value: { - dps: 9731.23007 - tps: 10706.45081 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-AOE-NoBuffs-LongSingleTarget" - value: { - dps: 3536.8039 - tps: 3189.20321 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-AOE-NoBuffs-ShortSingleTarget" - value: { - dps: 4120.82807 - tps: 3700.29151 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-BM-FullBuffs-LongMultiTarget" - value: { - dps: 6363.98953 - tps: 4997.67446 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-BM-FullBuffs-LongSingleTarget" - value: { - dps: 6363.98953 - tps: 4012.92588 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-BM-FullBuffs-ShortSingleTarget" - value: { - dps: 7602.25667 - tps: 4754.2048 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-BM-NoBuffs-LongMultiTarget" - value: { - dps: 3058.34479 - tps: 3739.48629 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-BM-NoBuffs-LongSingleTarget" - value: { - dps: 3058.34479 - tps: 2239.10554 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-BM-NoBuffs-ShortSingleTarget" - value: { - dps: 3648.63932 - tps: 2676.1749 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-Marksman-FullBuffs-LongMultiTarget" - value: { - dps: 6744.78693 - tps: 6876.80955 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-Marksman-FullBuffs-LongSingleTarget" - value: { - dps: 6744.78693 - tps: 5817.25079 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-Marksman-FullBuffs-ShortSingleTarget" - value: { - dps: 7720.95965 - tps: 6647.81634 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-Marksman-NoBuffs-LongMultiTarget" - value: { - dps: 3491.84975 - tps: 4606.12889 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-Marksman-NoBuffs-LongSingleTarget" - value: { - dps: 3491.84975 - tps: 3165.3782 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-Marksman-NoBuffs-ShortSingleTarget" - value: { - dps: 4227.18053 - tps: 3814.09815 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-SV-FullBuffs-LongMultiTarget" - value: { - dps: 6948.32065 - tps: 7080.68605 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-SV-FullBuffs-LongSingleTarget" - value: { - dps: 6948.32065 - tps: 5891.53563 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-SV-FullBuffs-ShortSingleTarget" - value: { - dps: 7772.69351 - tps: 6564.96103 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-SV-NoBuffs-LongMultiTarget" - value: { - dps: 3507.21385 - tps: 4570.60872 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-SV-NoBuffs-LongSingleTarget" - value: { - dps: 3507.21385 - tps: 3163.5371 - } -} -dps_results: { - key: "TestHunter-Settings-Orc-P1-SV-NoBuffs-ShortSingleTarget" - value: { - dps: 4091.96575 - tps: 3671.19798 - } -} -dps_results: { - key: "TestHunter-SwitchInFrontOfTarget-Default" - value: { - dps: 7029.67581 - tps: 6156.11336 - } -} diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results new file mode 100644 index 0000000000..f5bd7bfe54 --- /dev/null +++ b/sim/hunter/TestMM.results @@ -0,0 +1,915 @@ +character_stats_results: { + key: "TestMM-CharacterStats-Default" + value: { + final_stats: 358.6 + final_stats: 1816.672 + final_stats: 1453.65 + final_stats: 613.184 + final_stats: 276.1 + final_stats: 280 + final_stats: 109 + final_stats: 232 + final_stats: 1188.45766 + final_stats: 225 + final_stats: 0 + final_stats: 5760.9992 + final_stats: 330.37 + final_stats: 2179.73867 + final_stats: 225 + final_stats: 68 + final_stats: 0 + final_stats: 13963.76 + final_stats: 0 + final_stats: 0 + final_stats: 13646.844 + final_stats: 6052.0416 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 21860.5 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 130 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +dps_results: { + key: "TestMM-AllItems-Ahn'KaharBloodHunter'sBattlegear" + value: { + dps: 7627.45471 + tps: 6726.45425 + } +} +dps_results: { + key: "TestMM-AllItems-Althor'sAbacus-50359" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-Althor'sAbacus-50366" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-AshtongueTalismanofSwiftness-32487" + value: { + dps: 7005.03858 + tps: 6083.26087 + } +} +dps_results: { + key: "TestMM-AllItems-AustereEarthsiegeDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-Bandit'sInsignia-40371" + value: { + dps: 7129.22141 + tps: 6201.44857 + } +} +dps_results: { + key: "TestMM-AllItems-BaubleofTrueBlood-50354" + value: { + dps: 6952.0244 + tps: 15814.83448 + } +} +dps_results: { + key: "TestMM-AllItems-BaubleofTrueBlood-50726" + value: { + dps: 6952.0244 + tps: 15814.83448 + } +} +dps_results: { + key: "TestMM-AllItems-BeamingEarthsiegeDiamond" + value: { + dps: 7057.19811 + tps: 6127.38094 + } +} +dps_results: { + key: "TestMM-AllItems-Beast-tamer'sShoulders-30892" + value: { + dps: 6992.21584 + tps: 6080.82602 + } +} +dps_results: { + key: "TestMM-AllItems-BlackBowoftheBetrayer-32336" + value: { + dps: 6612.23276 + tps: 5694.10159 + } +} +dps_results: { + key: "TestMM-AllItems-BlessedGarboftheUndeadSlayer" + value: { + dps: 6075.84067 + tps: 5277.24074 + } +} +dps_results: { + key: "TestMM-AllItems-BlessedRegaliaofUndeadCleansing" + value: { + dps: 5819.14468 + tps: 5035.60781 + } +} +dps_results: { + key: "TestMM-AllItems-BracingEarthsiegeDiamond" + value: { + dps: 7037.23272 + tps: 5985.97791 + } +} +dps_results: { + key: "TestMM-AllItems-ChaoticSkyflareDiamond" + value: { + dps: 7203.72397 + tps: 6273.96994 + } +} +dps_results: { + key: "TestMM-AllItems-CorpseTongueCoin-50349" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-CorpseTongueCoin-50352" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-CorrodedSkeletonKey-50356" + value: { + dps: 6951.95958 + tps: 6035.09012 + hps: 64 + } +} +dps_results: { + key: "TestMM-AllItems-CryptstalkerBattlegear" + value: { + dps: 6578.90564 + tps: 5679.98981 + } +} +dps_results: { + key: "TestMM-AllItems-DarkmoonCard:Berserker!-42989" + value: { + dps: 7062.81701 + tps: 6144.38443 + } +} +dps_results: { + key: "TestMM-AllItems-DarkmoonCard:Death-42990" + value: { + dps: 7114.33825 + tps: 6195.87301 + } +} +dps_results: { + key: "TestMM-AllItems-DarkmoonCard:Greatness-44255" + value: { + dps: 7147.47878 + tps: 6217.31557 + } +} +dps_results: { + key: "TestMM-AllItems-Death'sChoice-47464" + value: { + dps: 7366.76786 + tps: 6422.15724 + } +} +dps_results: { + key: "TestMM-AllItems-DeathKnight'sAnguish-38212" + value: { + dps: 7040.00426 + tps: 6121.6759 + } +} +dps_results: { + key: "TestMM-AllItems-Deathbringer'sWill-50362" + value: { + dps: 7329.8439 + tps: 6400.05311 + } +} +dps_results: { + key: "TestMM-AllItems-Deathbringer'sWill-50363" + value: { + dps: 7375.60723 + tps: 6444.00474 + } +} +dps_results: { + key: "TestMM-AllItems-Defender'sCode-40257" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-DestructiveSkyflareDiamond" + value: { + dps: 7061.07865 + tps: 6131.33258 + } +} +dps_results: { + key: "TestMM-AllItems-DislodgedForeignObject-50348" + value: { + dps: 7109.14758 + tps: 6200.96537 + } +} +dps_results: { + key: "TestMM-AllItems-DislodgedForeignObject-50353" + value: { + dps: 7080.61694 + tps: 6169.56636 + } +} +dps_results: { + key: "TestMM-AllItems-EffulgentSkyflareDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-EmberSkyflareDiamond" + value: { + dps: 7044.82508 + tps: 6113.79555 + } +} +dps_results: { + key: "TestMM-AllItems-EnigmaticSkyflareDiamond" + value: { + dps: 7057.14462 + tps: 6127.39059 + } +} +dps_results: { + key: "TestMM-AllItems-EnigmaticStarflareDiamond" + value: { + dps: 7054.90615 + tps: 6125.15213 + } +} +dps_results: { + key: "TestMM-AllItems-EphemeralSnowflake-50260" + value: { + dps: 7057.50074 + tps: 6145.69799 + } +} +dps_results: { + key: "TestMM-AllItems-EssenceofGossamer-37220" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-EternalEarthsiegeDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-ExtractofNecromanticPower-40373" + value: { + dps: 7118.75361 + tps: 6200.31068 + } +} +dps_results: { + key: "TestMM-AllItems-EyeoftheBroodmother-45308" + value: { + dps: 7048.78047 + tps: 6130.37418 + } +} +dps_results: { + key: "TestMM-AllItems-Figurine-SapphireOwl-42413" + value: { + dps: 6982.12758 + tps: 6062.53488 + } +} +dps_results: { + key: "TestMM-AllItems-ForethoughtTalisman-40258" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-ForgeEmber-37660" + value: { + dps: 7021.45187 + tps: 6103.42963 + } +} +dps_results: { + key: "TestMM-AllItems-ForlornSkyflareDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-ForlornStarflareDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-FuryoftheFiveFlights-40431" + value: { + dps: 7141.46479 + tps: 6206.77544 + } +} +dps_results: { + key: "TestMM-AllItems-FuturesightRune-38763" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-Gladiator'sPursuit" + value: { + dps: 7173.05348 + tps: 6302.35356 + } +} +dps_results: { + key: "TestMM-AllItems-GlowingTwilightScale-54573" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-GlowingTwilightScale-54589" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-GnomishLightningGenerator-41121" + value: { + dps: 7088.61033 + tps: 6170.19676 + } +} +dps_results: { + key: "TestMM-AllItems-Gronnstalker'sArmor" + value: { + dps: 5477.67345 + tps: 4708.4597 + } +} +dps_results: { + key: "TestMM-AllItems-Heartpierce-49982" + value: { + dps: 7270.2675 + tps: 6333.82439 + } +} +dps_results: { + key: "TestMM-AllItems-Heartpierce-50641" + value: { + dps: 7271.50447 + tps: 6334.94697 + } +} +dps_results: { + key: "TestMM-AllItems-IllustrationoftheDragonSoul-40432" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-ImpassiveSkyflareDiamond" + value: { + dps: 7057.14462 + tps: 6127.39059 + } +} +dps_results: { + key: "TestMM-AllItems-ImpassiveStarflareDiamond" + value: { + dps: 7054.90615 + tps: 6125.15213 + } +} +dps_results: { + key: "TestMM-AllItems-IncisorFragment-37723" + value: { + dps: 7106.76032 + tps: 6181.4334 + } +} +dps_results: { + key: "TestMM-AllItems-InsightfulEarthsiegeDiamond" + value: { + dps: 7052.7901 + tps: 6128.47652 + } +} +dps_results: { + key: "TestMM-AllItems-InvigoratingEarthsiegeDiamond" + value: { + dps: 7063.1458 + tps: 6130.52647 + hps: 11.22172 + } +} +dps_results: { + key: "TestMM-AllItems-Lavanthor'sTalisman-37872" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-MajesticDragonFigurine-40430" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-MeteoriteWhetstone-37390" + value: { + dps: 7095.92576 + tps: 6187.76877 + } +} +dps_results: { + key: "TestMM-AllItems-NevermeltingIceCrystal-50259" + value: { + dps: 7124.22299 + tps: 6207.60442 + } +} +dps_results: { + key: "TestMM-AllItems-OfferingofSacrifice-37638" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-PersistentEarthshatterDiamond" + value: { + dps: 7057.7688 + tps: 6125.57109 + } +} +dps_results: { + key: "TestMM-AllItems-PersistentEarthsiegeDiamond" + value: { + dps: 7062.60082 + tps: 6129.94528 + } +} +dps_results: { + key: "TestMM-AllItems-PetrifiedTwilightScale-54571" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-PetrifiedTwilightScale-54591" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-PowerfulEarthshatterDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-PowerfulEarthsiegeDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-PurifiedShardoftheGods" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-ReignoftheDead-47316" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-ReignoftheDead-47477" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-RelentlessEarthsiegeDiamond" + value: { + dps: 7212.74802 + tps: 6281.62434 + } +} +dps_results: { + key: "TestMM-AllItems-RevitalizingSkyflareDiamond" + value: { + dps: 7037.77178 + tps: 6107.22995 + } +} +dps_results: { + key: "TestMM-AllItems-RuneofRepulsion-40372" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-ScourgestalkerBattlegear" + value: { + dps: 6956.08595 + tps: 6071.79274 + } +} +dps_results: { + key: "TestMM-AllItems-SealofthePantheon-36993" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-Shadowmourne-49623" + value: { + dps: 7463.95297 + tps: 6531.91489 + } +} +dps_results: { + key: "TestMM-AllItems-ShinyShardoftheGods" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-Sindragosa'sFlawlessFang-50361" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-SliverofPureIce-50339" + value: { + dps: 6952.92223 + tps: 6041.28034 + } +} +dps_results: { + key: "TestMM-AllItems-SliverofPureIce-50346" + value: { + dps: 6952.92223 + tps: 6041.8752 + } +} +dps_results: { + key: "TestMM-AllItems-SouloftheDead-40382" + value: { + dps: 7054.50206 + tps: 6136.16352 + } +} +dps_results: { + key: "TestMM-AllItems-SparkofHope-45703" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-SparkofLife-37657" + value: { + dps: 6996.21111 + tps: 6088.53033 + } +} +dps_results: { + key: "TestMM-AllItems-SphereofRedDragon'sBlood-37166" + value: { + dps: 7049.03024 + tps: 6122.44297 + } +} +dps_results: { + key: "TestMM-AllItems-StormshroudArmor" + value: { + dps: 5686.17268 + tps: 4905.20161 + } +} +dps_results: { + key: "TestMM-AllItems-SwiftSkyflareDiamond" + value: { + dps: 7062.60082 + tps: 6129.94528 + } +} +dps_results: { + key: "TestMM-AllItems-SwiftStarflareDiamond" + value: { + dps: 7057.7688 + tps: 6125.57109 + } +} +dps_results: { + key: "TestMM-AllItems-SwiftWindfireDiamond" + value: { + dps: 7049.31277 + tps: 6117.91627 + } +} +dps_results: { + key: "TestMM-AllItems-TalismanofTrollDivinity-37734" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-TearsoftheVanquished-47215" + value: { + dps: 7011.32872 + tps: 6088.53929 + } +} +dps_results: { + key: "TestMM-AllItems-TheFistsofFury" + value: { + dps: 6880.41865 + tps: 5968.27971 + } +} +dps_results: { + key: "TestMM-AllItems-TheGeneral'sHeart-45507" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-TheTwinBladesofAzzinoth" + value: { + dps: 7014.17912 + tps: 6099.61935 + } +} +dps_results: { + key: "TestMM-AllItems-ThunderingSkyflareDiamond" + value: { + dps: 7079.04922 + tps: 6152.46596 + } +} +dps_results: { + key: "TestMM-AllItems-TinyAbominationinaJar-50351" + value: { + dps: 6952.21175 + tps: 6035.34229 + } +} +dps_results: { + key: "TestMM-AllItems-TinyAbominationinaJar-50706" + value: { + dps: 6952.21175 + tps: 6035.34229 + } +} +dps_results: { + key: "TestMM-AllItems-TirelessSkyflareDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-TirelessStarflareDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-TomeofArcanePhenomena-36972" + value: { + dps: 7017.6378 + tps: 6107.79672 + } +} +dps_results: { + key: "TestMM-AllItems-TrenchantEarthshatterDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-TrenchantEarthsiegeDiamond" + value: { + dps: 7037.23272 + tps: 6106.98082 + } +} +dps_results: { + key: "TestMM-AllItems-UndeadSlayer'sBlessedArmor" + value: { + dps: 6014.0865 + tps: 5218.96941 + } +} +dps_results: { + key: "TestMM-AllItems-Val'anyr,HammerofAncientKings-46017" + value: { + dps: 6916.83526 + tps: 6007.24414 + } +} +dps_results: { + key: "TestMM-AllItems-Windrunner'sPursuit" + value: { + dps: 7094.90741 + tps: 6187.96237 + } +} +dps_results: { + key: "TestMM-AllItems-WingedTalisman-37844" + value: { + dps: 6951.95958 + tps: 6035.09012 + } +} +dps_results: { + key: "TestMM-AllItems-Zod'sRepeatingLongbow-50034" + value: { + dps: 7700.11416 + tps: 6781.6111 + } +} +dps_results: { + key: "TestMM-AllItems-Zod'sRepeatingLongbow-50638" + value: { + dps: 7903.80012 + tps: 6990.37047 + } +} +dps_results: { + key: "TestMM-Average-Default" + value: { + dps: 7219.15056 + tps: 6298.15421 + } +} +dps_results: { + key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-LongMultiTarget" + value: { + dps: 7177.16885 + tps: 7375.99732 + } +} +dps_results: { + key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-LongSingleTarget" + value: { + dps: 7177.16885 + tps: 6296.27211 + } +} +dps_results: { + key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-ShortSingleTarget" + value: { + dps: 8207.63751 + tps: 7198.49028 + } +} +dps_results: { + key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-LongMultiTarget" + value: { + dps: 3545.7234 + tps: 4793.8387 + } +} +dps_results: { + key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-LongSingleTarget" + value: { + dps: 3545.7234 + tps: 3278.74339 + } +} +dps_results: { + key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-ShortSingleTarget" + value: { + dps: 4324.20847 + tps: 3969.10983 + } +} +dps_results: { + key: "TestMM-Settings-Orc-P1-MM-FullBuffs-LongMultiTarget" + value: { + dps: 7212.74802 + tps: 7361.49698 + } +} +dps_results: { + key: "TestMM-Settings-Orc-P1-MM-FullBuffs-LongSingleTarget" + value: { + dps: 7212.74802 + tps: 6281.62434 + } +} +dps_results: { + key: "TestMM-Settings-Orc-P1-MM-FullBuffs-ShortSingleTarget" + value: { + dps: 8294.22125 + tps: 7225.44878 + } +} +dps_results: { + key: "TestMM-Settings-Orc-P1-MM-NoBuffs-LongMultiTarget" + value: { + dps: 3559.16458 + tps: 4798.69102 + } +} +dps_results: { + key: "TestMM-Settings-Orc-P1-MM-NoBuffs-LongSingleTarget" + value: { + dps: 3559.16458 + tps: 3277.89861 + } +} +dps_results: { + key: "TestMM-Settings-Orc-P1-MM-NoBuffs-ShortSingleTarget" + value: { + dps: 4344.41286 + tps: 3969.8766 + } +} +dps_results: { + key: "TestMM-SwitchInFrontOfTarget-Default" + value: { + dps: 7198.82363 + tps: 6335.33364 + } +} diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results new file mode 100644 index 0000000000..dcfaa4cc3a --- /dev/null +++ b/sim/hunter/TestSV.results @@ -0,0 +1,999 @@ +character_stats_results: { + key: "TestSV-CharacterStats-Default" + value: { + final_stats: 358.6 + final_stats: 2028.9082 + final_stats: 1599.015 + final_stats: 589.6 + final_stats: 276.1 + final_stats: 280 + final_stats: 109 + final_stats: 232 + final_stats: 1181.96121 + final_stats: 225 + final_stats: 0 + final_stats: 6522.13397 + final_stats: 264.79 + final_stats: 2204.84852 + final_stats: 225 + final_stats: 68 + final_stats: 0 + final_stats: 13610 + final_stats: 0 + final_stats: 0 + final_stats: 14071.3164 + final_stats: 6787.23397 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 23314.15 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 130 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +dps_results: { + key: "TestSV-AllItems-Ahn'KaharBloodHunter'sBattlegear" + value: { + dps: 7458.98045 + tps: 6461.72043 + } +} +dps_results: { + key: "TestSV-AllItems-Althor'sAbacus-50359" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-Althor'sAbacus-50366" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-AshtongueTalismanofSwiftness-32487" + value: { + dps: 6962.31201 + tps: 5928.24392 + } +} +dps_results: { + key: "TestSV-AllItems-AustereEarthsiegeDiamond" + value: { + dps: 7043.42315 + tps: 5995.44952 + } +} +dps_results: { + key: "TestSV-AllItems-Bandit'sInsignia-40371" + value: { + dps: 7076.10269 + tps: 6035.78754 + } +} +dps_results: { + key: "TestSV-AllItems-BaubleofTrueBlood-50354" + value: { + dps: 6918.50032 + tps: 15106.50712 + } +} +dps_results: { + key: "TestSV-AllItems-BaubleofTrueBlood-50726" + value: { + dps: 6918.50032 + tps: 15106.50712 + } +} +dps_results: { + key: "TestSV-AllItems-BeamingEarthsiegeDiamond" + value: { + dps: 7055.88297 + tps: 6010.51343 + } +} +dps_results: { + key: "TestSV-AllItems-Beast-tamer'sShoulders-30892" + value: { + dps: 7034.1777 + tps: 5995.34243 + } +} +dps_results: { + key: "TestSV-AllItems-BlackBowoftheBetrayer-32336" + value: { + dps: 6805.45605 + tps: 5765.41653 + } +} +dps_results: { + key: "TestSV-AllItems-BlessedGarboftheUndeadSlayer" + value: { + dps: 5905.76487 + tps: 5040.99653 + } +} +dps_results: { + key: "TestSV-AllItems-BlessedRegaliaofUndeadCleansing" + value: { + dps: 5635.32078 + tps: 4783.88702 + } +} +dps_results: { + key: "TestSV-AllItems-BracingEarthsiegeDiamond" + value: { + dps: 7034.68292 + tps: 5871.10817 + } +} +dps_results: { + key: "TestSV-AllItems-ChaoticSkyflareDiamond" + value: { + dps: 7199.19774 + tps: 6153.87841 + } +} +dps_results: { + key: "TestSV-AllItems-CorpseTongueCoin-50349" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-CorpseTongueCoin-50352" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-CorrodedSkeletonKey-50356" + value: { + dps: 6977.60283 + tps: 5927.06127 + hps: 64 + } +} +dps_results: { + key: "TestSV-AllItems-CryptstalkerBattlegear" + value: { + dps: 6453.05478 + tps: 5480.28188 + } +} +dps_results: { + key: "TestSV-AllItems-DarkmoonCard:Berserker!-42989" + value: { + dps: 7013.79174 + tps: 5984.20308 + } +} +dps_results: { + key: "TestSV-AllItems-DarkmoonCard:Death-42990" + value: { + dps: 7063.17035 + tps: 6032.72819 + } +} +dps_results: { + key: "TestSV-AllItems-DarkmoonCard:Greatness-44255" + value: { + dps: 7122.66348 + tps: 6079.91995 + } +} +dps_results: { + key: "TestSV-AllItems-Death'sChoice-47464" + value: { + dps: 7348.42427 + tps: 6285.25592 + } +} +dps_results: { + key: "TestSV-AllItems-DeathKnight'sAnguish-38212" + value: { + dps: 6992.2042 + tps: 5962.60058 + } +} +dps_results: { + key: "TestSV-AllItems-Deathbringer'sWill-50362" + value: { + dps: 7254.73721 + tps: 6212.4662 + } +} +dps_results: { + key: "TestSV-AllItems-Deathbringer'sWill-50363" + value: { + dps: 7291.35945 + tps: 6247.8912 + } +} +dps_results: { + key: "TestSV-AllItems-Defender'sCode-40257" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-DestructiveSkyflareDiamond" + value: { + dps: 7059.75592 + tps: 6014.46266 + } +} +dps_results: { + key: "TestSV-AllItems-DislodgedForeignObject-50348" + value: { + dps: 7070.11208 + tps: 6033.28279 + } +} +dps_results: { + key: "TestSV-AllItems-DislodgedForeignObject-50353" + value: { + dps: 7073.82779 + tps: 6039.05894 + } +} +dps_results: { + key: "TestSV-AllItems-EffulgentSkyflareDiamond" + value: { + dps: 7043.42315 + tps: 5995.44952 + } +} +dps_results: { + key: "TestSV-AllItems-EmberSkyflareDiamond" + value: { + dps: 7041.24118 + tps: 5995.50353 + } +} +dps_results: { + key: "TestSV-AllItems-EnigmaticSkyflareDiamond" + value: { + dps: 7055.88297 + tps: 6010.56363 + } +} +dps_results: { + key: "TestSV-AllItems-EnigmaticStarflareDiamond" + value: { + dps: 7050.53161 + tps: 6005.52017 + } +} +dps_results: { + key: "TestSV-AllItems-EphemeralSnowflake-50260" + value: { + dps: 7005.05471 + tps: 5971.5141 + } +} +dps_results: { + key: "TestSV-AllItems-EssenceofGossamer-37220" + value: { + dps: 6945.51386 + tps: 5905.64136 + } +} +dps_results: { + key: "TestSV-AllItems-EternalEarthsiegeDiamond" + value: { + dps: 7034.68292 + tps: 5989.63006 + } +} +dps_results: { + key: "TestSV-AllItems-ExtractofNecromanticPower-40373" + value: { + dps: 7073.35828 + tps: 6043.0553 + } +} +dps_results: { + key: "TestSV-AllItems-EyeoftheBroodmother-45308" + value: { + dps: 7002.66736 + tps: 5972.37386 + } +} +dps_results: { + key: "TestSV-AllItems-Figurine-SapphireOwl-42413" + value: { + dps: 6940.91782 + tps: 5909.28573 + } +} +dps_results: { + key: "TestSV-AllItems-ForethoughtTalisman-40258" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-ForgeEmber-37660" + value: { + dps: 6981.8073 + tps: 5951.87353 + } +} +dps_results: { + key: "TestSV-AllItems-ForlornSkyflareDiamond" + value: { + dps: 7034.68292 + tps: 5989.63006 + } +} +dps_results: { + key: "TestSV-AllItems-ForlornStarflareDiamond" + value: { + dps: 7034.68292 + tps: 5989.63006 + } +} +dps_results: { + key: "TestSV-AllItems-FuryoftheFiveFlights-40431" + value: { + dps: 7086.43106 + tps: 6039.83882 + } +} +dps_results: { + key: "TestSV-AllItems-FuturesightRune-38763" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-Gladiator'sPursuit" + value: { + dps: 6981.52677 + tps: 5988.52574 + } +} +dps_results: { + key: "TestSV-AllItems-GlowingTwilightScale-54573" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-GlowingTwilightScale-54589" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-GnomishLightningGenerator-41121" + value: { + dps: 7033.99481 + tps: 6003.67357 + } +} +dps_results: { + key: "TestSV-AllItems-Gronnstalker'sArmor" + value: { + dps: 5252.0739 + tps: 4433.39757 + } +} +dps_results: { + key: "TestSV-AllItems-Heartpierce-49982" + value: { + dps: 7282.07965 + tps: 6223.78846 + } +} +dps_results: { + key: "TestSV-AllItems-Heartpierce-50641" + value: { + dps: 7285.72077 + tps: 6226.49776 + } +} +dps_results: { + key: "TestSV-AllItems-IllustrationoftheDragonSoul-40432" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-ImpassiveSkyflareDiamond" + value: { + dps: 7055.88297 + tps: 6010.56363 + } +} +dps_results: { + key: "TestSV-AllItems-ImpassiveStarflareDiamond" + value: { + dps: 7050.53161 + tps: 6005.52017 + } +} +dps_results: { + key: "TestSV-AllItems-IncisorFragment-37723" + value: { + dps: 7055.12921 + tps: 6017.22027 + } +} +dps_results: { + key: "TestSV-AllItems-InsightfulEarthsiegeDiamond" + value: { + dps: 7047.53025 + tps: 6007.3945 + } +} +dps_results: { + key: "TestSV-AllItems-InvigoratingEarthsiegeDiamond" + value: { + dps: 7059.90912 + tps: 6012.61876 + hps: 12.04564 + } +} +dps_results: { + key: "TestSV-AllItems-Lavanthor'sTalisman-37872" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-MajesticDragonFigurine-40430" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-MeteoriteWhetstone-37390" + value: { + dps: 7097.26908 + tps: 6070.13599 + } +} +dps_results: { + key: "TestSV-AllItems-NevermeltingIceCrystal-50259" + value: { + dps: 7033.37957 + tps: 6003.80818 + } +} +dps_results: { + key: "TestSV-AllItems-OfferingofSacrifice-37638" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-PersistentEarthshatterDiamond" + value: { + dps: 7053.59241 + tps: 6006.66359 + } +} +dps_results: { + key: "TestSV-AllItems-PersistentEarthsiegeDiamond" + value: { + dps: 7058.04171 + tps: 6010.67148 + } +} +dps_results: { + key: "TestSV-AllItems-PetrifiedTwilightScale-54571" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-PetrifiedTwilightScale-54591" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-PowerfulEarthshatterDiamond" + value: { + dps: 7041.78436 + tps: 5994.35837 + } +} +dps_results: { + key: "TestSV-AllItems-PowerfulEarthsiegeDiamond" + value: { + dps: 7043.42315 + tps: 5995.44952 + } +} +dps_results: { + key: "TestSV-AllItems-PurifiedShardoftheGods" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-ReignoftheDead-47316" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-ReignoftheDead-47477" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-RelentlessEarthsiegeDiamond" + value: { + dps: 7209.92798 + tps: 6163.06602 + } +} +dps_results: { + key: "TestSV-AllItems-RevitalizingSkyflareDiamond" + value: { + dps: 7034.68292 + tps: 5989.41878 + } +} +dps_results: { + key: "TestSV-AllItems-RuneofRepulsion-40372" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-ScourgestalkerBattlegear" + value: { + dps: 6940.49915 + tps: 5946.96739 + } +} +dps_results: { + key: "TestSV-AllItems-SealofthePantheon-36993" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-Shadowmourne-49623" + value: { + dps: 7483.00262 + tps: 6414.89041 + } +} +dps_results: { + key: "TestSV-AllItems-ShinyShardoftheGods" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-Sindragosa'sFlawlessFang-50361" + value: { + dps: 6977.60283 + tps: 5927.06127 + } +} +dps_results: { + key: "TestSV-AllItems-SliverofPureIce-50339" + value: { + dps: 6915.07048 + tps: 5889.51875 + } +} +dps_results: { + key: "TestSV-AllItems-SliverofPureIce-50346" + value: { + dps: 6915.07048 + tps: 5889.86041 + } +} +dps_results: { + key: "TestSV-AllItems-SouloftheDead-40382" + value: { + dps: 7008.49459 + tps: 5978.18719 + } +} +dps_results: { + key: "TestSV-AllItems-SparkofHope-45703" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-SparkofLife-37657" + value: { + dps: 7023.8535 + tps: 5985.45809 + } +} +dps_results: { + key: "TestSV-AllItems-SphereofRedDragon'sBlood-37166" + value: { + dps: 7005.04146 + tps: 5966.09932 + } +} +dps_results: { + key: "TestSV-AllItems-StormshroudArmor" + value: { + dps: 5493.4681 + tps: 4655.37606 + } +} +dps_results: { + key: "TestSV-AllItems-SwiftSkyflareDiamond" + value: { + dps: 7058.04171 + tps: 6010.67148 + } +} +dps_results: { + key: "TestSV-AllItems-SwiftStarflareDiamond" + value: { + dps: 7053.59241 + tps: 6006.66359 + } +} +dps_results: { + key: "TestSV-AllItems-SwiftWindfireDiamond" + value: { + dps: 7045.80615 + tps: 5999.64978 + } +} +dps_results: { + key: "TestSV-AllItems-TalismanofTrollDivinity-37734" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-TearsoftheVanquished-47215" + value: { + dps: 6966.76952 + tps: 5931.65442 + } +} +dps_results: { + key: "TestSV-AllItems-TheFistsofFury" + value: { + dps: 6889.94278 + tps: 5863.95818 + } +} +dps_results: { + key: "TestSV-AllItems-TheGeneral'sHeart-45507" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-TheTwinBladesofAzzinoth" + value: { + dps: 7013.96331 + tps: 5987.63275 + } +} +dps_results: { + key: "TestSV-AllItems-ThunderingSkyflareDiamond" + value: { + dps: 7056.66578 + tps: 6011.90187 + } +} +dps_results: { + key: "TestSV-AllItems-TinyAbominationinaJar-50351" + value: { + dps: 6915.24715 + tps: 5885.49657 + } +} +dps_results: { + key: "TestSV-AllItems-TinyAbominationinaJar-50706" + value: { + dps: 6915.24715 + tps: 5885.49657 + } +} +dps_results: { + key: "TestSV-AllItems-TirelessSkyflareDiamond" + value: { + dps: 7034.68292 + tps: 5989.63006 + } +} +dps_results: { + key: "TestSV-AllItems-TirelessStarflareDiamond" + value: { + dps: 7034.68292 + tps: 5989.63006 + } +} +dps_results: { + key: "TestSV-AllItems-TomeofArcanePhenomena-36972" + value: { + dps: 6978.50846 + tps: 5941.36101 + } +} +dps_results: { + key: "TestSV-AllItems-TrenchantEarthshatterDiamond" + value: { + dps: 7034.68292 + tps: 5989.63006 + } +} +dps_results: { + key: "TestSV-AllItems-TrenchantEarthsiegeDiamond" + value: { + dps: 7034.68292 + tps: 5989.63006 + } +} +dps_results: { + key: "TestSV-AllItems-UndeadSlayer'sBlessedArmor" + value: { + dps: 5861.20952 + tps: 4992.59119 + } +} +dps_results: { + key: "TestSV-AllItems-Val'anyr,HammerofAncientKings-46017" + value: { + dps: 6894.43156 + tps: 5865.626 + } +} +dps_results: { + key: "TestSV-AllItems-Windrunner'sPursuit" + value: { + dps: 7010.00533 + tps: 5985.51795 + } +} +dps_results: { + key: "TestSV-AllItems-WingedTalisman-37844" + value: { + dps: 6915.07048 + tps: 5885.3199 + } +} +dps_results: { + key: "TestSV-AllItems-Zod'sRepeatingLongbow-50034" + value: { + dps: 7547.11558 + tps: 6490.99947 + } +} +dps_results: { + key: "TestSV-AllItems-Zod'sRepeatingLongbow-50638" + value: { + dps: 7635.61134 + tps: 6591.02816 + } +} +dps_results: { + key: "TestSV-Average-Default" + value: { + dps: 7231.59987 + tps: 6183.01959 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-LongMultiTarget" + value: { + dps: 17868.40931 + tps: 18066.47434 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-LongSingleTarget" + value: { + dps: 7166.37501 + tps: 6164.60967 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-ShortSingleTarget" + value: { + dps: 8067.24159 + tps: 6926.79812 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-LongMultiTarget" + value: { + dps: 10426.3238 + tps: 11326.91754 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-LongSingleTarget" + value: { + dps: 3667.47454 + tps: 3335.52069 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-ShortSingleTarget" + value: { + dps: 4328.95754 + tps: 3932.86184 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-LongMultiTarget" + value: { + dps: 7176.58677 + tps: 7398.6751 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-LongSingleTarget" + value: { + dps: 7176.58677 + tps: 6184.67613 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-ShortSingleTarget" + value: { + dps: 8036.19934 + tps: 6887.3813 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-LongMultiTarget" + value: { + dps: 3678.98397 + tps: 4689.86836 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-LongSingleTarget" + value: { + dps: 3678.98397 + tps: 3350.91873 + } +} +dps_results: { + key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-ShortSingleTarget" + value: { + dps: 4311.19358 + tps: 3912.26242 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-LongMultiTarget" + value: { + dps: 17976.97865 + tps: 18112.77474 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-LongSingleTarget" + value: { + dps: 7221.65518 + tps: 6163.43722 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-ShortSingleTarget" + value: { + dps: 8147.25268 + tps: 6939.50988 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-LongMultiTarget" + value: { + dps: 10505.18914 + tps: 11390.13178 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-LongSingleTarget" + value: { + dps: 3690.39457 + tps: 3337.56471 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-ShortSingleTarget" + value: { + dps: 4369.23153 + tps: 3950.19521 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-SV-FullBuffs-LongMultiTarget" + value: { + dps: 7209.92798 + tps: 7372.07651 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-SV-FullBuffs-LongSingleTarget" + value: { + dps: 7209.92798 + tps: 6163.06602 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-SV-FullBuffs-ShortSingleTarget" + value: { + dps: 8112.39038 + tps: 6896.05982 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-SV-NoBuffs-LongMultiTarget" + value: { + dps: 3695.52331 + tps: 4691.26112 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-SV-NoBuffs-LongSingleTarget" + value: { + dps: 3695.52331 + tps: 3346.80115 + } +} +dps_results: { + key: "TestSV-Settings-Orc-P1-SV-NoBuffs-ShortSingleTarget" + value: { + dps: 4351.88777 + tps: 3928.30523 + } +} +dps_results: { + key: "TestSV-SwitchInFrontOfTarget-Default" + value: { + dps: 7138.95917 + tps: 6179.67382 + } +} diff --git a/sim/hunter/hunter.go b/sim/hunter/hunter.go index c0472e898f..5124f9ad9a 100644 --- a/sim/hunter/hunter.go +++ b/sim/hunter/hunter.go @@ -9,6 +9,8 @@ import ( "github.com/wowsims/wotlk/sim/core/stats" ) +var TalentTreeSizes = [3]int{26, 27, 28} + const ThoridalTheStarsFuryItemID = 34334 func RegisterHunter() { @@ -174,10 +176,11 @@ func NewHunter(character core.Character, options *proto.Player) *Hunter { hunter := &Hunter{ Character: character, - Talents: hunterOptions.Talents, + Talents: &proto.HunterTalents{}, Options: hunterOptions.Options, Rotation: hunterOptions.Rotation, } + core.FillTalentsProto(hunter.Talents.ProtoReflect(), options.TalentsString, TalentTreeSizes) hunter.EnableManaBar() hunter.PseudoStats.CanParry = true diff --git a/sim/hunter/hunter_test.go b/sim/hunter/hunter_test.go index 5759495e8e..2dfbdbcc5e 100644 --- a/sim/hunter/hunter_test.go +++ b/sim/hunter/hunter_test.go @@ -12,55 +12,88 @@ func init() { RegisterHunter() } -func TestHunter(t *testing.T) { +func TestBM(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ Class: proto.Class_ClassHunter, Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: BMTalents, + Glyphs: BMGlyphs, + Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "BM", SpecOptions: PlayerOptionsBM}, - SpecOptions: core.SpecOptionsCombo{Label: "Marksman", SpecOptions: PlayerOptionsMM}, + ItemFilter: ItemFilter, + })) +} + +func TestMM(t *testing.T) { + core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ + Class: proto.Class_ClassHunter, + Race: proto.Race_RaceOrc, + OtherRaces: []proto.Race{proto.Race_RaceDwarf}, + + GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: MMTalents, + Glyphs: MMGlyphs, + Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "MM", SpecOptions: PlayerOptionsMM}, + + ItemFilter: ItemFilter, + })) +} + +func TestSV(t *testing.T) { + core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ + Class: proto.Class_ClassHunter, + Race: proto.Race_RaceOrc, + OtherRaces: []proto.Race{proto.Race_RaceDwarf}, + + GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: SVTalents, + Glyphs: SVGlyphs, + Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "SV", SpecOptions: PlayerOptionsSV}, OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "BM", SpecOptions: PlayerOptionsBM}, - {Label: "SV", SpecOptions: PlayerOptionsSV}, {Label: "AOE", SpecOptions: PlayerOptionsAOE}, }, - Glyphs: DefaultGlyphs, - Consumes: FullConsumes, - - ItemFilter: core.ItemFilter{ - ArmorType: proto.ArmorType_ArmorTypeMail, - WeaponTypes: []proto.WeaponType{ - proto.WeaponType_WeaponTypeAxe, - proto.WeaponType_WeaponTypeDagger, - proto.WeaponType_WeaponTypeFist, - proto.WeaponType_WeaponTypeMace, - proto.WeaponType_WeaponTypeOffHand, - proto.WeaponType_WeaponTypePolearm, - proto.WeaponType_WeaponTypeStaff, - proto.WeaponType_WeaponTypeSword, - }, - RangedWeaponTypes: []proto.RangedWeaponType{ - proto.RangedWeaponType_RangedWeaponTypeBow, - proto.RangedWeaponType_RangedWeaponTypeCrossbow, - proto.RangedWeaponType_RangedWeaponTypeGun, - }, - }, + ItemFilter: ItemFilter, })) } +var ItemFilter = core.ItemFilter{ + ArmorType: proto.ArmorType_ArmorTypeMail, + WeaponTypes: []proto.WeaponType{ + proto.WeaponType_WeaponTypeAxe, + proto.WeaponType_WeaponTypeDagger, + proto.WeaponType_WeaponTypeFist, + proto.WeaponType_WeaponTypeMace, + proto.WeaponType_WeaponTypeOffHand, + proto.WeaponType_WeaponTypePolearm, + proto.WeaponType_WeaponTypeStaff, + proto.WeaponType_WeaponTypeSword, + }, + RangedWeaponTypes: []proto.RangedWeaponType{ + proto.RangedWeaponType_RangedWeaponTypeBow, + proto.RangedWeaponType_RangedWeaponTypeCrossbow, + proto.RangedWeaponType_RangedWeaponTypeGun, + }, +} + func BenchmarkSimulate(b *testing.B) { rsr := &proto.RaidSimRequest{ Raid: core.SinglePlayerRaidProto( &proto.Player{ - Race: proto.Race_RaceOrc, - Class: proto.Class_ClassHunter, - Equipment: P1Gear, - Consumes: FullConsumes, - Spec: PlayerOptionsMM, - Buffs: core.FullIndividualBuffs, + Race: proto.Race_RaceOrc, + Class: proto.Class_ClassHunter, + Equipment: P1Gear, + Consumes: FullConsumes, + Spec: PlayerOptionsMM, + Glyphs: MMGlyphs, + TalentsString: MMTalents, + Buffs: core.FullIndividualBuffs, }, core.FullPartyBuffs, core.FullRaidBuffs, diff --git a/sim/hunter/presets.go b/sim/hunter/presets.go index 60f21180b3..011f88f8c7 100644 --- a/sim/hunter/presets.go +++ b/sim/hunter/presets.go @@ -5,95 +5,23 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var BMTalents = &proto.HunterTalents{ - ImprovedAspectOfTheHawk: 5, - EnduranceTraining: 1, - FocusedFire: 2, - ImprovedRevivePet: 2, - AspectMastery: true, - UnleashedFury: 5, - Ferocity: 5, - SpiritBond: 1, - Intimidation: true, - BestialDiscipline: 2, - AnimalHandler: 2, - Frenzy: 4, - FerociousInspiration: 3, - BestialWrath: true, - CatlikeReflexes: 2, - SerpentsSwiftness: 5, - Longevity: 3, - TheBeastWithin: true, - CobraStrikes: 2, - KindredSpirits: 5, - BeastMastery: true, - - LethalShots: 5, - CarefulAim: 3, - MortalShots: 5, - GoForTheThroat: 2, - AimedShot: true, - - ImprovedTracking: 1, +var BMTalents = "51200201515012233110531351-005305-5" +var MMTalents = "502-035335131030013233035031051-5000002" +var SVTalents = "-015305101-5000032500033330532135301311" +var BMGlyphs = &proto.Glyphs{ + Major1: int32(proto.HunterMajorGlyph_GlyphOfBestialWrath), + Major2: int32(proto.HunterMajorGlyph_GlyphOfSteadyShot), + Major3: int32(proto.HunterMajorGlyph_GlyphOfSerpentSting), } - -var MMTalents = &proto.HunterTalents{ - ImprovedAspectOfTheHawk: 5, - FocusedFire: 2, - - FocusedAim: 3, - LethalShots: 5, - CarefulAim: 3, - MortalShots: 5, - GoForTheThroat: 1, - AimedShot: true, - RapidKilling: 2, - ImprovedStings: 3, - Readiness: true, - Barrage: 3, - CombatExperience: 2, - RangedWeaponSpecialization: 3, - PiercingShots: 3, - TrueshotAura: true, - ImprovedBarrage: 3, - MasterMarksman: 5, - WildQuiver: 3, - SilencingShot: true, - ImprovedSteadyShot: 3, - MarkedForDeath: 5, - ChimeraShot: true, - - ImprovedTracking: 5, - SurvivalInstincts: 2, +var MMGlyphs = &proto.Glyphs{ + Major1: int32(proto.HunterMajorGlyph_GlyphOfSerpentSting), + Major2: int32(proto.HunterMajorGlyph_GlyphOfSteadyShot), + Major3: int32(proto.HunterMajorGlyph_GlyphOfChimeraShot), } - -var SVTalents = &proto.HunterTalents{ - FocusedAim: 2, - LethalShots: 5, - CarefulAim: 3, - MortalShots: 5, - GoForTheThroat: 1, - AimedShot: true, - - ImprovedTracking: 5, - TrapMastery: 3, - SurvivalInstincts: 2, - Survivalist: 5, - TNT: 3, - LockAndLoad: 3, - HunterVsWild: 3, - KillerInstinct: 3, - LightningReflexes: 5, - Resourcefulness: 2, - ExposeWeakness: 2, - WyvernSting: true, - ThrillOfTheHunt: 3, - MasterTactician: 5, - NoxiousStings: 3, - BlackArrow: true, - SniperTraining: 3, - HuntingParty: 1, - ExplosiveShot: true, +var SVGlyphs = &proto.Glyphs{ + Major1: int32(proto.HunterMajorGlyph_GlyphOfSerpentSting), + Major2: int32(proto.HunterMajorGlyph_GlyphOfExplosiveShot), + Major3: int32(proto.HunterMajorGlyph_GlyphOfKillShot), } var FerocityTalents = &proto.HunterPetTalents{ @@ -108,16 +36,8 @@ var FerocityTalents = &proto.HunterPetTalents{ WildHunt: 1, } -var DefaultGlyphs = &proto.Glyphs{ - Major1: int32(proto.HunterMajorGlyph_GlyphOfSteadyShot), - Major2: int32(proto.HunterMajorGlyph_GlyphOfSerpentSting), - Major3: int32(proto.HunterMajorGlyph_GlyphOfKillShot), - // No interesting minor glyphs. -} - var PlayerOptionsMM = &proto.Player_Hunter{ Hunter: &proto.Hunter{ - Talents: MMTalents, Options: basicOptions, Rotation: basicRotation, }, @@ -125,7 +45,6 @@ var PlayerOptionsMM = &proto.Player_Hunter{ var PlayerOptionsBM = &proto.Player_Hunter{ Hunter: &proto.Hunter{ - Talents: BMTalents, Options: basicOptions, Rotation: basicRotation, }, @@ -133,7 +52,6 @@ var PlayerOptionsBM = &proto.Player_Hunter{ var PlayerOptionsSV = &proto.Player_Hunter{ Hunter: &proto.Hunter{ - Talents: SVTalents, Options: basicOptions, Rotation: basicRotation, }, @@ -141,7 +59,6 @@ var PlayerOptionsSV = &proto.Player_Hunter{ var PlayerOptionsAOE = &proto.Player_Hunter{ Hunter: &proto.Hunter{ - Talents: SVTalents, Options: basicOptions, Rotation: aoeRotation, }, diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index 6ff670929b..cb8fe8daf1 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -9,7 +9,7 @@ character_stats_results: { final_stats: 2731.3455 final_stats: 109 final_stats: 295.696 - final_stats: 1443.21502 + final_stats: 1608.01702 final_stats: 609 final_stats: 0 final_stats: 755.7 @@ -46,792 +46,792 @@ character_stats_results: { dps_results: { key: "TestArcane-AllItems-Althor'sAbacus-50359" value: { - dps: 6349.97607 - tps: 3845.14135 + dps: 7076.48414 + tps: 4276.89578 } } dps_results: { key: "TestArcane-AllItems-Althor'sAbacus-50366" value: { - dps: 6381.63885 - tps: 3863.82255 + dps: 7111.9273 + tps: 4297.83114 } } dps_results: { key: "TestArcane-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-Bandit'sInsignia-40371" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6075.55551 - tps: 10215.40056 + dps: 6782.81925 + tps: 10466.46749 } } dps_results: { key: "TestArcane-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6075.55551 - tps: 10215.40056 + dps: 6782.81925 + tps: 10466.46749 } } dps_results: { key: "TestArcane-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6346.10329 - tps: 3842.76065 + dps: 7079.12196 + tps: 4280.53249 } } dps_results: { key: "TestArcane-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5128.77368 - tps: 3117.01181 + dps: 5769.74146 + tps: 3500.46837 } } dps_results: { key: "TestArcane-AllItems-Bloodmage'sRegalia" value: { - dps: 7027.60119 - tps: 4252.74732 + dps: 7870.09179 + tps: 4759.74217 } } dps_results: { key: "TestArcane-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6343.1918 - tps: 3766.11601 + dps: 7045.50433 + tps: 4177.46135 } } dps_results: { key: "TestArcane-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6467.86634 - tps: 3916.06471 + dps: 7193.6818 + tps: 4349.93016 } } dps_results: { key: "TestArcane-AllItems-CorpseTongueCoin-50349" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-CorpseTongueCoin-50352" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 hps: 64 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6149.91999 - tps: 3727.15441 + dps: 6880.93875 + tps: 4162.10879 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6202.63048 - tps: 3777.47622 + dps: 6905.44045 + tps: 4198.40238 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6255.51037 - tps: 3791.91817 + dps: 6982.67426 + tps: 4227.75796 } } dps_results: { key: "TestArcane-AllItems-Death'sChoice-47464" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6108.86123 - tps: 3702.98126 + dps: 6819.73968 + tps: 4125.44187 } } dps_results: { key: "TestArcane-AllItems-Deathbringer'sWill-50362" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-Deathbringer'sWill-50363" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-Defender'sCode-40257" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6326.12427 - tps: 3830.95335 + dps: 7028.42905 + tps: 4250.71974 } } dps_results: { key: "TestArcane-AllItems-DislodgedForeignObject-50348" value: { - dps: 6587.70081 - tps: 3990.763 + dps: 7395.34503 + tps: 4470.47057 } } dps_results: { key: "TestArcane-AllItems-DislodgedForeignObject-50353" value: { - dps: 6523.00834 - tps: 3950.85553 + dps: 7297.65177 + tps: 4414.07871 } } dps_results: { key: "TestArcane-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-EmberSkyflareDiamond" value: { - dps: 6377.99317 - tps: 3861.52055 + dps: 7109.22732 + tps: 4298.30757 } } dps_results: { key: "TestArcane-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6322.462 - tps: 3828.8221 + dps: 7021.68032 + tps: 4246.72927 } } dps_results: { key: "TestArcane-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6319.67084 - tps: 3827.14741 + dps: 7015.97632 + tps: 4243.30687 } } dps_results: { key: "TestArcane-AllItems-EphemeralSnowflake-50260" value: { - dps: 6151.46735 - tps: 3728.65194 + dps: 6862.22363 + tps: 4152.86541 } } dps_results: { key: "TestArcane-AllItems-EssenceofGossamer-37220" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6147.06912 - tps: 3725.18765 + dps: 6876.52929 + tps: 4159.26278 } } dps_results: { key: "TestArcane-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6331.44611 - tps: 3834.94077 + dps: 7081.43956 + tps: 4281.20776 } } dps_results: { key: "TestArcane-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6127.3014 - tps: 3716.11445 + dps: 6823.13883 + tps: 4133.22239 } } dps_results: { key: "TestArcane-AllItems-ForethoughtTalisman-40258" value: { - dps: 6252.10929 - tps: 3787.39947 + dps: 6966.93255 + tps: 4212.18649 } } dps_results: { key: "TestArcane-AllItems-ForgeEmber-37660" value: { - dps: 6282.66544 - tps: 3805.9135 + dps: 7016.37142 + tps: 4242.06751 } } dps_results: { key: "TestArcane-AllItems-ForlornSkyflareDiamond" value: { - dps: 6343.1918 - tps: 3840.88333 + dps: 7045.50433 + tps: 4260.64102 } } dps_results: { key: "TestArcane-AllItems-ForlornStarflareDiamond" value: { - dps: 6335.98475 - tps: 3836.63443 + dps: 7037.46746 + tps: 4255.89543 } } dps_results: { key: "TestArcane-AllItems-FrostfireGarb" value: { - dps: 5834.64715 - tps: 3537.70799 + dps: 6483.61559 + tps: 3925.89345 } } dps_results: { key: "TestArcane-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-FuturesightRune-38763" value: { - dps: 6166.15045 - tps: 3735.46452 + dps: 6908.28757 + tps: 4178.52286 } } dps_results: { key: "TestArcane-AllItems-Gladiator'sRegalia" value: { - dps: 6152.46603 - tps: 3718.86966 + dps: 6853.3794 + tps: 4136.37823 } } dps_results: { key: "TestArcane-AllItems-GlowingTwilightScale-54573" value: { - dps: 6365.80746 - tps: 3854.48195 + dps: 7094.20572 + tps: 4287.36346 } } dps_results: { key: "TestArcane-AllItems-GlowingTwilightScale-54589" value: { - dps: 6401.78789 - tps: 3875.71058 + dps: 7134.48204 + tps: 4311.15364 } } dps_results: { key: "TestArcane-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6159.46441 - tps: 3745.16999 + dps: 6880.51114 + tps: 4177.44874 } } dps_results: { key: "TestArcane-AllItems-Heartpierce-49982" value: { - dps: 6467.86634 - tps: 3916.06471 + dps: 7193.6818 + tps: 4349.93016 } } dps_results: { key: "TestArcane-AllItems-Heartpierce-50641" value: { - dps: 6467.86634 - tps: 3916.06471 + dps: 7193.6818 + tps: 4349.93016 } } dps_results: { key: "TestArcane-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6369.42277 - tps: 3857.94739 + dps: 7097.62944 + tps: 4290.73876 } } dps_results: { key: "TestArcane-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6322.462 - tps: 3828.8221 + dps: 7021.68032 + tps: 4246.72927 } } dps_results: { key: "TestArcane-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6319.67084 - tps: 3827.14741 + dps: 7015.97632 + tps: 4243.30687 } } dps_results: { key: "TestArcane-AllItems-IncisorFragment-37723" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6412.70868 - tps: 3886.99404 + dps: 7102.15665 + tps: 4298.57632 } } dps_results: { key: "TestArcane-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-Khadgar'sRegalia" value: { - dps: 6262.17123 - tps: 3787.41645 + dps: 7006.33222 + tps: 4235.18359 } } dps_results: { key: "TestArcane-AllItems-KirinTorGarb" value: { - dps: 6134.26585 - tps: 3709.39373 + dps: 6843.52142 + tps: 4133.67947 } } dps_results: { key: "TestArcane-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6162.52501 - tps: 3733.31486 + dps: 6905.76094 + tps: 4177.4214 } } dps_results: { key: "TestArcane-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6134.65286 - tps: 3718.02439 + dps: 6852.36641 + tps: 4144.80289 } } dps_results: { key: "TestArcane-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6277.79412 - tps: 3802.81037 + dps: 7001.04021 + tps: 4232.65108 } } dps_results: { key: "TestArcane-AllItems-OfferingofSacrifice-37638" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-PurifiedShardoftheGods" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-ReignoftheDead-47316" value: { - dps: 6442.30682 - tps: 3973.65636 + dps: 7231.76378 + tps: 4449.3877 } } dps_results: { key: "TestArcane-AllItems-ReignoftheDead-47477" value: { - dps: 6490.81466 - tps: 4011.6081 + dps: 7284.45766 + tps: 4490.2073 } } dps_results: { key: "TestArcane-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6451.18341 - tps: 3906.05495 + dps: 7175.84905 + tps: 4339.2305 } } dps_results: { key: "TestArcane-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6339.78553 - tps: 3838.84747 + dps: 7028.65653 + tps: 4249.79301 } } dps_results: { key: "TestArcane-AllItems-RuneofRepulsion-40372" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-SealofthePantheon-36993" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-ShinyShardoftheGods" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-SliverofPureIce-50339" value: { - dps: 6308.41912 - tps: 3825.78343 + dps: 7046.53458 + tps: 4264.2873 } } dps_results: { key: "TestArcane-AllItems-SliverofPureIce-50346" value: { - dps: 6360.25547 - tps: 3857.46991 + dps: 7071.93224 + tps: 4280.02869 } } dps_results: { key: "TestArcane-AllItems-SouloftheDead-40382" value: { - dps: 6185.51944 - tps: 3755.40983 + dps: 6897.84457 + tps: 4180.88489 } } dps_results: { key: "TestArcane-AllItems-SparkofHope-45703" value: { - dps: 6114.12287 - tps: 3706.1286 + dps: 6872.43015 + tps: 4158.1832 } } dps_results: { key: "TestArcane-AllItems-SparkofLife-37657" value: { - dps: 6165.88889 - tps: 3736.01186 + dps: 6888.82608 + tps: 4167.34106 } } dps_results: { key: "TestArcane-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6217.69036 - tps: 3768.81129 + dps: 6921.75438 + tps: 4187.47326 } } dps_results: { key: "TestArcane-AllItems-SwiftSkyflareDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-SwiftStarflareDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-SwiftWindfireDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6102.66421 - tps: 3698.4056 + dps: 6831.56615 + tps: 4132.99788 } } dps_results: { key: "TestArcane-AllItems-TearsoftheVanquished-47215" value: { - dps: 6163.79748 - tps: 3737.0212 + dps: 6903.15573 + tps: 4179.70887 } } dps_results: { key: "TestArcane-AllItems-TempestRegalia" value: { - dps: 4706.23639 - tps: 2875.19882 + dps: 5186.53699 + tps: 3159.62844 } } dps_results: { key: "TestArcane-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6092.35618 - tps: 3693.14434 + dps: 6788.10568 + tps: 4106.55808 } } dps_results: { key: "TestArcane-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5314.78791 - tps: 3232.41372 + dps: 5895.94424 + tps: 3577.19734 } } dps_results: { key: "TestArcane-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6307.15656 - tps: 3819.63884 + dps: 7005.32 + tps: 4236.91307 } } dps_results: { key: "TestArcane-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6264.68678 - tps: 3794.47792 + dps: 6960.71422 + tps: 4210.64141 } } dps_results: { key: "TestArcane-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6264.68678 - tps: 3794.47792 + dps: 6960.71422 + tps: 4210.64141 } } dps_results: { key: "TestArcane-AllItems-TirelessSkyflareDiamond" value: { - dps: 6343.1918 - tps: 3840.88333 + dps: 7045.50433 + tps: 4260.64102 } } dps_results: { key: "TestArcane-AllItems-TirelessStarflareDiamond" value: { - dps: 6335.98475 - tps: 3836.63443 + dps: 7037.46746 + tps: 4255.89543 } } dps_results: { key: "TestArcane-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6221.47944 - tps: 3769.0693 + dps: 6939.99492 + tps: 4195.08218 } } dps_results: { key: "TestArcane-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6335.98475 - tps: 3836.63443 + dps: 7037.46746 + tps: 4255.89543 } } dps_results: { key: "TestArcane-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6343.1918 - tps: 3840.88333 + dps: 7045.50433 + tps: 4260.64102 } } dps_results: { key: "TestArcane-AllItems-WingedTalisman-37844" value: { - dps: 6211.94044 - tps: 3764.8949 + dps: 6925.28631 + tps: 4188.86645 } } dps_results: { key: "TestArcane-Average-Default" value: { - dps: 6548.02825 - tps: 3966.62668 + dps: 7310.07813 + tps: 4421.88422 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-AOE-FullBuffs-LongMultiTarget" value: { - dps: 18653.20519 - tps: 11326.64779 + dps: 19073.70212 + tps: 11577.56973 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-AOE-FullBuffs-LongSingleTarget" value: { - dps: 1414.20942 - tps: 886.08122 + dps: 1447.6535 + tps: 905.31924 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 2361.78762 - tps: 1353.19765 + dps: 2402.86158 + tps: 1376.25709 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-AOE-NoBuffs-LongMultiTarget" value: { - dps: 15223.98747 - tps: 9361.37535 + dps: 15508.25551 + tps: 9531.51032 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-AOE-NoBuffs-LongSingleTarget" value: { - dps: 741.2726 - tps: 478.04574 + dps: 755.34597 + tps: 486.04197 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 1525.99865 - tps: 938.81081 + dps: 1554.19802 + tps: 954.3408 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-FullBuffs-LongMultiTarget" value: { - dps: 6425.34711 - tps: 5839.85423 + dps: 7199.24094 + tps: 6285.64663 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-FullBuffs-LongSingleTarget" value: { - dps: 6425.34711 - tps: 3890.75787 + dps: 7199.24094 + tps: 4353.48579 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-FullBuffs-ShortSingleTarget" value: { - dps: 8380.31285 - tps: 4978.74853 + dps: 9424.92558 + tps: 5610.96331 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-NoBuffs-LongMultiTarget" value: { - dps: 3097.17555 - tps: 3184.70819 + dps: 3493.32779 + tps: 3465.24345 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-NoBuffs-LongSingleTarget" value: { - dps: 3097.17555 - tps: 1878.60675 + dps: 3493.32779 + tps: 2119.10113 } } dps_results: { key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-NoBuffs-ShortSingleTarget" value: { - dps: 4459.96275 - tps: 2656.70599 + dps: 4825.96015 + tps: 2891.48355 } } dps_results: { key: "TestArcane-SwitchInFrontOfTarget-Default" value: { - dps: 6467.86634 - tps: 3916.06471 + dps: 7193.6818 + tps: 4349.93016 } } diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index acaa9826f3..92daff9025 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -9,7 +9,7 @@ character_stats_results: { final_stats: 2523 final_stats: 109 final_stats: 217 - final_stats: 1377.57883 + final_stats: 1533.39163 final_stats: 609 final_stats: 0 final_stats: 755.7 @@ -46,792 +46,792 @@ character_stats_results: { dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50359" value: { - dps: 5563.13718 - tps: 4991.44827 + dps: 6220.50014 + tps: 4980.4985 } } dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50366" value: { - dps: 5595.17149 - tps: 5019.81241 + dps: 6256.26473 + tps: 5008.69741 } } dps_results: { key: "TestFire-AllItems-AustereEarthsiegeDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-Bandit'sInsignia-40371" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50354" value: { - dps: 5304.72903 - tps: 10614.00499 + dps: 5920.8268 + tps: 11001.05026 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50726" value: { - dps: 5304.72903 - tps: 10614.00499 + dps: 5920.8268 + tps: 11001.05026 } } dps_results: { key: "TestFire-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 5624.45279 - tps: 5049.85603 + dps: 6223.33172 + tps: 4984.80087 } } dps_results: { key: "TestFire-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 4251.79399 - tps: 3808.54147 + dps: 4772.45329 + tps: 3820.25538 } } dps_results: { key: "TestFire-AllItems-Bloodmage'sRegalia" value: { - dps: 6173.35104 - tps: 5539.17116 + dps: 6875.92976 + tps: 5503.01762 } } dps_results: { key: "TestFire-AllItems-BracingEarthsiegeDiamond" value: { - dps: 5604.25011 - tps: 4931.0501 + dps: 6237.92365 + tps: 4898.56081 } } dps_results: { key: "TestFire-AllItems-ChaoticSkyflareDiamond" value: { - dps: 5713.88615 - tps: 5129.60952 + dps: 6380.03614 + tps: 5109.98748 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50349" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50352" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 hps: 64 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 5421.32375 - tps: 4869.58227 + dps: 6085.71443 + tps: 4877.84586 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Death-42990" value: { - dps: 5460.71316 - tps: 4908.91609 + dps: 6157.71903 + tps: 4945.36212 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 5429.31492 - tps: 4879.10498 + dps: 6102.13657 + tps: 4892.79957 } } dps_results: { key: "TestFire-AllItems-Death'sChoice-47464" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 5321.59079 - tps: 4777.64724 + dps: 5951.23639 + tps: 4768.2866 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50362" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50363" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-Defender'sCode-40257" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-DestructiveSkyflareDiamond" value: { - dps: 5568.01809 - tps: 4997.80418 + dps: 6209.05192 + tps: 4973.21181 } } dps_results: { key: "TestFire-AllItems-DislodgedForeignObject-50348" value: { - dps: 5559.85008 - tps: 4991.43671 + dps: 6401.03427 + tps: 5128.31623 } } dps_results: { key: "TestFire-AllItems-DislodgedForeignObject-50353" value: { - dps: 5608.67321 - tps: 5035.78173 + dps: 6312.40722 + tps: 5055.51162 } } dps_results: { key: "TestFire-AllItems-EffulgentSkyflareDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-EmberSkyflareDiamond" value: { - dps: 5655.59547 - tps: 5077.91464 + dps: 6249.96771 + tps: 5005.9943 } } dps_results: { key: "TestFire-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 5573.4557 - tps: 5003.22211 + dps: 6207.45125 + tps: 4971.91957 } } dps_results: { key: "TestFire-AllItems-EnigmaticStarflareDiamond" value: { - dps: 5579.79809 - tps: 5009.1003 + dps: 6198.13342 + tps: 4964.57883 } } dps_results: { key: "TestFire-AllItems-EphemeralSnowflake-50260" value: { - dps: 5329.07854 - tps: 4783.23171 + dps: 5981.79865 + tps: 4792.30089 } } dps_results: { key: "TestFire-AllItems-EssenceofGossamer-37220" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-EternalEarthsiegeDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 5477.94932 - tps: 4924.65878 + dps: 6126.83139 + tps: 4919.91388 } } dps_results: { key: "TestFire-AllItems-EyeoftheBroodmother-45308" value: { - dps: 5608.72186 - tps: 5036.54817 + dps: 6313.24284 + tps: 5058.04119 } } dps_results: { key: "TestFire-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 5338.36399 - tps: 4797.5566 + dps: 5998.80759 + tps: 4810.60693 } } dps_results: { key: "TestFire-AllItems-ForethoughtTalisman-40258" value: { - dps: 5464.12207 - tps: 4903.7773 + dps: 6109.95506 + tps: 4893.33823 } } dps_results: { key: "TestFire-AllItems-ForgeEmber-37660" value: { - dps: 5498.8649 - tps: 4938.02089 + dps: 6205.02556 + tps: 4972.41974 } } dps_results: { key: "TestFire-AllItems-ForlornSkyflareDiamond" value: { - dps: 5604.25011 - tps: 5030.0864 + dps: 6237.92365 + tps: 4996.74617 } } dps_results: { key: "TestFire-AllItems-ForlornStarflareDiamond" value: { - dps: 5596.87291 - tps: 5023.55401 + dps: 6229.7366 + tps: 4990.29155 } } dps_results: { key: "TestFire-AllItems-FrostfireGarb" value: { - dps: 5097.81752 - tps: 4578.56141 + dps: 5654.75009 + tps: 4533.90976 } } dps_results: { key: "TestFire-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-FuturesightRune-38763" value: { - dps: 5416.60256 - tps: 4861.98418 + dps: 6120.26318 + tps: 4904.30066 } } dps_results: { key: "TestFire-AllItems-Gladiator'sRegalia" value: { - dps: 5605.31078 - tps: 5022.79405 + dps: 6115.57278 + tps: 4887.89409 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54573" value: { - dps: 5579.15433 - tps: 5005.63034 + dps: 6238.38243 + tps: 4994.59796 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54589" value: { - dps: 5615.55695 - tps: 5037.86231 + dps: 6279.02401 + tps: 5026.64217 } } dps_results: { key: "TestFire-AllItems-GnomishLightningGenerator-41121" value: { - dps: 5405.19378 - tps: 4856.42077 + dps: 6123.51184 + tps: 4913.3433 } } dps_results: { key: "TestFire-AllItems-Heartpierce-49982" value: { - dps: 5713.88615 - tps: 5129.60952 + dps: 6380.03614 + tps: 5109.98748 } } dps_results: { key: "TestFire-AllItems-Heartpierce-50641" value: { - dps: 5713.88615 - tps: 5129.60952 + dps: 6380.03614 + tps: 5109.98748 } } dps_results: { key: "TestFire-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 5580.90241 - tps: 5009.10454 + dps: 6240.84323 + tps: 4998.23803 } } dps_results: { key: "TestFire-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 5573.4557 - tps: 5003.22211 + dps: 6207.45125 + tps: 4971.91957 } } dps_results: { key: "TestFire-AllItems-ImpassiveStarflareDiamond" value: { - dps: 5579.79809 - tps: 5009.1003 + dps: 6198.13342 + tps: 4964.57883 } } dps_results: { key: "TestFire-AllItems-IncisorFragment-37723" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 5578.71399 - tps: 5012.61916 + dps: 6231.47097 + tps: 4995.50532 } } dps_results: { key: "TestFire-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-Khadgar'sRegalia" value: { - dps: 5699.43599 - tps: 5114.34667 + dps: 6356.01709 + tps: 5088.19533 } } dps_results: { key: "TestFire-AllItems-KirinTorGarb" value: { - dps: 5774.89189 - tps: 5175.0226 + dps: 6374.82619 + tps: 5098.24219 } } dps_results: { key: "TestFire-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-MajesticDragonFigurine-40430" value: { - dps: 5436.91385 - tps: 4881.89581 + dps: 6142.44907 + tps: 4922.00883 } } dps_results: { key: "TestFire-AllItems-MeteoriteWhetstone-37390" value: { - dps: 5371.89629 - tps: 4824.30652 + dps: 6057.67245 + tps: 4854.37479 } } dps_results: { key: "TestFire-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 5520.56615 - tps: 4956.00318 + dps: 6203.33962 + tps: 4969.71402 } } dps_results: { key: "TestFire-AllItems-OfferingofSacrifice-37638" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-PersistentEarthshatterDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-PurifiedShardoftheGods" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-ReignoftheDead-47316" value: { - dps: 5663.38048 - tps: 5100.65509 + dps: 6388.8347 + tps: 5153.19025 } } dps_results: { key: "TestFire-AllItems-ReignoftheDead-47477" value: { - dps: 5710.88517 - tps: 5145.17293 + dps: 6440.64128 + tps: 5198.77321 } } dps_results: { key: "TestFire-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 5707.80132 - tps: 5123.81796 + dps: 6368.60169 + tps: 5101.76368 } } dps_results: { key: "TestFire-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 5606.72501 - tps: 5033.90725 + dps: 6185.03803 + tps: 4952.69784 } } dps_results: { key: "TestFire-AllItems-RuneofRepulsion-40372" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-SealofthePantheon-36993" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-ShinyShardoftheGods" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-SliverofPureIce-50339" value: { - dps: 5580.30971 - tps: 5014.31862 + dps: 6215.24689 + tps: 4981.65402 } } dps_results: { key: "TestFire-AllItems-SliverofPureIce-50346" value: { - dps: 5614.07566 - tps: 5044.05185 + dps: 6238.89181 + tps: 4999.35372 } } dps_results: { key: "TestFire-AllItems-SouloftheDead-40382" value: { - dps: 5447.44143 - tps: 4897.65606 + dps: 6144.80641 + tps: 4932.17588 } } dps_results: { key: "TestFire-AllItems-SparkofHope-45703" value: { - dps: 5370.73253 - tps: 4822.00076 + dps: 6064.33811 + tps: 4859.27662 } } dps_results: { key: "TestFire-AllItems-SparkofLife-37657" value: { - dps: 5368.46766 - tps: 4818.70426 + dps: 6094.8292 + tps: 4883.72571 } } dps_results: { key: "TestFire-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 5441.43977 - tps: 4886.023 + dps: 6117.31193 + tps: 4901.98954 } } dps_results: { key: "TestFire-AllItems-SwiftSkyflareDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-SwiftStarflareDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-SwiftWindfireDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 5333.10029 - tps: 4787.3814 + dps: 6022.60479 + tps: 4825.63107 } } dps_results: { key: "TestFire-AllItems-TearsoftheVanquished-47215" value: { - dps: 5397.35316 - tps: 4848.86528 + dps: 6042.94428 + tps: 4844.27799 } } dps_results: { key: "TestFire-AllItems-TempestRegalia" value: { - dps: 3909.2053 - tps: 3504.95692 + dps: 4346.4866 + tps: 3476.91799 } } dps_results: { key: "TestFire-AllItems-TheGeneral'sHeart-45507" value: { - dps: 5302.49445 - tps: 4760.66733 + dps: 5929.50647 + tps: 4751.06191 } } dps_results: { key: "TestFire-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 4473.73692 - tps: 4021.26936 + dps: 5050.63476 + tps: 4054.82815 } } dps_results: { key: "TestFire-AllItems-ThunderingSkyflareDiamond" value: { - dps: 5567.3641 - tps: 4997.42446 + dps: 6196.98842 + tps: 4964.47307 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50351" value: { - dps: 5563.78252 - tps: 4995.98157 + dps: 6202.89089 + tps: 4968.57619 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50706" value: { - dps: 5563.78252 - tps: 4995.98157 + dps: 6202.89089 + tps: 4968.57619 } } dps_results: { key: "TestFire-AllItems-TirelessSkyflareDiamond" value: { - dps: 5604.25011 - tps: 5030.0864 + dps: 6237.92365 + tps: 4996.74617 } } dps_results: { key: "TestFire-AllItems-TirelessStarflareDiamond" value: { - dps: 5596.87291 - tps: 5023.55401 + dps: 6229.7366 + tps: 4990.29155 } } dps_results: { key: "TestFire-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 5406.88695 - tps: 4854.111 + dps: 6140.30832 + tps: 4919.50174 } } dps_results: { key: "TestFire-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 5596.87291 - tps: 5023.55401 + dps: 6229.7366 + tps: 4990.29155 } } dps_results: { key: "TestFire-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 5604.25011 - tps: 5030.0864 + dps: 6237.92365 + tps: 4996.74617 } } dps_results: { key: "TestFire-AllItems-WingedTalisman-37844" value: { - dps: 5427.98195 - tps: 4873.60607 + dps: 6066.05646 + tps: 4860.30191 } } dps_results: { key: "TestFire-Average-Default" value: { - dps: 5847.33545 - tps: 5248.6541 + dps: 6520.01994 + tps: 5220.63899 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-AOE-FullBuffs-LongMultiTarget" value: { - dps: 16151.15464 - tps: 16760.01086 + dps: 16406.86037 + tps: 16251.25769 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-AOE-FullBuffs-LongSingleTarget" value: { - dps: 1766.96134 - tps: 1647.33704 + dps: 1907.49242 + tps: 1683.61172 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 2462.76779 - tps: 2200.20834 + dps: 2530.40926 + tps: 2140.47538 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-AOE-NoBuffs-LongMultiTarget" value: { - dps: 12946.00241 - tps: 13439.01165 + dps: 13092.77802 + tps: 12967.15457 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-AOE-NoBuffs-LongSingleTarget" value: { - dps: 847.25331 - tps: 778.56858 + dps: 890.50483 + tps: 777.75897 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 1416.93099 - tps: 1208.45002 + dps: 1439.37405 + tps: 1163.97443 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-FireRotation-FullBuffs-LongMultiTarget" value: { - dps: 7790.55111 - tps: 8759.23662 + dps: 8560.43653 + tps: 8856.8582 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-FireRotation-FullBuffs-LongSingleTarget" value: { - dps: 5754.09878 - tps: 5163.47164 + dps: 6379.4424 + tps: 5106.92995 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-FireRotation-FullBuffs-ShortSingleTarget" value: { - dps: 7111.3122 - tps: 6282.75583 + dps: 7806.54782 + tps: 6163.19129 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-FireRotation-NoBuffs-LongMultiTarget" value: { - dps: 4186.39339 - tps: 5239.42125 + dps: 4630.5292 + tps: 5361.61223 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-FireRotation-NoBuffs-LongSingleTarget" value: { - dps: 2239.90113 - tps: 1996.50173 + dps: 2507.2279 + tps: 1999.88313 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-FireRotation-NoBuffs-ShortSingleTarget" value: { - dps: 3548.63228 - tps: 3076.35033 + dps: 3856.05443 + tps: 2990.86622 } } dps_results: { key: "TestFire-SwitchInFrontOfTarget-Default" value: { - dps: 5713.88615 - tps: 5129.60952 + dps: 6380.03614 + tps: 5109.98748 } } diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index a610bcd9cf..f98b8e9ba2 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -46,792 +46,792 @@ character_stats_results: { dps_results: { key: "TestFrost-AllItems-Althor'sAbacus-50359" value: { - dps: 4669.45534 - tps: 3857.06511 + dps: 5140.11684 + tps: 4080.84953 } } dps_results: { key: "TestFrost-AllItems-Althor'sAbacus-50366" value: { - dps: 4696.55095 - tps: 3879.72339 + dps: 5169.66711 + tps: 4104.84176 } } dps_results: { key: "TestFrost-AllItems-AustereEarthsiegeDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-Bandit'sInsignia-40371" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-BaubleofTrueBlood-50354" value: { - dps: 4449.96445 - tps: 10073.73405 + dps: 4900.7549 + tps: 10297.14849 } } dps_results: { key: "TestFrost-AllItems-BaubleofTrueBlood-50726" value: { - dps: 4449.96445 - tps: 10073.73405 + dps: 4900.7549 + tps: 10297.14849 } } dps_results: { key: "TestFrost-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 4625.24698 - tps: 3816.35663 + dps: 5036.5198 + tps: 3999.2495 } } dps_results: { key: "TestFrost-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 3890.89226 - tps: 3187.79755 + dps: 4325.37321 + tps: 3410.6296 } } dps_results: { key: "TestFrost-AllItems-Bloodmage'sRegalia" value: { - dps: 5057.11854 - tps: 4199.41054 + dps: 5523.74545 + tps: 4430.80936 } } dps_results: { key: "TestFrost-AllItems-BracingEarthsiegeDiamond" value: { - dps: 4644.67324 - tps: 3756.555 + dps: 5055.68591 + tps: 3934.26048 } } dps_results: { key: "TestFrost-AllItems-ChaoticSkyflareDiamond" value: { - dps: 4743.10857 - tps: 3922.59292 + dps: 5158.09434 + tps: 4108.76635 } } dps_results: { key: "TestFrost-AllItems-CorpseTongueCoin-50349" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-CorpseTongueCoin-50352" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 hps: 64 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 4511.74851 - tps: 3728.74434 + dps: 4969.35402 + tps: 3947.60951 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Death-42990" value: { - dps: 4574.4081 - tps: 3785.92593 + dps: 5015.91784 + tps: 3993.23069 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 4499.00759 - tps: 3721.41815 + dps: 4950.15589 + tps: 3936.55437 } } dps_results: { key: "TestFrost-AllItems-Death'sChoice-47464" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 4473.77649 - tps: 3694.74791 + dps: 4913.87674 + tps: 3897.92468 } } dps_results: { key: "TestFrost-AllItems-Deathbringer'sWill-50362" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-Deathbringer'sWill-50363" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-Defender'sCode-40257" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-DestructiveSkyflareDiamond" value: { - dps: 4628.0935 - tps: 3819.30708 + dps: 5041.98362 + tps: 4004.49545 } } dps_results: { key: "TestFrost-AllItems-DislodgedForeignObject-50348" value: { - dps: 4912.77908 - tps: 4079.71426 + dps: 5371.02435 + tps: 4299.40543 } } dps_results: { key: "TestFrost-AllItems-DislodgedForeignObject-50353" value: { - dps: 4872.17667 - tps: 4046.7949 + dps: 5327.62514 + tps: 4266.97971 } } dps_results: { key: "TestFrost-AllItems-EffulgentSkyflareDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-EmberSkyflareDiamond" value: { - dps: 4646.14618 - tps: 3833.04545 + dps: 5057.08428 + tps: 4014.16071 } } dps_results: { key: "TestFrost-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 4625.94383 - tps: 3817.38749 + dps: 5036.95704 + tps: 3999.98636 } } dps_results: { key: "TestFrost-AllItems-EnigmaticStarflareDiamond" value: { - dps: 4625.10117 - tps: 3816.77965 + dps: 5034.58907 + tps: 3997.85518 } } dps_results: { key: "TestFrost-AllItems-EphemeralSnowflake-50260" value: { - dps: 4511.70664 - tps: 3728.55363 + dps: 4945.11174 + tps: 3924.65418 } } dps_results: { key: "TestFrost-AllItems-EssenceofGossamer-37220" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-EternalEarthsiegeDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 4536.08422 - tps: 3747.07059 + dps: 4941.08575 + tps: 3918.677 } } dps_results: { key: "TestFrost-AllItems-EyeoftheBroodmother-45308" value: { - dps: 4670.28242 - tps: 3864.47341 + dps: 5126.73726 + tps: 4087.30747 } } dps_results: { key: "TestFrost-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 4447.54087 - tps: 3668.08724 + dps: 4891.37291 + tps: 3877.74174 } } dps_results: { key: "TestFrost-AllItems-ForethoughtTalisman-40258" value: { - dps: 4585.70528 - tps: 3787.03043 + dps: 5048.77965 + tps: 4006.6917 } } dps_results: { key: "TestFrost-AllItems-ForgeEmber-37660" value: { - dps: 4613.53806 - tps: 3815.76435 + dps: 5062.70603 + tps: 4030.02485 } } dps_results: { key: "TestFrost-AllItems-ForlornSkyflareDiamond" value: { - dps: 4644.67324 - tps: 3832.55185 + dps: 5055.68591 + tps: 4013.89285 } } dps_results: { key: "TestFrost-AllItems-ForlornStarflareDiamond" value: { - dps: 4638.52143 - tps: 3827.41057 + dps: 5049.03499 + tps: 4008.50575 } } dps_results: { key: "TestFrost-AllItems-FrostfireGarb" value: { - dps: 4215.91094 - tps: 3464.66736 + dps: 4646.56651 + tps: 3670.02498 } } dps_results: { key: "TestFrost-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-FuturesightRune-38763" value: { - dps: 4523.07189 - tps: 3731.5094 + dps: 4981.59408 + tps: 3951.24257 } } dps_results: { key: "TestFrost-AllItems-Gladiator'sRegalia" value: { - dps: 4681.02042 - tps: 3843.73089 + dps: 5150.91149 + tps: 4079.54647 } } dps_results: { key: "TestFrost-AllItems-GlowingTwilightScale-54573" value: { - dps: 4683.00315 - tps: 3868.39425 + dps: 5154.89198 + tps: 4092.84565 } } dps_results: { key: "TestFrost-AllItems-GlowingTwilightScale-54589" value: { - dps: 4713.79361 - tps: 3894.1423 + dps: 5188.47183 + tps: 4120.10955 } } dps_results: { key: "TestFrost-AllItems-GnomishLightningGenerator-41121" value: { - dps: 4562.82019 - tps: 3772.92926 + dps: 4960.28184 + tps: 3941.00816 } } dps_results: { key: "TestFrost-AllItems-Heartpierce-49982" value: { - dps: 4743.10857 - tps: 3922.59292 + dps: 5158.09434 + tps: 4108.76635 } } dps_results: { key: "TestFrost-AllItems-Heartpierce-50641" value: { - dps: 4743.10857 - tps: 3922.59292 + dps: 5158.09434 + tps: 4108.76635 } } dps_results: { key: "TestFrost-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 4682.58018 - tps: 3873.20691 + dps: 5138.16558 + tps: 4097.87839 } } dps_results: { key: "TestFrost-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 4625.94383 - tps: 3817.38749 + dps: 5036.95704 + tps: 3999.98636 } } dps_results: { key: "TestFrost-AllItems-ImpassiveStarflareDiamond" value: { - dps: 4625.10117 - tps: 3816.77965 + dps: 5034.58907 + tps: 3997.85518 } } dps_results: { key: "TestFrost-AllItems-IncisorFragment-37723" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 4608.68798 - tps: 3803.63804 + dps: 5013.62659 + tps: 3980.47904 } } dps_results: { key: "TestFrost-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-Khadgar'sRegalia" value: { - dps: 4549.42573 - tps: 3746.41393 + dps: 4962.64505 + tps: 3941.87145 } } dps_results: { key: "TestFrost-AllItems-KirinTorGarb" value: { - dps: 4570.35453 - tps: 3759.26063 + dps: 5029.56474 + tps: 3992.62514 } } dps_results: { key: "TestFrost-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-MajesticDragonFigurine-40430" value: { - dps: 4442.64946 - tps: 3662.02918 + dps: 4890.15865 + tps: 3872.56179 } } dps_results: { key: "TestFrost-AllItems-MeteoriteWhetstone-37390" value: { - dps: 4504.16388 - tps: 3721.70477 + dps: 4948.57246 + tps: 3928.64751 } } dps_results: { key: "TestFrost-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 4631.27443 - tps: 3827.97643 + dps: 5090.03407 + tps: 4043.80603 } } dps_results: { key: "TestFrost-AllItems-OfferingofSacrifice-37638" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-PersistentEarthshatterDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-PurifiedShardoftheGods" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-ReignoftheDead-47316" value: { - dps: 4732.52275 - tps: 3925.67269 + dps: 5215.85213 + tps: 4165.6235 } } dps_results: { key: "TestFrost-AllItems-ReignoftheDead-47477" value: { - dps: 4770.71459 - tps: 3960.2381 + dps: 5256.36795 + tps: 4201.5964 } } dps_results: { key: "TestFrost-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 4730.02183 - tps: 3911.10212 + dps: 5142.26129 + tps: 4094.56475 } } dps_results: { key: "TestFrost-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 4611.98963 - tps: 3804.38862 + dps: 5021.30395 + tps: 3985.0169 } } dps_results: { key: "TestFrost-AllItems-RuneofRepulsion-40372" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-SealofthePantheon-36993" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-ShinyShardoftheGods" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-SliverofPureIce-50339" value: { - dps: 4636.05537 - tps: 3830.44956 + dps: 5106.0948 + tps: 4055.33814 } } dps_results: { key: "TestFrost-AllItems-SliverofPureIce-50346" value: { - dps: 4660.47776 - tps: 3851.50387 + dps: 5133.06757 + tps: 4077.81353 } } dps_results: { key: "TestFrost-AllItems-SouloftheDead-40382" value: { - dps: 4505.79208 - tps: 3723.42119 + dps: 4959.75168 + tps: 3940.57834 } } dps_results: { key: "TestFrost-AllItems-SparkofHope-45703" value: { - dps: 4445.03587 - tps: 3664.47184 + dps: 4896.07248 + tps: 3878.98151 } } dps_results: { key: "TestFrost-AllItems-SparkofLife-37657" value: { - dps: 4502.70656 - tps: 3707.72984 + dps: 4987.36111 + tps: 3964.02677 } } dps_results: { key: "TestFrost-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 4551.2272 - tps: 3760.3932 + dps: 4976.99457 + tps: 3948.33039 } } dps_results: { key: "TestFrost-AllItems-SwiftSkyflareDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-SwiftStarflareDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-SwiftWindfireDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 4445.45105 - tps: 3665.45934 + dps: 4897.22404 + tps: 3880.52487 } } dps_results: { key: "TestFrost-AllItems-TearsoftheVanquished-47215" value: { - dps: 4465.22758 - tps: 3682.65829 + dps: 4907.79316 + tps: 3890.32772 } } dps_results: { key: "TestFrost-AllItems-TempestRegalia" value: { - dps: 3681.73431 - tps: 3017.24228 + dps: 4039.23001 + tps: 3173.12538 } } dps_results: { key: "TestFrost-AllItems-TheGeneral'sHeart-45507" value: { - dps: 4448.99561 - tps: 3672.70911 + dps: 4899.68512 + tps: 3885.63996 } } dps_results: { key: "TestFrost-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 3829.66183 - tps: 3154.61552 + dps: 4171.7144 + tps: 3303.50271 } } dps_results: { key: "TestFrost-AllItems-ThunderingSkyflareDiamond" value: { - dps: 4613.9142 - tps: 3806.84547 + dps: 5022.43131 + tps: 3986.95736 } } dps_results: { key: "TestFrost-AllItems-TinyAbominationinaJar-50351" value: { - dps: 4594.55515 - tps: 3799.74334 + dps: 5027.17693 + tps: 3994.40334 } } dps_results: { key: "TestFrost-AllItems-TinyAbominationinaJar-50706" value: { - dps: 4594.55515 - tps: 3799.74334 + dps: 5027.17693 + tps: 3994.40334 } } dps_results: { key: "TestFrost-AllItems-TirelessSkyflareDiamond" value: { - dps: 4644.67324 - tps: 3832.55185 + dps: 5055.68591 + tps: 4013.89285 } } dps_results: { key: "TestFrost-AllItems-TirelessStarflareDiamond" value: { - dps: 4638.52143 - tps: 3827.41057 + dps: 5049.03499 + tps: 4008.50575 } } dps_results: { key: "TestFrost-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 4547.12106 - tps: 3754.7445 + dps: 5038.70816 + tps: 4002.23391 } } dps_results: { key: "TestFrost-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 4638.52143 - tps: 3827.41057 + dps: 5049.03499 + tps: 4008.50575 } } dps_results: { key: "TestFrost-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 4644.67324 - tps: 3832.55185 + dps: 5055.68591 + tps: 4013.89285 } } dps_results: { key: "TestFrost-AllItems-WingedTalisman-37844" value: { - dps: 4537.87772 - tps: 3752.5769 + dps: 4994.66057 + tps: 3970.97725 } } dps_results: { key: "TestFrost-Average-Default" value: { - dps: 4829.80463 - tps: 3994.31994 + dps: 5265.21476 + tps: 4204.12756 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-AOE-FullBuffs-LongMultiTarget" value: { - dps: 10019.79809 - tps: 9720.3977 + dps: 10462.89013 + tps: 9949.97906 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-AOE-FullBuffs-LongSingleTarget" value: { - dps: 1475.87694 - tps: 1024.91687 + dps: 1714.63304 + tps: 1047.97963 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 2720.37369 - tps: 1826.5727 + dps: 2757.02679 + tps: 1866.54589 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-AOE-NoBuffs-LongMultiTarget" value: { - dps: 5278.77342 - tps: 5235.83252 + dps: 5741.9488 + tps: 5482.9994 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-AOE-NoBuffs-LongSingleTarget" value: { - dps: 721.08207 - tps: 488.38111 + dps: 980.21096 + tps: 511.77981 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 1664.74297 - tps: 1026.06295 + dps: 1698.4969 + tps: 1057.80202 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-FrostRotation-FullBuffs-LongMultiTarget" value: { - dps: 4741.19729 - tps: 4513.92415 + dps: 5173.418 + tps: 4711.89331 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-FrostRotation-FullBuffs-LongSingleTarget" value: { - dps: 4741.19729 - tps: 3916.39909 + dps: 5173.418 + tps: 4118.68694 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-FrostRotation-FullBuffs-ShortSingleTarget" value: { - dps: 6053.91514 - tps: 4804.57106 + dps: 6442.10252 + tps: 5148.17782 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-FrostRotation-NoBuffs-LongMultiTarget" value: { - dps: 2950.48159 - tps: 3173.10476 + dps: 3225.26998 + tps: 3278.4072 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-FrostRotation-NoBuffs-LongSingleTarget" value: { - dps: 2950.48159 - tps: 2411.22277 + dps: 3225.26998 + tps: 2518.73265 } } dps_results: { key: "TestFrost-Settings-Troll-P1Frost-FrostRotation-NoBuffs-ShortSingleTarget" value: { - dps: 3551.35257 - tps: 2710.79387 + dps: 3733.30575 + tps: 2870.92393 } } dps_results: { key: "TestFrost-SwitchInFrontOfTarget-Default" value: { - dps: 4743.10857 - tps: 3922.59292 + dps: 5158.09434 + tps: 4108.76635 } } diff --git a/sim/mage/mage.go b/sim/mage/mage.go index 59db2da415..6fa822fe2c 100644 --- a/sim/mage/mage.go +++ b/sim/mage/mage.go @@ -14,6 +14,8 @@ const ( HotStreakSpells = core.SpellFlagAgentReserved3 ) +var TalentTreeSizes = [3]int{30, 28, 28} + func RegisterMage() { core.RegisterAgentFactory( proto.Player_Mage{}, @@ -156,13 +158,15 @@ func NewMage(character core.Character, options *proto.Player) *Mage { mage := &Mage{ Character: character, - Talents: mageOptions.Talents, + Talents: &proto.MageTalents{}, Options: mageOptions.Options, Rotation: mageOptions.Rotation, ReactionTime: time.Millisecond * time.Duration(mageOptions.Options.ReactionTimeMs), PyroblastDelayMs: time.Millisecond * time.Duration(mageOptions.Rotation.PyroblastDelayMs), } + core.FillTalentsProto(mage.Talents.ProtoReflect(), options.TalentsString, TalentTreeSizes) + mage.bonusCritDamage = .25*float64(mage.Talents.SpellPower) + .1*float64(mage.Talents.Burnout) mage.EnableManaBar() mage.EnableResumeAfterManaWait(mage.tryUseGCD) diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go index ad5efa8646..4aeb7fb8e5 100644 --- a/sim/mage/mage_test.go +++ b/sim/mage/mage_test.go @@ -18,13 +18,14 @@ func TestArcane(t *testing.T) { Race: proto.Race_RaceTroll, GearSet: core.GearSetCombo{Label: "P1Arcane", GearSet: P1ArcaneGear}, + Talents: ArcaneTalents, + Glyphs: ArcaneGlyphs, + Consumes: FullArcaneConsumes, SpecOptions: core.SpecOptionsCombo{Label: "ArcaneRotation", SpecOptions: PlayerOptionsArcane}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "AOE", SpecOptions: PlayerOptionsArcaneAOE}, }, - Consumes: FullArcaneConsumes, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeDagger, @@ -46,13 +47,14 @@ func TestFire(t *testing.T) { Race: proto.Race_RaceTroll, GearSet: core.GearSetCombo{Label: "P1Fire", GearSet: P1FireGear}, + Talents: FireTalents, + Glyphs: FireGlyphs, + Consumes: FullFireConsumes, SpecOptions: core.SpecOptionsCombo{Label: "FireRotation", SpecOptions: PlayerOptionsFire}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "AOE", SpecOptions: PlayerOptionsFireAOE}, }, - Consumes: FullFireConsumes, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeDagger, @@ -74,13 +76,14 @@ func TestFrost(t *testing.T) { Race: proto.Race_RaceTroll, GearSet: core.GearSetCombo{Label: "P1Frost", GearSet: P1FrostGear}, + Talents: FrostTalents, + Glyphs: FrostGlyphs, + Consumes: FullFrostConsumes, SpecOptions: core.SpecOptionsCombo{Label: "FrostRotation", SpecOptions: PlayerOptionsFrost}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "AOE", SpecOptions: PlayerOptionsFrostAOE}, }, - Consumes: FullFrostConsumes, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeDagger, diff --git a/sim/mage/presets.go b/sim/mage/presets.go index 10af07dc99..e9a9e6bbfa 100644 --- a/sim/mage/presets.go +++ b/sim/mage/presets.go @@ -5,98 +5,23 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var FireTalents = &proto.MageTalents{ - ArcaneSubtlety: 2, - ArcaneFocus: 3, - ArcaneConcentration: 5, - SpellImpact: 3, - StudentOfTheMind: 1, - FocusMagic: true, - TormentTheWeak: 3, - - ImprovedFireball: 5, - Ignite: 5, - WorldInFlames: 3, - Pyroblast: true, - BurningSoul: 1, - ImprovedScorch: 3, - MasterOfElements: 2, - PlayingWithFire: 3, - CriticalMass: 3, - BlastWave: true, - FirePower: 5, - Pyromaniac: 3, - Combustion: true, - MoltenFury: 2, - EmpoweredFire: 3, - DragonsBreath: true, - Firestarter: 2, - HotStreak: 3, - Burnout: 5, - LivingBomb: true, +var ArcaneTalents = "23000513310033015032310250532-03-023303001" +var FireTalents = "23000503110003-0055030012303331053120301351" +var FrostTalents = "23000503110003--0533030310233100030152231351" +var ArcaneGlyphs = &proto.Glyphs{ + Major1: int32(proto.MageMajorGlyph_GlyphOfArcaneBlast), + Major2: int32(proto.MageMajorGlyph_GlyphOfArcaneMissiles), + Major3: int32(proto.MageMajorGlyph_GlyphOfMoltenArmor), } - -var FrostTalents = &proto.MageTalents{ - ArcaneSubtlety: 2, - ArcaneFocus: 3, - ArcaneConcentration: 5, - SpellImpact: 3, - StudentOfTheMind: 1, - FocusMagic: true, - TormentTheWeak: 3, - - ImprovedFrostbolt: 5, - IceFloes: 3, - IceShards: 3, - Precision: 3, - PiercingIce: 3, - IcyVeins: true, - ArcticReach: 2, - FrostChanneling: 3, - Shatter: 3, - ColdSnap: true, - WintersChill: 3, - IceBarrier: true, - ArcticWinds: 5, - EmpoweredFrostbolt: 2, - FingersOfFrost: 2, - BrainFreeze: 3, - SummonWaterElemental: true, - EnduringWinter: 3, - ChilledToTheBone: 5, - DeepFreeze: true, +var FireGlyphs = &proto.Glyphs{ + Major1: int32(proto.MageMajorGlyph_GlyphOfFireball), + Major2: int32(proto.MageMajorGlyph_GlyphOfMoltenArmor), + Major3: int32(proto.MageMajorGlyph_GlyphOfLivingBomb), } - -var ArcaneTalents = &proto.MageTalents{ - ArcaneFocus: 3, - ArcaneSubtlety: 2, - ArcaneConcentration: 5, - SpellImpact: 3, - FocusMagic: true, - MagicAttunement: 1, - StudentOfTheMind: 3, - ArcaneMeditation: 3, - TormentTheWeak: 3, - PresenceOfMind: true, - ArcaneMind: 5, - ArcaneInstability: 3, - ArcanePotency: 2, - ArcaneEmpowerment: 3, - ArcanePower: true, - ArcaneFlows: 2, - MindMastery: 5, - MissileBarrage: 5, - NetherwindPresence: 3, - SpellPower: 2, - ArcaneBarrage: true, - - Incineration: 3, - - ImprovedFrostbolt: 2, - IceFloes: 3, - IceShards: 2, - Precision: 3, - IcyVeins: true, +var FrostGlyphs = &proto.Glyphs{ + Major1: int32(proto.MageMajorGlyph_GlyphOfFrostbolt), + Major3: int32(proto.MageMajorGlyph_GlyphOfEternalWater), + Major2: int32(proto.MageMajorGlyph_GlyphOfMoltenArmor), } var fireMageOptions = &proto.Mage_Options{ @@ -106,7 +31,6 @@ var fireMageOptions = &proto.Mage_Options{ } var PlayerOptionsFire = &proto.Player_Mage{ Mage: &proto.Mage{ - Talents: FireTalents, Options: fireMageOptions, Rotation: &proto.Mage_Rotation{ Type: proto.Mage_Rotation_Fire, @@ -118,7 +42,6 @@ var PlayerOptionsFire = &proto.Player_Mage{ } var PlayerOptionsFireAOE = &proto.Player_Mage{ Mage: &proto.Mage{ - Talents: FireTalents, Options: fireMageOptions, Rotation: &proto.Mage_Rotation{ Type: proto.Mage_Rotation_Aoe, @@ -133,7 +56,6 @@ var frostMageOptions = &proto.Mage_Options{ } var PlayerOptionsFrost = &proto.Player_Mage{ Mage: &proto.Mage{ - Talents: FrostTalents, Options: frostMageOptions, Rotation: &proto.Mage_Rotation{ Type: proto.Mage_Rotation_Frost, @@ -142,7 +64,6 @@ var PlayerOptionsFrost = &proto.Player_Mage{ } var PlayerOptionsFrostAOE = &proto.Player_Mage{ Mage: &proto.Mage{ - Talents: FrostTalents, Options: frostMageOptions, Rotation: &proto.Mage_Rotation{ Type: proto.Mage_Rotation_Aoe, @@ -157,7 +78,6 @@ var arcaneMageOptions = &proto.Mage_Options{ } var PlayerOptionsArcane = &proto.Player_Mage{ Mage: &proto.Mage{ - Talents: ArcaneTalents, Options: arcaneMageOptions, Rotation: &proto.Mage_Rotation{ Type: proto.Mage_Rotation_Arcane, @@ -171,7 +91,6 @@ var PlayerOptionsArcane = &proto.Player_Mage{ } var PlayerOptionsArcaneAOE = &proto.Player_Mage{ Mage: &proto.Mage{ - Talents: ArcaneTalents, Options: arcaneMageOptions, Rotation: &proto.Mage_Rotation{ Type: proto.Mage_Rotation_Aoe, diff --git a/sim/paladin/holy/holy.go b/sim/paladin/holy/holy.go index 8d6e8ab98d..eae3966848 100644 --- a/sim/paladin/holy/holy.go +++ b/sim/paladin/holy/holy.go @@ -27,7 +27,7 @@ func NewHolyPaladin(character core.Character, options *proto.Player) *HolyPaladi holyOptions := options.GetHolyPaladin() holy := &HolyPaladin{ - Paladin: paladin.NewPaladin(character, holyOptions.Talents), + Paladin: paladin.NewPaladin(character, options.TalentsString), Rotation: holyOptions.Rotation, Options: holyOptions.Options, } diff --git a/sim/paladin/holy/holy_test.go b/sim/paladin/holy/holy_test.go index 1f8b9dbaac..148b81075a 100644 --- a/sim/paladin/holy/holy_test.go +++ b/sim/paladin/holy/holy_test.go @@ -19,10 +19,11 @@ func TestHoly(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceHuman}, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: BasicOptions}, - Consumes: FullConsumes, - Glyphs: StandardGlyphs, IsHealer: true, InFrontOfTarget: true, @@ -45,13 +46,14 @@ func BenchmarkSimulate(b *testing.B) { rsr := &proto.RaidSimRequest{ Raid: core.SinglePlayerRaidProto( &proto.Player{ - Race: proto.Race_RaceBloodElf, - Class: proto.Class_ClassPaladin, - Equipment: P1Gear, - Consumes: FullConsumes, - Spec: BasicOptions, - Glyphs: StandardGlyphs, - Buffs: core.FullIndividualBuffs, + Race: proto.Race_RaceBloodElf, + Class: proto.Class_ClassPaladin, + Equipment: P1Gear, + Consumes: FullConsumes, + Spec: BasicOptions, + TalentsString: StandardTalents, + Glyphs: StandardGlyphs, + Buffs: core.FullIndividualBuffs, }, core.FullPartyBuffs, core.FullRaidBuffs, diff --git a/sim/paladin/holy/presets.go b/sim/paladin/holy/presets.go index ec14c31db3..9cb73d9e35 100644 --- a/sim/paladin/holy/presets.go +++ b/sim/paladin/holy/presets.go @@ -5,36 +5,7 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var defaultProtTalents = &proto.PaladinTalents{ - SpiritualFocus: 5, - HealingLight: 3, - DivineIntellect: 5, - AuraMastery: true, - Illumination: 5, - ImprovedLayOnHands: 1, - ImprovedBlessingOfWisdom: 2, - DivineFavor: true, - SanctifiedLight: 3, - HolyPower: 5, - LightsGrace: 3, - HolyShock: true, - HolyGuidance: 5, - DivineIllumination: true, - JudgementsOfThePure: 5, - InfusionOfLight: 2, - EnlightenedJudgements: 2, - BeaconOfLight: true, - - Divinity: 5, - GuardiansFavor: 2, - Anticipation: 3, - DivineSacrifice: true, - ImprovedRighteousFury: 3, - Toughness: 1, - DivineGuardian: 2, - ImprovedDevotionAura: 3, -} - +var StandardTalents = "50350151020013053100515221-50023131203" var StandardGlyphs = &proto.Glyphs{ Major1: int32(proto.PaladinMajorGlyph_GlyphOfHolyLight), Major2: int32(proto.PaladinMajorGlyph_GlyphOfSealOfWisdom), @@ -52,7 +23,6 @@ var defaultProtOptions = &proto.HolyPaladin_Options{ var BasicOptions = &proto.Player_HolyPaladin{ HolyPaladin: &proto.HolyPaladin{ - Talents: defaultProtTalents, Options: defaultProtOptions, Rotation: defaultProtRotation, }, diff --git a/sim/paladin/paladin.go b/sim/paladin/paladin.go index 3d04ccb201..81c2baad01 100644 --- a/sim/paladin/paladin.go +++ b/sim/paladin/paladin.go @@ -11,6 +11,8 @@ const ( SpellFlagPrimaryJudgement = core.SpellFlagAgentReserved2 ) +var TalentTreeSizes = [3]int{26, 26, 26} + type Paladin struct { core.Character @@ -170,11 +172,12 @@ func (paladin *Paladin) Reset(_ *core.Simulation) { } // maybe need to add stat dependencies -func NewPaladin(character core.Character, talents *proto.PaladinTalents) *Paladin { +func NewPaladin(character core.Character, talentsStr string) *Paladin { paladin := &Paladin{ Character: character, - Talents: talents, + Talents: &proto.PaladinTalents{}, } + core.FillTalentsProto(paladin.Talents.ProtoReflect(), talentsStr, TalentTreeSizes) // This is used to cache its effect in talents.go paladin.HasTuralyonsOrLiadrinsBattlegear2Pc = paladin.HasSetBonus(ItemSetTuralyonsBattlegear, 2) diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 6aeb4c62dc..b1f40e23a2 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -46,844 +46,844 @@ character_stats_results: { dps_results: { key: "TestProtection-AllItems-AegisBattlegear" value: { - dps: 3350.94333 - tps: 8013.96924 + dps: 3482.33501 + tps: 8320.89722 } } dps_results: { key: "TestProtection-AllItems-AegisPlate" value: { - dps: 3096.07954 - tps: 7470.29426 + dps: 3247.82092 + tps: 7826.69779 } } dps_results: { key: "TestProtection-AllItems-Althor'sAbacus-50359" value: { - dps: 3199.3023 - tps: 7720.25472 + dps: 3252.65662 + tps: 7839.40166 } } dps_results: { key: "TestProtection-AllItems-Althor'sAbacus-50366" value: { - dps: 3201.87799 - tps: 7726.88455 + dps: 3255.2486 + tps: 7846.07341 } } dps_results: { key: "TestProtection-AllItems-AshtongueTalismanofZeal-32489" value: { - dps: 3207.50591 - tps: 7741.37081 + dps: 3261.23433 + tps: 7861.48069 } } dps_results: { key: "TestProtection-AllItems-AustereEarthsiegeDiamond" value: { - dps: 3165.45356 - tps: 7633.12808 + dps: 3218.72295 + tps: 7752.05641 } } dps_results: { key: "TestProtection-AllItems-Bandit'sInsignia-40371" value: { - dps: 3306.21598 - tps: 7917.14841 + dps: 3359.18519 + tps: 8034.90538 } } dps_results: { key: "TestProtection-AllItems-BaubleofTrueBlood-50354" value: { - dps: 3178.30987 - tps: 23122.03663 + dps: 3231.60777 + tps: 23253.81032 } } dps_results: { key: "TestProtection-AllItems-BaubleofTrueBlood-50726" value: { - dps: 3178.30987 - tps: 23122.03663 + dps: 3231.60777 + tps: 23253.81032 } } dps_results: { key: "TestProtection-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 3195.37123 - tps: 7707.82831 + dps: 3241.93843 + tps: 7813.18654 } } dps_results: { key: "TestProtection-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 3102.33418 - tps: 7473.71354 + dps: 3152.56014 + tps: 7588.33964 } } dps_results: { key: "TestProtection-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 2770.54056 - tps: 6659.4949 + dps: 2854.70718 + tps: 6847.46436 } } dps_results: { key: "TestProtection-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 2800.17518 - tps: 6750.99661 + dps: 2883.9704 + tps: 6939.49796 } } dps_results: { key: "TestProtection-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 2715.497 - tps: 6562.95461 + dps: 2795.00449 + tps: 6751.2185 } } dps_results: { key: "TestProtection-AllItems-BracingEarthsiegeDiamond" value: { - dps: 3168.38048 - tps: 7489.82924 + dps: 3221.66838 + tps: 7606.42627 } } dps_results: { key: "TestProtection-AllItems-ChaoticSkyflareDiamond" value: { - dps: 3208.01164 - tps: 7732.20811 + dps: 3257.87618 + tps: 7843.25175 } } dps_results: { key: "TestProtection-AllItems-CorpseTongueCoin-50349" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-CorpseTongueCoin-50352" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 hps: 64 } } dps_results: { key: "TestProtection-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 3224.25583 - tps: 7768.91352 + dps: 3274.00075 + tps: 7883.12392 } } dps_results: { key: "TestProtection-AllItems-DarkmoonCard:Death-42990" value: { - dps: 3279.50425 - tps: 7842.09077 + dps: 3334.46642 + tps: 7966.9321 } } dps_results: { key: "TestProtection-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 3339.45241 - tps: 8062.98047 + dps: 3393.22495 + tps: 8185.75291 } } dps_results: { key: "TestProtection-AllItems-DeadlyGladiator'sLibramofFortitude-42852" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-AllItems-Death'sChoice-47464" value: { - dps: 3492.9377 - tps: 8403.96167 + dps: 3552.85085 + tps: 8537.81584 } } dps_results: { key: "TestProtection-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 3212.7567 - tps: 7744.63949 + dps: 3259.82861 + tps: 7850.14843 } } dps_results: { key: "TestProtection-AllItems-Deathbringer'sWill-50362" value: { - dps: 3313.29537 - tps: 7944.71608 + dps: 3364.78935 + tps: 8063.19375 } } dps_results: { key: "TestProtection-AllItems-Deathbringer'sWill-50363" value: { - dps: 3357.27948 - tps: 8048.68162 + dps: 3402.18116 + tps: 8142.58839 } } dps_results: { key: "TestProtection-AllItems-Defender'sCode-40257" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-DestructiveSkyflareDiamond" value: { - dps: 3180.22874 - tps: 7668.12112 + dps: 3231.47027 + tps: 7781.39644 } } dps_results: { key: "TestProtection-AllItems-DislodgedForeignObject-50348" value: { - dps: 3247.46907 - tps: 7800.89754 + dps: 3304.61038 + tps: 7929.69504 } } dps_results: { key: "TestProtection-AllItems-DislodgedForeignObject-50353" value: { - dps: 3250.55357 - tps: 7816.40638 + dps: 3321.1767 + tps: 7975.48886 } } dps_results: { key: "TestProtection-AllItems-EffulgentSkyflareDiamond" value: { - dps: 3165.45356 - tps: 7633.12808 + dps: 3218.72295 + tps: 7752.05641 } } dps_results: { key: "TestProtection-AllItems-EmberSkyflareDiamond" value: { - dps: 3183.56393 - tps: 7677.02475 + dps: 3234.83312 + tps: 7794.19051 } } dps_results: { key: "TestProtection-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 3179.02453 - tps: 7665.02148 + dps: 3228.93813 + tps: 7776.21432 } } dps_results: { key: "TestProtection-AllItems-EnigmaticStarflareDiamond" value: { - dps: 3176.96834 - tps: 7660.3284 + dps: 3227.9637 + tps: 7774.10421 } } dps_results: { key: "TestProtection-AllItems-EphemeralSnowflake-50260" value: { - dps: 3218.15147 - tps: 7740.86842 + dps: 3273.03425 + tps: 7863.02858 } } dps_results: { key: "TestProtection-AllItems-EternalEarthsiegeDiamond" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 3278.44092 - tps: 7845.13553 + dps: 3330.08305 + tps: 7963.45978 } } dps_results: { key: "TestProtection-AllItems-EyeoftheBroodmother-45308" value: { - dps: 3234.59692 - tps: 7797.69107 + dps: 3284.08222 + tps: 7910.41968 } } dps_results: { key: "TestProtection-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 3215.11944 - tps: 7764.38211 + dps: 3266.39548 + tps: 7881.26181 } } dps_results: { key: "TestProtection-AllItems-ForethoughtTalisman-40258" value: { - dps: 3191.34108 - tps: 7699.76254 + dps: 3244.64505 + tps: 7818.77989 } } dps_results: { key: "TestProtection-AllItems-ForgeEmber-37660" value: { - dps: 3214.35325 - tps: 7748.29692 + dps: 3263.27649 + tps: 7858.00068 } } dps_results: { key: "TestProtection-AllItems-ForlornSkyflareDiamond" value: { - dps: 3168.38048 - tps: 7640.66197 + dps: 3221.66838 + tps: 7759.63794 } } dps_results: { key: "TestProtection-AllItems-ForlornStarflareDiamond" value: { - dps: 3167.7951 - tps: 7639.15519 + dps: 3221.0793 + tps: 7758.12163 } } dps_results: { key: "TestProtection-AllItems-FuriousGladiator'sLibramofFortitude-42853" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 3298.88199 - tps: 7946.62758 + dps: 3354.70826 + tps: 8071.2639 } } dps_results: { key: "TestProtection-AllItems-FuturesightRune-38763" value: { - dps: 3185.60431 - tps: 7684.99611 + dps: 3238.87201 + tps: 7803.92008 } } dps_results: { key: "TestProtection-AllItems-Gladiator'sVindication" value: { - dps: 3413.42831 - tps: 8160.1152 + dps: 3578.64593 + tps: 8547.25736 } } dps_results: { key: "TestProtection-AllItems-GlowingTwilightScale-54573" value: { - dps: 3200.59014 - tps: 7723.56963 + dps: 3253.95261 + tps: 7842.73753 } } dps_results: { key: "TestProtection-AllItems-GlowingTwilightScale-54589" value: { - dps: 3203.51706 - tps: 7731.10353 + dps: 3256.89804 + tps: 7850.31906 } } dps_results: { key: "TestProtection-AllItems-GnomishLightningGenerator-41121" value: { - dps: 3261.33657 - tps: 7824.39702 + dps: 3309.45838 + tps: 7932.73454 } } dps_results: { key: "TestProtection-AllItems-HatefulGladiator'sLibramofFortitude-42851" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 3179.02453 - tps: 7665.02148 + dps: 3228.93813 + tps: 7776.21432 } } dps_results: { key: "TestProtection-AllItems-ImpassiveStarflareDiamond" value: { - dps: 3176.96834 - tps: 7660.3284 + dps: 3227.9637 + tps: 7774.10421 } } dps_results: { key: "TestProtection-AllItems-IncisorFragment-37723" value: { - dps: 3244.06405 - tps: 7811.73088 + dps: 3298.65942 + tps: 7933.46434 } } dps_results: { key: "TestProtection-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 3203.35218 - tps: 7740.73106 + dps: 3254.51502 + tps: 7857.41387 } } dps_results: { key: "TestProtection-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 3181.80742 - tps: 7671.11232 - hps: 16.01848 + dps: 3235.41861 + tps: 7790.80283 + hps: 16.14611 } } dps_results: { key: "TestProtection-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 3197.66495 - tps: 7716.04019 + dps: 3250.99762 + tps: 7835.13139 } } dps_results: { key: "TestProtection-AllItems-LibramofFuriousBlows-37574" value: { - dps: 3136.71975 - tps: 7555.12381 + dps: 3188.10237 + tps: 7670.73794 } } dps_results: { key: "TestProtection-AllItems-LibramofReciprocation-40706" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-AllItems-LibramofThreeTruths-50455" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-AllItems-LibramofValiance-47661" value: { - dps: 3358.27551 - tps: 8081.79342 + dps: 3415.5529 + tps: 8209.5877 } } dps_results: { key: "TestProtection-AllItems-LibramoftheSacredShield-45145" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-AllItems-LightbringerBattlegear" value: { - dps: 2786.17863 - tps: 6702.15171 + dps: 2837.5495 + tps: 6818.80957 } } dps_results: { key: "TestProtection-AllItems-LightswornBattlegear" value: { - dps: 3712.99134 - tps: 8855.73628 + dps: 3792.85265 + tps: 9037.60477 } } dps_results: { key: "TestProtection-AllItems-LightswornPlate" value: { - dps: 3270.54769 - tps: 7865.89673 + dps: 3338.42904 + tps: 8023.23221 } } dps_results: { key: "TestProtection-AllItems-MajesticDragonFigurine-40430" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-MeteoriteWhetstone-37390" value: { - dps: 3236.12378 - tps: 7789.18808 + dps: 3324.85147 + tps: 7996.74324 } } dps_results: { key: "TestProtection-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 3243.39346 - tps: 7816.7633 + dps: 3303.58442 + tps: 7951.20617 } } dps_results: { key: "TestProtection-AllItems-OfferingofSacrifice-37638" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-PersistentEarthshatterDiamond" value: { - dps: 3178.6924 - tps: 7663.87723 + dps: 3232.23849 + tps: 7783.42255 } } dps_results: { key: "TestProtection-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 3181.80742 - tps: 7671.11232 + dps: 3235.41861 + tps: 7790.80283 } } dps_results: { key: "TestProtection-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 3165.45356 - tps: 7633.12808 + dps: 3218.72295 + tps: 7752.05641 } } dps_results: { key: "TestProtection-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 3165.45356 - tps: 7633.12808 + dps: 3218.72295 + tps: 7752.05641 } } dps_results: { key: "TestProtection-AllItems-PurifiedShardoftheGods" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-RedemptionBattlegear" value: { - dps: 3075.3781 - tps: 7330.51859 + dps: 3181.76196 + tps: 7570.02514 } } dps_results: { key: "TestProtection-AllItems-RedemptionPlate" value: { - dps: 3018.76088 - tps: 7273.87297 + dps: 3110.53758 + tps: 7495.96563 } } dps_results: { key: "TestProtection-AllItems-ReignoftheDead-47316" value: { - dps: 3195.90707 - tps: 7711.51541 + dps: 3249.23992 + tps: 7830.60708 } } dps_results: { key: "TestProtection-AllItems-ReignoftheDead-47477" value: { - dps: 3198.01445 - tps: 7716.93981 + dps: 3251.36063 + tps: 7836.06578 } } dps_results: { key: "TestProtection-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 3206.92837 - tps: 7729.62248 + dps: 3257.59584 + tps: 7842.53018 } } dps_results: { key: "TestProtection-AllItems-RelentlessGladiator'sLibramofFortitude-42854" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 3181.29926 - tps: 7668.85573 + dps: 3226.69295 + tps: 7772.55842 } } dps_results: { key: "TestProtection-AllItems-RuneofRepulsion-40372" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-SavageGladiator'sLibramofFortitude-42611" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-AllItems-SealofthePantheon-36993" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-ShinyShardoftheGods" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-SliverofPureIce-50339" value: { - dps: 3236.82654 - tps: 7820.40157 + dps: 3288.12835 + tps: 7937.36395 } } dps_results: { key: "TestProtection-AllItems-SliverofPureIce-50346" value: { - dps: 3237.81974 - tps: 7823.79889 + dps: 3289.25516 + tps: 7940.78833 } } dps_results: { key: "TestProtection-AllItems-SouloftheDead-40382" value: { - dps: 3220.01752 - tps: 7759.79361 + dps: 3269.46297 + tps: 7872.59509 } } dps_results: { key: "TestProtection-AllItems-SparkofHope-45703" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-SparkofLife-37657" value: { - dps: 3264.84365 - tps: 7870.19853 + dps: 3303.94192 + tps: 7955.0805 } } dps_results: { key: "TestProtection-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 3288.76531 - tps: 7921.84108 + dps: 3333.79153 + tps: 8029.47626 } } dps_results: { key: "TestProtection-AllItems-StormshroudArmor" value: { - dps: 2563.9052 - tps: 6182.22066 + dps: 2651.97104 + tps: 6391.08178 } } dps_results: { key: "TestProtection-AllItems-SwiftSkyflareDiamond" value: { - dps: 3181.80742 - tps: 7671.11232 + dps: 3235.41861 + tps: 7790.80283 } } dps_results: { key: "TestProtection-AllItems-SwiftStarflareDiamond" value: { - dps: 3178.6924 - tps: 7663.87723 + dps: 3232.23849 + tps: 7783.42255 } } dps_results: { key: "TestProtection-AllItems-SwiftWindfireDiamond" value: { - dps: 3173.24111 - tps: 7651.21581 + dps: 3226.67327 + tps: 7770.50708 } } dps_results: { key: "TestProtection-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-TearsoftheVanquished-47215" value: { - dps: 3215.11944 - tps: 7768.69296 + dps: 3266.39548 + tps: 7885.57867 } } dps_results: { key: "TestProtection-AllItems-TheGeneral'sHeart-45507" value: { - dps: 3178.34555 - tps: 7666.31206 + dps: 3231.56735 + tps: 7785.11788 } } dps_results: { key: "TestProtection-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 3022.85946 - tps: 7300.66919 + dps: 3064.73231 + tps: 7397.10949 } } dps_results: { key: "TestProtection-AllItems-ThunderingSkyflareDiamond" value: { - dps: 3189.74143 - tps: 7689.07516 + dps: 3220.07528 + tps: 7747.61576 } } dps_results: { key: "TestProtection-AllItems-TinyAbominationinaJar-50351" value: { - dps: 3345.38114 - tps: 8041.05487 + dps: 3416.64285 + tps: 8206.63211 } } dps_results: { key: "TestProtection-AllItems-TinyAbominationinaJar-50706" value: { - dps: 3348.91853 - tps: 8046.28699 + dps: 3439.17339 + tps: 8268.99964 } } dps_results: { key: "TestProtection-AllItems-TirelessSkyflareDiamond" value: { - dps: 3168.38048 - tps: 7640.66197 + dps: 3221.66838 + tps: 7759.63794 } } dps_results: { key: "TestProtection-AllItems-TirelessStarflareDiamond" value: { - dps: 3167.7951 - tps: 7639.15519 + dps: 3221.0793 + tps: 7758.12163 } } dps_results: { key: "TestProtection-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 3218.66045 - tps: 7747.19662 + dps: 3292.41321 + tps: 7928.92621 } } dps_results: { key: "TestProtection-AllItems-TomeoftheLightbringer-32368" value: { - dps: 3155.82352 - tps: 7608.34036 + dps: 3208.88806 + tps: 7726.74138 } } dps_results: { key: "TestProtection-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 3167.7951 - tps: 7639.15519 + dps: 3221.0793 + tps: 7758.12163 } } dps_results: { key: "TestProtection-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 3168.38048 - tps: 7640.66197 + dps: 3221.66838 + tps: 7759.63794 } } dps_results: { key: "TestProtection-AllItems-Turalyon'sBattlegear" value: { - dps: 3363.87091 - tps: 8032.31405 + dps: 3453.30843 + tps: 8242.50426 } } dps_results: { key: "TestProtection-AllItems-Turalyon'sPlate" value: { - dps: 3124.06391 - tps: 7521.27415 + dps: 3203.17404 + tps: 7708.59857 } } dps_results: { key: "TestProtection-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 2726.238 - tps: 6549.07242 + dps: 2817.88346 + tps: 6753.20012 } } dps_results: { key: "TestProtection-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 3099.12874 - tps: 7496.35649 + dps: 3167.58295 + tps: 7658.85827 } } dps_results: { key: "TestProtection-AllItems-WingedTalisman-37844" value: { - dps: 3186.99823 - tps: 7688.58404 + dps: 3240.32349 + tps: 7807.65618 } } dps_results: { key: "TestProtection-AllItems-WrathfulGladiator'sLibramofFortitude-51478" value: { - dps: 3121.16534 - tps: 7519.1302 + dps: 3173.98787 + tps: 7636.90829 } } dps_results: { key: "TestProtection-Average-Default" value: { - dps: 3584.58064 - tps: 8597.07302 - dtps: 15.01878 + dps: 3638.51646 + tps: 8721.84073 + dtps: 14.0532 } } dps_results: { @@ -1142,7 +1142,7 @@ dps_results: { key: "TestProtection-SwitchInFrontOfTarget-Default" value: { dps: 3758.67434 - tps: 9009.73746 - dtps: 12.47426 + tps: 9009.73588 + dtps: 12.10003 } } diff --git a/sim/paladin/protection/presets.go b/sim/paladin/protection/presets.go index 751cee2096..5c0ef09056 100644 --- a/sim/paladin/protection/presets.go +++ b/sim/paladin/protection/presets.go @@ -5,36 +5,13 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var defaultProtTalents = &proto.PaladinTalents{ - DivineStrength: 5, - Anticipation: 5, - DivineSacrifice: true, - ImprovedRighteousFury: 3, - Toughness: 5, - DivineGuardian: 2, - BlessingOfSanctuary: true, - Reckoning: 3, - SacredDuty: 2, - OneHandedWeaponSpecialization: 3, - SpiritualAttunement: 1, - HolyShield: true, - ArdentDefender: 3, - Redoubt: 3, - CombatExpertise: 3, - TouchedByTheLight: 3, - AvengersShield: true, - GuardedByTheLight: 2, - ShieldOfTheTemplar: 3, - JudgementsOfTheJust: 2, - HammerOfTheRighteous: true, - Deflection: 5, - Benediction: 1, - ImprovedJudgements: 1, - HeartOfTheCrusader: 3, - Vindication: 2, - SealOfCommand: true, - PursuitOfJustice: 2, - Crusade: 3, +var StandardTalents = "-05005135200132311333312321-511302012003" +var StandardGlyphs = &proto.Glyphs{ + Major1: int32(proto.PaladinMajorGlyph_GlyphOfSealOfVengeance), + Major2: int32(proto.PaladinMajorGlyph_GlyphOfRighteousDefense), + Major3: int32(proto.PaladinMajorGlyph_GlyphOfDivinePlea), + Minor1: int32(proto.PaladinMinorGlyph_GlyphOfLayOnHands), + Minor2: int32(proto.PaladinMinorGlyph_GlyphOfSenseUndead), } var defaultProtRotation = &proto.ProtectionPaladin_Rotation{} @@ -47,7 +24,6 @@ var defaultProtOptions = &proto.ProtectionPaladin_Options{ var DefaultOptions = &proto.Player_ProtectionPaladin{ ProtectionPaladin: &proto.ProtectionPaladin{ - Talents: defaultProtTalents, Options: defaultProtOptions, Rotation: defaultProtRotation, }, diff --git a/sim/paladin/protection/protection.go b/sim/paladin/protection/protection.go index 289675e92f..83c93b3a6e 100644 --- a/sim/paladin/protection/protection.go +++ b/sim/paladin/protection/protection.go @@ -29,7 +29,7 @@ func NewProtectionPaladin(character core.Character, options *proto.Player) *Prot protOptions := options.GetProtectionPaladin() prot := &ProtectionPaladin{ - Paladin: paladin.NewPaladin(character, protOptions.Talents), + Paladin: paladin.NewPaladin(character, options.TalentsString), Rotation: protOptions.Rotation, Options: protOptions.Options, Seal: protOptions.Options.Seal, diff --git a/sim/paladin/protection/protection_test.go b/sim/paladin/protection/protection_test.go index 9ee3f8d54f..e6ba21ab21 100644 --- a/sim/paladin/protection/protection_test.go +++ b/sim/paladin/protection/protection_test.go @@ -19,13 +19,15 @@ func TestProtection(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceHuman}, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Protection Paladin SOV", SpecOptions: DefaultOptions}, OtherSpecOptions: []core.SpecOptionsCombo{ { Label: "Protection Paladin SOC", SpecOptions: &proto.Player_ProtectionPaladin{ ProtectionPaladin: &proto.ProtectionPaladin{ - Talents: defaultProtTalents, Options: &proto.ProtectionPaladin_Options{ Judgement: proto.PaladinJudgement_JudgementOfWisdom, Seal: proto.PaladinSeal_Command, @@ -40,7 +42,6 @@ func TestProtection(t *testing.T) { Label: "Protection Paladin SOR", SpecOptions: &proto.Player_ProtectionPaladin{ ProtectionPaladin: &proto.ProtectionPaladin{ - Talents: defaultProtTalents, Options: &proto.ProtectionPaladin_Options{ Judgement: proto.PaladinJudgement_JudgementOfWisdom, Seal: proto.PaladinSeal_Righteousness, @@ -53,7 +54,6 @@ func TestProtection(t *testing.T) { }, }, - Consumes: FullConsumes, IsTank: true, InFrontOfTarget: true, diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 979fc832c1..f2dd696aee 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -6,7 +6,7 @@ character_stats_results: { final_stats: 1524.05 final_stats: 280.72 final_stats: 301.4 - final_stats: 280 + final_stats: 1933.8544 final_stats: 109 final_stats: 267 final_stats: 1574.23692 @@ -46,152 +46,152 @@ character_stats_results: { dps_results: { key: "TestRetribution-AllItems-AegisBattlegear" value: { - dps: 5638.96268 - tps: 5737.24118 + dps: 6116.30288 + tps: 6214.58137 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-AegisPlate" value: { - dps: 5057.20082 - tps: 5155.39994 + dps: 5488.48287 + tps: 5586.682 dtps: 8.90286 } } dps_results: { key: "TestRetribution-AllItems-Althor'sAbacus-50359" value: { - dps: 5775.59371 - tps: 5876.9975 + dps: 6301.63049 + tps: 6403.03427 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Althor'sAbacus-50366" value: { - dps: 5781.85427 - tps: 5883.25806 + dps: 6307.89105 + tps: 6409.29483 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-AshtongueTalismanofZeal-32489" value: { - dps: 5761.83556 - tps: 5863.23935 + dps: 6288.97973 + tps: 6390.38351 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-AustereEarthsiegeDiamond" value: { - dps: 5821.08875 - tps: 5922.49254 + dps: 6363.44131 + tps: 6464.8451 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Bandit'sInsignia-40371" value: { - dps: 5909.60658 - tps: 6011.0954 + dps: 6454.07355 + tps: 6555.56237 dtps: 10.03858 } } dps_results: { key: "TestRetribution-AllItems-BaubleofTrueBlood-50354" value: { - dps: 5726.14259 - tps: 12090.54858 + dps: 6252.19001 + tps: 12616.59601 dtps: 9.63782 } } dps_results: { key: "TestRetribution-AllItems-BaubleofTrueBlood-50726" value: { - dps: 5726.14259 - tps: 12090.54858 + dps: 6252.19001 + tps: 12616.59601 dtps: 9.63782 } } dps_results: { key: "TestRetribution-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 5833.25937 - tps: 5934.49753 + dps: 6377.71309 + tps: 6478.95126 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 5709.68942 - tps: 5808.59186 + dps: 6184.91187 + tps: 6283.81431 dtps: 9.56591 } } dps_results: { key: "TestRetribution-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 4836.13208 - tps: 4934.7679 + dps: 5232.90403 + tps: 5331.53985 dtps: 9.23882 } } dps_results: { key: "TestRetribution-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 4696.21603 - tps: 4794.17463 + dps: 5068.06172 + tps: 5166.02032 dtps: 9.23882 } } dps_results: { key: "TestRetribution-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 4617.85677 - tps: 4715.68617 + dps: 4985.82755 + tps: 5083.65695 dtps: 9.23882 } } dps_results: { key: "TestRetribution-AllItems-BracingEarthsiegeDiamond" value: { - dps: 5828.03883 - tps: 5812.88184 + dps: 6370.3914 + tps: 6344.38735 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ChaoticSkyflareDiamond" value: { - dps: 5945.37728 - tps: 6046.78107 + dps: 6500.52058 + tps: 6601.92436 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-CorpseTongueCoin-50349" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-CorpseTongueCoin-50352" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 hps: 64 } @@ -199,304 +199,304 @@ dps_results: { dps_results: { key: "TestRetribution-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 5785.92125 - tps: 5887.32504 + dps: 6315.55435 + tps: 6416.95813 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-DarkmoonCard:Death-42990" value: { - dps: 5833.56041 - tps: 5935.03532 + dps: 6362.25194 + tps: 6463.72685 dtps: 9.77043 } } dps_results: { key: "TestRetribution-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 5721.92157 - tps: 5822.3371 + dps: 6247.66565 + tps: 6348.08118 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Death'sChoice-47464" value: { - dps: 6250.7127 - tps: 6352.11649 + dps: 6847.32426 + tps: 6948.72805 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 5765.19019 - tps: 5866.59397 + dps: 6292.78925 + tps: 6394.19304 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Deathbringer'sWill-50362" value: { - dps: 6027.82984 - tps: 6129.59088 + dps: 6569.13483 + tps: 6670.89587 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Deathbringer'sWill-50363" value: { - dps: 6068.05858 - tps: 6169.59505 + dps: 6608.82665 + tps: 6710.36313 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Defender'sCode-40257" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-DestructiveSkyflareDiamond" value: { - dps: 5838.54247 - tps: 5939.94625 + dps: 6384.08827 + tps: 6485.49206 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-DislodgedForeignObject-50348" value: { - dps: 5871.86961 - tps: 5973.30872 + dps: 6400.40996 + tps: 6501.84907 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-DislodgedForeignObject-50353" value: { - dps: 5854.23497 - tps: 5955.93197 + dps: 6376.86747 + tps: 6478.56447 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-EffulgentSkyflareDiamond" value: { - dps: 5821.08875 - tps: 5922.49254 + dps: 6363.44131 + tps: 6464.8451 dtps: 9.731 } } dps_results: { key: "TestRetribution-AllItems-EmberSkyflareDiamond" value: { - dps: 5825.30899 - tps: 5926.5963 + dps: 6367.29574 + tps: 6468.58305 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 5836.14244 - tps: 5937.54622 + dps: 6380.90961 + tps: 6482.3134 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-EnigmaticStarflareDiamond" value: { - dps: 5834.79419 - tps: 5936.19797 + dps: 6379.11579 + tps: 6480.51957 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-EphemeralSnowflake-50260" value: { - dps: 5807.47943 - tps: 5910.27899 + dps: 6329.50685 + tps: 6432.30641 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-EssenceofGossamer-37220" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-EternalEarthsiegeDiamond" value: { - dps: 5821.08875 - tps: 5922.49254 + dps: 6363.44131 + tps: 6464.8451 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 5850.30022 - tps: 5951.79655 + dps: 6379.97602 + tps: 6481.47236 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-EyeoftheBroodmother-45308" value: { - dps: 5814.16252 - tps: 5915.56631 + dps: 6343.26815 + tps: 6444.67194 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 5721.74871 - tps: 5822.72325 + dps: 6247.47975 + tps: 6348.45429 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ForethoughtTalisman-40258" value: { - dps: 5756.24289 - tps: 5857.64668 + dps: 6282.27967 + tps: 6383.68345 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ForgeEmber-37660" value: { - dps: 5779.61513 - tps: 5881.01892 + dps: 6308.64879 + tps: 6410.05258 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ForlornSkyflareDiamond" value: { - dps: 5828.03883 - tps: 5929.44262 + dps: 6370.3914 + tps: 6471.79518 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ForlornStarflareDiamond" value: { - dps: 5826.64882 - tps: 5928.0526 + dps: 6369.00138 + tps: 6470.40517 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-FuriousGladiator'sLibramofFortitude-42853" value: { - dps: 5961.86285 - tps: 6063.26663 + dps: 6519.23727 + tps: 6620.64105 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-FuturesightRune-38763" value: { - dps: 5742.29892 - tps: 5843.7027 + dps: 6268.33569 + tps: 6369.73948 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Gladiator'sVindication" value: { - dps: 5670.14926 - tps: 5768.17955 + dps: 6225.58684 + tps: 6323.61714 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-GlowingTwilightScale-54573" value: { - dps: 5778.72399 - tps: 5880.12778 + dps: 6304.76077 + tps: 6406.16455 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-GlowingTwilightScale-54589" value: { - dps: 5785.83826 - tps: 5887.24205 + dps: 6311.87504 + tps: 6413.27882 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-GnomishLightningGenerator-41121" value: { - dps: 5809.34289 - tps: 5910.7792 + dps: 6337.81751 + tps: 6439.25382 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-HatefulGladiator'sLibramofFortitude-42851" value: { - dps: 5932.65727 - tps: 6034.06106 + dps: 6486.4192 + tps: 6587.82299 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 5731.48829 - tps: 5832.89208 + dps: 6257.52507 + tps: 6358.92886 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 5836.14244 - tps: 5937.54622 + dps: 6380.90961 + tps: 6482.3134 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ImpassiveStarflareDiamond" value: { - dps: 5834.79419 - tps: 5936.19797 + dps: 6379.11579 + tps: 6480.51957 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-IncisorFragment-37723" value: { - dps: 5870.37029 - tps: 5971.77407 + dps: 6410.30551 + tps: 6511.70929 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 5818.3639 - tps: 5920.93718 + dps: 6360.35065 + tps: 6462.92393 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 5850.21803 - tps: 5951.62182 + dps: 6396.364 + tps: 6497.76778 dtps: 9.92959 hps: 11.51045 } @@ -504,1240 +504,1240 @@ dps_results: { dps_results: { key: "TestRetribution-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-LibramofFuriousBlows-37574" value: { - dps: 5884.1378 - tps: 5985.54159 + dps: 6427.89602 + tps: 6529.2998 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-LibramofObstruction-40707" value: { - dps: 5860.31405 - tps: 5961.71783 + dps: 6404.30174 + tps: 6505.70553 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-LibramofReciprocation-40706" value: { - dps: 5860.31405 - tps: 5961.71783 + dps: 6404.30174 + tps: 6505.70553 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-LibramofThreeTruths-50455" value: { - dps: 5938.81691 - tps: 6040.2207 + dps: 6493.15329 + tps: 6594.55707 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-LibramofValiance-47661" value: { - dps: 6209.09797 - tps: 6310.50176 + dps: 6799.32977 + tps: 6900.73356 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-LibramoftheSacredShield-45145" value: { - dps: 5860.31405 - tps: 5961.71783 + dps: 6404.30174 + tps: 6505.70553 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-LightbringerBattlegear" value: { - dps: 4409.87715 - tps: 4506.79035 + dps: 4780.5902 + tps: 4877.5034 dtps: 9.23882 } } dps_results: { key: "TestRetribution-AllItems-LightswornBattlegear" value: { - dps: 6279.42851 - tps: 6387.72715 + dps: 6777.33204 + tps: 6885.63068 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-LightswornPlate" value: { - dps: 5176.19824 - tps: 5274.66061 + dps: 5634.36062 + tps: 5732.82298 dtps: 8.90286 } } dps_results: { key: "TestRetribution-AllItems-MajesticDragonFigurine-40430" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-MeteoriteWhetstone-37390" value: { - dps: 5855.55113 - tps: 5956.61381 + dps: 6388.14874 + tps: 6489.21142 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 5843.84344 - tps: 5945.25253 + dps: 6376.33319 + tps: 6477.74228 dtps: 10.29273 } } dps_results: { key: "TestRetribution-AllItems-OfferingofSacrifice-37638" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-PersistentEarthshatterDiamond" value: { - dps: 5844.75074 - tps: 5946.15453 + dps: 6390.2225 + tps: 6491.62629 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 5850.31827 - tps: 5951.72205 + dps: 6396.52396 + tps: 6497.92774 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 5821.08875 - tps: 5922.49254 + dps: 6363.44131 + tps: 6464.8451 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 5821.08875 - tps: 5922.49254 + dps: 6363.44131 + tps: 6464.8451 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-PurifiedShardoftheGods" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-RedemptionBattlegear" value: { - dps: 5228.49489 - tps: 5330.06754 + dps: 5704.04964 + tps: 5805.62229 dtps: 9.23882 } } dps_results: { key: "TestRetribution-AllItems-RedemptionPlate" value: { - dps: 4844.78438 - tps: 4943.02728 + dps: 5265.38189 + tps: 5363.62479 dtps: 8.90286 } } dps_results: { key: "TestRetribution-AllItems-ReignoftheDead-47316" value: { - dps: 5825.55809 - tps: 5927.06109 + dps: 6352.21209 + tps: 6453.71509 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ReignoftheDead-47477" value: { - dps: 5837.82036 - tps: 5939.32336 + dps: 6364.47437 + tps: 6465.97737 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 5944.93805 - tps: 6046.34183 + dps: 6500.08135 + tps: 6601.48513 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-RelentlessGladiator'sLibramofFortitude-42854" value: { - dps: 5981.60845 - tps: 6083.01224 + dps: 6541.58584 + tps: 6642.98963 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 5818.3639 - tps: 5919.11553 + dps: 6360.35065 + tps: 6461.10228 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-RuneofRepulsion-40372" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SavageGladiator'sLibramofFortitude-42611" value: { - dps: 5924.46747 - tps: 6025.87126 + dps: 6477.12289 + tps: 6578.52667 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SealofthePantheon-36993" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Shadowmourne-49623" value: { - dps: 6900.94744 - tps: 7002.42181 + dps: 7557.40066 + tps: 7658.87503 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-ShinyShardoftheGods" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 6.55074 } } dps_results: { key: "TestRetribution-AllItems-SliverofPureIce-50339" value: { - dps: 5769.61772 - tps: 5871.02151 + dps: 6295.6545 + tps: 6397.05828 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SliverofPureIce-50346" value: { - dps: 5775.30914 - tps: 5876.71293 + dps: 6301.34592 + tps: 6402.7497 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SouloftheDead-40382" value: { - dps: 5778.39094 - tps: 5880.43009 + dps: 6307.50816 + tps: 6409.5473 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SparkofHope-45703" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SparkofLife-37657" value: { - dps: 5763.92102 - tps: 5860.69521 + dps: 6292.84006 + tps: 6389.61424 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 5845.46402 - tps: 5946.91979 + dps: 6387.41999 + tps: 6488.87576 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-StormshroudArmor" value: { - dps: 4543.79619 - tps: 4641.96179 + dps: 4915.52513 + tps: 5013.69073 dtps: 9.23882 } } dps_results: { key: "TestRetribution-AllItems-SwiftSkyflareDiamond" value: { - dps: 5850.31827 - tps: 5951.72205 + dps: 6396.52396 + tps: 6497.92774 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SwiftStarflareDiamond" value: { - dps: 5844.75074 - tps: 5946.15453 + dps: 6390.2225 + tps: 6491.62629 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-SwiftWindfireDiamond" value: { - dps: 5835.00757 - tps: 5936.41135 + dps: 6379.19495 + tps: 6480.59874 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TearsoftheVanquished-47215" value: { - dps: 5721.92157 - tps: 5822.40422 + dps: 6247.66565 + tps: 6348.1483 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TheGeneral'sHeart-45507" value: { - dps: 5724.65552 - tps: 5826.05931 + dps: 6250.6923 + tps: 6352.09608 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 4766.73674 - tps: 4867.32761 + dps: 5278.32479 + tps: 5378.91566 dtps: 9.56591 } } dps_results: { key: "TestRetribution-AllItems-ThunderingSkyflareDiamond" value: { - dps: 5817.13703 - tps: 5918.59087 + dps: 6365.82121 + tps: 6467.27505 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TinyAbominationinaJar-50351" value: { - dps: 5900.3784 - tps: 6002.18362 + dps: 6425.60188 + tps: 6527.4071 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TinyAbominationinaJar-50706" value: { - dps: 5911.60683 - tps: 6013.48209 + dps: 6441.05081 + tps: 6542.92607 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TirelessSkyflareDiamond" value: { - dps: 5828.03883 - tps: 5929.44262 + dps: 6370.3914 + tps: 6471.79518 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TirelessStarflareDiamond" value: { - dps: 5826.64882 - tps: 5928.0526 + dps: 6369.00138 + tps: 6470.40517 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 5768.14537 - tps: 5870.46791 + dps: 6297.73496 + tps: 6400.0575 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TomeoftheLightbringer-32368" value: { - dps: 5860.31405 - tps: 5961.71783 + dps: 6404.30174 + tps: 6505.70553 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 5826.64882 - tps: 5928.0526 + dps: 6369.00138 + tps: 6470.40517 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 5828.03883 - tps: 5929.44262 + dps: 6370.3914 + tps: 6471.79518 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Turalyon'sBattlegear" value: { - dps: 5643.91712 - tps: 5742.87556 + dps: 6148.72692 + tps: 6247.68536 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-Turalyon'sPlate" value: { - dps: 4983.4563 - tps: 5081.68761 + dps: 5422.45423 + tps: 5520.68554 dtps: 8.90286 } } dps_results: { key: "TestRetribution-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 4726.78015 - tps: 4825.91359 + dps: 5107.08789 + tps: 5206.22133 dtps: 9.23882 } } dps_results: { key: "TestRetribution-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 4627.12721 - tps: 4725.75979 + dps: 5144.03974 + tps: 5242.67232 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-WingedTalisman-37844" value: { - dps: 5745.63913 - tps: 5847.04291 + dps: 6271.6759 + tps: 6373.07969 dtps: 9.92959 } } dps_results: { key: "TestRetribution-AllItems-WrathfulGladiator'sLibramofFortitude-51478" value: { - dps: 6004.17485 - tps: 6105.57864 + dps: 6567.12707 + tps: 6668.53085 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Average-Default" value: { - dps: 5961.66541 - tps: 6062.855 + dps: 6509.26139 + tps: 6610.45098 dtps: 13.93696 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-FullBuffs-LongMultiTarget" value: { - dps: 16911.11373 - tps: 19212.84415 + dps: 18858.39129 + tps: 20949.85175 dtps: 8.81235 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-FullBuffs-LongSingleTarget" value: { - dps: 4931.95074 - tps: 5035.21897 + dps: 5264.99817 + tps: 5365.70464 dtps: 9.85058 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-FullBuffs-ShortSingleTarget" value: { - dps: 5607.57014 - tps: 5715.90254 + dps: 5919.13727 + tps: 6022.37728 dtps: 49.25289 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-NoBuffs-LongMultiTarget" value: { - dps: 11276.33745 - tps: 13629.96823 + dps: 12530.9217 + tps: 14793.21284 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-NoBuffs-LongSingleTarget" value: { - dps: 2773.15458 - tps: 2886.40445 + dps: 2949.4837 + tps: 3060.82505 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-NoBuffs-ShortSingleTarget" value: { - dps: 2939.17802 - tps: 3052.10339 + dps: 3120.83003 + tps: 3231.30746 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-FullBuffs-LongMultiTarget" value: { - dps: 14589.40649 - tps: 16891.10149 + dps: 17255.37059 + tps: 19346.94585 dtps: 8.61128 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-FullBuffs-LongSingleTarget" value: { - dps: 4699.77576 - tps: 4803.0504 + dps: 5674.41748 + tps: 5775.15069 dtps: 9.85058 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-FullBuffs-ShortSingleTarget" value: { - dps: 5232.60259 - tps: 5340.96703 + dps: 6272.20803 + tps: 6375.74646 dtps: 49.25289 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-NoBuffs-LongMultiTarget" value: { - dps: 9738.15102 - tps: 12091.26075 + dps: 11415.21655 + tps: 13677.69078 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-NoBuffs-LongSingleTarget" value: { - dps: 2530.31882 - tps: 2643.60518 + dps: 3056.16483 + tps: 3167.40549 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-NoBuffs-ShortSingleTarget" value: { - dps: 2696.37644 - tps: 2809.25542 + dps: 3209.99885 + tps: 3320.53871 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-LongMultiTarget" value: { - dps: 15711.50009 - tps: 17957.31375 + dps: 18311.86319 + tps: 20406.80968 dtps: 8.80605 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-LongSingleTarget" value: { - dps: 5723.39154 - tps: 5827.32156 + dps: 6500.08135 + tps: 6601.48513 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-ShortSingleTarget" value: { - dps: 6385.17931 - tps: 6494.14982 + dps: 7181.11735 + tps: 7285.01196 dtps: 49.64794 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-LongMultiTarget" value: { - dps: 10346.71351 - tps: 12573.56959 + dps: 12228.99046 + tps: 14466.14503 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-LongSingleTarget" value: { - dps: 3169.52074 - tps: 3282.77758 + dps: 3565.66715 + tps: 3675.84752 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-ShortSingleTarget" value: { - dps: 3302.43476 - tps: 3414.5438 + dps: 3663.28501 + tps: 3773.20871 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-FullBuffs-LongMultiTarget" value: { - dps: 15310.40174 - tps: 17563.84647 + dps: 17902.4343 + tps: 19998.98001 dtps: 8.80605 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-FullBuffs-LongSingleTarget" value: { - dps: 5723.39154 - tps: 5827.32156 + dps: 6500.08135 + tps: 6601.48513 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-FullBuffs-ShortSingleTarget" value: { - dps: 6385.17931 - tps: 6494.14982 + dps: 7181.11735 + tps: 7285.01196 dtps: 49.64794 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-NoBuffs-LongMultiTarget" value: { - dps: 10251.35628 - tps: 12569.13564 + dps: 11827.66285 + tps: 14096.28045 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-NoBuffs-LongSingleTarget" value: { - dps: 3169.52074 - tps: 3282.77758 + dps: 3565.66715 + tps: 3675.84752 } } dps_results: { key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-NoBuffs-ShortSingleTarget" value: { - dps: 3302.43476 - tps: 3414.5438 + dps: 3663.28501 + tps: 3773.20871 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-FullBuffs-LongMultiTarget" value: { - dps: 17051.41423 - tps: 19322.73732 + dps: 19063.50039 + tps: 21159.70161 dtps: 8.81235 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-FullBuffs-LongSingleTarget" value: { - dps: 4946.45075 - tps: 5049.699 + dps: 5273.81914 + tps: 5374.171 dtps: 9.85058 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-FullBuffs-ShortSingleTarget" value: { - dps: 5621.97152 - tps: 5730.35065 + dps: 5935.10377 + tps: 6038.37899 dtps: 49.25289 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-NoBuffs-LongMultiTarget" value: { - dps: 11354.46511 - tps: 13679.35072 + dps: 12622.73218 + tps: 14874.62412 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-NoBuffs-LongSingleTarget" value: { - dps: 2772.80789 - tps: 2885.64887 + dps: 2966.74826 + tps: 3077.58791 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-NoBuffs-ShortSingleTarget" value: { - dps: 2944.51112 - tps: 3056.64023 + dps: 3129.24321 + tps: 3239.46559 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-FullBuffs-LongMultiTarget" value: { - dps: 14736.13612 - tps: 17007.52964 + dps: 17459.86737 + tps: 19555.95823 dtps: 8.61128 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-FullBuffs-LongSingleTarget" value: { - dps: 4710.88362 - tps: 4814.13826 + dps: 5686.96176 + tps: 5787.34017 dtps: 9.85058 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-FullBuffs-ShortSingleTarget" value: { - dps: 5245.46893 - tps: 5353.88001 + dps: 6288.26324 + tps: 6391.83707 dtps: 49.25289 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-NoBuffs-LongMultiTarget" value: { - dps: 9816.29688 - tps: 12141.03603 + dps: 11513.86143 + tps: 13765.89605 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-NoBuffs-LongSingleTarget" value: { - dps: 2543.9318 - tps: 2656.7545 + dps: 3074.46318 + tps: 3185.34745 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-NoBuffs-ShortSingleTarget" value: { - dps: 2702.48088 - tps: 2814.56327 + dps: 3217.31034 + tps: 3327.55924 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-LongMultiTarget" value: { - dps: 15809.00997 - tps: 18055.26678 + dps: 18460.16242 + tps: 20545.50703 dtps: 8.80605 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-LongSingleTarget" value: { - dps: 5734.70675 - tps: 5838.15403 + dps: 6512.54294 + tps: 6613.99293 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-ShortSingleTarget" value: { - dps: 6399.72487 - tps: 6508.72352 + dps: 7198.60415 + tps: 7302.53007 dtps: 49.64794 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-LongMultiTarget" value: { - dps: 10349.79945 - tps: 12559.8577 + dps: 12312.2728 + tps: 14533.04032 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-LongSingleTarget" value: { - dps: 3174.47494 - tps: 3287.16262 + dps: 3577.56504 + tps: 3687.80132 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-ShortSingleTarget" value: { - dps: 3304.01099 - tps: 3416.11359 + dps: 3666.47916 + tps: 3776.42856 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-FullBuffs-LongMultiTarget" value: { - dps: 15403.67775 - tps: 17657.91883 + dps: 18033.33315 + tps: 20126.46676 dtps: 8.80605 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-FullBuffs-LongSingleTarget" value: { - dps: 5734.70675 - tps: 5838.15403 + dps: 6512.54294 + tps: 6613.99293 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-FullBuffs-ShortSingleTarget" value: { - dps: 6399.72487 - tps: 6508.72352 + dps: 7198.60415 + tps: 7302.53007 dtps: 49.64794 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-NoBuffs-LongMultiTarget" value: { - dps: 10286.22748 - tps: 12575.6155 + dps: 11979.68286 + tps: 14253.35035 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-NoBuffs-LongSingleTarget" value: { - dps: 3174.47494 - tps: 3287.16262 + dps: 3577.56504 + tps: 3687.80132 } } dps_results: { key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-NoBuffs-ShortSingleTarget" value: { - dps: 3304.01099 - tps: 3416.11359 + dps: 3666.47916 + tps: 3776.42856 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-FullBuffs-LongMultiTarget" value: { - dps: 16972.40208 - tps: 19243.66771 + dps: 19004.97829 + tps: 21100.05362 dtps: 8.81235 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-FullBuffs-LongSingleTarget" value: { - dps: 4945.12603 - tps: 5048.36048 + dps: 5272.18573 + tps: 5372.51873 dtps: 9.85058 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-FullBuffs-ShortSingleTarget" value: { - dps: 5620.15252 - tps: 5728.53683 + dps: 5932.73683 + tps: 6036.02379 dtps: 49.25289 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-NoBuffs-LongMultiTarget" value: { - dps: 11291.45335 - tps: 13614.65194 + dps: 12548.05943 + tps: 14798.72474 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-NoBuffs-LongSingleTarget" value: { - dps: 2771.20494 - tps: 2884.04765 + dps: 2962.0682 + tps: 3072.95305 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-NoBuffs-ShortSingleTarget" value: { - dps: 2945.79326 - tps: 3057.92025 + dps: 3128.01953 + tps: 3238.2137 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-FullBuffs-LongMultiTarget" value: { - dps: 14655.14861 - tps: 16926.37598 + dps: 17376.67121 + tps: 19471.92731 dtps: 8.61128 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-FullBuffs-LongSingleTarget" value: { - dps: 4710.54575 - tps: 4813.78658 + dps: 5686.89564 + tps: 5787.25513 dtps: 9.85058 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-FullBuffs-ShortSingleTarget" value: { - dps: 5243.45984 - tps: 5351.87607 + dps: 6286.5708 + tps: 6390.15642 dtps: 49.25289 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-NoBuffs-LongMultiTarget" value: { - dps: 9745.62063 - tps: 12068.52628 + dps: 11439.768 + tps: 13690.5761 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-NoBuffs-LongSingleTarget" value: { - dps: 2543.28409 - tps: 2656.10905 + dps: 3071.08523 + tps: 3181.92786 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-NoBuffs-ShortSingleTarget" value: { - dps: 2704.09474 - tps: 2816.17505 + dps: 3219.92148 + tps: 3330.17881 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-LongMultiTarget" value: { - dps: 15726.40163 - tps: 17973.14318 + dps: 18361.49037 + tps: 20446.7657 dtps: 8.80605 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-LongSingleTarget" value: { - dps: 5733.88338 - tps: 5837.29775 + dps: 6512.69543 + tps: 6614.14313 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-ShortSingleTarget" value: { - dps: 6398.29565 - tps: 6507.31407 + dps: 7196.93099 + tps: 7300.86734 dtps: 49.64794 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-LongMultiTarget" value: { - dps: 10277.42031 - tps: 12478.11399 + dps: 12228.23965 + tps: 14448.49829 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-LongSingleTarget" value: { - dps: 3173.30842 - tps: 3285.9659 + dps: 3577.31279 + tps: 3687.55658 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-ShortSingleTarget" value: { - dps: 3306.28939 - tps: 3418.38984 + dps: 3664.95906 + tps: 3774.91702 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-FullBuffs-LongMultiTarget" value: { - dps: 15315.9381 - tps: 17574.34803 + dps: 17933.69071 + tps: 20026.77862 dtps: 8.80605 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-FullBuffs-LongSingleTarget" value: { - dps: 5733.88338 - tps: 5837.29775 + dps: 6512.69543 + tps: 6614.14313 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-FullBuffs-ShortSingleTarget" value: { - dps: 6398.29565 - tps: 6507.31407 + dps: 7196.93099 + tps: 7300.86734 dtps: 49.64794 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-NoBuffs-LongMultiTarget" value: { - dps: 10214.00778 - tps: 12505.08182 + dps: 11907.73891 + tps: 14179.98613 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-NoBuffs-LongSingleTarget" value: { - dps: 3173.30842 - tps: 3285.9659 + dps: 3577.31279 + tps: 3687.55658 } } dps_results: { key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-NoBuffs-ShortSingleTarget" value: { - dps: 3306.28939 - tps: 3418.38984 + dps: 3664.95906 + tps: 3774.91702 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-FullBuffs-LongMultiTarget" value: { - dps: 16954.27929 - tps: 19224.44402 + dps: 18983.54098 + tps: 21078.38936 dtps: 8.81235 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-FullBuffs-LongSingleTarget" value: { - dps: 4940.1669 - tps: 5043.39014 + dps: 5266.73838 + tps: 5367.06009 dtps: 9.85058 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-FullBuffs-ShortSingleTarget" value: { - dps: 5612.28853 - tps: 5720.65986 + dps: 5924.2371 + tps: 6027.51233 dtps: 49.25289 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-NoBuffs-LongMultiTarget" value: { - dps: 11277.26407 - tps: 13603.58123 + dps: 12535.47172 + tps: 14786.33839 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-NoBuffs-LongSingleTarget" value: { - dps: 2769.19622 - tps: 2882.03518 + dps: 2960.38649 + tps: 3071.28822 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-NoBuffs-ShortSingleTarget" value: { - dps: 2941.27606 - tps: 3053.40517 + dps: 3123.04775 + tps: 3233.23352 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-FullBuffs-LongMultiTarget" value: { - dps: 14636.5811 - tps: 16906.70152 + dps: 17353.1954 + tps: 19448.22636 dtps: 8.61128 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-FullBuffs-LongSingleTarget" value: { - dps: 4703.6813 - tps: 4806.91092 + dps: 5677.98181 + tps: 5778.33007 dtps: 9.85058 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-FullBuffs-ShortSingleTarget" value: { - dps: 5237.43348 - tps: 5345.83677 + dps: 6278.35349 + tps: 6381.92732 dtps: 49.25289 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-NoBuffs-LongMultiTarget" value: { - dps: 9739.59304 - tps: 12065.76374 + dps: 11427.05307 + tps: 13678.06242 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-NoBuffs-LongSingleTarget" value: { - dps: 2538.92427 - tps: 2651.74494 + dps: 3066.2623 + tps: 3177.11113 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-NoBuffs-ShortSingleTarget" value: { - dps: 2699.27081 - tps: 2811.3532 + dps: 3213.71984 + tps: 3323.96874 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-LongMultiTarget" value: { - dps: 15710.30674 - tps: 17955.803 + dps: 18336.32193 + tps: 20421.35822 dtps: 8.80605 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-LongSingleTarget" value: { - dps: 5728.36173 - tps: 5831.76517 + dps: 6505.97124 + tps: 6607.40792 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-FullBuffs-ShortSingleTarget" value: { - dps: 6390.8738 - tps: 6499.88025 + dps: 7187.76457 + tps: 7291.69049 dtps: 49.64794 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-LongMultiTarget" value: { - dps: 10263.43091 - tps: 12472.75683 + dps: 12216.95814 + tps: 14437.82027 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-LongSingleTarget" value: { - dps: 3170.90357 - tps: 3283.56742 + dps: 3572.85702 + tps: 3683.08938 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-NoBuffs-ShortSingleTarget" value: { - dps: 3300.701 - tps: 3412.80359 + dps: 3662.46638 + tps: 3772.41578 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-FullBuffs-LongMultiTarget" value: { - dps: 15302.91873 - tps: 17558.6838 + dps: 17910.37907 + tps: 20003.20138 dtps: 8.80605 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-FullBuffs-LongSingleTarget" value: { - dps: 5728.36173 - tps: 5831.76517 + dps: 6505.97124 + tps: 6607.40792 dtps: 9.92959 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-FullBuffs-ShortSingleTarget" value: { - dps: 6390.8738 - tps: 6499.88025 + dps: 7187.76457 + tps: 7291.69049 dtps: 49.64794 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-NoBuffs-LongMultiTarget" value: { - dps: 10208.86347 - tps: 12498.25149 + dps: 11885.68767 + tps: 14157.88403 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-NoBuffs-LongSingleTarget" value: { - dps: 3170.90357 - tps: 3283.56742 + dps: 3572.85702 + tps: 3683.08938 } } dps_results: { key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-NoBuffs-ShortSingleTarget" value: { - dps: 3300.701 - tps: 3412.80359 + dps: 3662.46638 + tps: 3772.41578 } } dps_results: { key: "TestRetribution-SwitchInFrontOfTarget-Default" value: { - dps: 5564.5833 - tps: 5665.99239 + dps: 6107.34106 + tps: 6208.75015 dtps: 9.92959 } } diff --git a/sim/paladin/retribution/presets.go b/sim/paladin/retribution/presets.go index c0326f79b9..53777ea5b7 100644 --- a/sim/paladin/retribution/presets.go +++ b/sim/paladin/retribution/presets.go @@ -5,36 +5,8 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var defaultRetTalents = &proto.PaladinTalents{ - SealsOfThePure: 5, - DivineIntellect: 5, - AuraMastery: true, - DivineStrength: 5, - Benediction: 5, - ImprovedJudgements: 2, - HeartOfTheCrusader: 3, - ImprovedBlessingOfMight: 2, - Conviction: 5, - SealOfCommand: true, - PursuitOfJustice: 2, - SanctityOfBattle: 3, - Crusade: 3, - TwoHandedWeaponSpecialization: 3, - SanctifiedRetribution: true, - Vengeance: 3, - TheArtOfWar: 2, - Repentance: true, - JudgementsOfTheWise: 3, - Fanaticism: 3, - SanctifiedWrath: 2, - SwiftRetribution: 3, - CrusaderStrike: true, - SanctifiedLight: 3, - RighteousVengeance: 3, - DivineStorm: true, -} - -var defaultRetGlyphs = &proto.Glyphs{ +var StandardTalents = "050501-05-05232051203331302133231331" +var StandardGlyphs = &proto.Glyphs{ Major1: int32(proto.PaladinMajorGlyph_GlyphOfSealOfVengeance), Major2: int32(proto.PaladinMajorGlyph_GlyphOfJudgement), Major3: int32(proto.PaladinMajorGlyph_GlyphOfConsecration), @@ -60,7 +32,6 @@ var defaultRetOptions = &proto.RetributionPaladin_Options{ var DefaultOptions = &proto.Player_RetributionPaladin{ RetributionPaladin: &proto.RetributionPaladin{ - Talents: defaultRetTalents, Options: defaultRetOptions, Rotation: defaultRetRotation, }, diff --git a/sim/paladin/retribution/retribution.go b/sim/paladin/retribution/retribution.go index ca76575ca0..a5de4cb10a 100644 --- a/sim/paladin/retribution/retribution.go +++ b/sim/paladin/retribution/retribution.go @@ -29,7 +29,7 @@ func RegisterRetributionPaladin() { func NewRetributionPaladin(character core.Character, options *proto.Player) *RetributionPaladin { retOptions := options.GetRetributionPaladin() - pal := paladin.NewPaladin(character, retOptions.Talents) + pal := paladin.NewPaladin(character, options.TalentsString) ret := &RetributionPaladin{ Paladin: pal, diff --git a/sim/paladin/retribution/retribution_test.go b/sim/paladin/retribution/retribution_test.go index be0ef1f8ee..a965494cbc 100644 --- a/sim/paladin/retribution/retribution_test.go +++ b/sim/paladin/retribution/retribution_test.go @@ -19,13 +19,15 @@ func TestRetribution(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceHuman, proto.Race_RaceDraenei, proto.Race_RaceDwarf}, GearSet: core.GearSetCombo{Label: "P1", GearSet: Phase1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Retribution Paladin SOV", SpecOptions: DefaultOptions}, OtherSpecOptions: []core.SpecOptionsCombo{ { Label: "Retribution Paladin SOC", SpecOptions: &proto.Player_RetributionPaladin{ RetributionPaladin: &proto.RetributionPaladin{ - Talents: defaultRetTalents, Options: &proto.RetributionPaladin_Options{ Judgement: proto.PaladinJudgement_JudgementOfWisdom, Seal: proto.PaladinSeal_Command, @@ -40,7 +42,6 @@ func TestRetribution(t *testing.T) { Label: "Retribution Paladin SOR", SpecOptions: &proto.Player_RetributionPaladin{ RetributionPaladin: &proto.RetributionPaladin{ - Talents: defaultRetTalents, Options: &proto.RetributionPaladin_Options{ Judgement: proto.PaladinJudgement_JudgementOfWisdom, Seal: proto.PaladinSeal_Righteousness, @@ -55,7 +56,6 @@ func TestRetribution(t *testing.T) { Label: "Retribution Paladin SOV 2 Target Swapping", SpecOptions: &proto.Player_RetributionPaladin{ RetributionPaladin: &proto.RetributionPaladin{ - Talents: defaultRetTalents, Options: &proto.RetributionPaladin_Options{ Judgement: proto.PaladinJudgement_JudgementOfWisdom, Seal: proto.PaladinSeal_Vengeance, @@ -74,8 +74,6 @@ func TestRetribution(t *testing.T) { }, }, }, - Glyphs: defaultRetGlyphs, - Consumes: FullConsumes, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ @@ -96,13 +94,14 @@ func BenchmarkSimulate(b *testing.B) { rsr := &proto.RaidSimRequest{ Raid: core.SinglePlayerRaidProto( &proto.Player{ - Race: proto.Race_RaceBloodElf, - Class: proto.Class_ClassPaladin, - Glyphs: defaultRetGlyphs, - Equipment: Phase1Gear, - Consumes: FullConsumes, - Spec: DefaultOptions, - Buffs: core.FullIndividualBuffs, + Race: proto.Race_RaceBloodElf, + Class: proto.Class_ClassPaladin, + TalentsString: StandardTalents, + Glyphs: StandardGlyphs, + Equipment: Phase1Gear, + Consumes: FullConsumes, + Spec: DefaultOptions, + Buffs: core.FullIndividualBuffs, }, core.FullPartyBuffs, core.FullRaidBuffs, diff --git a/sim/priest/healing/TestDisc.results b/sim/priest/healing/TestDisc.results index 1cb1bd7096..f9f5c2cd33 100644 --- a/sim/priest/healing/TestDisc.results +++ b/sim/priest/healing/TestDisc.results @@ -940,48 +940,48 @@ dps_results: { key: "TestDisc-Settings-Undead-P1-Disc-FullBuffs-LongMultiTarget" value: { dps: 99.2875 - tps: 1597.25464 - hps: 6665.44647 + tps: 1608.25464 + hps: 6975.48232 } } dps_results: { key: "TestDisc-Settings-Undead-P1-Disc-FullBuffs-LongSingleTarget" value: { dps: 99.2875 - tps: 79.86273 - hps: 6665.44647 + tps: 80.41273 + hps: 6975.48232 } } dps_results: { key: "TestDisc-Settings-Undead-P1-Disc-FullBuffs-ShortSingleTarget" value: { dps: 496.43751 - tps: 212.5782 - hps: 9081.34772 + tps: 209.92811 + hps: 9184.6292 } } dps_results: { key: "TestDisc-Settings-Undead-P1-Disc-NoBuffs-LongMultiTarget" value: { dps: 46.29484 - tps: 923.38559 - hps: 3865.92202 + tps: 926.38559 + hps: 3957.18063 } } dps_results: { key: "TestDisc-Settings-Undead-P1-Disc-NoBuffs-LongSingleTarget" value: { dps: 46.29484 - tps: 46.16928 - hps: 3865.92202 + tps: 46.31928 + hps: 3957.18063 } } dps_results: { key: "TestDisc-Settings-Undead-P1-Disc-NoBuffs-ShortSingleTarget" value: { dps: 231.47421 - tps: 111.20851 - hps: 6224.24357 + tps: 111.95851 + hps: 6316.77799 } } dps_results: { diff --git a/sim/priest/healing/TestHoly.results b/sim/priest/healing/TestHoly.results index f8d7ddd2af..cb4758c5a4 100644 --- a/sim/priest/healing/TestHoly.results +++ b/sim/priest/healing/TestHoly.results @@ -895,48 +895,48 @@ dps_results: { key: "TestHoly-Settings-Undead-P1-Holy-FullBuffs-LongMultiTarget" value: { dps: 104.65635 - tps: 990.27055 - hps: 4715.73685 + tps: 991.27055 + hps: 4910.26824 } } dps_results: { key: "TestHoly-Settings-Undead-P1-Holy-FullBuffs-LongSingleTarget" value: { dps: 104.65635 - tps: 49.51353 - hps: 4715.73685 + tps: 49.56353 + hps: 4910.26824 } } dps_results: { key: "TestHoly-Settings-Undead-P1-Holy-FullBuffs-ShortSingleTarget" value: { dps: 523.28175 - tps: 196.38698 - hps: 9272.06842 + tps: 194.72965 + hps: 9494.86134 } } dps_results: { key: "TestHoly-Settings-Undead-P1-Holy-NoBuffs-LongMultiTarget" value: { dps: 48.815 - tps: 445.41013 - hps: 2465.27937 + tps: 447.41013 + hps: 2674.33745 } } dps_results: { key: "TestHoly-Settings-Undead-P1-Holy-NoBuffs-LongSingleTarget" value: { dps: 48.815 - tps: 22.27051 - hps: 2465.27937 + tps: 22.37051 + hps: 2674.33745 } } dps_results: { key: "TestHoly-Settings-Undead-P1-Holy-NoBuffs-ShortSingleTarget" value: { dps: 244.07498 - tps: 98.28599 - hps: 5912.81696 + tps: 99.07323 + hps: 6129.29041 } } dps_results: { diff --git a/sim/priest/healing/healing_priest.go b/sim/priest/healing/healing_priest.go index 16f6b8be4b..4495b8f6b9 100644 --- a/sim/priest/healing/healing_priest.go +++ b/sim/priest/healing/healing_priest.go @@ -44,19 +44,18 @@ func NewHealingPriest(character core.Character, options *proto.Player) *HealingP UseShadowfiend: healingOptions.Options.UseShadowfiend, } - selfBuffs.PowerInfusionTarget = &proto.RaidTarget{TargetIndex: -1} - if healingOptions.Talents.PowerInfusion && healingOptions.Options.PowerInfusionTarget != nil { - selfBuffs.PowerInfusionTarget = healingOptions.Options.PowerInfusionTarget - } - - basePriest := priest.New(character, selfBuffs, healingOptions.Talents) - + basePriest := priest.New(character, selfBuffs, options.TalentsString) hpriest := &HealingPriest{ Priest: basePriest, rotation: healingOptions.Rotation, Options: healingOptions.Options, } + hpriest.SelfBuffs.PowerInfusionTarget = &proto.RaidTarget{TargetIndex: -1} + if hpriest.Talents.PowerInfusion && hpriest.Options.PowerInfusionTarget != nil { + hpriest.SelfBuffs.PowerInfusionTarget = hpriest.Options.PowerInfusionTarget + } + hpriest.EnableResumeAfterManaWait(hpriest.tryUseGCD) return hpriest diff --git a/sim/priest/healing/healing_priest_test.go b/sim/priest/healing/healing_priest_test.go index 2b7e9fdbaf..fcb57a055c 100644 --- a/sim/priest/healing/healing_priest_test.go +++ b/sim/priest/healing/healing_priest_test.go @@ -19,9 +19,10 @@ func TestDisc(t *testing.T) { IsHealer: true, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, - SpecOptions: core.SpecOptionsCombo{Label: "Disc", SpecOptions: PlayerOptionsDisc}, + Talents: DiscTalents, Glyphs: DiscGlyphs, Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "Disc", SpecOptions: PlayerOptionsDisc}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ @@ -53,9 +54,10 @@ func TestHoly(t *testing.T) { IsHealer: true, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, - SpecOptions: core.SpecOptionsCombo{Label: "Holy", SpecOptions: PlayerOptionsHoly}, + Talents: HolyTalents, Glyphs: HolyGlyphs, Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "Holy", SpecOptions: PlayerOptionsHoly}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ diff --git a/sim/priest/healing/presets.go b/sim/priest/healing/presets.go index 55af1adbe3..de0d44598b 100644 --- a/sim/priest/healing/presets.go +++ b/sim/priest/healing/presets.go @@ -5,68 +5,7 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var DiscTalents = &proto.PriestTalents{ - TwinDisciplines: 5, - ImprovedInnerFire: 3, - ImprovedPowerWordFortitude: 2, - Meditation: 3, - InnerFocus: true, - ImprovedPowerWordShield: 3, - MentalAgility: 3, - MentalStrength: 5, - SoulWarding: true, - FocusedPower: 2, - Enlightenment: 3, - PowerInfusion: true, - ImprovedFlashHeal: 3, - RenewedHope: 1, - Rapture: 3, - Aspiration: 2, - DivineAegis: 3, - PainSuppression: true, - Grace: 2, - BorrowedTime: 5, - Penance: true, - - HealingFocus: 2, - ImprovedRenew: 3, - HolySpecialization: 5, - SpellWarding: 1, - DesperatePrayer: true, - Inspiration: 3, - ImprovedHealing: 3, -} - -var HolyTalents = &proto.PriestTalents{ - TwinDisciplines: 5, - ImprovedInnerFire: 3, - ImprovedPowerWordFortitude: 2, - Meditation: 3, - InnerFocus: true, - ImprovedPowerWordShield: 1, - MentalAgility: 3, - - HealingFocus: 2, - ImprovedRenew: 3, - HolySpecialization: 4, - DivineFury: 5, - DesperatePrayer: true, - Inspiration: 3, - HolyReach: 2, - HealingPrayers: 2, - SpiritOfRedemption: true, - SpiritualGuidance: 5, - SurgeOfLight: 2, - SpiritualHealing: 5, - HolyConcentration: 3, - EmpoweredHealing: 4, - Serendipity: 3, - EmpoweredRenew: 1, - CircleOfHealing: true, - DivineProvidence: 5, - GuardianSpirit: true, -} - +var DiscTalents = "0503203130300512301313231251-2351010303" var DiscGlyphs = &proto.Glyphs{ Major1: int32(proto.PriestMajorGlyph_GlyphOfPowerWordShield), Major2: int32(proto.PriestMajorGlyph_GlyphOfFlashHeal), @@ -74,6 +13,7 @@ var DiscGlyphs = &proto.Glyphs{ // No interesting minor glyphs. } +var HolyTalents = "05032031103-234051032002152530004311051" var HolyGlyphs = &proto.Glyphs{ Major1: int32(proto.PriestMajorGlyph_GlyphOfPrayerOfHealing), Major2: int32(proto.PriestMajorGlyph_GlyphOfRenew), @@ -90,7 +30,6 @@ var FullConsumes = &proto.Consumes{ var PlayerOptionsDisc = &proto.Player_HealingPriest{ HealingPriest: &proto.HealingPriest{ - Talents: DiscTalents, Options: &proto.HealingPriest_Options{ UseInnerFire: true, UseShadowfiend: true, @@ -102,7 +41,6 @@ var PlayerOptionsDisc = &proto.Player_HealingPriest{ var PlayerOptionsHoly = &proto.Player_HealingPriest{ HealingPriest: &proto.HealingPriest{ - Talents: HolyTalents, Options: &proto.HealingPriest_Options{ UseInnerFire: true, UseShadowfiend: true, diff --git a/sim/priest/priest.go b/sim/priest/priest.go index 20ac7b5b7e..add0d99ebe 100644 --- a/sim/priest/priest.go +++ b/sim/priest/priest.go @@ -8,6 +8,8 @@ import ( "github.com/wowsims/wotlk/sim/core/stats" ) +var TalentTreeSizes = [3]int{28, 27, 27} + type Priest struct { core.Character SelfBuffs @@ -195,12 +197,14 @@ func (priest *Priest) AddShadowWeavingStack(sim *core.Simulation) { func (priest *Priest) Reset(_ *core.Simulation) { } -func New(char core.Character, selfBuffs SelfBuffs, talents *proto.PriestTalents) *Priest { +func New(char core.Character, selfBuffs SelfBuffs, talents string) *Priest { priest := &Priest{ Character: char, SelfBuffs: selfBuffs, - Talents: talents, + Talents: &proto.PriestTalents{}, } + core.FillTalentsProto(priest.Talents.ProtoReflect(), talents, TalentTreeSizes) + priest.EnableManaBar() priest.ShadowfiendPet = priest.NewShadowfiend() @@ -218,72 +222,72 @@ func New(char core.Character, selfBuffs SelfBuffs, talents *proto.PriestTalents) func init() { core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceHuman, Class: proto.Class_ClassPriest}] = stats.Stats{ stats.Health: 6960, + stats.Mana: 3863, stats.Strength: 39, stats.Agility: 45, stats.Stamina: 58, stats.Intellect: 145, stats.Spirit: 166, - stats.Mana: 3863, stats.SpellCrit: core.CritRatingPerCritChance * 1.24, } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceDwarf, Class: proto.Class_ClassPriest}] = stats.Stats{ stats.Health: 6960, + stats.Mana: 3863, stats.Strength: 41, stats.Agility: 41, stats.Stamina: 61, stats.Intellect: 144, stats.Spirit: 150, - stats.Mana: 3863, stats.SpellCrit: core.CritRatingPerCritChance * 1.24, } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceNightElf, Class: proto.Class_ClassPriest}] = stats.Stats{ stats.Health: 6960, + stats.Mana: 3863, stats.Strength: 36, stats.Agility: 50, stats.Stamina: 57, stats.Intellect: 145, stats.Spirit: 151, - stats.Mana: 3863, stats.SpellCrit: core.CritRatingPerCritChance * 1.24, } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceDraenei, Class: proto.Class_ClassPriest}] = stats.Stats{ stats.Health: 6960, + stats.Mana: 3863, stats.Strength: 40, stats.Agility: 42, stats.Stamina: 57, stats.Intellect: 146, stats.Spirit: 153, - stats.Mana: 3863, stats.SpellCrit: core.CritRatingPerCritChance * 1.24, } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceUndead, Class: proto.Class_ClassPriest}] = stats.Stats{ stats.Health: 6960, + stats.Mana: 3863, stats.Strength: 38, stats.Agility: 43, stats.Stamina: 59, stats.Intellect: 143, stats.Spirit: 156, - stats.Mana: 3863, stats.SpellCrit: core.CritRatingPerCritChance * 1.24, } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceTroll, Class: proto.Class_ClassPriest}] = stats.Stats{ stats.Health: 6960, + stats.Mana: 3863, stats.Strength: 40, stats.Agility: 47, stats.Stamina: 59, stats.Intellect: 141, stats.Spirit: 152, - stats.Mana: 3863, stats.SpellCrit: core.CritRatingPerCritChance * 1.24, } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceBloodElf, Class: proto.Class_ClassPriest}] = stats.Stats{ stats.Health: 6960, + stats.Mana: 3863, stats.Strength: 36, stats.Agility: 47, stats.Stamina: 57, stats.Intellect: 149, stats.Spirit: 150, - stats.Mana: 3863, stats.SpellCrit: core.CritRatingPerCritChance * 1.24, } } diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index 89a73190f1..57eddab972 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -789,379 +789,379 @@ dps_results: { dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 6536.85066 - tps: 7685.73355 + dps: 7056.43559 + tps: 8199.65743 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6536.85066 - tps: 6491.30153 + dps: 7056.43559 + tps: 7005.22541 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7103.2513 - tps: 7191.17862 + dps: 7635.53951 + tps: 7723.46683 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3264.57907 - tps: 4125.71277 + dps: 3523.32831 + tps: 4378.54472 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3264.57907 - tps: 3163.39571 + dps: 3523.32831 + tps: 3416.22766 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3836.37193 - tps: 3647.90641 + dps: 4076.36819 + tps: 3875.83414 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-FullBuffs-LongMultiTarget" value: { - dps: 6218.23947 - tps: 7310.81334 + dps: 6671.01185 + tps: 7757.89345 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-FullBuffs-LongSingleTarget" value: { - dps: 6218.23947 - tps: 6164.48015 + dps: 6671.01185 + tps: 6611.56026 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-FullBuffs-ShortSingleTarget" value: { - dps: 6819.99239 - tps: 6915.57148 + dps: 7290.54446 + tps: 7386.12355 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-LongMultiTarget" value: { - dps: 3130.38171 - tps: 3988.67207 + dps: 3377.90623 + tps: 4229.05628 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-LongSingleTarget" value: { - dps: 3130.38171 - tps: 3026.355 + dps: 3377.90623 + tps: 3266.73922 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-ShortSingleTarget" value: { - dps: 3601.34698 - tps: 3411.9998 + dps: 3811.16627 + tps: 3607.99168 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-FullBuffs-LongMultiTarget" value: { - dps: 6572.66271 - tps: 7724.99314 + dps: 7086.61861 + tps: 8228.71108 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-FullBuffs-LongSingleTarget" value: { - dps: 6572.66271 - tps: 6521.72039 + dps: 7086.61861 + tps: 7029.5163 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-FullBuffs-ShortSingleTarget" value: { - dps: 7238.62145 - tps: 7339.43335 + dps: 7806.13117 + tps: 7906.95537 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-LongMultiTarget" value: { - dps: 3191.97669 - tps: 4040.64646 + dps: 3507.42218 + tps: 4392.82636 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-LongSingleTarget" value: { - dps: 3191.97669 - tps: 3091.75707 + dps: 3507.42218 + tps: 3400.29701 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-ShortSingleTarget" value: { - dps: 3887.48861 - tps: 3698.67322 + dps: 4113.42344 + tps: 3912.83615 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 6523.65034 - tps: 7672.76215 + dps: 7040.87965 + tps: 8184.20549 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6523.65034 - tps: 6478.4484 + dps: 7040.87965 + tps: 6989.89174 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7105.13315 - tps: 7193.02748 + dps: 7637.39276 + tps: 7725.28708 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3249.90071 - tps: 4110.48132 + dps: 3512.43314 + tps: 4367.00381 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3249.90071 - tps: 3148.98125 + dps: 3512.43314 + tps: 3405.50374 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3831.06442 - tps: 3642.69435 + dps: 4069.23913 + tps: 3868.89609 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-FullBuffs-LongMultiTarget" value: { - dps: 6211.88412 - tps: 7300.77925 + dps: 6661.9833 + tps: 7745.10621 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-FullBuffs-LongSingleTarget" value: { - dps: 6211.88412 - tps: 6156.43901 + dps: 6661.9833 + tps: 6600.76597 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-FullBuffs-ShortSingleTarget" value: { - dps: 6816.63351 - tps: 6912.1796 + dps: 7284.16064 + tps: 7379.70673 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-LongMultiTarget" value: { - dps: 3113.95746 - tps: 3970.97334 + dps: 3380.14572 + tps: 4231.7771 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-LongSingleTarget" value: { - dps: 3113.95746 - tps: 3009.47327 + dps: 3380.14572 + tps: 3270.27703 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-ShortSingleTarget" value: { - dps: 3597.4038 - tps: 3407.84449 + dps: 3807.46044 + tps: 3603.88725 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-FullBuffs-LongMultiTarget" value: { - dps: 6562.92607 - tps: 7710.61199 + dps: 7064.30806 + tps: 8208.51033 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-FullBuffs-LongSingleTarget" value: { - dps: 6562.92607 - tps: 6511.35101 + dps: 7064.30806 + tps: 7007.26466 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-FullBuffs-ShortSingleTarget" value: { - dps: 7233.25047 - tps: 7332.76344 + dps: 7796.77474 + tps: 7898.6473 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-LongMultiTarget" value: { - dps: 3200.14052 - tps: 4063.14913 + dps: 3495.82347 + tps: 4375.14984 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-LongSingleTarget" value: { - dps: 3200.14052 - tps: 3101.64906 + dps: 3495.82347 + tps: 3390.17128 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-ShortSingleTarget" value: { - dps: 3881.86212 - tps: 3693.02168 + dps: 4108.09066 + tps: 3907.51732 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 6525.73308 - tps: 7673.27945 + dps: 7045.42443 + tps: 8187.13757 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6525.73308 - tps: 6480.35054 + dps: 7045.42443 + tps: 6994.20866 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7107.22239 - tps: 7195.05071 + dps: 7641.95278 + tps: 7729.78111 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3252.05291 - tps: 4111.219 + dps: 3509.00419 + tps: 4361.31589 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3252.05291 - tps: 3151.35294 + dps: 3509.00419 + tps: 3401.44982 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3832.20413 - tps: 3643.61605 + dps: 4071.5846 + tps: 3870.92411 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-FullBuffs-LongMultiTarget" value: { - dps: 6212.68909 - tps: 7301.2216 + dps: 6664.80108 + tps: 7747.51775 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-FullBuffs-LongSingleTarget" value: { - dps: 6212.68909 - tps: 6157.25066 + dps: 6664.80108 + tps: 6603.54681 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-FullBuffs-ShortSingleTarget" value: { - dps: 6818.61113 - tps: 6914.09122 + dps: 7288.41287 + tps: 7383.89296 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-LongMultiTarget" value: { - dps: 3118.4298 - tps: 3975.16582 + dps: 3382.66067 + tps: 4232.94372 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-LongSingleTarget" value: { - dps: 3118.4298 - tps: 3015.29976 + dps: 3382.66067 + tps: 3273.07766 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-ShortSingleTarget" value: { - dps: 3598.46438 - tps: 3408.68658 + dps: 3809.64836 + tps: 3605.74028 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-FullBuffs-LongMultiTarget" value: { - dps: 6564.61054 - tps: 7711.04216 + dps: 7068.49378 + tps: 8210.99473 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-FullBuffs-LongSingleTarget" value: { - dps: 6564.61054 - tps: 6512.93745 + dps: 7068.49378 + tps: 7011.28656 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-FullBuffs-ShortSingleTarget" value: { - dps: 7235.36526 - tps: 7334.81224 + dps: 7801.38748 + tps: 7902.0483 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-LongMultiTarget" value: { - dps: 3207.4839 - tps: 4068.22567 + dps: 3509.74945 + tps: 4400.58303 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-LongSingleTarget" value: { - dps: 3207.4839 - tps: 3108.35961 + dps: 3509.74945 + tps: 3403.88489 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-ShortSingleTarget" value: { - dps: 3883.01113 - tps: 3693.95203 + dps: 4110.41305 + tps: 3909.52359 } } dps_results: { diff --git a/sim/priest/shadow/presets.go b/sim/priest/shadow/presets.go index f4b1c721b8..acfdbf56dc 100644 --- a/sim/priest/shadow/presets.go +++ b/sim/priest/shadow/presets.go @@ -5,37 +5,7 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var StandardTalents = &proto.PriestTalents{ - TwinDisciplines: 5, - ImprovedInnerFire: 3, - ImprovedPowerWordFortitude: 2, - Meditation: 3, - InnerFocus: true, - - SpiritTap: 3, - ImprovedSpiritTap: 2, - Darkness: 5, - ImprovedShadowWordPain: 2, - ShadowFocus: 3, - ImprovedMindBlast: 5, - MindFlay: true, - VeiledShadows: 2, - ShadowReach: 2, - ShadowWeaving: 3, - VampiricEmbrace: true, - FocusedMind: 3, - MindMelt: 2, - ImprovedDevouringPlague: 3, - Shadowform: true, - ShadowPower: 5, - ImprovedShadowform: 1, - Misery: 3, - VampiricTouch: true, - PainAndSuffering: 3, - TwistedFaith: 5, - Dispersion: true, -} - +var DefaultTalents = "05032031--325023051223010323151301351" var DefaultGlyphs = &proto.Glyphs{ Major1: int32(proto.PriestMajorGlyph_GlyphOfShadow), Major2: int32(proto.PriestMajorGlyph_GlyphOfMindFlay), @@ -53,7 +23,6 @@ var FullConsumes = &proto.Consumes{ var PlayerOptionsBasic = &proto.Player_ShadowPriest{ ShadowPriest: &proto.ShadowPriest{ - Talents: StandardTalents, Options: &proto.ShadowPriest_Options{ Armor: proto.ShadowPriest_Options_InnerFire, UseShadowfiend: true, @@ -68,7 +37,6 @@ var PlayerOptionsBasic = &proto.Player_ShadowPriest{ } var PlayerOptionsClipping = &proto.Player_ShadowPriest{ ShadowPriest: &proto.ShadowPriest{ - Talents: StandardTalents, Options: &proto.ShadowPriest_Options{ Armor: proto.ShadowPriest_Options_InnerFire, UseShadowfiend: true, @@ -84,7 +52,6 @@ var PlayerOptionsClipping = &proto.Player_ShadowPriest{ } var PlayerOptionsIdeal = &proto.Player_ShadowPriest{ ShadowPriest: &proto.ShadowPriest{ - Talents: StandardTalents, Options: &proto.ShadowPriest_Options{ Armor: proto.ShadowPriest_Options_InnerFire, UseShadowfiend: true, diff --git a/sim/priest/shadow/shadow_priest.go b/sim/priest/shadow/shadow_priest.go index bc378620a1..1bfd0df376 100644 --- a/sim/priest/shadow/shadow_priest.go +++ b/sim/priest/shadow/shadow_priest.go @@ -33,13 +33,19 @@ func NewShadowPriest(character core.Character, options *proto.Player) *ShadowPri UseInnerFire: shadowOptions.Options.Armor == proto.ShadowPriest_Options_InnerFire, } - basePriest := priest.New(character, selfBuffs, shadowOptions.Talents) + basePriest := priest.New(character, selfBuffs, options.TalentsString) basePriest.Latency = shadowOptions.Rotation.Latency spriest := &ShadowPriest{ Priest: basePriest, rotation: shadowOptions.Rotation, options: shadowOptions.Options, } + + spriest.SelfBuffs.PowerInfusionTarget = &proto.RaidTarget{TargetIndex: -1} + if spriest.Talents.PowerInfusion && shadowOptions.Options.PowerInfusionTarget != nil { + spriest.SelfBuffs.PowerInfusionTarget = shadowOptions.Options.PowerInfusionTarget + } + spriest.EnableResumeAfterManaWait(spriest.tryUseGCD) spriest.CanRolloverSWP = spriest.Talents.MindFlay && spriest.Talents.PainAndSuffering > 0 diff --git a/sim/priest/shadow/shadow_priest_test.go b/sim/priest/shadow/shadow_priest_test.go index b31d7fcfec..d7245c65cc 100644 --- a/sim/priest/shadow/shadow_priest_test.go +++ b/sim/priest/shadow/shadow_priest_test.go @@ -18,16 +18,17 @@ func TestShadow(t *testing.T) { Race: proto.Race_RaceUndead, OtherRaces: []proto.Race{proto.Race_RaceNightElf, proto.Race_RaceDraenei}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: DefaultTalents, + Glyphs: DefaultGlyphs, + Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "Ideal", SpecOptions: PlayerOptionsIdeal}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "Basic", SpecOptions: PlayerOptionsBasic}, {Label: "Clipping", SpecOptions: PlayerOptionsClipping}, }, - Glyphs: DefaultGlyphs, - Consumes: FullConsumes, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeDagger, diff --git a/sim/priest/smite/TestSmite.results b/sim/priest/smite/TestSmite.results index 8ba48cf696..cd34da2c83 100644 --- a/sim/priest/smite/TestSmite.results +++ b/sim/priest/smite/TestSmite.results @@ -46,792 +46,792 @@ character_stats_results: { dps_results: { key: "TestSmite-AllItems-AbsolutionRegalia" value: { - dps: 2355.37607 - tps: 2016.79124 + dps: 2269.15845 + tps: 1953.35899 } } dps_results: { key: "TestSmite-AllItems-Althor'sAbacus-50359" value: { - dps: 3544.20883 - tps: 3003.97483 + dps: 3379.3875 + tps: 2879.76887 } } dps_results: { key: "TestSmite-AllItems-Althor'sAbacus-50366" value: { - dps: 3561.64635 - tps: 3018.31798 + dps: 3395.99231 + tps: 2893.48103 } } dps_results: { key: "TestSmite-AllItems-AshtongueTalismanofAcumen-32490" value: { - dps: 3442.16196 - tps: 2920.22476 + dps: 3282.1495 + tps: 2799.67208 } } dps_results: { key: "TestSmite-AllItems-AustereEarthsiegeDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-Bandit'sInsignia-40371" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-BaubleofTrueBlood-50354" value: { - dps: 3403.00145 - tps: 8951.65721 + dps: 3244.38954 + tps: 8512.89892 } } dps_results: { key: "TestSmite-AllItems-BaubleofTrueBlood-50726" value: { - dps: 3403.00145 - tps: 8951.65721 + dps: 3244.38954 + tps: 8512.89892 } } dps_results: { key: "TestSmite-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 3536.68745 - tps: 2997.54289 + dps: 3377.57403 + tps: 2876.2261 } } dps_results: { key: "TestSmite-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 2690.77962 - tps: 2297.32842 + dps: 2536.08738 + tps: 2173.96221 } } dps_results: { key: "TestSmite-AllItems-BracingEarthsiegeDiamond" value: { - dps: 3523.02567 - tps: 2928.48289 + dps: 3347.41848 + tps: 2795.0253 } } dps_results: { key: "TestSmite-AllItems-ChaoticSkyflareDiamond" value: { - dps: 3543.07704 - tps: 3004.75849 + dps: 3363.36721 + tps: 2863.94105 } } dps_results: { key: "TestSmite-AllItems-CorpseTongueCoin-50349" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-CorpseTongueCoin-50352" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 hps: 64 } } dps_results: { key: "TestSmite-AllItems-CrimsonAcolyte'sRaiment" value: { - dps: 3598.63297 - tps: 3056.29038 + dps: 3391.21092 + tps: 2894.74569 } } dps_results: { key: "TestSmite-AllItems-CrimsonAcolyte'sRegalia" value: { - dps: 3469.74332 - tps: 2942.95625 + dps: 3346.7452 + tps: 2854.20747 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 3444.59783 - tps: 2919.88025 + dps: 3264.56536 + tps: 2782.8442 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Death-42990" value: { - dps: 3462.96906 - tps: 2946.21642 + dps: 3326.68917 + tps: 2844.05681 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 3468.67914 - tps: 2941.87186 + dps: 3331.7569 + tps: 2839.14593 } } dps_results: { key: "TestSmite-AllItems-Death'sChoice-47464" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 3401.39977 - tps: 2886.55159 + dps: 3252.19794 + tps: 2773.81433 } } dps_results: { key: "TestSmite-AllItems-Deathbringer'sWill-50362" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-Deathbringer'sWill-50363" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-Defender'sCode-40257" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-DestructiveSkyflareDiamond" value: { - dps: 3512.55233 - tps: 2979.52103 + dps: 3334.78921 + tps: 2840.05846 } } dps_results: { key: "TestSmite-AllItems-DislodgedForeignObject-50348" value: { - dps: 3571.05481 - tps: 3026.46874 + dps: 3397.02202 + tps: 2894.1871 } } dps_results: { key: "TestSmite-AllItems-DislodgedForeignObject-50353" value: { - dps: 3548.06235 - tps: 3009.63375 + dps: 3374.97673 + tps: 2878.33995 } } dps_results: { key: "TestSmite-AllItems-EffulgentSkyflareDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-EmberSkyflareDiamond" value: { - dps: 3555.50387 - tps: 3012.88242 + dps: 3389.80084 + tps: 2887.98731 } } dps_results: { key: "TestSmite-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 3510.44137 - tps: 2977.79126 + dps: 3334.08419 + tps: 2839.57333 } } dps_results: { key: "TestSmite-AllItems-EnigmaticStarflareDiamond" value: { - dps: 3509.27645 - tps: 2976.61437 + dps: 3333.7304 + tps: 2839.5303 } } dps_results: { key: "TestSmite-AllItems-EphemeralSnowflake-50260" value: { - dps: 3401.14821 - tps: 2886.18242 + dps: 3242.97091 + tps: 2766.62043 } } dps_results: { key: "TestSmite-AllItems-EssenceofGossamer-37220" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-EternalEarthsiegeDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 3481.80502 - tps: 2962.58919 + dps: 3326.12195 + tps: 2844.88109 } } dps_results: { key: "TestSmite-AllItems-EyeoftheBroodmother-45308" value: { - dps: 3543.84987 - tps: 3001.62327 + dps: 3359.29356 + tps: 2861.04421 } } dps_results: { key: "TestSmite-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 3466.8645 - tps: 2936.22619 + dps: 3319.74785 + tps: 2828.95632 } } dps_results: { key: "TestSmite-AllItems-ForethoughtTalisman-40258" value: { - dps: 3490.31104 - tps: 2959.64143 + dps: 3328.06354 + tps: 2837.38585 } } dps_results: { key: "TestSmite-AllItems-ForgeEmber-37660" value: { - dps: 3486.57869 - tps: 2956.88835 + dps: 3317.29786 + tps: 2828.066 } } dps_results: { key: "TestSmite-AllItems-ForlornSkyflareDiamond" value: { - dps: 3523.02567 - tps: 2987.00287 + dps: 3347.41848 + tps: 2850.82766 } } dps_results: { key: "TestSmite-AllItems-ForlornStarflareDiamond" value: { - dps: 3519.10113 - tps: 2983.77349 + dps: 3343.69048 + tps: 2847.75102 } } dps_results: { key: "TestSmite-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-FuturesightRune-38763" value: { - dps: 3432.16451 - tps: 2912.37584 + dps: 3318.97472 + tps: 2829.79321 } } dps_results: { key: "TestSmite-AllItems-GarbofFaith" value: { - dps: 3169.43081 - tps: 2698.03022 + dps: 3024.69184 + tps: 2592.39835 } } dps_results: { key: "TestSmite-AllItems-Gladiator'sInvestiture" value: { - dps: 3656.76596 - tps: 3104.56353 + dps: 3431.13168 + tps: 2925.59794 } } dps_results: { key: "TestSmite-AllItems-Gladiator'sRaiment" value: { - dps: 3291.22773 - tps: 2797.47054 + dps: 3182.5215 + tps: 2719.78668 } } dps_results: { key: "TestSmite-AllItems-GlowingTwilightScale-54573" value: { - dps: 3552.92759 - tps: 3011.1464 + dps: 3387.6899 + tps: 2886.62495 } } dps_results: { key: "TestSmite-AllItems-GlowingTwilightScale-54589" value: { - dps: 3572.74295 - tps: 3027.44545 + dps: 3406.559 + tps: 2902.20695 } } dps_results: { key: "TestSmite-AllItems-GnomishLightningGenerator-41121" value: { - dps: 3464.34017 - tps: 2942.47517 + dps: 3320.09144 + tps: 2834.3316 } } dps_results: { key: "TestSmite-AllItems-Heartpierce-49982" value: { - dps: 3555.50387 - tps: 3012.88242 + dps: 3389.80084 + tps: 2887.98731 } } dps_results: { key: "TestSmite-AllItems-Heartpierce-50641" value: { - dps: 3555.50387 - tps: 3012.88242 + dps: 3389.80084 + tps: 2887.98731 } } dps_results: { key: "TestSmite-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 3510.44137 - tps: 2977.79126 + dps: 3334.08419 + tps: 2839.57333 } } dps_results: { key: "TestSmite-AllItems-ImpassiveStarflareDiamond" value: { - dps: 3509.27645 - tps: 2976.61437 + dps: 3333.7304 + tps: 2839.5303 } } dps_results: { key: "TestSmite-AllItems-IncisorFragment-37723" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 3616.70962 - tps: 3067.77954 + dps: 3463.5536 + tps: 2951.82276 } } dps_results: { key: "TestSmite-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-MajesticDragonFigurine-40430" value: { - dps: 3615.8865 - tps: 3063.45948 + dps: 3391.73546 + tps: 2891.21493 } } dps_results: { key: "TestSmite-AllItems-MeteoriteWhetstone-37390" value: { - dps: 3421.36677 - tps: 2901.84623 + dps: 3258.10574 + tps: 2777.96687 } } dps_results: { key: "TestSmite-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 3500.23785 - tps: 2966.91869 + dps: 3342.44843 + tps: 2849.523 } } dps_results: { key: "TestSmite-AllItems-OfferingofSacrifice-37638" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-PersistentEarthshatterDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-PurifiedShardoftheGods" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-RegaliaofFaith" value: { - dps: 3138.17131 - tps: 2672.53807 + dps: 2961.2764 + tps: 2536.86326 } } dps_results: { key: "TestSmite-AllItems-ReignoftheDead-47316" value: { - dps: 3624.40964 - tps: 3089.15483 + dps: 3480.81516 + tps: 2978.89955 } } dps_results: { key: "TestSmite-AllItems-ReignoftheDead-47477" value: { - dps: 3653.16467 - tps: 3115.38554 + dps: 3508.25279 + tps: 3003.94662 } } dps_results: { key: "TestSmite-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 3535.42129 - tps: 2997.31715 + dps: 3357.70884 + tps: 2859.54995 } } dps_results: { key: "TestSmite-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 3518.73253 - tps: 2982.81165 + dps: 3355.60253 + tps: 2857.29447 } } dps_results: { key: "TestSmite-AllItems-RuneofRepulsion-40372" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-SanctificationGarb" value: { - dps: 3365.32411 - tps: 2863.93911 + dps: 3193.12101 + tps: 2731.57966 } } dps_results: { key: "TestSmite-AllItems-SanctificationRegalia" value: { - dps: 3359.59435 - tps: 2855.42541 + dps: 3145.13709 + tps: 2687.8759 } } dps_results: { key: "TestSmite-AllItems-SealofthePantheon-36993" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-ShinyShardoftheGods" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-SliverofPureIce-50339" value: { - dps: 3643.47166 - tps: 3092.64601 + dps: 3470.94112 + tps: 2960.07429 } } dps_results: { key: "TestSmite-AllItems-SliverofPureIce-50346" value: { - dps: 3671.78677 - tps: 3116.24825 + dps: 3499.37077 + tps: 2986.00417 } } dps_results: { key: "TestSmite-AllItems-SouloftheDead-40382" value: { - dps: 3505.61463 - tps: 2977.61487 + dps: 3368.10705 + tps: 2874.22379 } } dps_results: { key: "TestSmite-AllItems-SparkofHope-45703" value: { - dps: 3534.47535 - tps: 2994.73051 + dps: 3326.69894 + tps: 2837.15102 } } dps_results: { key: "TestSmite-AllItems-SparkofLife-37657" value: { - dps: 3404.61187 - tps: 2886.8786 + dps: 3336.17983 + tps: 2842.25935 } } dps_results: { key: "TestSmite-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 3443.621 - tps: 2920.19026 + dps: 3282.21257 + tps: 2797.43822 } } dps_results: { key: "TestSmite-AllItems-SwiftSkyflareDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-SwiftStarflareDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-SwiftWindfireDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 3486.92374 - tps: 2954.95756 + dps: 3304.11208 + tps: 2817.82781 } } dps_results: { key: "TestSmite-AllItems-TearsoftheVanquished-47215" value: { - dps: 3528.56749 - tps: 2991.63559 + dps: 3364.56188 + tps: 2869.9761 } } dps_results: { key: "TestSmite-AllItems-TheGeneral'sHeart-45507" value: { - dps: 3402.33082 - tps: 2887.27368 + dps: 3244.28473 + tps: 2768.20179 } } dps_results: { key: "TestSmite-AllItems-ThunderingSkyflareDiamond" value: { - dps: 3503.40298 - tps: 2970.85599 + dps: 3328.7785 + tps: 2835.44443 } } dps_results: { key: "TestSmite-AllItems-TinyAbominationinaJar-50351" value: { - dps: 3443.621 - tps: 2920.19026 + dps: 3282.21257 + tps: 2797.43822 } } dps_results: { key: "TestSmite-AllItems-TinyAbominationinaJar-50706" value: { - dps: 3443.621 - tps: 2920.19026 + dps: 3282.21257 + tps: 2797.43822 } } dps_results: { key: "TestSmite-AllItems-TirelessSkyflareDiamond" value: { - dps: 3523.02567 - tps: 2987.00287 + dps: 3347.41848 + tps: 2850.82766 } } dps_results: { key: "TestSmite-AllItems-TirelessStarflareDiamond" value: { - dps: 3519.10113 - tps: 2983.77349 + dps: 3343.69048 + tps: 2847.75102 } } dps_results: { key: "TestSmite-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 3457.14435 - tps: 2931.48609 + dps: 3290.28072 + tps: 2805.07661 } } dps_results: { key: "TestSmite-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 3519.10113 - tps: 2983.77349 + dps: 3343.69048 + tps: 2847.75102 } } dps_results: { key: "TestSmite-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 3523.02567 - tps: 2987.00287 + dps: 3347.41848 + tps: 2850.82766 } } dps_results: { key: "TestSmite-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 3651.64404 - tps: 3091.85719 + dps: 3491.62596 + tps: 2968.62338 } } dps_results: { key: "TestSmite-AllItems-VestmentsofAbsolution" value: { - dps: 2277.37976 - tps: 1949.10267 + dps: 2188.22215 + tps: 1880.77997 } } dps_results: { key: "TestSmite-AllItems-WingedTalisman-37844" value: { - dps: 3458.76169 - tps: 2935.21751 + dps: 3298.84872 + tps: 2814.75407 } } dps_results: { key: "TestSmite-AllItems-Zabra'sRaiment" value: { - dps: 3333.73626 - tps: 2834.73609 + dps: 3142.63396 + tps: 2690.72078 } } dps_results: { key: "TestSmite-AllItems-Zabra'sRegalia" value: { - dps: 3496.25221 - tps: 2970.49136 + dps: 3304.36691 + tps: 2821.41062 } } dps_results: { key: "TestSmite-Average-Default" value: { - dps: 3553.59094 - tps: 3012.531 + dps: 3392.38137 + tps: 2888.76963 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 3262.90082 - tps: 3945.30779 + dps: 3389.80084 + tps: 4055.39804 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 3262.90082 - tps: 2777.91503 + dps: 3389.80084 + tps: 2887.98731 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 4235.86793 - tps: 3637.18966 + dps: 4761.99787 + tps: 4011.49413 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 1103.56266 - tps: 1361.79475 + dps: 1127.25569 + tps: 1379.38518 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 1103.56266 - tps: 952.86926 + dps: 1127.25569 + tps: 970.4597 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 2571.25217 - tps: 2069.90238 + dps: 2768.0621 + tps: 2236.94852 } } dps_results: { key: "TestSmite-SwitchInFrontOfTarget-Default" value: { - dps: 3540.65658 - tps: 3012.88242 + dps: 3374.6595 + tps: 2887.98731 } } diff --git a/sim/priest/smite/presets.go b/sim/priest/smite/presets.go index cd2463456b..abfb643387 100644 --- a/sim/priest/smite/presets.go +++ b/sim/priest/smite/presets.go @@ -5,35 +5,7 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var StandardTalents = &proto.PriestTalents{ - TwinDisciplines: 5, - SilentResolve: 3, - ImprovedInnerFire: 3, - ImprovedPowerWordFortitude: 2, - Meditation: 3, - InnerFocus: true, - MentalAgility: 3, - MentalStrength: 5, - FocusedPower: 2, - Enlightenment: 3, - FocusedWill: 3, - PowerInfusion: true, - - HolySpecialization: 5, - SpellWarding: 5, - DivineFury: 5, - DesperatePrayer: true, - HolyReach: 2, - SearingLight: 2, - SpiritOfRedemption: true, - SpiritualGuidance: 5, - SurgeOfLight: 2, - - SpiritTap: 3, - ImprovedSpiritTap: 2, - Darkness: 4, -} - +var DefaultTalents = "05332031013005023310001-005551002020152-00502" var DefaultGlyphs = &proto.Glyphs{ Major1: int32(proto.PriestMajorGlyph_GlyphOfSmite), Major2: int32(proto.PriestMajorGlyph_GlyphOfHolyNova), @@ -50,7 +22,6 @@ var FullConsumes = &proto.Consumes{ var PlayerOptionsBasic = &proto.Player_SmitePriest{ SmitePriest: &proto.SmitePriest{ - Talents: StandardTalents, Options: &proto.SmitePriest_Options{ UseInnerFire: true, UseShadowfiend: true, diff --git a/sim/priest/smite/smite_priest.go b/sim/priest/smite/smite_priest.go index 865d269db5..1631ed34d8 100644 --- a/sim/priest/smite/smite_priest.go +++ b/sim/priest/smite/smite_priest.go @@ -33,13 +33,7 @@ func NewSmitePriest(character core.Character, options *proto.Player) *SmitePries UseShadowfiend: smiteOptions.Options.UseShadowfiend, } - selfBuffs.PowerInfusionTarget = &proto.RaidTarget{TargetIndex: -1} - if smiteOptions.Options.PowerInfusionTarget != nil { - selfBuffs.PowerInfusionTarget = smiteOptions.Options.PowerInfusionTarget - } - - basePriest := priest.New(character, selfBuffs, smiteOptions.Talents) - + basePriest := priest.New(character, selfBuffs, options.TalentsString) spriest := &SmitePriest{ Priest: basePriest, rotation: smiteOptions.Rotation, @@ -47,6 +41,11 @@ func NewSmitePriest(character core.Character, options *proto.Player) *SmitePries allowedHFDelay: time.Millisecond * time.Duration(smiteOptions.Rotation.AllowedHolyFireDelayMs), } + spriest.SelfBuffs.PowerInfusionTarget = &proto.RaidTarget{TargetIndex: -1} + if spriest.Talents.PowerInfusion && smiteOptions.Options.PowerInfusionTarget != nil { + spriest.SelfBuffs.PowerInfusionTarget = smiteOptions.Options.PowerInfusionTarget + } + spriest.EnableResumeAfterManaWait(spriest.tryUseGCD) return spriest diff --git a/sim/priest/smite/smite_priest_test.go b/sim/priest/smite/smite_priest_test.go index ea903d1e5b..543e647605 100644 --- a/sim/priest/smite/smite_priest_test.go +++ b/sim/priest/smite/smite_priest_test.go @@ -18,9 +18,10 @@ func TestSmite(t *testing.T) { Race: proto.Race_RaceUndead, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, + Talents: DefaultTalents, Glyphs: DefaultGlyphs, Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ diff --git a/sim/raid_bench_test.go b/sim/raid_bench_test.go index d38eff0c36..c9d1960c71 100644 --- a/sim/raid_bench_test.go +++ b/sim/raid_bench_test.go @@ -6,10 +6,6 @@ import ( "github.com/wowsims/wotlk/sim/core" "github.com/wowsims/wotlk/sim/core/proto" "github.com/wowsims/wotlk/sim/core/stats" - "github.com/wowsims/wotlk/sim/druid/balance" - "github.com/wowsims/wotlk/sim/mage" - "github.com/wowsims/wotlk/sim/priest/shadow" - "github.com/wowsims/wotlk/sim/shaman/elemental" "github.com/wowsims/wotlk/sim/shaman/enhancement" ) @@ -23,7 +19,6 @@ var castersWithElemental = &proto.Party{ Equipment: MoonkinEquipment, Spec: &proto.Player_BalanceDruid{ BalanceDruid: &proto.BalanceDruid{ - Talents: balance.StandardTalents, Rotation: &proto.BalanceDruid_Rotation{ Type: proto.BalanceDruid_Rotation_Adaptive, }, @@ -49,7 +44,6 @@ var castersWithElemental = &proto.Party{ Equipment: ShadowEquipment, Spec: &proto.Player_ShadowPriest{ ShadowPriest: &proto.ShadowPriest{ - Talents: shadow.StandardTalents, Rotation: &proto.ShadowPriest_Rotation{ RotationType: proto.ShadowPriest_Rotation_Ideal, }, @@ -73,7 +67,6 @@ var castersWithElemental = &proto.Party{ Equipment: ElementalEquipment, Spec: &proto.Player_ElementalShaman{ ElementalShaman: &proto.ElementalShaman{ - Talents: elemental.StandardTalents, Rotation: &proto.ElementalShaman_Rotation{ Totems: &proto.ShamanTotems{ Earth: proto.EarthTotem_TremorTotem, @@ -104,7 +97,6 @@ var castersWithElemental = &proto.Party{ Equipment: ArcaneEquipment, Spec: &proto.Player_Mage{ Mage: &proto.Mage{ - Talents: mage.ArcaneTalents, Options: &proto.Mage_Options{ Armor: proto.Mage_Options_MageArmor, }, @@ -133,7 +125,6 @@ var castersWithResto = &proto.Party{ Equipment: MoonkinEquipment, Spec: &proto.Player_BalanceDruid{ BalanceDruid: &proto.BalanceDruid{ - Talents: balance.StandardTalents, Rotation: &proto.BalanceDruid_Rotation{ Type: proto.BalanceDruid_Rotation_Adaptive, }, @@ -159,7 +150,6 @@ var castersWithResto = &proto.Party{ Equipment: ShadowEquipment, Spec: &proto.Player_ShadowPriest{ ShadowPriest: &proto.ShadowPriest{ - Talents: shadow.StandardTalents, Rotation: &proto.ShadowPriest_Rotation{ RotationType: proto.ShadowPriest_Rotation_Ideal, }, @@ -183,7 +173,6 @@ var castersWithResto = &proto.Party{ Equipment: ArcaneEquipment, Spec: &proto.Player_Mage{ Mage: &proto.Mage{ - Talents: mage.ArcaneTalents, Options: &proto.Mage_Options{ Armor: proto.Mage_Options_MageArmor, }, @@ -219,7 +208,6 @@ func BenchmarkSimulate(b *testing.B) { Equipment: enhancement.Phase1Gear, Spec: &proto.Player_EnhancementShaman{ EnhancementShaman: &proto.EnhancementShaman{ - Talents: enhancement.StandardTalents, Rotation: &proto.EnhancementShaman_Rotation{ Totems: &proto.ShamanTotems{ Earth: proto.EarthTotem_TremorTotem, diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index a2e95dba15..ed8a51749b 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -46,1066 +46,1066 @@ character_stats_results: { dps_results: { key: "TestAssassination-AllItems-Althor'sAbacus-50359" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-Althor'sAbacus-50366" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 7009.34594 - tps: 4976.63562 + dps: 7474.66983 + tps: 5307.01558 } } dps_results: { key: "TestAssassination-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-Bandit'sInsignia-40371" value: { - dps: 7202.88841 - tps: 5114.05077 + dps: 7668.08249 + tps: 5444.33857 } } dps_results: { key: "TestAssassination-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6978.96688 - tps: 78383.84817 + dps: 7435.55995 + tps: 79261.04928 } } dps_results: { key: "TestAssassination-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6978.96688 - tps: 78383.84817 + dps: 7435.55995 + tps: 79261.04928 } } dps_results: { key: "TestAssassination-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7179.82253 - tps: 5097.67399 + dps: 7698.09519 + tps: 5465.64759 } } dps_results: { key: "TestAssassination-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5421.92146 - tps: 3849.56424 + dps: 5764.81487 + tps: 4093.01856 } } dps_results: { key: "TestAssassination-AllItems-BonescytheBattlegear" value: { - dps: 6509.43604 - tps: 4621.69959 + dps: 6944.07058 + tps: 4930.29011 } } dps_results: { key: "TestAssassination-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7157.4952 - tps: 4980.18516 + dps: 7659.33454 + tps: 5329.36497 } } dps_results: { key: "TestAssassination-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7293.93185 - tps: 5178.69161 + dps: 7821.27716 + tps: 5553.10678 } } dps_results: { key: "TestAssassination-AllItems-CorpseTongueCoin-50349" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-CorpseTongueCoin-50352" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 hps: 64 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7120.07019 - tps: 5055.24983 + dps: 7609.72387 + tps: 5402.90395 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7165.09185 - tps: 5087.21522 + dps: 7660.35499 + tps: 5438.85205 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7170.44748 - tps: 5091.01771 + dps: 7637.26337 + tps: 5422.45699 } } dps_results: { key: "TestAssassination-AllItems-Death'sChoice-47464" value: { - dps: 7540.1276 - tps: 5353.4906 + dps: 8032.41321 + tps: 5703.01338 } } dps_results: { key: "TestAssassination-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7106.24144 - tps: 5045.43142 + dps: 7586.69537 + tps: 5386.55371 } } dps_results: { key: "TestAssassination-AllItems-Deathbringer'sWill-50362" value: { - dps: 7370.22355 - tps: 5232.85872 + dps: 7874.58892 + tps: 5590.95813 } } dps_results: { key: "TestAssassination-AllItems-Deathbringer'sWill-50363" value: { - dps: 7448.78177 - tps: 5288.63506 + dps: 7951.30365 + tps: 5645.42559 } } dps_results: { key: "TestAssassination-AllItems-Defender'sCode-40257" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7185.97188 - tps: 5102.04003 + dps: 7698.0561 + tps: 5465.61983 } } dps_results: { key: "TestAssassination-AllItems-DislodgedForeignObject-50348" value: { - dps: 7197.06332 - tps: 5109.91496 + dps: 7666.69617 + tps: 5443.35428 } } dps_results: { key: "TestAssassination-AllItems-DislodgedForeignObject-50353" value: { - dps: 7175.8455 - tps: 5094.8503 + dps: 7638.86655 + tps: 5423.59525 } } dps_results: { key: "TestAssassination-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-EmberSkyflareDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7179.82253 - tps: 5097.67399 + dps: 7698.09519 + tps: 5465.64759 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7172.32021 - tps: 5092.34735 + dps: 7680.92926 + tps: 5453.45978 } } dps_results: { key: "TestAssassination-AllItems-EphemeralSnowflake-50260" value: { - dps: 7103.08854 - tps: 5043.19286 + dps: 7564.73117 + tps: 5370.95913 } } dps_results: { key: "TestAssassination-AllItems-EssenceofGossamer-37220" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7138.84031 - tps: 5068.57662 + dps: 7627.09643 + tps: 5415.23846 } } dps_results: { key: "TestAssassination-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7104.98463 - tps: 5044.53909 + dps: 7600.16508 + tps: 5396.11721 } } dps_results: { key: "TestAssassination-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-ForethoughtTalisman-40258" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-ForgeEmber-37660" value: { - dps: 7080.438 - tps: 5027.11098 + dps: 7565.89099 + tps: 5371.7826 } } dps_results: { key: "TestAssassination-AllItems-ForlornSkyflareDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-ForlornStarflareDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7252.64557 - tps: 5149.37835 + dps: 7727.22638 + tps: 5486.33073 } } dps_results: { key: "TestAssassination-AllItems-FuturesightRune-38763" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-Gladiator'sVestments" value: { - dps: 7018.11046 - tps: 4982.85843 + dps: 7455.83062 + tps: 5293.63974 } } dps_results: { key: "TestAssassination-AllItems-GlowingTwilightScale-54573" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-GlowingTwilightScale-54589" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7138.73072 - tps: 5068.49881 + dps: 7632.35711 + tps: 5418.97354 } } dps_results: { key: "TestAssassination-AllItems-Heartpierce-49982" value: { - dps: 7295.28038 - tps: 5179.64907 + dps: 7803.72508 + tps: 5540.64481 } } dps_results: { key: "TestAssassination-AllItems-Heartpierce-50641" value: { - dps: 7295.28038 - tps: 5179.64907 + dps: 7803.72508 + tps: 5540.64481 } } dps_results: { key: "TestAssassination-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7179.82253 - tps: 5097.67399 + dps: 7698.09519 + tps: 5465.64759 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7172.32021 - tps: 5092.34735 + dps: 7680.92926 + tps: 5453.45978 } } dps_results: { key: "TestAssassination-AllItems-IncisorFragment-37723" value: { - dps: 7156.76021 - tps: 5081.29975 + dps: 7624.9858 + tps: 5413.73992 } } dps_results: { key: "TestAssassination-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7195.12052 - tps: 5108.53557 + dps: 7697.65624 + tps: 5465.33593 hps: 9.14161 } } dps_results: { key: "TestAssassination-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7212.19311 - tps: 5120.65711 + dps: 7700.63235 + tps: 5467.44897 } } dps_results: { key: "TestAssassination-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7007.17191 - tps: 4975.09206 + dps: 7481.38819 + tps: 5311.78561 } } dps_results: { key: "TestAssassination-AllItems-OfferingofSacrifice-37638" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7186.86388 - tps: 5102.67336 + dps: 7690.70441 + tps: 5460.40013 } } dps_results: { key: "TestAssassination-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7193.77416 - tps: 5107.57966 + dps: 7698.08555 + tps: 5465.64074 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-PurifiedShardoftheGods" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-ReignoftheDead-47316" value: { - dps: 7178.98201 - tps: 5097.07723 + dps: 7645.11359 + tps: 5428.03065 } } dps_results: { key: "TestAssassination-AllItems-ReignoftheDead-47477" value: { - dps: 7203.25365 - tps: 5114.31009 + dps: 7670.96388 + tps: 5446.38435 } } dps_results: { key: "TestAssassination-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7295.28038 - tps: 5179.64907 + dps: 7803.72508 + tps: 5540.64481 } } dps_results: { key: "TestAssassination-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-RuneofRepulsion-40372" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-SealofthePantheon-36993" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-Shadowblade'sBattlegear" value: { - dps: 7467.23518 - tps: 5301.73698 + dps: 7931.79625 + tps: 5631.57534 } } dps_results: { key: "TestAssassination-AllItems-ShinyShardoftheGods" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-Slayer'sArmor" value: { - dps: 5332.07121 - tps: 3785.77056 + dps: 5679.43922 + tps: 4032.40184 } } dps_results: { key: "TestAssassination-AllItems-SliverofPureIce-50339" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-SliverofPureIce-50346" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-SouloftheDead-40382" value: { - dps: 7111.28924 - tps: 5049.01536 + dps: 7598.40802 + tps: 5394.86969 } } dps_results: { key: "TestAssassination-AllItems-SparkofHope-45703" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-SparkofLife-37657" value: { - dps: 7065.27381 - tps: 5016.3444 + dps: 7549.9962 + tps: 5360.4973 } } dps_results: { key: "TestAssassination-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7179.05461 - tps: 5097.12877 + dps: 7660.83072 + tps: 5439.18981 } } dps_results: { key: "TestAssassination-AllItems-StormshroudArmor" value: { - dps: 5657.53583 - tps: 4016.85044 + dps: 6043.75469 + tps: 4291.06583 } } dps_results: { key: "TestAssassination-AllItems-SwiftSkyflareDiamond" value: { - dps: 7193.77416 - tps: 5107.57966 + dps: 7698.08555 + tps: 5465.64074 } } dps_results: { key: "TestAssassination-AllItems-SwiftStarflareDiamond" value: { - dps: 7186.86388 - tps: 5102.67336 + dps: 7690.70441 + tps: 5460.40013 } } dps_results: { key: "TestAssassination-AllItems-SwiftWindfireDiamond" value: { - dps: 7174.7709 - tps: 5094.08734 + dps: 7677.7874 + tps: 5451.22906 } } dps_results: { key: "TestAssassination-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-TearsoftheVanquished-47215" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-TerrorbladeBattlegear" value: { - dps: 6903.99481 - tps: 4901.83631 + dps: 7342.97725 + tps: 5213.51385 } } dps_results: { key: "TestAssassination-AllItems-TheFistsofFury" value: { - dps: 4939.36912 - tps: 3506.95208 + dps: 5079.13956 + tps: 3606.18909 } } dps_results: { key: "TestAssassination-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7230.16149 - tps: 5133.41466 + dps: 7735.36945 + tps: 5492.11231 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7309.76199 - tps: 5189.93101 + dps: 7794.83604 + tps: 5534.33359 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7354.64838 - tps: 5221.80035 + dps: 7829.03019 + tps: 5558.61144 } } dps_results: { key: "TestAssassination-AllItems-TirelessSkyflareDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-TirelessStarflareDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7025.72627 - tps: 4988.26565 + dps: 7502.74519 + tps: 5326.94909 } } dps_results: { key: "TestAssassination-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7157.4952 - tps: 5081.82159 + dps: 7659.33454 + tps: 5438.12752 } } dps_results: { key: "TestAssassination-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5775.68916 - tps: 4100.73931 + dps: 6130.51124 + tps: 4352.66298 } } dps_results: { key: "TestAssassination-AllItems-VanCleef'sBattlegear" value: { - dps: 6696.25075 - tps: 4754.33803 + dps: 7138.35678 + tps: 5068.23331 } } dps_results: { key: "TestAssassination-AllItems-WingedTalisman-37844" value: { - dps: 6978.96688 - tps: 4955.06649 + dps: 7435.55995 + tps: 5279.24756 } } dps_results: { key: "TestAssassination-Average-Default" value: { - dps: 7304.06482 - tps: 5185.88602 + dps: 7804.20206 + tps: 5540.98346 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-LongMultiTarget" value: { - dps: 25764.84282 - tps: 18293.0384 + dps: 26447.05039 + tps: 18777.40578 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-LongSingleTarget" value: { - dps: 7295.28038 - tps: 5179.64907 + dps: 7803.72508 + tps: 5540.64481 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-ShortSingleTarget" value: { - dps: 8299.23448 - tps: 5892.45648 + dps: 8920.95477 + tps: 6333.87788 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-LongMultiTarget" value: { - dps: 15102.86158 - tps: 10723.03172 + dps: 15565.47 + tps: 11051.4837 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-LongSingleTarget" value: { - dps: 3569.46067 - tps: 2534.31708 + dps: 3726.16509 + tps: 2645.57721 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-ShortSingleTarget" value: { - dps: 3616.02634 - tps: 2567.3787 + dps: 3739.99116 + tps: 2655.39372 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 15657.11592 - tps: 11116.5523 + dps: 16110.11071 + tps: 11438.1786 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5715.62331 - tps: 4058.09255 + dps: 6107.66523 + tps: 4336.44232 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6657.14776 - tps: 4726.57491 + dps: 7125.5277 + tps: 5059.12467 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8934.2213 - tps: 6343.29713 + dps: 9190.67749 + tps: 6525.38102 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2585.83203 - tps: 1835.94074 + dps: 2701.38216 + tps: 1917.98134 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2637.77316 - tps: 1872.81895 + dps: 2785.21298 + tps: 1977.50122 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 25764.84282 - tps: 18293.0384 + dps: 26447.05039 + tps: 18777.40578 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 7295.28038 - tps: 5179.64907 + dps: 7803.72508 + tps: 5540.64481 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 8299.23448 - tps: 5892.45648 + dps: 8920.95477 + tps: 6333.87788 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 15102.86158 - tps: 10723.03172 + dps: 15565.47 + tps: 11051.4837 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3569.46067 - tps: 2534.31708 + dps: 3726.16509 + tps: 2645.57721 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3616.02634 - tps: 2567.3787 + dps: 3739.99116 + tps: 2655.39372 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 19956.55895 - tps: 14169.15686 + dps: 20595.26045 + tps: 14622.63492 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 4772.22873 - tps: 3388.28239 + dps: 5108.17677 + tps: 3626.80551 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 5427.49574 - tps: 3853.52197 + dps: 5819.98046 + tps: 4132.18612 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 12927.38305 - tps: 9178.44197 + dps: 13305.2961 + tps: 9446.76023 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 2376.44822 - tps: 1687.27824 + dps: 2476.27382 + tps: 1758.15441 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 2479.78591 - tps: 1760.648 + dps: 2559.97792 + tps: 1817.58432 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-LongMultiTarget" value: { - dps: 25848.99333 - tps: 18352.78526 + dps: 26604.55515 + tps: 18889.23415 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-LongSingleTarget" value: { - dps: 7343.55003 - tps: 5213.92052 + dps: 7856.80909 + tps: 5578.33446 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-ShortSingleTarget" value: { - dps: 8395.15617 - tps: 5960.56088 + dps: 9026.12627 + tps: 6408.54965 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-LongMultiTarget" value: { - dps: 15178.98765 - tps: 10777.08123 + dps: 15618.38953 + tps: 11089.05657 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-LongSingleTarget" value: { - dps: 3593.12577 - tps: 2551.1193 + dps: 3750.67863 + tps: 2662.98183 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-ShortSingleTarget" value: { - dps: 3657.3198 - tps: 2596.69706 + dps: 3784.78913 + tps: 2687.20029 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 15743.31226 - tps: 11177.7517 + dps: 16191.23584 + tps: 11495.77744 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5746.65897 - tps: 4080.12787 + dps: 6151.68907 + tps: 4367.69924 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6738.0226 - tps: 4783.99604 + dps: 7221.08833 + tps: 5126.97271 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8986.48757 - tps: 6380.40618 + dps: 9249.19525 + tps: 6566.92863 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2605.94533 - tps: 1850.22118 + dps: 2717.35777 + tps: 1929.32402 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2674.82383 - tps: 1899.12492 + dps: 2821.57553 + tps: 2003.31863 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 25848.99333 - tps: 18352.78526 + dps: 26604.55515 + tps: 18889.23415 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 7343.55003 - tps: 5213.92052 + dps: 7856.80909 + tps: 5578.33446 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 8395.15617 - tps: 5960.56088 + dps: 9026.12627 + tps: 6408.54965 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 15178.98765 - tps: 10777.08123 + dps: 15618.38953 + tps: 11089.05657 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3593.12577 - tps: 2551.1193 + dps: 3750.67863 + tps: 2662.98183 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3657.3198 - tps: 2596.69706 + dps: 3784.78913 + tps: 2687.20029 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 20062.55476 - tps: 14244.41388 + dps: 20701.73233 + tps: 14698.22995 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 4802.95027 - tps: 3410.09469 + dps: 5140.89486 + tps: 3650.03535 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 5484.98979 - tps: 3894.34275 + dps: 5886.54706 + tps: 4179.44841 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 13008.8735 - tps: 9236.30019 + dps: 13402.28685 + tps: 9515.62367 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 2393.08077 - tps: 1699.08734 + dps: 2492.40444 + tps: 1769.60715 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 2506.49053 - tps: 1779.60828 + dps: 2589.51693 + tps: 1838.55702 } } dps_results: { key: "TestAssassination-SwitchInFrontOfTarget-Default" value: { - dps: 6851.71111 - tps: 4864.71489 + dps: 7290.59423 + tps: 5176.3219 } } diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index 02c2f85626..a3998ed59a 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -46,1087 +46,1087 @@ character_stats_results: { dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50359" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50366" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 6158.45716 - tps: 4372.50458 + dps: 6330.44966 + tps: 4494.61926 } } dps_results: { key: "TestCombat-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-Bandit'sInsignia-40371" value: { - dps: 6339.84178 - tps: 4501.28766 + dps: 6519.18215 + tps: 4628.61933 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6140.84592 - tps: 48944.07897 + dps: 6316.65937 + tps: 48599.69066 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6140.84592 - tps: 48944.07897 + dps: 6316.65937 + tps: 48599.69066 } } dps_results: { key: "TestCombat-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6296.55948 - tps: 4470.55723 + dps: 6470.77951 + tps: 4594.25345 } } dps_results: { key: "TestCombat-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 4852.66274 - tps: 3445.39054 + dps: 4989.99966 + tps: 3542.89976 } } dps_results: { key: "TestCombat-AllItems-BonescytheBattlegear" value: { - dps: 5824.51782 - tps: 4135.40765 + dps: 5978.03349 + tps: 4244.40377 } } dps_results: { key: "TestCombat-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6270.61077 - tps: 4363.09098 + dps: 6446.77798 + tps: 4485.66812 } } dps_results: { key: "TestCombat-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6408.01085 - tps: 4549.6877 + dps: 6585.51591 + tps: 4675.7163 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50349" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50352" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 hps: 64 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6268.73122 - tps: 4450.79917 + dps: 6444.27285 + tps: 4575.43372 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6302.91024 - tps: 4475.06627 + dps: 6477.13365 + tps: 4598.76489 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6280.5246 - tps: 4459.17247 + dps: 6458.05598 + tps: 4585.21975 } } dps_results: { key: "TestCombat-AllItems-Death'sChoice-47464" value: { - dps: 6599.6043 - tps: 4685.71905 + dps: 6782.91303 + tps: 4815.86825 } } dps_results: { key: "TestCombat-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6241.90086 - tps: 4431.74961 + dps: 6419.68957 + tps: 4557.97959 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50362" value: { - dps: 6532.72691 - tps: 4638.23611 + dps: 6712.27243 + tps: 4765.71343 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50363" value: { - dps: 6585.1023 - tps: 4675.42263 + dps: 6767.31751 + tps: 4804.79543 } } dps_results: { key: "TestCombat-AllItems-Defender'sCode-40257" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6299.97135 - tps: 4472.97966 + dps: 6474.59473 + tps: 4596.96226 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50348" value: { - dps: 6362.74578 - tps: 4517.54951 + dps: 6541.65341 + tps: 4644.57392 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50353" value: { - dps: 6343.45011 - tps: 4503.84958 + dps: 6495.84625 + tps: 4612.05084 } } dps_results: { key: "TestCombat-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-EmberSkyflareDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6296.55948 - tps: 4470.55723 + dps: 6470.77951 + tps: 4594.25345 } } dps_results: { key: "TestCombat-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6291.45663 - tps: 4466.93421 + dps: 6466.34381 + tps: 4591.10411 } } dps_results: { key: "TestCombat-AllItems-EphemeralSnowflake-50260" value: { - dps: 6277.29443 - tps: 4456.87905 + dps: 6455.59124 + tps: 4583.46978 } } dps_results: { key: "TestCombat-AllItems-EssenceofGossamer-37220" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6305.38638 - tps: 4476.82433 + dps: 6478.29959 + tps: 4599.59271 } } dps_results: { key: "TestCombat-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6253.33195 - tps: 4439.86568 + dps: 6428.90543 + tps: 4564.52285 } } dps_results: { key: "TestCombat-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-ForethoughtTalisman-40258" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-ForgeEmber-37660" value: { - dps: 6227.41278 - tps: 4421.46307 + dps: 6402.43475 + tps: 4545.72867 } } dps_results: { key: "TestCombat-AllItems-ForlornSkyflareDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-ForlornStarflareDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6381.7378 - tps: 4531.03384 + dps: 6563.52218 + tps: 4660.10074 } } dps_results: { key: "TestCombat-AllItems-FuturesightRune-38763" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-Gladiator'sVestments" value: { - dps: 6221.94679 - tps: 4417.58222 + dps: 6396.6451 + tps: 4541.61802 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54573" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54589" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6277.47864 - tps: 4457.00984 + dps: 6452.46529 + tps: 4581.25035 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-49982" value: { - dps: 6412.72082 - tps: 4553.03178 + dps: 6592.32193 + tps: 4680.54857 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-50641" value: { - dps: 6412.72082 - tps: 4553.03178 + dps: 6592.32193 + tps: 4680.54857 } } dps_results: { key: "TestCombat-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6296.55948 - tps: 4470.55723 + dps: 6470.77951 + tps: 4594.25345 } } dps_results: { key: "TestCombat-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6291.45663 - tps: 4466.93421 + dps: 6466.34381 + tps: 4591.10411 } } dps_results: { key: "TestCombat-AllItems-IncisorFragment-37723" value: { - dps: 6325.07619 - tps: 4490.8041 + dps: 6496.29002 + tps: 4612.36592 } } dps_results: { key: "TestCombat-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6302.03441 - tps: 4474.44443 + dps: 6479.14387 + tps: 4600.19215 hps: 9.14161 } } dps_results: { key: "TestCombat-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6366.48907 - tps: 4520.20724 + dps: 6549.7003 + tps: 4650.28722 } } dps_results: { key: "TestCombat-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6186.63659 - tps: 4392.51198 + dps: 6365.45243 + tps: 4519.47122 } } dps_results: { key: "TestCombat-AllItems-OfferingofSacrifice-37638" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6296.38222 - tps: 4470.43138 + dps: 6473.18171 + tps: 4595.95901 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6302.4461 - tps: 4474.73673 + dps: 6479.39435 + tps: 4600.36999 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-PurifiedShardoftheGods" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47316" value: { - dps: 6285.06065 - tps: 4462.39306 + dps: 6463.13422 + tps: 4588.8253 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47477" value: { - dps: 6303.29045 - tps: 4475.33622 + dps: 6481.86377 + tps: 4602.12328 } } dps_results: { key: "TestCombat-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6412.72082 - tps: 4553.03178 + dps: 6592.32193 + tps: 4680.54857 } } dps_results: { key: "TestCombat-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-RuneofRepulsion-40372" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-SealofthePantheon-36993" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-Shadowblade'sBattlegear" value: { - dps: 6441.48969 - tps: 4573.45768 + dps: 6616.52115 + tps: 4697.73002 } } dps_results: { key: "TestCombat-AllItems-Shadowmourne-49623" value: { - dps: 6412.72082 - tps: 4553.03178 + dps: 6592.32193 + tps: 4680.54857 } } dps_results: { key: "TestCombat-AllItems-ShinyShardoftheGods" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-Slayer'sArmor" value: { - dps: 4793.38018 - tps: 3403.29993 + dps: 4923.42884 + tps: 3495.63447 } } dps_results: { key: "TestCombat-AllItems-SliverofPureIce-50339" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-SliverofPureIce-50346" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-SouloftheDead-40382" value: { - dps: 6258.88356 - tps: 4443.80733 + dps: 6433.98973 + tps: 4568.13271 } } dps_results: { key: "TestCombat-AllItems-SparkofHope-45703" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-SparkofLife-37657" value: { - dps: 6249.19228 - tps: 4436.92652 + dps: 6413.32085 + tps: 4553.45781 } } dps_results: { key: "TestCombat-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6346.63699 - tps: 4506.11227 + dps: 6510.86898 + tps: 4622.71698 } } dps_results: { key: "TestCombat-AllItems-StormshroudArmor" value: { - dps: 4919.95667 - tps: 3493.16923 + dps: 5051.5181 + tps: 3586.57785 } } dps_results: { key: "TestCombat-AllItems-SwiftSkyflareDiamond" value: { - dps: 6302.4461 - tps: 4474.73673 + dps: 6479.39435 + tps: 4600.36999 } } dps_results: { key: "TestCombat-AllItems-SwiftStarflareDiamond" value: { - dps: 6296.38222 - tps: 4470.43138 + dps: 6473.18171 + tps: 4595.95901 } } dps_results: { key: "TestCombat-AllItems-SwiftWindfireDiamond" value: { - dps: 6285.77045 - tps: 4462.89702 + dps: 6462.30958 + tps: 4588.23981 } } dps_results: { key: "TestCombat-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-TearsoftheVanquished-47215" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-TerrorbladeBattlegear" value: { - dps: 6201.50106 - tps: 4403.06576 + dps: 6388.92584 + tps: 4536.13735 } } dps_results: { key: "TestCombat-AllItems-TheFistsofFury" value: { - dps: 5608.74451 - tps: 3982.2086 + dps: 5770.528 + tps: 4097.07488 } } dps_results: { key: "TestCombat-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5704.49041 - tps: 4050.18819 + dps: 5868.58094 + tps: 4166.69247 } } dps_results: { key: "TestCombat-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6351.11097 - tps: 4509.28879 + dps: 6544.79619 + tps: 4646.8053 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6428.12573 - tps: 4563.96927 + dps: 6588.78681 + tps: 4678.03864 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6457.67491 - tps: 4584.94919 + dps: 6623.8234 + tps: 4702.91461 } } dps_results: { key: "TestCombat-AllItems-TirelessSkyflareDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-TirelessStarflareDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6217.98728 - tps: 4414.77097 + dps: 6375.33857 + tps: 4526.49038 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6270.61077 - tps: 4452.13365 + dps: 6446.77798 + tps: 4577.21236 } } dps_results: { key: "TestCombat-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5155.48417 - tps: 3660.39376 + dps: 5306.13359 + tps: 3767.35485 } } dps_results: { key: "TestCombat-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6020.51691 - tps: 4274.567 + dps: 6188.34728 + tps: 4393.72657 } } dps_results: { key: "TestCombat-AllItems-VanCleef'sBattlegear" value: { - dps: 5970.48552 - tps: 4239.04472 + dps: 6153.82779 + tps: 4369.21773 } } dps_results: { key: "TestCombat-AllItems-WingedTalisman-37844" value: { - dps: 6140.84592 - tps: 4360.0006 + dps: 6316.65937 + tps: 4484.82815 } } dps_results: { key: "TestCombat-Average-Default" value: { - dps: 6404.11781 - tps: 4546.92364 + dps: 6576.19205 + tps: 4669.09635 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 14059.92222 - tps: 9982.54478 + dps: 14245.82184 + tps: 10114.53351 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5428.58811 - tps: 3854.29756 + dps: 5602.86664 + tps: 3978.03531 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6370.70242 - tps: 4523.19872 + dps: 6407.98703 + tps: 4549.67079 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8573.22493 - tps: 6086.9897 + dps: 8671.62405 + tps: 6156.85308 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2524.81854 - tps: 1792.62117 + dps: 2615.50576 + tps: 1857.00909 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2640.12767 - tps: 1874.49065 + dps: 2682.63318 + tps: 1904.66956 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 19275.31892 - tps: 13685.47643 + dps: 19505.87794 + tps: 13849.17334 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 6412.72082 - tps: 4553.03178 + dps: 6592.32193 + tps: 4680.54857 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 7339.47046 - tps: 5211.02403 + dps: 7375.74149 + tps: 5236.77645 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 12054.96666 - tps: 8559.02633 + dps: 12288.52298 + tps: 8724.85131 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 3162.64297 - tps: 2245.47651 + dps: 3260.81349 + tps: 2315.17758 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 3223.9124 - tps: 2288.9778 + dps: 3271.4504 + tps: 2322.72978 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 19275.31892 - tps: 13685.47643 + dps: 19505.87794 + tps: 13849.17334 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 6412.72082 - tps: 4553.03178 + dps: 6592.32193 + tps: 4680.54857 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 7339.47046 - tps: 5211.02403 + dps: 7375.74149 + tps: 5236.77645 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 12054.96666 - tps: 8559.02633 + dps: 12288.52298 + tps: 8724.85131 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3162.64297 - tps: 2245.47651 + dps: 3260.81349 + tps: 2315.17758 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3223.9124 - tps: 2288.9778 + dps: 3271.4504 + tps: 2322.72978 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 18019.47033 - tps: 12793.82394 + dps: 18165.20614 + tps: 12897.29636 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 4723.08847 - tps: 3353.39282 + dps: 4874.29804 + tps: 3460.75161 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 5386.8298 - tps: 3824.64916 + dps: 5439.38068 + tps: 3861.96029 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 11821.09776 - tps: 8392.97941 + dps: 11923.73175 + tps: 8465.84954 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 2352.35036 - tps: 1670.16876 + dps: 2438.60599 + tps: 1731.41025 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 2435.23679 - tps: 1729.01812 + dps: 2485.01484 + tps: 1764.36054 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 14185.49367 - tps: 10071.70051 + dps: 14364.75701 + tps: 10198.97748 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5470.51176 - tps: 3884.06335 + dps: 5640.58959 + tps: 4004.81861 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6457.50579 - tps: 4584.82911 + dps: 6495.67371 + tps: 4611.92833 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8658.69305 - tps: 6147.67206 + dps: 8751.00536 + tps: 6213.21381 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2548.1809 - tps: 1809.20844 + dps: 2635.4268 + tps: 1871.15302 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2678.4404 - tps: 1901.69268 + dps: 2721.4708 + tps: 1932.24427 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 19429.66268 - tps: 13795.0605 + dps: 19653.396 + tps: 13953.91116 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 6462.19523 - tps: 4588.15861 + dps: 6636.1288 + tps: 4711.65145 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 7439.4511 - tps: 5282.01028 + dps: 7476.38457 + tps: 5308.23305 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 12162.53315 - tps: 8635.39854 + dps: 12391.36828 + tps: 8797.87148 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 3191.5324 - tps: 2265.988 + dps: 3285.69334 + tps: 2332.84227 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 3272.39477 - tps: 2323.40028 + dps: 3319.86928 + tps: 2357.10719 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 19429.66268 - tps: 13795.0605 + dps: 19653.396 + tps: 13953.91116 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 6462.19523 - tps: 4588.15861 + dps: 6636.1288 + tps: 4711.65145 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 7439.4511 - tps: 5282.01028 + dps: 7476.38457 + tps: 5308.23305 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 12162.53315 - tps: 8635.39854 + dps: 12391.36828 + tps: 8797.87148 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3191.5324 - tps: 2265.988 + dps: 3285.69334 + tps: 2332.84227 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3272.39477 - tps: 2323.40028 + dps: 3319.86928 + tps: 2357.10719 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 18162.15718 - tps: 12895.1316 + dps: 18302.00453 + tps: 12994.42321 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 4758.55894 - tps: 3378.57685 + dps: 4906.02381 + tps: 3483.27691 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 5458.36375 - tps: 3875.43826 + dps: 5511.61374 + tps: 3913.24575 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 11926.42131 - tps: 8467.75913 + dps: 12024.11854 + tps: 8537.12416 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 2373.05606 - tps: 1684.8698 + dps: 2456.60187 + tps: 1744.18733 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 2470.01689 - tps: 1753.712 + dps: 2520.10085 + tps: 1789.2716 } } dps_results: { key: "TestCombat-SwitchInFrontOfTarget-Default" value: { - dps: 6166.02359 - tps: 4377.87675 + dps: 6332.57763 + tps: 4496.13012 } } diff --git a/sim/rogue/TestRotation.results b/sim/rogue/TestRotation.results deleted file mode 100644 index 65734df09f..0000000000 --- a/sim/rogue/TestRotation.results +++ /dev/null @@ -1,2580 +0,0 @@ -casts_results: { - key: "TestRotation-Casts-Assassination Maintain Expose No Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 423 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 329.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:14177" - value: 2 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 0 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 62.9 - } - casts: { - key: "spell_id:48665" - value: 62.9 - } - casts: { - key: "spell_id:48666" - value: 62.9 - } - casts: { - key: "spell_id:48668 tag:1" - value: 0 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 0 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 0 - } - casts: { - key: "spell_id:48672 tag:2" - value: 0 - } - casts: { - key: "spell_id:48672 tag:3" - value: 0 - } - casts: { - key: "spell_id:48672 tag:4" - value: 0 - } - casts: { - key: "spell_id:48672 tag:5" - value: 0 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51662" - value: 5.1 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 0 - } - casts: { - key: "spell_id:57968" - value: 175.3 - } - casts: { - key: "spell_id:57968 tag:1" - value: 312.7 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 317.7 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:1" - value: 0 - } - casts: { - key: "spell_id:57993 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:3" - value: 0 - } - casts: { - key: "spell_id:57993 tag:4" - value: 17.5 - } - casts: { - key: "spell_id:57993 tag:5" - value: 16.7 - } - casts: { - key: "spell_id:58426" - value: 2 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 0 - } - casts: { - key: "spell_id:6774 tag:2" - value: 0.2 - } - casts: { - key: "spell_id:6774 tag:3" - value: 0.9 - } - casts: { - key: "spell_id:6774 tag:4" - value: 0.1 - } - casts: { - key: "spell_id:6774 tag:5" - value: 0.2 - } - casts: { - key: "spell_id:8647 tag:1" - value: 1.2 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0.4 - } - casts: { - key: "spell_id:8647 tag:3" - value: 2.5 - } - casts: { - key: "spell_id:8647 tag:4" - value: 2 - } - casts: { - key: "spell_id:8647 tag:5" - value: 2.2 - } - } -} -casts_results: { - key: "TestRotation-Casts-Assassination No Expose Maintain Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 423.1 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 329.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:14177" - value: 2 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 0 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 60.2 - } - casts: { - key: "spell_id:48665" - value: 60.2 - } - casts: { - key: "spell_id:48666" - value: 60.2 - } - casts: { - key: "spell_id:48668 tag:1" - value: 0 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 0 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 0 - } - casts: { - key: "spell_id:48672 tag:2" - value: 0 - } - casts: { - key: "spell_id:48672 tag:3" - value: 0 - } - casts: { - key: "spell_id:48672 tag:4" - value: 0 - } - casts: { - key: "spell_id:48672 tag:5" - value: 0 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51662" - value: 5.2 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 10 - } - casts: { - key: "spell_id:57968" - value: 179.8 - } - casts: { - key: "spell_id:57968 tag:1" - value: 314.2 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 319.2 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:1" - value: 0 - } - casts: { - key: "spell_id:57993 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:3" - value: 0 - } - casts: { - key: "spell_id:57993 tag:4" - value: 20 - } - casts: { - key: "spell_id:57993 tag:5" - value: 19 - } - casts: { - key: "spell_id:58426" - value: 2 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 0 - } - casts: { - key: "spell_id:6774 tag:2" - value: 0.1 - } - casts: { - key: "spell_id:6774 tag:3" - value: 0.9 - } - casts: { - key: "spell_id:6774 tag:4" - value: 0 - } - casts: { - key: "spell_id:6774 tag:5" - value: 0 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} -casts_results: { - key: "TestRotation-Casts-Assassination No Expose Maintain Tricks Secondary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 423 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 329.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:14177" - value: 2 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 0 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 62.9 - } - casts: { - key: "spell_id:48665" - value: 62.9 - } - casts: { - key: "spell_id:48666" - value: 62.9 - } - casts: { - key: "spell_id:48668 tag:1" - value: 0 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 0 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 0 - } - casts: { - key: "spell_id:48672 tag:2" - value: 0 - } - casts: { - key: "spell_id:48672 tag:3" - value: 0 - } - casts: { - key: "spell_id:48672 tag:4" - value: 5.6 - } - casts: { - key: "spell_id:48672 tag:5" - value: 9.6 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51662" - value: 5.2 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 10 - } - casts: { - key: "spell_id:57968" - value: 163.6 - } - casts: { - key: "spell_id:57968 tag:1" - value: 297.1 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 302.1 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:1" - value: 0 - } - casts: { - key: "spell_id:57993 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:3" - value: 0 - } - casts: { - key: "spell_id:57993 tag:4" - value: 14.7 - } - casts: { - key: "spell_id:57993 tag:5" - value: 9.4 - } - casts: { - key: "spell_id:58426" - value: 2 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 0 - } - casts: { - key: "spell_id:6774 tag:2" - value: 0.1 - } - casts: { - key: "spell_id:6774 tag:3" - value: 1 - } - casts: { - key: "spell_id:6774 tag:4" - value: 0.1 - } - casts: { - key: "spell_id:6774 tag:5" - value: 1.1 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} -casts_results: { - key: "TestRotation-Casts-Assassination No Expose No Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 423.1 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 329.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:14177" - value: 2 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 0 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 62.8 - } - casts: { - key: "spell_id:48665" - value: 62.8 - } - casts: { - key: "spell_id:48666" - value: 62.8 - } - casts: { - key: "spell_id:48668 tag:1" - value: 0 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 0 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 0 - } - casts: { - key: "spell_id:48672 tag:2" - value: 0 - } - casts: { - key: "spell_id:48672 tag:3" - value: 0 - } - casts: { - key: "spell_id:48672 tag:4" - value: 0 - } - casts: { - key: "spell_id:48672 tag:5" - value: 0 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51662" - value: 5.2 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 0 - } - casts: { - key: "spell_id:57968" - value: 182.2 - } - casts: { - key: "spell_id:57968 tag:1" - value: 319.8 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 324.8 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:1" - value: 0 - } - casts: { - key: "spell_id:57993 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:3" - value: 0 - } - casts: { - key: "spell_id:57993 tag:4" - value: 20.7 - } - casts: { - key: "spell_id:57993 tag:5" - value: 19.9 - } - casts: { - key: "spell_id:58426" - value: 2 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 0 - } - casts: { - key: "spell_id:6774 tag:2" - value: 0.1 - } - casts: { - key: "spell_id:6774 tag:3" - value: 0.9 - } - casts: { - key: "spell_id:6774 tag:4" - value: 0 - } - casts: { - key: "spell_id:6774 tag:5" - value: 0 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} -casts_results: { - key: "TestRotation-Casts-Assassination No Expose One Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 423.1 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 329.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:14177" - value: 2 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 0 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 60.2 - } - casts: { - key: "spell_id:48665" - value: 60.2 - } - casts: { - key: "spell_id:48666" - value: 60.2 - } - casts: { - key: "spell_id:48668 tag:1" - value: 0 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 0 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 0 - } - casts: { - key: "spell_id:48672 tag:2" - value: 0 - } - casts: { - key: "spell_id:48672 tag:3" - value: 0 - } - casts: { - key: "spell_id:48672 tag:4" - value: 0 - } - casts: { - key: "spell_id:48672 tag:5" - value: 0 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51662" - value: 5.2 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 10 - } - casts: { - key: "spell_id:57968" - value: 179.8 - } - casts: { - key: "spell_id:57968 tag:1" - value: 314.2 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 319.2 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:1" - value: 0 - } - casts: { - key: "spell_id:57993 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:3" - value: 0 - } - casts: { - key: "spell_id:57993 tag:4" - value: 20 - } - casts: { - key: "spell_id:57993 tag:5" - value: 19 - } - casts: { - key: "spell_id:58426" - value: 2 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 0 - } - casts: { - key: "spell_id:6774 tag:2" - value: 0.1 - } - casts: { - key: "spell_id:6774 tag:3" - value: 0.9 - } - casts: { - key: "spell_id:6774 tag:4" - value: 0 - } - casts: { - key: "spell_id:6774 tag:5" - value: 0 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} -casts_results: { - key: "TestRotation-Casts-Assassination One Expose No Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 423.1 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 329.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:14177" - value: 2 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 0 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 62.9 - } - casts: { - key: "spell_id:48665" - value: 62.9 - } - casts: { - key: "spell_id:48666" - value: 62.9 - } - casts: { - key: "spell_id:48668 tag:1" - value: 0 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 0 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 0 - } - casts: { - key: "spell_id:48672 tag:2" - value: 0 - } - casts: { - key: "spell_id:48672 tag:3" - value: 0 - } - casts: { - key: "spell_id:48672 tag:4" - value: 0 - } - casts: { - key: "spell_id:48672 tag:5" - value: 0 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51662" - value: 5 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 0 - } - casts: { - key: "spell_id:57968" - value: 180.6 - } - casts: { - key: "spell_id:57968 tag:1" - value: 319.4 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 324.4 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:1" - value: 0 - } - casts: { - key: "spell_id:57993 tag:2" - value: 0 - } - casts: { - key: "spell_id:57993 tag:3" - value: 0 - } - casts: { - key: "spell_id:57993 tag:4" - value: 20 - } - casts: { - key: "spell_id:57993 tag:5" - value: 19.7 - } - casts: { - key: "spell_id:58426" - value: 2 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 0 - } - casts: { - key: "spell_id:6774 tag:2" - value: 0.1 - } - casts: { - key: "spell_id:6774 tag:3" - value: 0.9 - } - casts: { - key: "spell_id:6774 tag:4" - value: 0 - } - casts: { - key: "spell_id:6774 tag:5" - value: 0 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0.4 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0.5 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0.1 - } - } -} -casts_results: { - key: "TestRotation-Casts-Combat Maintain Expose No Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 477 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 371.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:13750" - value: 1 - } - casts: { - key: "spell_id:13877" - value: 3 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 80.5 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 0 - } - casts: { - key: "spell_id:48665" - value: 0 - } - casts: { - key: "spell_id:48666" - value: 0 - } - casts: { - key: "spell_id:48668 tag:1" - value: 0.8 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 0.3 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 22.1 - } - casts: { - key: "spell_id:48672 tag:2" - value: 2.2 - } - casts: { - key: "spell_id:48672 tag:3" - value: 1.3 - } - casts: { - key: "spell_id:48672 tag:4" - value: 0.4 - } - casts: { - key: "spell_id:48672 tag:5" - value: 0.8 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51690" - value: 3 - } - casts: { - key: "spell_id:51690 tag:1" - value: 15 - } - casts: { - key: "spell_id:51690 tag:2" - value: 15 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 0 - } - casts: { - key: "spell_id:57968" - value: 113.7 - } - casts: { - key: "spell_id:57968 tag:1" - value: 234.1 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 239.2 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 4.8 - } - casts: { - key: "spell_id:6774 tag:2" - value: 4.3 - } - casts: { - key: "spell_id:6774 tag:3" - value: 3.9 - } - casts: { - key: "spell_id:6774 tag:4" - value: 1.8 - } - casts: { - key: "spell_id:6774 tag:5" - value: 0.8 - } - casts: { - key: "spell_id:8647 tag:1" - value: 16 - } - casts: { - key: "spell_id:8647 tag:2" - value: 6.5 - } - casts: { - key: "spell_id:8647 tag:3" - value: 4.2 - } - casts: { - key: "spell_id:8647 tag:4" - value: 1.2 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0.3 - } - } -} -casts_results: { - key: "TestRotation-Casts-Combat No Expose Maintain Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 475.8 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 370.3 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:13750" - value: 1 - } - casts: { - key: "spell_id:13877" - value: 3 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 94.4 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 0 - } - casts: { - key: "spell_id:48665" - value: 0 - } - casts: { - key: "spell_id:48666" - value: 0 - } - casts: { - key: "spell_id:48668 tag:1" - value: 1.4 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 1.4 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 6.7 - } - casts: { - key: "spell_id:48672 tag:2" - value: 3.9 - } - casts: { - key: "spell_id:48672 tag:3" - value: 6.2 - } - casts: { - key: "spell_id:48672 tag:4" - value: 4.6 - } - casts: { - key: "spell_id:48672 tag:5" - value: 4.6 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51690" - value: 3 - } - casts: { - key: "spell_id:51690 tag:1" - value: 15 - } - casts: { - key: "spell_id:51690 tag:2" - value: 15 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 10 - } - casts: { - key: "spell_id:57968" - value: 113.9 - } - casts: { - key: "spell_id:57968 tag:1" - value: 227.3 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 232.3 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 4.6 - } - casts: { - key: "spell_id:6774 tag:2" - value: 3.4 - } - casts: { - key: "spell_id:6774 tag:3" - value: 3.1 - } - casts: { - key: "spell_id:6774 tag:4" - value: 2.5 - } - casts: { - key: "spell_id:6774 tag:5" - value: 1.3 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} -casts_results: { - key: "TestRotation-Casts-Combat No Expose Maintain Tricks Secondary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 470.6 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 366.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:13750" - value: 1 - } - casts: { - key: "spell_id:13877" - value: 3 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 40.1 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 0 - } - casts: { - key: "spell_id:48665" - value: 0 - } - casts: { - key: "spell_id:48666" - value: 0 - } - casts: { - key: "spell_id:48668 tag:1" - value: 76.5 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 0 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 0 - } - casts: { - key: "spell_id:48672 tag:2" - value: 0 - } - casts: { - key: "spell_id:48672 tag:3" - value: 0 - } - casts: { - key: "spell_id:48672 tag:4" - value: 0 - } - casts: { - key: "spell_id:48672 tag:5" - value: 0 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51690" - value: 3 - } - casts: { - key: "spell_id:51690 tag:1" - value: 15 - } - casts: { - key: "spell_id:51690 tag:2" - value: 15 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 10 - } - casts: { - key: "spell_id:57968" - value: 112.6 - } - casts: { - key: "spell_id:57968 tag:1" - value: 222.5 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 227.5 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 21.1 - } - casts: { - key: "spell_id:6774 tag:2" - value: 0 - } - casts: { - key: "spell_id:6774 tag:3" - value: 0 - } - casts: { - key: "spell_id:6774 tag:4" - value: 0 - } - casts: { - key: "spell_id:6774 tag:5" - value: 0 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} -casts_results: { - key: "TestRotation-Casts-Combat No Expose No Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 477 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 371.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:13750" - value: 1 - } - casts: { - key: "spell_id:13877" - value: 3 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 98.6 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 0 - } - casts: { - key: "spell_id:48665" - value: 0 - } - casts: { - key: "spell_id:48666" - value: 0 - } - casts: { - key: "spell_id:48668 tag:1" - value: 1.2 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 1.6 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 6 - } - casts: { - key: "spell_id:48672 tag:2" - value: 3.4 - } - casts: { - key: "spell_id:48672 tag:3" - value: 5.7 - } - casts: { - key: "spell_id:48672 tag:4" - value: 5 - } - casts: { - key: "spell_id:48672 tag:5" - value: 5.4 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51690" - value: 3 - } - casts: { - key: "spell_id:51690 tag:1" - value: 15 - } - casts: { - key: "spell_id:51690 tag:2" - value: 15 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 0 - } - casts: { - key: "spell_id:57968" - value: 114.2 - } - casts: { - key: "spell_id:57968 tag:1" - value: 229.2 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 234.2 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 5.1 - } - casts: { - key: "spell_id:6774 tag:2" - value: 3.2 - } - casts: { - key: "spell_id:6774 tag:3" - value: 3.1 - } - casts: { - key: "spell_id:6774 tag:4" - value: 2.2 - } - casts: { - key: "spell_id:6774 tag:5" - value: 1.6 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} -casts_results: { - key: "TestRotation-Casts-Combat No Expose One Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 475.8 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 370.3 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:13750" - value: 1 - } - casts: { - key: "spell_id:13877" - value: 3 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 94.4 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 0 - } - casts: { - key: "spell_id:48665" - value: 0 - } - casts: { - key: "spell_id:48666" - value: 0 - } - casts: { - key: "spell_id:48668 tag:1" - value: 1.4 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 1.4 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 6.7 - } - casts: { - key: "spell_id:48672 tag:2" - value: 3.9 - } - casts: { - key: "spell_id:48672 tag:3" - value: 6.2 - } - casts: { - key: "spell_id:48672 tag:4" - value: 4.6 - } - casts: { - key: "spell_id:48672 tag:5" - value: 4.6 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51690" - value: 3 - } - casts: { - key: "spell_id:51690 tag:1" - value: 15 - } - casts: { - key: "spell_id:51690 tag:2" - value: 15 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 10 - } - casts: { - key: "spell_id:57968" - value: 113.9 - } - casts: { - key: "spell_id:57968 tag:1" - value: 227.3 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 232.3 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 4.6 - } - casts: { - key: "spell_id:6774 tag:2" - value: 3.4 - } - casts: { - key: "spell_id:6774 tag:3" - value: 3.1 - } - casts: { - key: "spell_id:6774 tag:4" - value: 2.5 - } - casts: { - key: "spell_id:6774 tag:5" - value: 1.3 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 0 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} -casts_results: { - key: "TestRotation-Casts-Combat One Expose No Tricks Primary" - value: { - casts: { - key: "item_id:40211" - value: 1 - } - casts: { - key: "item_id:7676" - value: 1 - } - casts: { - key: "other_id:OtherActionAttack tag:1" - value: 477 - } - casts: { - key: "other_id:OtherActionAttack tag:2" - value: 371.2 - } - casts: { - key: "other_id:OtherActionShoot" - value: 0 - } - casts: { - key: "spell_id:13750" - value: 1 - } - casts: { - key: "spell_id:13877" - value: 3 - } - casts: { - key: "spell_id:26863" - value: 0 - } - casts: { - key: "spell_id:26864" - value: 0 - } - casts: { - key: "spell_id:48638" - value: 98.3 - } - casts: { - key: "spell_id:48659" - value: 0 - } - casts: { - key: "spell_id:48664" - value: 0 - } - casts: { - key: "spell_id:48665" - value: 0 - } - casts: { - key: "spell_id:48666" - value: 0 - } - casts: { - key: "spell_id:48668 tag:1" - value: 1.4 - } - casts: { - key: "spell_id:48668 tag:2" - value: 0 - } - casts: { - key: "spell_id:48668 tag:3" - value: 0 - } - casts: { - key: "spell_id:48668 tag:4" - value: 0 - } - casts: { - key: "spell_id:48668 tag:5" - value: 1.6 - } - casts: { - key: "spell_id:48672" - value: 0 - } - casts: { - key: "spell_id:48672 tag:1" - value: 7.1 - } - casts: { - key: "spell_id:48672 tag:2" - value: 3.4 - } - casts: { - key: "spell_id:48672 tag:3" - value: 4.4 - } - casts: { - key: "spell_id:48672 tag:4" - value: 4.7 - } - casts: { - key: "spell_id:48672 tag:5" - value: 5.7 - } - casts: { - key: "spell_id:48676" - value: 0 - } - casts: { - key: "spell_id:51690" - value: 3 - } - casts: { - key: "spell_id:51690 tag:1" - value: 15 - } - casts: { - key: "spell_id:51690 tag:2" - value: 15 - } - casts: { - key: "spell_id:51723" - value: 0 - } - casts: { - key: "spell_id:53307" - value: 0 - } - casts: { - key: "spell_id:54758" - value: 5 - } - casts: { - key: "spell_id:57934" - value: 0 - } - casts: { - key: "spell_id:57968" - value: 114.2 - } - casts: { - key: "spell_id:57968 tag:1" - value: 229.2 - } - casts: { - key: "spell_id:57968 tag:2" - value: 0 - } - casts: { - key: "spell_id:57973" - value: 234.2 - } - casts: { - key: "spell_id:57975" - value: 0 - } - casts: { - key: "spell_id:57975 tag:1" - value: 0 - } - casts: { - key: "spell_id:57975 tag:2" - value: 0 - } - casts: { - key: "spell_id:5938" - value: 0 - } - casts: { - key: "spell_id:6774 tag:1" - value: 5.5 - } - casts: { - key: "spell_id:6774 tag:2" - value: 2.8 - } - casts: { - key: "spell_id:6774 tag:3" - value: 2.8 - } - casts: { - key: "spell_id:6774 tag:4" - value: 2.5 - } - casts: { - key: "spell_id:6774 tag:5" - value: 1.6 - } - casts: { - key: "spell_id:8647 tag:1" - value: 0 - } - casts: { - key: "spell_id:8647 tag:2" - value: 0 - } - casts: { - key: "spell_id:8647 tag:3" - value: 1 - } - casts: { - key: "spell_id:8647 tag:4" - value: 0 - } - casts: { - key: "spell_id:8647 tag:5" - value: 0 - } - } -} diff --git a/sim/rogue/presets.go b/sim/rogue/presets.go index 8b9017b802..90572478ca 100644 --- a/sim/rogue/presets.go +++ b/sim/rogue/presets.go @@ -5,265 +5,42 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var CombatTalents = &proto.RogueTalents{ - Malice: 5, - Ruthlessness: 3, - BloodSpatter: 2, - Lethality: 5, - VilePoisons: 2, - ImprovedPoisons: 3, - - ImprovedSinisterStrike: 2, - DualWieldSpecialization: 5, - ImprovedSliceAndDice: 2, - Precision: 5, - Endurance: 1, - CloseQuartersCombat: 5, - LightningReflexes: 3, - Aggression: 5, - BladeFlurry: true, - WeaponExpertise: 2, - BladeTwisting: 2, - Vitality: 3, - AdrenalineRush: true, - CombatPotency: 5, - SurpriseAttacks: true, - SavageCombat: 2, - PreyOnTheWeak: 5, - KillingSpree: true, -} - -var CombatNoLethalityTalents = &proto.RogueTalents{ - Malice: 5, - Ruthlessness: 3, - BloodSpatter: 2, - VilePoisons: 2, - ImprovedPoisons: 3, - - ImprovedSinisterStrike: 2, - DualWieldSpecialization: 5, - ImprovedSliceAndDice: 2, - Precision: 5, - Endurance: 1, - CloseQuartersCombat: 5, - LightningReflexes: 3, - Aggression: 5, - BladeFlurry: true, - WeaponExpertise: 2, - BladeTwisting: 2, - Vitality: 3, - AdrenalineRush: true, - CombatPotency: 5, - SurpriseAttacks: true, - SavageCombat: 2, - PreyOnTheWeak: 5, - KillingSpree: true, +var CombatTalents = "00532000523-0252051050035010223100501251" +var CombatNoLethalityTalents = "00532000023-0252051050035010223100501251" +var CombatNoPotWTalents = "00532000523-0252051050035010223100501201" +var CombatNoLethalityNoPotWTalents = "00532000023-0252051050035010223100501201" +var AssassinationTalents = "005303005352100520103331051-005005003-502" +var CombatGlyphs = &proto.Glyphs{ + Major1: int32(proto.RogueMajorGlyph_GlyphOfKillingSpree), + Major2: int32(proto.RogueMajorGlyph_GlyphOfTricksOfTheTrade), + Major3: int32(proto.RogueMajorGlyph_GlyphOfRupture), } - -var CombatNoPotWTalents = &proto.RogueTalents{ - Malice: 5, - Ruthlessness: 3, - BloodSpatter: 2, - Lethality: 5, - VilePoisons: 2, - ImprovedPoisons: 3, - - ImprovedSinisterStrike: 2, - DualWieldSpecialization: 5, - ImprovedSliceAndDice: 2, - Precision: 5, - Endurance: 1, - CloseQuartersCombat: 5, - LightningReflexes: 3, - Aggression: 5, - BladeFlurry: true, - WeaponExpertise: 2, - BladeTwisting: 2, - Vitality: 3, - AdrenalineRush: true, - CombatPotency: 5, - SurpriseAttacks: true, - SavageCombat: 2, - KillingSpree: true, -} - -var CombatNoLethalityNoPotWTalents = &proto.RogueTalents{ - Malice: 5, - Ruthlessness: 3, - BloodSpatter: 2, - VilePoisons: 2, - ImprovedPoisons: 3, - - ImprovedSinisterStrike: 2, - DualWieldSpecialization: 5, - ImprovedSliceAndDice: 2, - Precision: 5, - Endurance: 1, - CloseQuartersCombat: 5, - LightningReflexes: 3, - Aggression: 5, - BladeFlurry: true, - WeaponExpertise: 2, - BladeTwisting: 2, - Vitality: 3, - AdrenalineRush: true, - CombatPotency: 5, - SurpriseAttacks: true, - SavageCombat: 2, - KillingSpree: true, -} - -var AssassinationTalents = &proto.RogueTalents{ - Malice: 5, - Ruthlessness: 3, - PuncturingWounds: 3, - Lethality: 5, - VilePoisons: 3, - ImprovedPoisons: 5, - FleetFooted: 2, - ColdBlood: true, - SealFate: 5, - Murder: 2, - Overkill: true, - FocusedAttacks: 3, - FindWeakness: 3, - MasterPoisoner: 3, - Mutilate: true, - CutToTheChase: 5, - HungerForBlood: true, - - DualWieldSpecialization: 5, - Precision: 5, - CloseQuartersCombat: 3, - - RelentlessStrikes: 5, - Opportunity: 2, -} - -var AssassinationRotationOptions = []*proto.Rogue_Rotation{ - { - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Never, - AssassinationFinisherPriority: proto.Rogue_Rotation_EnvenomRupture, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Once, - AssassinationFinisherPriority: proto.Rogue_Rotation_EnvenomRupture, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Once, - MinimumComboPointsExposeArmor: 3, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Never, - AssassinationFinisherPriority: proto.Rogue_Rotation_EnvenomRupture, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Maintain, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Never, - AssassinationFinisherPriority: proto.Rogue_Rotation_EnvenomRupture, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Maintain, - AssassinationFinisherPriority: proto.Rogue_Rotation_EnvenomRupture, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Maintain, - AssassinationFinisherPriority: proto.Rogue_Rotation_RuptureEnvenom, - }, -} - -var CombatRotationOptions = []*proto.Rogue_Rotation{ - { - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Never, - CombatFinisherPriority: proto.Rogue_Rotation_RuptureEviscerate, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Once, - CombatFinisherPriority: proto.Rogue_Rotation_RuptureEviscerate, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Once, - MinimumComboPointsExposeArmor: 3, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Never, - CombatFinisherPriority: proto.Rogue_Rotation_RuptureEviscerate, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Maintain, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Never, - CombatFinisherPriority: proto.Rogue_Rotation_RuptureEviscerate, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Maintain, - CombatFinisherPriority: proto.Rogue_Rotation_RuptureEviscerate, - }, - { - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Maintain, - CombatFinisherPriority: proto.Rogue_Rotation_EviscerateRupture, - }, -} - -var RotationNames = []string{ - "No Expose No Tricks Primary", - "No Expose One Tricks Primary", - "One Expose No Tricks Primary", - "Maintain Expose No Tricks Primary", - "No Expose Maintain Tricks Primary", - "No Expose Maintain Tricks Secondary", -} - -func RotationSpecOptions(talents *proto.RogueTalents, options *proto.Rogue_Options) []core.SpecOptionsCombo { - specs := make([]core.SpecOptionsCombo, 0) - specLabel := "Assassination" - rotationOptions := AssassinationRotationOptions - if !talents.Mutilate { - specLabel = "Combat" - rotationOptions = CombatRotationOptions - } - for idx, rotation := range rotationOptions { - specs = append(specs, core.SpecOptionsCombo{ - Label: specLabel + " " + RotationNames[idx], - SpecOptions: &proto.Player_Rogue{ - Rogue: &proto.Rogue{ - Talents: talents, - Options: options, - Rotation: rotation, - }, - }, - }) - } - return specs +var AssassinationGlyphs = &proto.Glyphs{ + Major1: int32(proto.RogueMajorGlyph_GlyphOfMutilate), + Major2: int32(proto.RogueMajorGlyph_GlyphOfTricksOfTheTrade), + Major3: int32(proto.RogueMajorGlyph_GlyphOfHungerForBlood), } var PlayerOptionsCombatDI = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: CombatTalents, Options: DeadlyInstant, Rotation: basicRotation, }, } var PlayerOptionsCombatDD = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: CombatTalents, Options: DeadlyDeadly, Rotation: basicRotation, }, } var PlayerOptionsCombatID = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: CombatTalents, Options: InstantDeadly, Rotation: basicRotation, }, } var PlayerOptionsCombatII = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: CombatTalents, Options: InstantInstant, Rotation: basicRotation, }, @@ -271,7 +48,6 @@ var PlayerOptionsCombatII = &proto.Player_Rogue{ var PlayerOptionsNoLethality = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: CombatNoLethalityTalents, Options: DeadlyInstant, Rotation: basicRotation, }, @@ -279,7 +55,6 @@ var PlayerOptionsNoLethality = &proto.Player_Rogue{ var PlayerOptionsNoPotW = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: CombatNoPotWTalents, Options: DeadlyInstant, Rotation: basicRotation, }, @@ -287,7 +62,6 @@ var PlayerOptionsNoPotW = &proto.Player_Rogue{ var PlayerOptionsNoLethalityNoPotW = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: CombatNoLethalityNoPotWTalents, Options: DeadlyInstant, Rotation: basicRotation, }, @@ -295,28 +69,24 @@ var PlayerOptionsNoLethalityNoPotW = &proto.Player_Rogue{ var PlayerOptionsAssassinationDI = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: AssassinationTalents, Options: DeadlyInstant, Rotation: basicRotation, }, } var PlayerOptionsAssassinationDD = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: AssassinationTalents, Options: DeadlyDeadly, Rotation: basicRotation, }, } var PlayerOptionsAssassinationID = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: AssassinationTalents, Options: InstantDeadly, Rotation: basicRotation, }, } var PlayerOptionsAssassinationII = &proto.Player_Rogue{ Rogue: &proto.Rogue{ - Talents: AssassinationTalents, Options: InstantInstant, Rotation: basicRotation, }, @@ -357,93 +127,6 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredRogueThistleTea, } -var PreRaidGear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 42550, - "enchant": 3817, - "gems": [ - 41398, - 40058 - ] - }, - { - "id": 40678 - }, - { - "id": 43481, - "enchant": 3808 - }, - { - "id": 38614, - "enchant": 3605 - }, - { - "id": 39558, - "enchant": 3832, - "gems": [ - 40003, - 42702 - ] - }, - { - "id": 34448, - "enchant": 3845, - "gems": [ - 40003, - 0 - ] - }, - { - "id": 39560, - "enchant": 3604, - "gems": [ - 40058, - 0 - ] - }, - { - "id": 40694, - "gems": [ - 40003, - 40003 - ] - }, - { - "id": 37644, - "enchant": 3823 - }, - { - "id": 34575, - "enchant": 3606, - "gems": [ - 40003 - ] - }, - { - "id": 40586 - }, - { - "id": 37642 - }, - { - "id": 40684 - }, - { - "id": 44253 - }, - { - "id": 37856, - "enchant": 3789 - }, - { - "id": 37667, - "enchant": 3789 - }, - { - "id": 43612 - } - ]}`) - var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ { "id": 40499, diff --git a/sim/rogue/rogue.go b/sim/rogue/rogue.go index 9afb20ca80..5d00d9adde 100644 --- a/sim/rogue/rogue.go +++ b/sim/rogue/rogue.go @@ -30,6 +30,8 @@ const ( SpellFlagFinisher = core.SpellFlagAgentReserved3 ) +var TalentTreeSizes = [3]int{27, 28, 28} + const RogueBleedTag = "RogueBleed" type Rogue struct { @@ -217,10 +219,11 @@ func NewRogue(character core.Character, options *proto.Player) *Rogue { rogue := &Rogue{ Character: character, - Talents: rogueOptions.Talents, + Talents: &proto.RogueTalents{}, Options: rogueOptions.Options, Rotation: rogueOptions.Rotation, } + core.FillTalentsProto(rogue.Talents.ProtoReflect(), options.TalentsString, TalentTreeSizes) // Passive rogue threat reduction: https://wotlk.wowhead.com/spell=21184/rogue-passive-dnd rogue.PseudoStats.ThreatMultiplier *= 0.71 diff --git a/sim/rogue/rogue_test.go b/sim/rogue/rogue_test.go index 26d1898341..326209e0e4 100644 --- a/sim/rogue/rogue_test.go +++ b/sim/rogue/rogue_test.go @@ -18,13 +18,15 @@ func TestCombat(t *testing.T) { Race: proto.Race_RaceHuman, OtherRaces: []proto.Race{proto.Race_RaceOrc}, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: CombatTalents, + Glyphs: CombatGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "MH Deadly OH Instant", SpecOptions: PlayerOptionsCombatDI}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "MH Instant OH Deadly", SpecOptions: PlayerOptionsCombatID}, {Label: "MH Instant OH Instant", SpecOptions: PlayerOptionsCombatII}, {Label: "MH Deadly OH Deadly", SpecOptions: PlayerOptionsCombatDD}, }, - Consumes: FullConsumes, ItemFilter: core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeLeather, RangedWeaponTypes: []proto.RangedWeaponType{ @@ -42,13 +44,15 @@ func TestAssassination(t *testing.T) { Race: proto.Race_RaceHuman, OtherRaces: []proto.Race{proto.Race_RaceOrc}, GearSet: core.GearSetCombo{Label: "P1 Assassination", GearSet: P1Gear}, + Talents: AssassinationTalents, + Glyphs: AssassinationGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Assassination", SpecOptions: PlayerOptionsAssassinationDI}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "MH Instant OH Deadly", SpecOptions: PlayerOptionsAssassinationID}, {Label: "MH Instant OH Instant", SpecOptions: PlayerOptionsAssassinationII}, {Label: "MH Deadly OH Deadly", SpecOptions: PlayerOptionsAssassinationDD}, }, - Consumes: FullConsumes, ItemFilter: core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeLeather, RangedWeaponTypes: []proto.RangedWeaponType{ @@ -64,20 +68,6 @@ func TestAssassination(t *testing.T) { })) } -func TestRotation(t *testing.T) { - specOptions := RotationSpecOptions(PlayerOptionsCombatDI.Rogue.Talents, PlayerOptionsCombatDI.Rogue.Options) - specOptions = append(specOptions, RotationSpecOptions(PlayerOptionsAssassinationDI.Rogue.Talents, PlayerOptionsAssassinationDI.Rogue.Options)...) - core.RunTestSuite(t, t.Name(), core.RotationTestSuiteGenerator(core.CharacterSuiteConfig{ - Class: proto.Class_ClassRogue, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, - SpecOptions: specOptions[0], - OtherSpecOptions: specOptions[1:], - Consumes: FullConsumes, - })) -} - type AttackType int const ( @@ -92,13 +82,15 @@ func GenerateCriticalDamageMultiplierTestCase( t *testing.T, testName string, equipment *proto.EquipmentSpec, + talents string, spec *proto.Player_Rogue, attackType AttackType, expectedMultiplier float64) { raid := core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{ - Class: proto.Class_ClassRogue, - Race: proto.Race_RaceOrc, - Equipment: equipment, + Class: proto.Class_ClassRogue, + Race: proto.Race_RaceOrc, + Equipment: equipment, + TalentsString: talents, }, spec), nil, nil, nil) encounter := core.MakeSingleTargetEncounter(0.0) env, _ := core.NewEnvironment(raid, encounter) @@ -130,29 +122,29 @@ func GenerateCriticalDamageMultiplierTestCase( // https://github.com/where-fore/rogue-wotlk/issues/31 func TestCritDamageMultipliers(t *testing.T) { // Poison, no RED - GenerateCriticalDamageMultiplierTestCase(t, "Poison", GearWithoutRED, PlayerOptionsNoPotW, Poison, 1.5) + GenerateCriticalDamageMultiplierTestCase(t, "Poison", GearWithoutRED, CombatNoPotWTalents, PlayerOptionsNoPotW, Poison, 1.5) // Poison, with RED - GenerateCriticalDamageMultiplierTestCase(t, "PoisonRED", GearWithRED, PlayerOptionsNoPotW, Poison, 1.545000) + GenerateCriticalDamageMultiplierTestCase(t, "PoisonRED", GearWithRED, CombatNoPotWTalents, PlayerOptionsNoPotW, Poison, 1.545000) // Poison, with RED & PotW - GenerateCriticalDamageMultiplierTestCase(t, "PoisonREDPotW", GearWithRED, PlayerOptionsCombatDI, Poison, 1.854000) + GenerateCriticalDamageMultiplierTestCase(t, "PoisonREDPotW", GearWithRED, CombatTalents, PlayerOptionsCombatDI, Poison, 1.854000) // Auto, no RED, no Lethality, no PotW - GenerateCriticalDamageMultiplierTestCase(t, "Auto", GearWithoutRED, PlayerOptionsNoLethalityNoPotW, MHAuto, 2.0) + GenerateCriticalDamageMultiplierTestCase(t, "Auto", GearWithoutRED, CombatNoLethalityNoPotWTalents, PlayerOptionsNoLethalityNoPotW, MHAuto, 2.0) // Auto, RED, no Lethality, no PotW - GenerateCriticalDamageMultiplierTestCase(t, "AutoRED", GearWithRED, PlayerOptionsNoLethalityNoPotW, MHAuto, 2.06) + GenerateCriticalDamageMultiplierTestCase(t, "AutoRED", GearWithRED, CombatNoLethalityNoPotWTalents, PlayerOptionsNoLethalityNoPotW, MHAuto, 2.06) // Auto, RED, no Lethality, PotW - GenerateCriticalDamageMultiplierTestCase(t, "AutoREDPotW", GearWithRED, PlayerOptionsNoLethality, MHAuto, 2.472) + GenerateCriticalDamageMultiplierTestCase(t, "AutoREDPotW", GearWithRED, CombatNoLethalityTalents, PlayerOptionsNoLethality, MHAuto, 2.472) // Builder, no RED, Lethality, no PotW - GenerateCriticalDamageMultiplierTestCase(t, "BuilderLethality", GearWithoutRED, PlayerOptionsNoPotW, Builder, 2.3) + GenerateCriticalDamageMultiplierTestCase(t, "BuilderLethality", GearWithoutRED, CombatNoPotWTalents, PlayerOptionsNoPotW, Builder, 2.3) // Builder, RED, Lethality, no PotW - GenerateCriticalDamageMultiplierTestCase(t, "BuilderREDLethality", GearWithRED, PlayerOptionsNoPotW, Builder, 2.378000) + GenerateCriticalDamageMultiplierTestCase(t, "BuilderREDLethality", GearWithRED, CombatNoPotWTalents, PlayerOptionsNoPotW, Builder, 2.378000) // Builder, no RED, Lethality, PotW - GenerateCriticalDamageMultiplierTestCase(t, "BuilderLethalityPotW", GearWithoutRED, PlayerOptionsCombatDI, Builder, 2.820000) + GenerateCriticalDamageMultiplierTestCase(t, "BuilderLethalityPotW", GearWithoutRED, CombatTalents, PlayerOptionsCombatDI, Builder, 2.820000) // Builder, RED, Lethality, PotW - GenerateCriticalDamageMultiplierTestCase(t, "BuilderREDLethalityPotW", GearWithRED, PlayerOptionsCombatDI, Builder, 2.913600) + GenerateCriticalDamageMultiplierTestCase(t, "BuilderREDLethalityPotW", GearWithRED, CombatTalents, PlayerOptionsCombatDI, Builder, 2.913600) // Finisher, no RED, Lethality, PotW - GenerateCriticalDamageMultiplierTestCase(t, "FinisherLethalityPotW", GearWithoutRED, PlayerOptionsCombatDI, Finisher, 2.4) + GenerateCriticalDamageMultiplierTestCase(t, "FinisherLethalityPotW", GearWithoutRED, CombatTalents, PlayerOptionsCombatDI, Finisher, 2.4) // Finisher, no RED, Lethality, PotW - GenerateCriticalDamageMultiplierTestCase(t, "FinisherREDLethalityPotW", GearWithRED, PlayerOptionsCombatDI, Finisher, 2.472) + GenerateCriticalDamageMultiplierTestCase(t, "FinisherREDLethalityPotW", GearWithRED, CombatTalents, PlayerOptionsCombatDI, Finisher, 2.472) } func BenchmarkSimulate(b *testing.B) { diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index d4e4593915..b9b67d78da 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -4,21 +4,21 @@ character_stats_results: { final_stats: 396 final_stats: 346.5 final_stats: 1395.35 - final_stats: 1141.8 + final_stats: 1255.98 final_stats: 335.5 - final_stats: 2493 - final_stats: 373.016 + final_stats: 2640.3 + final_stats: 336.4784 final_stats: 294 - final_stats: 1072.07222 + final_stats: 1333.07424 final_stats: 675 final_stats: 0 final_stats: 1676.95 final_stats: 294 - final_stats: 981.57737 + final_stats: 1211.12737 final_stats: 675 final_stats: 0 final_stats: 0 - final_stats: 21243 + final_stats: 22955.7 final_stats: 0 final_stats: 0 final_stats: 16372.5 @@ -49,12 +49,12 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.16194 + weights: 0.46138 weights: 0 - weights: 1.02303 + weights: 1.46373 weights: 0 weights: 0 - weights: 0.66182 + weights: 0.99514 weights: 0 weights: 0 weights: 0 @@ -91,1051 +91,1051 @@ stat_weights_results: { dps_results: { key: "TestElemental-AllItems-Althor'sAbacus-50359" value: { - dps: 4342.7416 - tps: 2592.61482 + dps: 6016.80988 + tps: 3828.10963 } } dps_results: { key: "TestElemental-AllItems-Althor'sAbacus-50366" value: { - dps: 4364.27506 - tps: 2605.20694 + dps: 6047.77535 + tps: 3847.52558 } } dps_results: { key: "TestElemental-AllItems-AshtongueTalismanofVision-32491" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-AustereEarthsiegeDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-Bandit'sInsignia-40371" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-BaubleofTrueBlood-50354" value: { - dps: 4166.93287 - tps: 9252.98953 + dps: 5765.588 + tps: 10642.20259 } } dps_results: { key: "TestElemental-AllItems-BaubleofTrueBlood-50726" value: { - dps: 4166.93287 - tps: 9252.98953 + dps: 5765.588 + tps: 10642.20259 } } dps_results: { key: "TestElemental-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 4354.29682 - tps: 2587.06487 + dps: 6004.20846 + tps: 3797.08583 } } dps_results: { key: "TestElemental-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 4204.34937 - tps: 2512.2444 + dps: 5811.32938 + tps: 3696.09411 } } dps_results: { key: "TestElemental-AllItems-Bizuri'sTotemofShatteredIce-50458" value: { - dps: 4552.53249 - tps: 2710.65126 + dps: 6341.93263 + tps: 4018.41515 } } dps_results: { key: "TestElemental-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 3312.2479 - tps: 2007.7432 + dps: 4789.49394 + tps: 3075.17987 } } dps_results: { key: "TestElemental-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 3498.01715 - tps: 2116.15665 + dps: 5015.43977 + tps: 3220.55997 } } dps_results: { key: "TestElemental-AllItems-BracingEarthsiegeDiamond" value: { - dps: 4366.63116 - tps: 2543.07023 + dps: 6013.82705 + tps: 3727.96042 } } dps_results: { key: "TestElemental-AllItems-ChaoticSkyflareDiamond" value: { - dps: 4469.0267 - tps: 2655.8512 + dps: 6178.94796 + tps: 3908.42921 } } dps_results: { key: "TestElemental-AllItems-CorpseTongueCoin-50349" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-CorpseTongueCoin-50352" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 hps: 64 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 4240.97421 - tps: 2531.98898 + dps: 5853.89807 + tps: 3720.86941 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Death-42990" value: { - dps: 4280.02578 - tps: 2573.01924 + dps: 5875.88666 + tps: 3757.71588 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 4207.47559 - tps: 2510.13834 + dps: 5812.22843 + tps: 3700.2841 } } dps_results: { key: "TestElemental-AllItems-DeadlyGladiator'sTotemofSurvival-42602" value: { - dps: 4384.18146 - tps: 2610.35895 + dps: 6108.02249 + tps: 3867.74012 } } dps_results: { key: "TestElemental-AllItems-Death'sChoice-47464" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 4187.467 - tps: 2500.70052 + dps: 5796.15898 + tps: 3687.31635 } } dps_results: { key: "TestElemental-AllItems-Deathbringer'sWill-50362" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-Deathbringer'sWill-50363" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-Defender'sCode-40257" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-DestructiveSkyflareDiamond" value: { - dps: 4357.26016 - tps: 2588.94267 + dps: 6007.31856 + tps: 3800.3503 } } dps_results: { key: "TestElemental-AllItems-DislodgedForeignObject-50348" value: { - dps: 4612.14038 - tps: 2756.40831 + dps: 6352.95689 + tps: 4032.91455 } } dps_results: { key: "TestElemental-AllItems-DislodgedForeignObject-50353" value: { - dps: 4567.62995 - tps: 2732.12703 + dps: 6273.83922 + tps: 3982.46081 } } dps_results: { key: "TestElemental-AllItems-EarthshatterBattlegear" value: { - dps: 3398.76099 - tps: 2041.12369 + dps: 4651.12927 + tps: 2962.56108 } } dps_results: { key: "TestElemental-AllItems-EarthshatterGarb" value: { - dps: 3951.86442 - tps: 2368.42314 + dps: 5443.59926 + tps: 3461.97167 } } dps_results: { key: "TestElemental-AllItems-EffulgentSkyflareDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-EmberSkyflareDiamond" value: { - dps: 4371.66149 - tps: 2597.35795 + dps: 6028.88068 + tps: 3812.37987 } } dps_results: { key: "TestElemental-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 4354.29682 - tps: 2587.07729 + dps: 6000.76889 + tps: 3796.09809 } } dps_results: { key: "TestElemental-AllItems-EnigmaticStarflareDiamond" value: { - dps: 4352.52189 - tps: 2586.05197 + dps: 5998.52897 + tps: 3794.77032 } } dps_results: { key: "TestElemental-AllItems-EphemeralSnowflake-50260" value: { - dps: 4271.10425 - tps: 2556.54387 + dps: 5884.07279 + tps: 3753.21755 } } dps_results: { key: "TestElemental-AllItems-EssenceofGossamer-37220" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-EternalEarthsiegeDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 4258.72512 - tps: 2552.99447 + dps: 5864.2218 + tps: 3746.94557 } } dps_results: { key: "TestElemental-AllItems-EyeoftheBroodmother-45308" value: { - dps: 4362.98748 - tps: 2603.44025 + dps: 6030.99023 + tps: 3832.68697 } } dps_results: { key: "TestElemental-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 4175.00733 - tps: 2495.75011 + dps: 5785.78508 + tps: 3678.67956 } } dps_results: { key: "TestElemental-AllItems-ForethoughtTalisman-40258" value: { - dps: 4276.18364 - tps: 2553.69373 + dps: 5921.09843 + tps: 3768.09668 } } dps_results: { key: "TestElemental-AllItems-ForgeEmber-37660" value: { - dps: 4318.58902 - tps: 2578.09745 + dps: 5963.78807 + tps: 3792.49809 } } dps_results: { key: "TestElemental-AllItems-ForlornSkyflareDiamond" value: { - dps: 4366.63116 - tps: 2594.24874 + dps: 6013.82705 + tps: 3803.17456 } } dps_results: { key: "TestElemental-AllItems-ForlornStarflareDiamond" value: { - dps: 4361.70007 - tps: 2591.38002 + dps: 6006.77134 + tps: 3798.78016 } } dps_results: { key: "TestElemental-AllItems-FrostWitch'sBattlegear" value: { - dps: 3623.386 - tps: 2169.54639 + dps: 4978.18993 + tps: 3170.48147 } } dps_results: { key: "TestElemental-AllItems-FrostWitch'sRegalia" value: { - dps: 4589.73267 - tps: 2707.09981 + dps: 6348.38775 + tps: 4002.97465 } } dps_results: { key: "TestElemental-AllItems-FuriousGladiator'sTotemofSurvival-42603" value: { - dps: 4393.38705 - tps: 2615.63405 + dps: 6121.30465 + tps: 3875.93943 } } dps_results: { key: "TestElemental-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-FuturesightRune-38763" value: { - dps: 4228.22275 - tps: 2525.64765 + dps: 5852.12989 + tps: 3724.85206 } } dps_results: { key: "TestElemental-AllItems-Gladiator'sEarthshaker" value: { - dps: 3336.53504 - tps: 2010.28626 + dps: 4575.04872 + tps: 2931.37924 } } dps_results: { key: "TestElemental-AllItems-Gladiator'sWartide" value: { - dps: 3942.36051 - tps: 2371.05108 + dps: 5464.26189 + tps: 3496.299 } } dps_results: { key: "TestElemental-AllItems-GlowingTwilightScale-54573" value: { - dps: 4353.50833 - tps: 2598.91088 + dps: 6032.29261 + tps: 3837.8176 } } dps_results: { key: "TestElemental-AllItems-GlowingTwilightScale-54589" value: { - dps: 4377.97817 - tps: 2613.22011 + dps: 6067.48064 + tps: 3859.88119 } } dps_results: { key: "TestElemental-AllItems-GnomishLightningGenerator-41121" value: { - dps: 4274.69471 - tps: 2570.56143 + dps: 5881.08143 + tps: 3757.02281 } } dps_results: { key: "TestElemental-AllItems-HatefulGladiator'sTotemofSurvival-42601" value: { - dps: 4359.42652 - tps: 2596.32755 + dps: 6072.64479 + tps: 3846.04003 } } dps_results: { key: "TestElemental-AllItems-Heartpierce-49982" value: { - dps: 4469.0267 - tps: 2655.8512 + dps: 6178.94796 + tps: 3908.42921 } } dps_results: { key: "TestElemental-AllItems-Heartpierce-50641" value: { - dps: 4469.0267 - tps: 2655.8512 + dps: 6178.94796 + tps: 3908.42921 } } dps_results: { key: "TestElemental-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 4354.29682 - tps: 2587.07729 + dps: 6000.76889 + tps: 3796.09809 } } dps_results: { key: "TestElemental-AllItems-ImpassiveStarflareDiamond" value: { - dps: 4352.52189 - tps: 2586.05197 + dps: 5998.52897 + tps: 3794.77032 } } dps_results: { key: "TestElemental-AllItems-IncisorFragment-37723" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 4346.97518 - tps: 2589.61803 + dps: 5990.86883 + tps: 3789.36173 } } dps_results: { key: "TestElemental-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-MajesticDragonFigurine-40430" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-MeteoriteWhetstone-37390" value: { - dps: 4223.17179 - tps: 2522.28089 + dps: 5831.7267 + tps: 3709.16558 } } dps_results: { key: "TestElemental-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 4293.25811 - tps: 2563.9635 + dps: 5946.00312 + tps: 3785.14492 } } dps_results: { key: "TestElemental-AllItems-OfferingofSacrifice-37638" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-PersistentEarthshatterDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-PurifiedShardoftheGods" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-ReignoftheDead-47316" value: { - dps: 4475.8559 - tps: 2739.06467 + dps: 6158.89092 + tps: 4001.93736 } } dps_results: { key: "TestElemental-AllItems-ReignoftheDead-47477" value: { - dps: 4514.90228 - tps: 2770.7951 + dps: 6208.07135 + tps: 4041.74002 } } dps_results: { key: "TestElemental-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 4455.59667 - tps: 2648.03226 + dps: 6154.9801 + tps: 3892.33535 } } dps_results: { key: "TestElemental-AllItems-RelentlessGladiator'sTotemofSurvival-42604" value: { - dps: 4404.56527 - tps: 2622.03952 + dps: 6137.43298 + tps: 3885.89573 } } dps_results: { key: "TestElemental-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 4341.97569 - tps: 2579.74054 + dps: 5985.94042 + tps: 3785.1904 } } dps_results: { key: "TestElemental-AllItems-RuneofRepulsion-40372" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-SavageGladiator'sTotemofSurvival-42594" value: { - dps: 4355.99539 - tps: 2594.33657 + dps: 6067.63946 + tps: 3842.9277 } } dps_results: { key: "TestElemental-AllItems-SealofthePantheon-36993" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-Shadowmourne-49623" value: { - dps: 4469.0267 - tps: 2655.8512 + dps: 6178.94796 + tps: 3908.42921 } } dps_results: { key: "TestElemental-AllItems-ShinyShardoftheGods" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-SkycallTotem-33506" value: { - dps: 4380.70358 - tps: 2613.64505 + dps: 6068.17338 + tps: 3844.83565 } } dps_results: { key: "TestElemental-AllItems-SkyshatterHarness" value: { - dps: 2852.70933 - tps: 1728.80194 + dps: 3917.93372 + tps: 2520.47994 } } dps_results: { key: "TestElemental-AllItems-SkyshatterRegalia" value: { - dps: 3414.36661 - tps: 2047.36861 + dps: 4655.66417 + tps: 2968.19632 } } dps_results: { key: "TestElemental-AllItems-SliverofPureIce-50339" value: { - dps: 4322.18694 - tps: 2586.38301 + dps: 5986.63233 + tps: 3808.80301 } } dps_results: { key: "TestElemental-AllItems-SliverofPureIce-50346" value: { - dps: 4341.76281 - tps: 2598.50519 + dps: 6022.58983 + tps: 3834.53259 } } dps_results: { key: "TestElemental-AllItems-SouloftheDead-40382" value: { - dps: 4236.61874 - tps: 2536.47005 + dps: 5861.12377 + tps: 3729.28405 } } dps_results: { key: "TestElemental-AllItems-SparkofHope-45703" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-SparkofLife-37657" value: { - dps: 4259.89641 - tps: 2551.45038 + dps: 5869.7095 + tps: 3731.06944 } } dps_results: { key: "TestElemental-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 4290.37489 - tps: 2556.80212 + dps: 5937.40811 + tps: 3764.90634 } } dps_results: { key: "TestElemental-AllItems-Stonebreaker'sTotem-33507" value: { - dps: 4338.15352 - tps: 2583.98344 + dps: 6041.61173 + tps: 3826.74357 } } dps_results: { key: "TestElemental-AllItems-StormshroudArmor" value: { - dps: 3138.25707 - tps: 1906.12622 + dps: 4652.84286 + tps: 2984.63969 } } dps_results: { key: "TestElemental-AllItems-SwiftSkyflareDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-SwiftStarflareDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-SwiftWindfireDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-TearsoftheVanquished-47215" value: { - dps: 4183.74376 - tps: 2498.41435 + dps: 5797.8473 + tps: 3685.56721 } } dps_results: { key: "TestElemental-AllItems-TheFistsofFury" value: { - dps: 3899.92469 - tps: 2330.1374 + dps: 5411.41553 + tps: 3436.25309 } } dps_results: { key: "TestElemental-AllItems-TheGeneral'sHeart-45507" value: { - dps: 4167.53755 - tps: 2490.16077 + dps: 5764.86357 + tps: 3670.13437 } } dps_results: { key: "TestElemental-AllItems-Thrall'sBattlegear" value: { - dps: 3578.41727 - tps: 2152.195 + dps: 4886.04022 + tps: 3117.85977 } } dps_results: { key: "TestElemental-AllItems-Thrall'sRegalia" value: { - dps: 4254.79229 - tps: 2549.06189 + dps: 5845.74314 + tps: 3728.13488 } } dps_results: { key: "TestElemental-AllItems-ThunderingSkyflareDiamond" value: { - dps: 4341.97569 - tps: 2579.90517 + dps: 5978.5485 + tps: 3781.20255 } } dps_results: { key: "TestElemental-AllItems-TidefuryRaiment" value: { - dps: 3201.78209 - tps: 1932.49169 + dps: 4438.89174 + tps: 2849.34876 } } dps_results: { key: "TestElemental-AllItems-TinyAbominationinaJar-50351" value: { - dps: 4315.68407 - tps: 2566.38888 + dps: 5967.36964 + tps: 3775.0607 } } dps_results: { key: "TestElemental-AllItems-TinyAbominationinaJar-50706" value: { - dps: 4315.68407 - tps: 2566.38888 + dps: 5967.36964 + tps: 3775.0607 } } dps_results: { key: "TestElemental-AllItems-TirelessSkyflareDiamond" value: { - dps: 4366.63116 - tps: 2594.24874 + dps: 6013.82705 + tps: 3803.17456 } } dps_results: { key: "TestElemental-AllItems-TirelessStarflareDiamond" value: { - dps: 4361.70007 - tps: 2591.38002 + dps: 6006.77134 + tps: 3798.78016 } } dps_results: { key: "TestElemental-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 4296.75661 - tps: 2567.55602 + dps: 5923.01628 + tps: 3771.09212 } } dps_results: { key: "TestElemental-AllItems-TotemofElectrifyingWind-47666" value: { - dps: 4531.4227 - tps: 2698.41848 + dps: 6303.40156 + tps: 3992.72643 } } dps_results: { key: "TestElemental-AllItems-TotemoftheAvalanche-50463" value: { - dps: 4338.15352 - tps: 2583.98344 + dps: 6041.61173 + tps: 3826.74357 } } dps_results: { key: "TestElemental-AllItems-TotemoftheElementalPlane-40708" value: { - dps: 4401.17857 - tps: 2623.35338 + dps: 6121.83314 + tps: 3884.37232 } } dps_results: { key: "TestElemental-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 4361.70007 - tps: 2591.38002 + dps: 6006.77134 + tps: 3798.78016 } } dps_results: { key: "TestElemental-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 4366.63116 - tps: 2594.24874 + dps: 6013.82705 + tps: 3803.17456 } } dps_results: { key: "TestElemental-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 3077.90244 - tps: 1870.70306 + dps: 4637.35772 + tps: 2979.57784 } } dps_results: { key: "TestElemental-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 4636.92775 - tps: 2754.08959 + dps: 6403.29944 + tps: 4047.44163 } } dps_results: { key: "TestElemental-AllItems-WingedTalisman-37844" value: { - dps: 4240.19179 - tps: 2532.78265 + dps: 5870.94021 + tps: 3737.0804 } } dps_results: { key: "TestElemental-AllItems-WorldbreakerBattlegear" value: { - dps: 3543.9793 - tps: 2127.83896 + dps: 4846.96405 + tps: 3091.37436 } } dps_results: { key: "TestElemental-AllItems-WorldbreakerGarb" value: { - dps: 4286.982 - tps: 2606.22249 + dps: 5902.41813 + tps: 3815.59281 } } dps_results: { key: "TestElemental-AllItems-WrathfulGladiator'sTotemofSurvival-51513" value: { - dps: 4416.40103 - tps: 2628.8218 + dps: 6154.51003 + tps: 3896.4377 } } dps_results: { key: "TestElemental-Average-Default" value: { - dps: 4538.16145 - tps: 2695.10482 + dps: 6251.84851 + tps: 3966.45783 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-FullBuffs-LongMultiTarget" value: { - dps: 6141.33784 - tps: 4533.41477 + dps: 10428.79508 + tps: 7987.43447 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-FullBuffs-LongSingleTarget" value: { - dps: 4487.30406 - tps: 2666.82698 + dps: 6152.47049 + tps: 3896.85544 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-FullBuffs-ShortSingleTarget" value: { - dps: 5096.05444 - tps: 3039.32281 + dps: 7104.9324 + tps: 4503.08061 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-NoBuffs-LongMultiTarget" value: { - dps: 1929.69716 - tps: 1219.18259 + dps: 3997.93929 + tps: 2993.81881 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-NoBuffs-LongSingleTarget" value: { - dps: 1637.63462 - tps: 996.37146 + dps: 3163.74793 + tps: 2044.32211 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-NoBuffs-ShortSingleTarget" value: { - dps: 3735.82121 - tps: 2204.08322 + dps: 5353.18682 + tps: 3377.04062 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 8397.89077 - tps: 4448.74793 + dps: 12881.76804 + tps: 7984.48799 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 5058.01178 - tps: 2636.66608 + dps: 6777.31715 + tps: 3900.54536 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 6438.91355 - tps: 2987.26074 + dps: 8406.1115 + tps: 4433.85875 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 4119.80487 - tps: 1170.62088 + dps: 6336.20501 + tps: 2999.76758 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 2113.26263 - tps: 968.13507 + dps: 3652.32998 + tps: 2013.37549 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 4890.45515 - tps: 2171.71985 + dps: 6427.79685 + tps: 3288.4192 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-FullBuffs-LongMultiTarget" value: { - dps: 5978.35859 - tps: 4422.13856 + dps: 10398.29721 + tps: 7965.51498 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-FullBuffs-LongSingleTarget" value: { - dps: 4469.0267 - tps: 2655.8512 + dps: 6178.94796 + tps: 3908.42921 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-FullBuffs-ShortSingleTarget" value: { - dps: 5069.12912 - tps: 3031.97709 + dps: 6997.19342 + tps: 4430.84374 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-NoBuffs-LongMultiTarget" value: { - dps: 1875.56472 - tps: 1185.57996 + dps: 4007.66602 + tps: 3006.41294 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-NoBuffs-LongSingleTarget" value: { - dps: 1637.44276 - tps: 997.79698 + dps: 3149.73309 + tps: 2034.64348 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-NoBuffs-ShortSingleTarget" value: { - dps: 3744.16871 - tps: 2215.83646 + dps: 5252.97271 + tps: 3309.22369 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 8169.47682 - tps: 4413.94262 + dps: 12696.97764 + tps: 7980.33976 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 5011.56427 - tps: 2640.97049 + dps: 6728.95867 + tps: 3905.65718 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 6292.52869 - tps: 2960.9771 + dps: 8231.44632 + tps: 4380.86755 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 3954.33183 - tps: 1168.77219 + dps: 6105.59017 + tps: 2961.0795 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 2049.91864 - tps: 955.80701 + dps: 3585.01477 + tps: 1995.63458 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 4752.24195 - tps: 2145.51281 + dps: 6267.05139 + tps: 3234.07973 } } dps_results: { key: "TestElemental-SwitchInFrontOfTarget-Default" value: { - dps: 4469.0267 - tps: 2655.8512 + dps: 6178.94796 + tps: 3908.42921 } } diff --git a/sim/shaman/elemental/elemental.go b/sim/shaman/elemental/elemental.go index bfde61994e..8392e652cd 100644 --- a/sim/shaman/elemental/elemental.go +++ b/sim/shaman/elemental/elemental.go @@ -41,13 +41,13 @@ func NewElementalShaman(character core.Character, options *proto.Player) *Elemen switch eleShamOptions.Rotation.Type { case proto.ElementalShaman_Rotation_Adaptive: - rotation = NewAdaptiveRotation(eleShamOptions.Talents, eleShamOptions.Rotation) + rotation = NewAdaptiveRotation(eleShamOptions.Rotation) case proto.ElementalShaman_Rotation_Manual: - rotation = NewManualRotation(eleShamOptions.Talents, eleShamOptions.Rotation) + rotation = NewManualRotation(eleShamOptions.Rotation) } ele := &ElementalShaman{ - Shaman: shaman.NewShaman(character, eleShamOptions.Talents, totems, selfBuffs, eleShamOptions.Rotation.InThunderstormRange), + Shaman: shaman.NewShaman(character, options.TalentsString, totems, selfBuffs, eleShamOptions.Rotation.InThunderstormRange), rotation: rotation, has4pT6: character.HasSetBonus(shaman.ItemSetSkyshatterRegalia, 4), } @@ -71,7 +71,6 @@ func NewElementalShaman(character core.Character, options *proto.Player) *Elemen SpiritWolf1: ele.NewSpiritWolf(1), SpiritWolf2: ele.NewSpiritWolf(2), } - } return ele diff --git a/sim/shaman/elemental/elemental_test.go b/sim/shaman/elemental/elemental_test.go index d5616951c7..482422d554 100644 --- a/sim/shaman/elemental/elemental_test.go +++ b/sim/shaman/elemental/elemental_test.go @@ -19,16 +19,14 @@ func TestElemental(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceOrc}, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "EleFireElemental", SpecOptions: PlayerOptionsAdaptiveFireElemental}, - // core.SpecOptionsCombo{Label: "Fixed3LBCL", SpecOptions: PlayerOptionsFixed3LBCL}, - // core.SpecOptionsCombo{Label: "CLOnClearcastNoBuffs", SpecOptions: PlayerOptionsCLOnClearcastNoBuffs}, - // core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive}, }, - Consumes: FullConsumes, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeAxe, @@ -59,12 +57,14 @@ func BenchmarkSimulate(b *testing.B) { rsr := &proto.RaidSimRequest{ Raid: core.SinglePlayerRaidProto( &proto.Player{ - Race: proto.Race_RaceOrc, - Class: proto.Class_ClassShaman, - Equipment: P1Gear, - Consumes: FullConsumes, - Spec: PlayerOptionsAdaptive, - Buffs: core.FullIndividualBuffs, + Race: proto.Race_RaceOrc, + Class: proto.Class_ClassShaman, + Equipment: P1Gear, + TalentsString: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, + Spec: PlayerOptionsAdaptive, + Buffs: core.FullIndividualBuffs, }, core.FullPartyBuffs, core.FullRaidBuffs, diff --git a/sim/shaman/elemental/presets.go b/sim/shaman/elemental/presets.go index 24b79a8954..3a6854901a 100644 --- a/sim/shaman/elemental/presets.go +++ b/sim/shaman/elemental/presets.go @@ -5,18 +5,11 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var StandardTalents = &proto.ShamanTalents{ - Convection: 5, - Concussion: 5, - ElementalFocus: true, - CallOfThunder: true, - ElementalFury: 5, - UnrelentingStorm: 3, - ElementalPrecision: 3, - LightningMastery: 5, - ElementalMastery: true, - LightningOverload: 5, - TotemOfWrath: true, +var StandardTalents = "0532001523212351322301351-005052031" +var StandardGlyphs = &proto.Glyphs{ + Major1: int32(proto.ShamanMajorGlyph_GlyphOfLava), + Major2: int32(proto.ShamanMajorGlyph_GlyphOfTotemOfWrath), + Major3: int32(proto.ShamanMajorGlyph_GlyphOfLightningBolt), } var NoTotems = &proto.ShamanTotems{} @@ -41,7 +34,6 @@ var eleShamOptions = &proto.ElementalShaman_Options{ } var PlayerOptionsAdaptive = &proto.Player_ElementalShaman{ ElementalShaman: &proto.ElementalShaman{ - Talents: StandardTalents, Options: eleShamOptions, Rotation: &proto.ElementalShaman_Rotation{ Totems: BasicTotems, @@ -52,7 +44,6 @@ var PlayerOptionsAdaptive = &proto.Player_ElementalShaman{ var PlayerOptionsAdaptiveFireElemental = &proto.Player_ElementalShaman{ ElementalShaman: &proto.ElementalShaman{ - Talents: StandardTalents, Options: eleShamOptions, Rotation: &proto.ElementalShaman_Rotation{ Totems: FireElementalBasicTotems, diff --git a/sim/shaman/elemental/rotation.go b/sim/shaman/elemental/rotation.go index 8e96b69dd7..4a351e80cf 100644 --- a/sim/shaman/elemental/rotation.go +++ b/sim/shaman/elemental/rotation.go @@ -152,7 +152,7 @@ func (rotation *AdaptiveRotation) Reset(eleShaman *ElementalShaman, sim *core.Si // } // } -func NewAdaptiveRotation(talents *proto.ShamanTalents, options *proto.ElementalShaman_Rotation) *AdaptiveRotation { +func NewAdaptiveRotation(options *proto.ElementalShaman_Rotation) *AdaptiveRotation { if options.LvbFsWaitMs == 0 { options.LvbFsWaitMs = 175 } @@ -167,7 +167,6 @@ func NewAdaptiveRotation(talents *proto.ShamanTalents, options *proto.ElementalS // // ################################################################ type ManualRotation struct { - // talents options *proto.ElementalShaman_Rotation } @@ -287,9 +286,8 @@ func (rotation *ManualRotation) Reset(eleShaman *ElementalShaman, sim *core.Simu // } // } -func NewManualRotation(talents *proto.ShamanTalents, options *proto.ElementalShaman_Rotation) *ManualRotation { +func NewManualRotation(options *proto.ElementalShaman_Rotation) *ManualRotation { return &ManualRotation{ - // talents: talents, options: options, } } diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 1c4cd0468a..de4d1c5da7 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -9,7 +9,7 @@ character_stats_results: { final_stats: 2933.15556 final_stats: 109 final_stats: 374 - final_stats: 1448.17453 + final_stats: 1631.81453 final_stats: 360 final_stats: 0 final_stats: 5373.51852 @@ -46,1136 +46,1136 @@ character_stats_results: { dps_results: { key: "TestEnhancement-AllItems-Althor'sAbacus-50359" value: { - dps: 6751.97734 - tps: 3844.13055 + dps: 7094.36382 + tps: 3982.29537 } } dps_results: { key: "TestEnhancement-AllItems-Althor'sAbacus-50366" value: { - dps: 6769.74451 - tps: 3855.28723 + dps: 7113.03313 + tps: 3994.04741 } } dps_results: { key: "TestEnhancement-AllItems-AshtongueTalismanofVision-32491" value: { - dps: 6693.41215 - tps: 3800.50833 + dps: 7036.78477 + tps: 3936.96953 } } dps_results: { key: "TestEnhancement-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6632.64264 - tps: 3765.59781 + dps: 6970.15045 + tps: 3900.51188 } } dps_results: { key: "TestEnhancement-AllItems-Bandit'sInsignia-40371" value: { - dps: 6765.48142 - tps: 3845.25887 + dps: 7121.61672 + tps: 3985.3729 } } dps_results: { key: "TestEnhancement-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6608.28246 - tps: 9063.93722 + dps: 6943.07495 + tps: 9324.18095 } } dps_results: { key: "TestEnhancement-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6608.28246 - tps: 9063.93722 + dps: 6943.07495 + tps: 9324.18095 } } dps_results: { key: "TestEnhancement-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6658.01208 - tps: 3776.55376 + dps: 7025.89639 + tps: 3938.85497 } } dps_results: { key: "TestEnhancement-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 6415.03617 - tps: 3627.87458 + dps: 6740.42934 + tps: 3747.96638 } } dps_results: { key: "TestEnhancement-AllItems-Bizuri'sTotemofShatteredIce-50458" value: { - dps: 7009.64078 - tps: 3991.17433 + dps: 7374.5301 + tps: 4147.74177 } } dps_results: { key: "TestEnhancement-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5374.97317 - tps: 3038.23353 + dps: 5670.26959 + tps: 3155.54642 } } dps_results: { key: "TestEnhancement-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5291.02536 - tps: 3001.79957 + dps: 5588.42057 + tps: 3122.0838 } } dps_results: { key: "TestEnhancement-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6652.82928 - tps: 3673.82612 + dps: 6991.38077 + tps: 3805.53824 } } dps_results: { key: "TestEnhancement-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6796.73645 - tps: 3857.41173 + dps: 7159.67371 + tps: 4011.62724 } } dps_results: { key: "TestEnhancement-AllItems-CorpseTongueCoin-50349" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-CorpseTongueCoin-50352" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 hps: 64 } } dps_results: { key: "TestEnhancement-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6705.10204 - tps: 3800.66688 + dps: 7042.47648 + tps: 3938.81441 } } dps_results: { key: "TestEnhancement-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6727.70933 - tps: 3820.79828 + dps: 7097.45581 + tps: 3977.78557 } } dps_results: { key: "TestEnhancement-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6806.11518 - tps: 3867.60228 + dps: 7149.57526 + tps: 3996.70534 } } dps_results: { key: "TestEnhancement-AllItems-DeadlyGladiator'sTotemofSurvival-42602" value: { - dps: 6802.74196 - tps: 3866.75351 + dps: 7162.66549 + tps: 4010.97747 } } dps_results: { key: "TestEnhancement-AllItems-Death'sChoice-47464" value: { - dps: 6952.7471 - tps: 3940.36693 + dps: 7307.86546 + tps: 4075.23206 } } dps_results: { key: "TestEnhancement-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6698.61459 - tps: 3802.32616 + dps: 7033.08575 + tps: 3930.6001 } } dps_results: { key: "TestEnhancement-AllItems-Deathbringer'sWill-50362" value: { - dps: 6910.48166 - tps: 3917.44337 + dps: 7243.89158 + tps: 4047.99924 } } dps_results: { key: "TestEnhancement-AllItems-Deathbringer'sWill-50363" value: { - dps: 6904.71277 - tps: 3913.92247 + dps: 7263.2685 + tps: 4062.12548 } } dps_results: { key: "TestEnhancement-AllItems-Defender'sCode-40257" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6653.05013 - tps: 3772.22128 + dps: 7010.83619 + tps: 3925.46688 } } dps_results: { key: "TestEnhancement-AllItems-DislodgedForeignObject-50348" value: { - dps: 6956.29163 - tps: 3965.07206 + dps: 7337.92979 + tps: 4124.60709 } } dps_results: { key: "TestEnhancement-AllItems-DislodgedForeignObject-50353" value: { - dps: 6900.77276 - tps: 3932.68953 + dps: 7290.96583 + tps: 4094.52832 } } dps_results: { key: "TestEnhancement-AllItems-EarthshatterBattlegear" value: { - dps: 6056.43892 - tps: 3426.96035 + dps: 6380.03675 + tps: 3551.68316 } } dps_results: { key: "TestEnhancement-AllItems-EarthshatterGarb" value: { - dps: 5644.77454 - tps: 3207.80696 + dps: 5943.38746 + tps: 3333.82737 } } dps_results: { key: "TestEnhancement-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6632.64264 - tps: 3765.59781 + dps: 6970.15045 + tps: 3900.51188 } } dps_results: { key: "TestEnhancement-AllItems-EmberSkyflareDiamond" value: { - dps: 6667.53339 - tps: 3784.82287 + dps: 7031.07814 + tps: 3936.2125 } } dps_results: { key: "TestEnhancement-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6650.66956 - tps: 3773.01847 + dps: 7000.33308 + tps: 3918.86919 } } dps_results: { key: "TestEnhancement-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6647.67589 - tps: 3771.36082 + dps: 6996.56862 + tps: 3916.72196 } } dps_results: { key: "TestEnhancement-AllItems-EphemeralSnowflake-50260" value: { - dps: 6734.74187 - tps: 3825.54411 + dps: 7099.93945 + tps: 3981.1382 } } dps_results: { key: "TestEnhancement-AllItems-EssenceofGossamer-37220" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6632.64264 - tps: 3765.59781 + dps: 6970.15045 + tps: 3900.51188 } } dps_results: { key: "TestEnhancement-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6728.6963 - tps: 3824.46355 + dps: 7064.28088 + tps: 3953.75553 } } dps_results: { key: "TestEnhancement-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6802.48728 - tps: 3864.32218 + dps: 7141.93553 + tps: 4001.78045 } } dps_results: { key: "TestEnhancement-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6628.79712 - tps: 3760.39887 + dps: 6989.63811 + tps: 3912.85684 } } dps_results: { key: "TestEnhancement-AllItems-ForethoughtTalisman-40258" value: { - dps: 6697.06064 - tps: 3809.64626 + dps: 7036.65868 + tps: 3945.97091 } } dps_results: { key: "TestEnhancement-AllItems-ForgeEmber-37660" value: { - dps: 6746.82225 - tps: 3829.32521 + dps: 7081.48084 + tps: 3963.31178 } } dps_results: { key: "TestEnhancement-AllItems-ForlornSkyflareDiamond" value: { - dps: 6652.82928 - tps: 3778.28592 + dps: 6991.38077 + tps: 3913.89282 } } dps_results: { key: "TestEnhancement-AllItems-ForlornStarflareDiamond" value: { - dps: 6648.79195 - tps: 3775.7483 + dps: 6987.1347 + tps: 3911.21664 } } dps_results: { key: "TestEnhancement-AllItems-FrostWitch'sBattlegear" value: { - dps: 6750.79307 - tps: 3804.68057 + dps: 7080.28175 + tps: 3926.56355 } } dps_results: { key: "TestEnhancement-AllItems-FrostWitch'sRegalia" value: { - dps: 6361.63541 - tps: 3625.08882 + dps: 6661.55794 + tps: 3750.69321 } } dps_results: { key: "TestEnhancement-AllItems-FuriousGladiator'sTotemofSurvival-42603" value: { - dps: 6814.01714 - tps: 3873.82629 + dps: 7174.58099 + tps: 4018.46468 } } dps_results: { key: "TestEnhancement-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6792.57202 - tps: 3856.14752 + dps: 7146.04247 + tps: 3996.08378 } } dps_results: { key: "TestEnhancement-AllItems-FuturesightRune-38763" value: { - dps: 6657.48831 - tps: 3784.79729 + dps: 6995.07704 + tps: 3919.79593 } } dps_results: { key: "TestEnhancement-AllItems-Gladiator'sEarthshaker" value: { - dps: 6417.04725 - tps: 3629.93619 + dps: 6750.03876 + tps: 3753.83739 } } dps_results: { key: "TestEnhancement-AllItems-Gladiator'sWartide" value: { - dps: 5419.45998 - tps: 3079.40906 + dps: 5752.35497 + tps: 3226.82498 } } dps_results: { key: "TestEnhancement-AllItems-GlowingTwilightScale-54573" value: { - dps: 6760.86093 - tps: 3849.70889 + dps: 7103.69847 + tps: 3988.17139 } } dps_results: { key: "TestEnhancement-AllItems-GlowingTwilightScale-54589" value: { - dps: 6781.05089 - tps: 3862.38694 + dps: 7124.9136 + tps: 4001.52597 } } dps_results: { key: "TestEnhancement-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6708.3724 - tps: 3811.45993 + dps: 7058.33856 + tps: 3949.92815 } } dps_results: { key: "TestEnhancement-AllItems-HatefulGladiator'sTotemofSurvival-42601" value: { - dps: 6781.62757 - tps: 3852.976 + dps: 7140.06185 + tps: 3996.22173 } } dps_results: { key: "TestEnhancement-AllItems-Heartpierce-49982" value: { - dps: 6799.42797 - tps: 3859.5589 + dps: 7150.48231 + tps: 4003.52466 } } dps_results: { key: "TestEnhancement-AllItems-Heartpierce-50641" value: { - dps: 6799.42797 - tps: 3859.5589 + dps: 7150.48231 + tps: 4003.52466 } } dps_results: { key: "TestEnhancement-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6761.21122 - tps: 3849.78722 + dps: 7104.12894 + tps: 3988.30119 } } dps_results: { key: "TestEnhancement-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6650.66956 - tps: 3773.01847 + dps: 7000.33308 + tps: 3918.86919 } } dps_results: { key: "TestEnhancement-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6647.67589 - tps: 3771.36082 + dps: 6996.56862 + tps: 3916.72196 } } dps_results: { key: "TestEnhancement-AllItems-IncisorFragment-37723" value: { - dps: 6729.4804 - tps: 3819.99874 + dps: 7073.2087 + tps: 3956.37097 } } dps_results: { key: "TestEnhancement-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6648.99445 - tps: 3773.45379 + dps: 6996.46616 + tps: 3910.54791 } } dps_results: { key: "TestEnhancement-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6658.07912 - tps: 3779.71024 - hps: 10.80745 + dps: 6997.93266 + tps: 3915.30324 + hps: 11.01073 } } dps_results: { key: "TestEnhancement-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6758.89126 - tps: 3844.262 + dps: 7128.10002 + tps: 3999.16721 } } dps_results: { key: "TestEnhancement-AllItems-OfferingofSacrifice-37638" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6653.23408 - tps: 3777.02271 + dps: 6992.77569 + tps: 3912.53199 } } dps_results: { key: "TestEnhancement-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6658.07912 - tps: 3779.71024 + dps: 6997.93266 + tps: 3915.30324 } } dps_results: { key: "TestEnhancement-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6632.64264 - tps: 3765.59781 + dps: 6970.15045 + tps: 3900.51188 } } dps_results: { key: "TestEnhancement-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6632.64264 - tps: 3765.59781 + dps: 6970.15045 + tps: 3900.51188 } } dps_results: { key: "TestEnhancement-AllItems-PurifiedShardoftheGods" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-ReignoftheDead-47316" value: { - dps: 6799.30281 - tps: 3882.24733 + dps: 7179.14832 + tps: 4042.70156 } } dps_results: { key: "TestEnhancement-AllItems-ReignoftheDead-47477" value: { - dps: 6827.30127 - tps: 3900.80752 + dps: 7209.5346 + tps: 4062.89856 } } dps_results: { key: "TestEnhancement-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6799.42797 - tps: 3859.5589 + dps: 7150.48231 + tps: 4003.52466 } } dps_results: { key: "TestEnhancement-AllItems-RelentlessGladiator'sTotemofSurvival-42604" value: { - dps: 6827.70842 - tps: 3882.41466 + dps: 7189.04983 + tps: 4027.55628 } } dps_results: { key: "TestEnhancement-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6638.43963 - tps: 3766.57734 + dps: 6987.15408 + tps: 3908.30295 } } dps_results: { key: "TestEnhancement-AllItems-RuneofRepulsion-40372" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-SavageGladiator'sTotemofSurvival-42594" value: { - dps: 6775.94023 - tps: 3849.49432 + dps: 7134.09832 + tps: 3992.56362 } } dps_results: { key: "TestEnhancement-AllItems-SealofthePantheon-36993" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-Shadowmourne-49623" value: { - dps: 6799.42797 - tps: 3859.5589 + dps: 7150.48231 + tps: 4003.52466 } } dps_results: { key: "TestEnhancement-AllItems-ShinyShardoftheGods" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-SkycallTotem-33506" value: { - dps: 6772.13221 - tps: 3848.52817 + dps: 7096.36032 + tps: 3970.1327 } } dps_results: { key: "TestEnhancement-AllItems-SkyshatterHarness" value: { - dps: 4778.44207 - tps: 2691.75276 + dps: 5042.0792 + tps: 2801.84388 } } dps_results: { key: "TestEnhancement-AllItems-SkyshatterRegalia" value: { - dps: 4741.60195 - tps: 2690.3923 + dps: 5005.53877 + tps: 2809.92191 } } dps_results: { key: "TestEnhancement-AllItems-SliverofPureIce-50339" value: { - dps: 6742.95649 - tps: 3837.30069 + dps: 7078.81617 + tps: 3975.15925 } } dps_results: { key: "TestEnhancement-AllItems-SliverofPureIce-50346" value: { - dps: 6738.95585 - tps: 3835.42139 + dps: 7089.16302 + tps: 3979.56346 } } dps_results: { key: "TestEnhancement-AllItems-SouloftheDead-40382" value: { - dps: 6720.85707 - tps: 3819.94531 + dps: 7058.06553 + tps: 3948.51364 } } dps_results: { key: "TestEnhancement-AllItems-SparkofHope-45703" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-SparkofLife-37657" value: { - dps: 6665.87609 - tps: 3784.74393 + dps: 7041.98397 + tps: 3937.81297 } } dps_results: { key: "TestEnhancement-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6696.20685 - tps: 3794.8786 + dps: 7052.7496 + tps: 3941.28714 } } dps_results: { key: "TestEnhancement-AllItems-Stonebreaker'sTotem-33507" value: { - dps: 6778.08806 - tps: 3848.8883 + dps: 7136.67848 + tps: 3991.44543 } } dps_results: { key: "TestEnhancement-AllItems-StormshroudArmor" value: { - dps: 5021.97917 - tps: 2837.99602 + dps: 5282.7904 + tps: 2936.82528 } } dps_results: { key: "TestEnhancement-AllItems-SwiftSkyflareDiamond" value: { - dps: 6658.07912 - tps: 3779.71024 + dps: 6997.93266 + tps: 3915.30324 } } dps_results: { key: "TestEnhancement-AllItems-SwiftStarflareDiamond" value: { - dps: 6653.23408 - tps: 3777.02271 + dps: 6992.77569 + tps: 3912.53199 } } dps_results: { key: "TestEnhancement-AllItems-SwiftWindfireDiamond" value: { - dps: 6644.75525 - tps: 3772.31963 + dps: 6983.75098 + tps: 3907.6834 } } dps_results: { key: "TestEnhancement-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-TearsoftheVanquished-47215" value: { - dps: 6685.26107 - tps: 3796.0853 + dps: 7028.95283 + tps: 3931.40901 } } dps_results: { key: "TestEnhancement-AllItems-TheFistsofFury" value: { - dps: 5289.67057 - tps: 2938.64705 + dps: 5575.80044 + tps: 3037.04973 } } dps_results: { key: "TestEnhancement-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6607.41719 - tps: 3753.35573 + dps: 6942.46354 + tps: 3886.67657 } } dps_results: { key: "TestEnhancement-AllItems-Thrall'sBattlegear" value: { - dps: 6545.65575 - tps: 3730.69101 + dps: 6897.65575 + tps: 3876.69831 } } dps_results: { key: "TestEnhancement-AllItems-Thrall'sRegalia" value: { - dps: 6141.36865 - tps: 3519.45847 + dps: 6438.87341 + tps: 3640.90854 } } dps_results: { key: "TestEnhancement-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6716.07618 - tps: 3818.66031 + dps: 7049.41107 + tps: 3951.8234 } } dps_results: { key: "TestEnhancement-AllItems-TidefuryRaiment" value: { - dps: 4728.36097 - tps: 2669.4809 + dps: 4977.921 + tps: 2770.12682 } } dps_results: { key: "TestEnhancement-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6792.81393 - tps: 3859.02581 + dps: 7162.36439 + tps: 4021.45162 } } dps_results: { key: "TestEnhancement-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6783.72172 - tps: 3851.01262 + dps: 7134.57907 + tps: 3993.39469 } } dps_results: { key: "TestEnhancement-AllItems-TirelessSkyflareDiamond" value: { - dps: 6652.82928 - tps: 3778.28592 + dps: 6991.38077 + tps: 3913.89282 } } dps_results: { key: "TestEnhancement-AllItems-TirelessStarflareDiamond" value: { - dps: 6648.79195 - tps: 3775.7483 + dps: 6987.1347 + tps: 3911.21664 } } dps_results: { key: "TestEnhancement-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6722.5696 - tps: 3818.45703 + dps: 7053.95927 + tps: 3955.49152 } } dps_results: { key: "TestEnhancement-AllItems-TotemofElectrifyingWind-47666" value: { - dps: 6964.71562 - tps: 3965.75556 + dps: 7310.78927 + tps: 4101.32037 } } dps_results: { key: "TestEnhancement-AllItems-TotemoftheAvalanche-50463" value: { - dps: 7006.80639 - tps: 3975.91603 + dps: 7379.17957 + tps: 4122.11933 } } dps_results: { key: "TestEnhancement-AllItems-TotemoftheElementalPlane-40708" value: { - dps: 6810.32652 - tps: 3867.53732 + dps: 7170.89497 + tps: 4017.63121 } } dps_results: { key: "TestEnhancement-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6648.79195 - tps: 3775.7483 + dps: 6987.1347 + tps: 3911.21664 } } dps_results: { key: "TestEnhancement-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6652.82928 - tps: 3778.28592 + dps: 6991.38077 + tps: 3913.89282 } } dps_results: { key: "TestEnhancement-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5316.95902 - tps: 3006.25104 + dps: 5613.44178 + tps: 3124.21618 } } dps_results: { key: "TestEnhancement-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6881.90256 - tps: 3901.83374 + dps: 7231.02957 + tps: 4048.38059 } } dps_results: { key: "TestEnhancement-AllItems-WingedTalisman-37844" value: { - dps: 6668.77028 - tps: 3792.21916 + dps: 7006.09007 + tps: 3927.20583 } } dps_results: { key: "TestEnhancement-AllItems-WorldbreakerBattlegear" value: { - dps: 6531.50539 - tps: 3726.61053 + dps: 6878.42633 + tps: 3865.39914 } } dps_results: { key: "TestEnhancement-AllItems-WorldbreakerGarb" value: { - dps: 6148.18632 - tps: 3518.87297 + dps: 6480.80077 + tps: 3666.94402 } } dps_results: { key: "TestEnhancement-AllItems-WrathfulGladiator'sTotemofSurvival-51513" value: { - dps: 6842.20508 - tps: 3891.50824 + dps: 7204.36977 + tps: 4037.18268 } } dps_results: { key: "TestEnhancement-Average-Default" value: { - dps: 6794.5632 - tps: 3858.83274 + dps: 7143.08213 + tps: 4000.91779 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 17932.83478 - tps: 10977.96135 + dps: 18671.61046 + tps: 11301.98223 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6788.66329 - tps: 3842.32096 + dps: 7139.90616 + tps: 3978.35732 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7894.3099 - tps: 4180.0267 + dps: 8390.20959 + tps: 4328.4246 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 10162.71374 - tps: 6330.80985 + dps: 10647.74936 + tps: 6535.69657 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3646.06797 - tps: 2061.54527 + dps: 3862.7606 + tps: 2146.48838 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4903.87245 - tps: 2639.71485 + dps: 5199.64985 + tps: 2725.03109 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 18350.14699 - tps: 10794.12731 + dps: 19058.96856 + tps: 11002.83284 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7169.09677 - tps: 3847.9685 + dps: 7540.08279 + tps: 4007.74353 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 8748.57128 - tps: 4208.84218 + dps: 9215.14109 + tps: 4348.18104 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 10942.39827 - tps: 6623.78731 + dps: 11567.26729 + tps: 6992.33882 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4017.21348 - tps: 2107.26627 + dps: 4249.47499 + tps: 2203.25758 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5487.55774 - tps: 2606.54689 + dps: 5814.96445 + tps: 2722.17232 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 17978.80517 - tps: 10635.5626 + dps: 18700.57723 + tps: 10913.1191 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 7000.4275 - tps: 3806.69824 + dps: 7376.35009 + tps: 3971.36484 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 8418.08654 - tps: 4102.67502 + dps: 8910.78851 + tps: 4265.14572 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 10693.65754 - tps: 6640.54876 + dps: 11294.56497 + tps: 6926.88895 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 3908.61005 - tps: 2085.02332 + dps: 4127.92731 + tps: 2179.24981 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5271.80432 - tps: 2563.78452 + dps: 5569.37983 + tps: 2661.50375 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 17911.04777 - tps: 10993.6388 + dps: 18579.72104 + tps: 11195.57445 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6799.42797 - tps: 3859.5589 + dps: 7150.48231 + tps: 4003.52466 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 8011.69472 - tps: 4277.19275 + dps: 8498.52276 + tps: 4433.42866 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 10143.68588 - tps: 6309.46416 + dps: 10593.03225 + tps: 6456.25385 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3575.08903 - tps: 2010.91951 + dps: 3817.88604 + tps: 2117.78567 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4870.57694 - tps: 2623.50576 + dps: 5178.13479 + tps: 2721.08225 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 18108.91415 - tps: 10706.69596 + dps: 18741.73264 + tps: 10914.51814 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7106.07908 - tps: 3866.74502 + dps: 7468.84991 + tps: 4018.93092 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 8702.15441 - tps: 4290.08611 + dps: 9132.26202 + tps: 4418.75263 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 10788.7321 - tps: 6645.24414 + dps: 11293.36491 + tps: 6894.30793 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 3946.51935 - tps: 2094.96406 + dps: 4164.40254 + tps: 2188.65632 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5460.2514 - tps: 2667.08154 + dps: 5806.82462 + tps: 2798.89463 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 17753.36198 - tps: 10611.53627 + dps: 18342.4024 + tps: 10864.49839 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 6968.18229 - tps: 3825.45543 + dps: 7299.55641 + tps: 3968.80227 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 8242.11833 - tps: 4093.45584 + dps: 8715.55 + tps: 4253.86205 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 10269.0576 - tps: 6482.53059 + dps: 10793.86396 + tps: 6731.47798 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 3840.43741 - tps: 2074.58682 + dps: 4048.63982 + tps: 2165.35718 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5104.39272 - tps: 2530.37723 + dps: 5386.80414 + tps: 2630.43916 } } dps_results: { key: "TestEnhancement-SwitchInFrontOfTarget-Default" value: { - dps: 6421.14174 - tps: 3627.19352 + dps: 6796.00668 + tps: 3783.5665 } } diff --git a/sim/shaman/enhancement/enhancement.go b/sim/shaman/enhancement/enhancement.go index 7ee0ffbdbb..d496c2fce8 100644 --- a/sim/shaman/enhancement/enhancement.go +++ b/sim/shaman/enhancement/enhancement.go @@ -42,7 +42,7 @@ func NewEnhancementShaman(character core.Character, options *proto.Player) *Enha } enh := &EnhancementShaman{ - Shaman: shaman.NewShaman(character, enhOptions.Talents, totems, selfBuffs, true), + Shaman: shaman.NewShaman(character, options.TalentsString, totems, selfBuffs, true), } enh.EnableResumeAfterManaWait(enh.OnGCDReady) diff --git a/sim/shaman/enhancement/enhancement_test.go b/sim/shaman/enhancement/enhancement_test.go index 75adb56a60..f30644d503 100644 --- a/sim/shaman/enhancement/enhancement_test.go +++ b/sim/shaman/enhancement/enhancement_test.go @@ -19,14 +19,15 @@ func TestEnhancement(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceOrc}, GearSet: core.GearSetCombo{Label: "P1", GearSet: Phase1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "EnhFireElemental", SpecOptions: PlayerOptionsFireElemental}, {Label: "EnhItemSwap", SpecOptions: PlayerOptionsItemSwap}, }, - Consumes: FullConsumes, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeAxe, @@ -49,12 +50,14 @@ func BenchmarkSimulate(b *testing.B) { rsr := &proto.RaidSimRequest{ Raid: core.SinglePlayerRaidProto( &proto.Player{ - Race: proto.Race_RaceOrc, - Class: proto.Class_ClassShaman, - Equipment: Phase1Gear, - Consumes: FullConsumes, - Spec: PlayerOptionsBasic, - Buffs: core.FullIndividualBuffs, + Race: proto.Race_RaceOrc, + Class: proto.Class_ClassShaman, + Equipment: Phase1Gear, + TalentsString: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, + Spec: PlayerOptionsBasic, + Buffs: core.FullIndividualBuffs, }, core.FullPartyBuffs, core.FullRaidBuffs, diff --git a/sim/shaman/enhancement/presets.go b/sim/shaman/enhancement/presets.go index 7437e91b97..c40b95f8b1 100644 --- a/sim/shaman/enhancement/presets.go +++ b/sim/shaman/enhancement/presets.go @@ -5,51 +5,15 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var BasicRaidBuffs = &proto.RaidBuffs{} -var BasicPartyBuffs = &proto.PartyBuffs{} -var BasicIndividualBuffs = &proto.IndividualBuffs{} - -var StandardTalents = &proto.ShamanTalents{ - Concussion: 5, - CallOfFlame: 3, - ElementalDevastation: 3, - ElementalFocus: true, - ElementalFury: 5, - ImprovedFireNova: 2, - - EnhancingTotems: 3, - AncestralKnowledge: 4, - ThunderingStrikes: 5, - ElementalWeapons: 3, - ShamanisticFocus: true, //1/2 imp stormstrike might be better, yet to be determined - Flurry: 5, - ImprovedWindfuryTotem: 2, - SpiritWeapons: true, - MentalDexterity: 3, - UnleashedRage: 3, - WeaponMastery: 3, - DualWieldSpecialization: 3, - DualWield: true, - Stormstrike: true, - StaticShock: 3, - LavaLash: true, - MentalQuickness: 3, - ShamanisticRage: true, - MaelstromWeapon: 5, - FeralSpirit: true, -} - -var DefaultGlyphs = &proto.Glyphs{ +var StandardTalents = "053030152-30405003105021333031131031051" +var StandardGlyphs = &proto.Glyphs{ Major1: int32(proto.ShamanMajorGlyph_GlyphOfStormstrike), Major2: int32(proto.ShamanMajorGlyph_GlyphOfFlametongueWeapon), Major3: int32(proto.ShamanMajorGlyph_GlyphOfFeralSpirit), - - //minor glyphs are all qol passive stuff } var PlayerOptionsBasic = &proto.Player_EnhancementShaman{ EnhancementShaman: &proto.EnhancementShaman{ - Talents: StandardTalents, Options: enhShamOptions, Rotation: enhShamRotation, }, @@ -57,7 +21,6 @@ var PlayerOptionsBasic = &proto.Player_EnhancementShaman{ var PlayerOptionsFireElemental = &proto.Player_EnhancementShaman{ EnhancementShaman: &proto.EnhancementShaman{ - Talents: StandardTalents, Options: enhShamOptions, Rotation: enhShamRotationFireElemental, }, @@ -65,7 +28,6 @@ var PlayerOptionsFireElemental = &proto.Player_EnhancementShaman{ var PlayerOptionsItemSwap = &proto.Player_EnhancementShaman{ EnhancementShaman: &proto.EnhancementShaman{ - Talents: StandardTalents, Options: enhShamOptions, Rotation: enhShamRotationItemSwap, }, diff --git a/sim/shaman/restoration/presets.go b/sim/shaman/restoration/presets.go index 4d8d6ff08e..daeb696189 100644 --- a/sim/shaman/restoration/presets.go +++ b/sim/shaman/restoration/presets.go @@ -5,35 +5,7 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var StandardTalents = &proto.ShamanTalents{ - EnhancingTotems: 3, - AncestralKnowledge: 2, - ThunderingStrikes: 5, - ImprovedShields: 3, - - ImprovedHealingWave: 5, - TidalFocus: 5, - ImprovedWaterShield: 3, - HealingFocus: 3, - TidalForce: true, - AncestralHealing: 3, - RestorativeTotems: 3, - TidalMastery: 5, - HealingWay: 3, - NaturesSwiftness: true, - Purification: 5, - ManaTideTotem: true, - CleanseSpirit: true, - BlessingOfTheEternals: 2, - ImprovedChainHeal: 2, - NaturesBlessing: 3, - AncestralAwakening: 3, - EarthShield: true, - ImprovedEarthShield: 2, - TidalWaves: 5, - Riptide: true, -} - +var StandardTalents = "-3020503-50005331335310501122331251" var StandardGlyphs = &proto.Glyphs{ Major1: int32(proto.ShamanMajorGlyph_GlyphOfChainHeal), Major2: int32(proto.ShamanMajorGlyph_GlyphOfEarthShield), @@ -53,7 +25,6 @@ var restoShamOptions = &proto.RestorationShaman_Options{ } var PlayerOptionsStandard = &proto.Player_RestorationShaman{ RestorationShaman: &proto.RestorationShaman{ - Talents: StandardTalents, Options: restoShamOptions, Rotation: &proto.RestorationShaman_Rotation{ Totems: BasicTotems, diff --git a/sim/shaman/restoration/restoration.go b/sim/shaman/restoration/restoration.go index 0da3b8f03b..d234a4668a 100644 --- a/sim/shaman/restoration/restoration.go +++ b/sim/shaman/restoration/restoration.go @@ -38,7 +38,7 @@ func NewRestorationShaman(character core.Character, options *proto.Player) *Rest } resto := &RestorationShaman{ - Shaman: shaman.NewShaman(character, restoShamOptions.Talents, totems, selfBuffs, false), + Shaman: shaman.NewShaman(character, options.TalentsString, totems, selfBuffs, false), } resto.EnableResumeAfterManaWait(resto.tryUseGCD) diff --git a/sim/shaman/restoration/restoration_test.go b/sim/shaman/restoration/restoration_test.go index 636908312d..a6595b1549 100644 --- a/sim/shaman/restoration/restoration_test.go +++ b/sim/shaman/restoration/restoration_test.go @@ -18,11 +18,11 @@ func TestRestoration(t *testing.T) { Race: proto.Race_RaceTroll, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: StandardTalents, + Glyphs: StandardGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Standard", SpecOptions: PlayerOptionsStandard}, - Consumes: FullConsumes, - Glyphs: StandardGlyphs, - ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ proto.WeaponType_WeaponTypeAxe, @@ -45,13 +45,14 @@ func BenchmarkSimulate(b *testing.B) { rsr := &proto.RaidSimRequest{ Raid: core.SinglePlayerRaidProto( &proto.Player{ - Race: proto.Race_RaceOrc, - Class: proto.Class_ClassShaman, - Equipment: P1Gear, - Consumes: FullConsumes, - Spec: PlayerOptionsStandard, - Buffs: core.FullIndividualBuffs, - Glyphs: StandardGlyphs, + Race: proto.Race_RaceOrc, + Class: proto.Class_ClassShaman, + Equipment: P1Gear, + Consumes: FullConsumes, + Spec: PlayerOptionsStandard, + Buffs: core.FullIndividualBuffs, + TalentsString: StandardTalents, + Glyphs: StandardGlyphs, }, core.FullPartyBuffs, core.FullRaidBuffs, diff --git a/sim/shaman/shaman.go b/sim/shaman/shaman.go index 8218459f9e..a4c49354b8 100644 --- a/sim/shaman/shaman.go +++ b/sim/shaman/shaman.go @@ -8,6 +8,8 @@ import ( "github.com/wowsims/wotlk/sim/core/stats" ) +var TalentTreeSizes = [3]int{25, 29, 26} + // Start looking to refresh 5 minute totems at 4:55. const TotemRefreshTime5M = time.Second * 295 @@ -18,20 +20,21 @@ const ( SpellFlagFocusable = core.SpellFlagAgentReserved4 ) -func NewShaman(character core.Character, talents *proto.ShamanTalents, totems *proto.ShamanTotems, selfBuffs SelfBuffs, thunderstormRange bool) *Shaman { - if totems.Fire == proto.FireTotem_TotemOfWrath && !talents.TotemOfWrath { - totems.Fire = proto.FireTotem_FlametongueTotem - } - +func NewShaman(character core.Character, talents string, totems *proto.ShamanTotems, selfBuffs SelfBuffs, thunderstormRange bool) *Shaman { shaman := &Shaman{ Character: character, - Talents: talents, + Talents: &proto.ShamanTalents{}, Totems: totems, SelfBuffs: selfBuffs, thunderstormInRange: thunderstormRange, } + core.FillTalentsProto(shaman.Talents.ProtoReflect(), talents, TalentTreeSizes) shaman.EnableManaBar() + if shaman.Totems.Fire == proto.FireTotem_TotemOfWrath && !shaman.Talents.TotemOfWrath { + shaman.Totems.Fire = proto.FireTotem_FlametongueTotem + } + // Add Shaman stat dependencies shaman.AddStatDependency(stats.Strength, stats.AttackPower, 1) shaman.AddStatDependency(stats.Agility, stats.AttackPower, 1) diff --git a/sim/warlock/TestAffliction.results b/sim/warlock/TestAffliction.results new file mode 100644 index 0000000000..1ad5ac3a32 --- /dev/null +++ b/sim/warlock/TestAffliction.results @@ -0,0 +1,360 @@ +character_stats_results: { + key: "TestAffliction-CharacterStats-Default" + value: { + final_stats: 331.1 + final_stats: 333.3 + final_stats: 1472.35 + final_stats: 1155 + final_stats: 767.8 + final_stats: 2832.34 + final_stats: 109 + final_stats: 368.696 + final_stats: 865.61556 + final_stats: 722 + final_stats: 0 + final_stats: 1207.91 + final_stats: 290 + final_stats: 469.55 + final_stats: 662 + final_stats: 0 + final_stats: 0 + final_stats: 20901 + final_stats: 0 + final_stats: 0 + final_stats: 5468.1 + final_stats: 843.7 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 21887.5 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 130 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +dps_results: { + key: "TestAffliction-AllItems-AshtongueTalismanofShadows-32493" + value: { + dps: 7368.59451 + tps: 6640.7569 + } +} +dps_results: { + key: "TestAffliction-AllItems-AustereEarthsiegeDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-BeamingEarthsiegeDiamond" + value: { + dps: 7205.91374 + tps: 6474.0237 + } +} +dps_results: { + key: "TestAffliction-AllItems-BracingEarthsiegeDiamond" + value: { + dps: 7248.05897 + tps: 6513.86209 + } +} +dps_results: { + key: "TestAffliction-AllItems-ChaoticSkyflareDiamond" + value: { + dps: 7311.15785 + tps: 6579.26781 + } +} +dps_results: { + key: "TestAffliction-AllItems-DarkCoven'sRegalia" + value: { + dps: 7660.82091 + tps: 6911.02713 + } +} +dps_results: { + key: "TestAffliction-AllItems-DeathbringerGarb" + value: { + dps: 7009.10157 + tps: 6286.76891 + } +} +dps_results: { + key: "TestAffliction-AllItems-DestructiveSkyflareDiamond" + value: { + dps: 7208.40026 + tps: 6476.51022 + } +} +dps_results: { + key: "TestAffliction-AllItems-EffulgentSkyflareDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-EmberSkyflareDiamond" + value: { + dps: 7248.05897 + tps: 6513.86209 + } +} +dps_results: { + key: "TestAffliction-AllItems-EnigmaticSkyflareDiamond" + value: { + dps: 7205.91374 + tps: 6474.0237 + } +} +dps_results: { + key: "TestAffliction-AllItems-EnigmaticStarflareDiamond" + value: { + dps: 7202.01837 + tps: 6470.12833 + } +} +dps_results: { + key: "TestAffliction-AllItems-EternalEarthsiegeDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-ForlornSkyflareDiamond" + value: { + dps: 7248.05897 + tps: 6513.86209 + } +} +dps_results: { + key: "TestAffliction-AllItems-ForlornStarflareDiamond" + value: { + dps: 7237.72501 + tps: 6503.95496 + } +} +dps_results: { + key: "TestAffliction-AllItems-Gladiator'sFelshroud" + value: { + dps: 7056.49434 + tps: 6357.26257 + } +} +dps_results: { + key: "TestAffliction-AllItems-Gul'dan'sRegalia" + value: { + dps: 6975.17435 + tps: 6192.38335 + } +} +dps_results: { + key: "TestAffliction-AllItems-ImpassiveSkyflareDiamond" + value: { + dps: 7205.91374 + tps: 6474.0237 + } +} +dps_results: { + key: "TestAffliction-AllItems-ImpassiveStarflareDiamond" + value: { + dps: 7202.01837 + tps: 6470.12833 + } +} +dps_results: { + key: "TestAffliction-AllItems-InsightfulEarthsiegeDiamond" + value: { + dps: 7212.80508 + tps: 6479.86174 + } +} +dps_results: { + key: "TestAffliction-AllItems-InvigoratingEarthsiegeDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-MaleficRaiment" + value: { + dps: 5389.70755 + tps: 4757.46061 + } +} +dps_results: { + key: "TestAffliction-AllItems-PersistentEarthshatterDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-PersistentEarthsiegeDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-PlagueheartGarb" + value: { + dps: 6651.89777 + tps: 5963.94005 + } +} +dps_results: { + key: "TestAffliction-AllItems-PowerfulEarthshatterDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-PowerfulEarthsiegeDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-RelentlessEarthsiegeDiamond" + value: { + dps: 7297.11809 + tps: 6565.22805 + } +} +dps_results: { + key: "TestAffliction-AllItems-RevitalizingSkyflareDiamond" + value: { + dps: 7210.50969 + tps: 6477.51299 + } +} +dps_results: { + key: "TestAffliction-AllItems-SwiftSkyflareDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-SwiftStarflareDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-SwiftWindfireDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-ThunderingSkyflareDiamond" + value: { + dps: 7193.03323 + tps: 6461.14319 + } +} +dps_results: { + key: "TestAffliction-AllItems-TirelessSkyflareDiamond" + value: { + dps: 7248.05897 + tps: 6513.86209 + } +} +dps_results: { + key: "TestAffliction-AllItems-TirelessStarflareDiamond" + value: { + dps: 7237.72501 + tps: 6503.95496 + } +} +dps_results: { + key: "TestAffliction-AllItems-TrenchantEarthshatterDiamond" + value: { + dps: 7237.72501 + tps: 6503.95496 + } +} +dps_results: { + key: "TestAffliction-AllItems-TrenchantEarthsiegeDiamond" + value: { + dps: 7248.05897 + tps: 6513.86209 + } +} +dps_results: { + key: "TestAffliction-Average-Default" + value: { + dps: 7404.49498 + tps: 6668.41422 + } +} +dps_results: { + key: "TestAffliction-Settings-Orc-P1-Affliction Warlock-FullBuffs-LongMultiTarget" + value: { + dps: 7366.18544 + tps: 8509.71556 + } +} +dps_results: { + key: "TestAffliction-Settings-Orc-P1-Affliction Warlock-FullBuffs-LongSingleTarget" + value: { + dps: 7366.18544 + tps: 6634.04174 + } +} +dps_results: { + key: "TestAffliction-Settings-Orc-P1-Affliction Warlock-FullBuffs-ShortSingleTarget" + value: { + dps: 7779.14108 + tps: 6989.34516 + } +} +dps_results: { + key: "TestAffliction-Settings-Orc-P1-Affliction Warlock-NoBuffs-LongMultiTarget" + value: { + dps: 4290.35965 + tps: 6177.21645 + } +} +dps_results: { + key: "TestAffliction-Settings-Orc-P1-Affliction Warlock-NoBuffs-LongSingleTarget" + value: { + dps: 4290.35965 + tps: 4041.57863 + } +} +dps_results: { + key: "TestAffliction-Settings-Orc-P1-Affliction Warlock-NoBuffs-ShortSingleTarget" + value: { + dps: 4095.83138 + tps: 3752.94489 + } +} +dps_results: { + key: "TestAffliction-SwitchInFrontOfTarget-Default" + value: { + dps: 7274.81262 + tps: 6579.26781 + } +} diff --git a/sim/warlock/TestDemonology.results b/sim/warlock/TestDemonology.results new file mode 100644 index 0000000000..933d8c0c99 --- /dev/null +++ b/sim/warlock/TestDemonology.results @@ -0,0 +1,360 @@ +character_stats_results: { + key: "TestDemonology-CharacterStats-Default" + value: { + final_stats: 331.1 + final_stats: 333.3 + final_stats: 1619.585 + final_stats: 1155 + final_stats: 767.8 + final_stats: 2955.442 + final_stats: 109 + final_stats: 290 + final_stats: 1324.71556 + final_stats: 902 + final_stats: 0 + final_stats: 1207.91 + final_stats: 290 + final_stats: 928.65 + final_stats: 662 + final_stats: 0 + final_stats: 0 + final_stats: 21528.03 + final_stats: 0 + final_stats: 0 + final_stats: 5468.1 + final_stats: 843.7 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 24060.6455 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 130 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +dps_results: { + key: "TestDemonology-AllItems-AshtongueTalismanofShadows-32493" + value: { + dps: 7409.83362 + tps: 6166.87432 + } +} +dps_results: { + key: "TestDemonology-AllItems-AustereEarthsiegeDiamond" + value: { + dps: 7293.69789 + tps: 6057.06087 + } +} +dps_results: { + key: "TestDemonology-AllItems-BeamingEarthsiegeDiamond" + value: { + dps: 7308.90778 + tps: 6072.8978 + } +} +dps_results: { + key: "TestDemonology-AllItems-BracingEarthsiegeDiamond" + value: { + dps: 7328.50857 + tps: 6087.46295 + } +} +dps_results: { + key: "TestDemonology-AllItems-ChaoticSkyflareDiamond" + value: { + dps: 7430.31387 + tps: 6194.30389 + } +} +dps_results: { + key: "TestDemonology-AllItems-DarkCoven'sRegalia" + value: { + dps: 7646.61679 + tps: 6391.78858 + } +} +dps_results: { + key: "TestDemonology-AllItems-DeathbringerGarb" + value: { + dps: 7080.38678 + tps: 5874.06419 + } +} +dps_results: { + key: "TestDemonology-AllItems-DestructiveSkyflareDiamond" + value: { + dps: 7308.90778 + tps: 6072.8978 + } +} +dps_results: { + key: "TestDemonology-AllItems-EffulgentSkyflareDiamond" + value: { + dps: 7293.69789 + tps: 6057.06087 + } +} +dps_results: { + key: "TestDemonology-AllItems-EmberSkyflareDiamond" + value: { + dps: 7328.50857 + tps: 6087.46295 + } +} +dps_results: { + key: "TestDemonology-AllItems-EnigmaticSkyflareDiamond" + value: { + dps: 7308.90778 + tps: 6072.8978 + } +} +dps_results: { + key: "TestDemonology-AllItems-EnigmaticStarflareDiamond" + value: { + dps: 7304.51572 + tps: 6068.50574 + } +} +dps_results: { + key: "TestDemonology-AllItems-EternalEarthsiegeDiamond" + value: { + dps: 7292.50507 + tps: 6056.49508 + } +} +dps_results: { + key: "TestDemonology-AllItems-ForlornSkyflareDiamond" + value: { + dps: 7328.50857 + tps: 6087.46295 + } +} +dps_results: { + key: "TestDemonology-AllItems-ForlornStarflareDiamond" + value: { + dps: 7320.718 + tps: 6080.90528 + } +} +dps_results: { + key: "TestDemonology-AllItems-Gladiator'sFelshroud" + value: { + dps: 7015.66068 + tps: 5810.9278 + } +} +dps_results: { + key: "TestDemonology-AllItems-Gul'dan'sRegalia" + value: { + dps: 7096.64227 + tps: 5775.83391 + } +} +dps_results: { + key: "TestDemonology-AllItems-ImpassiveSkyflareDiamond" + value: { + dps: 7308.90778 + tps: 6072.8978 + } +} +dps_results: { + key: "TestDemonology-AllItems-ImpassiveStarflareDiamond" + value: { + dps: 7304.51572 + tps: 6068.50574 + } +} +dps_results: { + key: "TestDemonology-AllItems-InsightfulEarthsiegeDiamond" + value: { + dps: 7299.53391 + tps: 6062.86419 + } +} +dps_results: { + key: "TestDemonology-AllItems-InvigoratingEarthsiegeDiamond" + value: { + dps: 7292.50507 + tps: 6056.49508 + } +} +dps_results: { + key: "TestDemonology-AllItems-MaleficRaiment" + value: { + dps: 5556.75573 + tps: 4503.07037 + } +} +dps_results: { + key: "TestDemonology-AllItems-PersistentEarthshatterDiamond" + value: { + dps: 7292.50507 + tps: 6056.49508 + } +} +dps_results: { + key: "TestDemonology-AllItems-PersistentEarthsiegeDiamond" + value: { + dps: 7292.50507 + tps: 6056.49508 + } +} +dps_results: { + key: "TestDemonology-AllItems-PlagueheartGarb" + value: { + dps: 6707.81767 + tps: 5531.42185 + } +} +dps_results: { + key: "TestDemonology-AllItems-PowerfulEarthshatterDiamond" + value: { + dps: 7292.43494 + tps: 6055.94797 + } +} +dps_results: { + key: "TestDemonology-AllItems-PowerfulEarthsiegeDiamond" + value: { + dps: 7293.69789 + tps: 6057.06087 + } +} +dps_results: { + key: "TestDemonology-AllItems-RelentlessEarthsiegeDiamond" + value: { + dps: 7412.43491 + tps: 6176.42493 + } +} +dps_results: { + key: "TestDemonology-AllItems-RevitalizingSkyflareDiamond" + value: { + dps: 7292.41579 + tps: 6055.76578 + } +} +dps_results: { + key: "TestDemonology-AllItems-SwiftSkyflareDiamond" + value: { + dps: 7292.50507 + tps: 6056.49508 + } +} +dps_results: { + key: "TestDemonology-AllItems-SwiftStarflareDiamond" + value: { + dps: 7292.50507 + tps: 6056.49508 + } +} +dps_results: { + key: "TestDemonology-AllItems-SwiftWindfireDiamond" + value: { + dps: 7292.50507 + tps: 6056.49508 + } +} +dps_results: { + key: "TestDemonology-AllItems-ThunderingSkyflareDiamond" + value: { + dps: 7292.50507 + tps: 6056.49508 + } +} +dps_results: { + key: "TestDemonology-AllItems-TirelessSkyflareDiamond" + value: { + dps: 7328.50857 + tps: 6087.46295 + } +} +dps_results: { + key: "TestDemonology-AllItems-TirelessStarflareDiamond" + value: { + dps: 7320.718 + tps: 6080.90528 + } +} +dps_results: { + key: "TestDemonology-AllItems-TrenchantEarthshatterDiamond" + value: { + dps: 7320.718 + tps: 6080.90528 + } +} +dps_results: { + key: "TestDemonology-AllItems-TrenchantEarthsiegeDiamond" + value: { + dps: 7328.50857 + tps: 6087.46295 + } +} +dps_results: { + key: "TestDemonology-Average-Default" + value: { + dps: 7506.12356 + tps: 6262.32167 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-P1-Demonology Warlock-FullBuffs-LongMultiTarget" + value: { + dps: 9489.27892 + tps: 10258.36466 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-P1-Demonology Warlock-FullBuffs-LongSingleTarget" + value: { + dps: 7456.08656 + tps: 6220.79088 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-P1-Demonology Warlock-FullBuffs-ShortSingleTarget" + value: { + dps: 8529.364 + tps: 7101.84759 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-P1-Demonology Warlock-NoBuffs-LongMultiTarget" + value: { + dps: 5944.123 + tps: 8021.93058 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-P1-Demonology Warlock-NoBuffs-LongSingleTarget" + value: { + dps: 4177.59526 + tps: 3818.95886 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-P1-Demonology Warlock-NoBuffs-ShortSingleTarget" + value: { + dps: 4375.61179 + tps: 3935.44095 + } +} +dps_results: { + key: "TestDemonology-SwitchInFrontOfTarget-Default" + value: { + dps: 7307.54694 + tps: 6195.02948 + } +} diff --git a/sim/warlock/TestDestruction.results b/sim/warlock/TestDestruction.results new file mode 100644 index 0000000000..ad5896fc16 --- /dev/null +++ b/sim/warlock/TestDestruction.results @@ -0,0 +1,360 @@ +character_stats_results: { + key: "TestDestruction-CharacterStats-Default" + value: { + final_stats: 331.1 + final_stats: 333.3 + final_stats: 1619.585 + final_stats: 1155 + final_stats: 767.8 + final_stats: 2955.442 + final_stats: 109 + final_stats: 290 + final_stats: 1052.34556 + final_stats: 662 + final_stats: 0 + final_stats: 1207.91 + final_stats: 290 + final_stats: 469.55 + final_stats: 662 + final_stats: 0 + final_stats: 0 + final_stats: 21528.03 + final_stats: 0 + final_stats: 0 + final_stats: 5468.1 + final_stats: 843.7 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 25430.5455 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 75 + final_stats: 130 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +dps_results: { + key: "TestDestruction-AllItems-AshtongueTalismanofShadows-32493" + value: { + dps: 6726.96678 + tps: 5603.42438 + } +} +dps_results: { + key: "TestDestruction-AllItems-AustereEarthsiegeDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-BeamingEarthsiegeDiamond" + value: { + dps: 6765.20769 + tps: 5617.5697 + } +} +dps_results: { + key: "TestDestruction-AllItems-BracingEarthsiegeDiamond" + value: { + dps: 6787.91315 + tps: 5635.68353 + } +} +dps_results: { + key: "TestDestruction-AllItems-ChaoticSkyflareDiamond" + value: { + dps: 6935.3738 + tps: 5770.71919 + } +} +dps_results: { + key: "TestDestruction-AllItems-DarkCoven'sRegalia" + value: { + dps: 7121.18937 + tps: 5909.92246 + } +} +dps_results: { + key: "TestDestruction-AllItems-DeathbringerGarb" + value: { + dps: 6611.73098 + tps: 5490.38818 + } +} +dps_results: { + key: "TestDestruction-AllItems-DestructiveSkyflareDiamond" + value: { + dps: 6767.42294 + tps: 5619.56342 + } +} +dps_results: { + key: "TestDestruction-AllItems-EffulgentSkyflareDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-EmberSkyflareDiamond" + value: { + dps: 6787.91315 + tps: 5635.68353 + } +} +dps_results: { + key: "TestDestruction-AllItems-EnigmaticSkyflareDiamond" + value: { + dps: 6765.20769 + tps: 5617.5697 + } +} +dps_results: { + key: "TestDestruction-AllItems-EnigmaticStarflareDiamond" + value: { + dps: 6760.80224 + tps: 5613.60479 + } +} +dps_results: { + key: "TestDestruction-AllItems-EternalEarthsiegeDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-ForlornSkyflareDiamond" + value: { + dps: 6787.91315 + tps: 5635.68353 + } +} +dps_results: { + key: "TestDestruction-AllItems-ForlornStarflareDiamond" + value: { + dps: 6780.32702 + tps: 5629.21798 + } +} +dps_results: { + key: "TestDestruction-AllItems-Gladiator'sFelshroud" + value: { + dps: 6570.96975 + tps: 5462.48244 + } +} +dps_results: { + key: "TestDestruction-AllItems-Gul'dan'sRegalia" + value: { + dps: 6604.52426 + tps: 5439.46702 + } +} +dps_results: { + key: "TestDestruction-AllItems-ImpassiveSkyflareDiamond" + value: { + dps: 6765.20769 + tps: 5617.5697 + } +} +dps_results: { + key: "TestDestruction-AllItems-ImpassiveStarflareDiamond" + value: { + dps: 6760.80224 + tps: 5613.60479 + } +} +dps_results: { + key: "TestDestruction-AllItems-InsightfulEarthsiegeDiamond" + value: { + dps: 6752.90634 + tps: 5602.14493 + } +} +dps_results: { + key: "TestDestruction-AllItems-InvigoratingEarthsiegeDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-MaleficRaiment" + value: { + dps: 5139.32452 + tps: 4269.53058 + } +} +dps_results: { + key: "TestDestruction-AllItems-PersistentEarthshatterDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-PersistentEarthsiegeDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-PlagueheartGarb" + value: { + dps: 6134.968 + tps: 5094.56988 + } +} +dps_results: { + key: "TestDestruction-AllItems-PowerfulEarthshatterDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-PowerfulEarthsiegeDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-RelentlessEarthsiegeDiamond" + value: { + dps: 6917.71475 + tps: 5754.79292 + } +} +dps_results: { + key: "TestDestruction-AllItems-RevitalizingSkyflareDiamond" + value: { + dps: 6751.58138 + tps: 5603.85367 + } +} +dps_results: { + key: "TestDestruction-AllItems-SwiftSkyflareDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-SwiftStarflareDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-SwiftWindfireDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-ThunderingSkyflareDiamond" + value: { + dps: 6748.90304 + tps: 5602.86238 + } +} +dps_results: { + key: "TestDestruction-AllItems-TirelessSkyflareDiamond" + value: { + dps: 6787.91315 + tps: 5635.68353 + } +} +dps_results: { + key: "TestDestruction-AllItems-TirelessStarflareDiamond" + value: { + dps: 6780.32702 + tps: 5629.21798 + } +} +dps_results: { + key: "TestDestruction-AllItems-TrenchantEarthshatterDiamond" + value: { + dps: 6780.32702 + tps: 5629.21798 + } +} +dps_results: { + key: "TestDestruction-AllItems-TrenchantEarthsiegeDiamond" + value: { + dps: 6787.91315 + tps: 5635.68353 + } +} +dps_results: { + key: "TestDestruction-Average-Default" + value: { + dps: 6983.6145 + tps: 5813.93604 + } +} +dps_results: { + key: "TestDestruction-Settings-Orc-P1-Destruction Warlock-FullBuffs-LongMultiTarget" + value: { + dps: 6933.40877 + tps: 7884.92923 + } +} +dps_results: { + key: "TestDestruction-Settings-Orc-P1-Destruction Warlock-FullBuffs-LongSingleTarget" + value: { + dps: 6933.40877 + tps: 5774.21163 + } +} +dps_results: { + key: "TestDestruction-Settings-Orc-P1-Destruction Warlock-FullBuffs-ShortSingleTarget" + value: { + dps: 8017.73974 + tps: 6594.24643 + } +} +dps_results: { + key: "TestDestruction-Settings-Orc-P1-Destruction Warlock-NoBuffs-LongMultiTarget" + value: { + dps: 3661.61842 + tps: 5409.64978 + } +} +dps_results: { + key: "TestDestruction-Settings-Orc-P1-Destruction Warlock-NoBuffs-LongSingleTarget" + value: { + dps: 3661.61842 + tps: 3268.71809 + } +} +dps_results: { + key: "TestDestruction-Settings-Orc-P1-Destruction Warlock-NoBuffs-ShortSingleTarget" + value: { + dps: 4005.03746 + tps: 3344.51377 + } +} +dps_results: { + key: "TestDestruction-SwitchInFrontOfTarget-Default" + value: { + dps: 6935.3738 + tps: 5770.71919 + } +} diff --git a/sim/warlock/TestWarlock.results b/sim/warlock/TestWarlock.results deleted file mode 100644 index 159567a430..0000000000 --- a/sim/warlock/TestWarlock.results +++ /dev/null @@ -1,444 +0,0 @@ -character_stats_results: { - key: "TestWarlock-CharacterStats-Default" - value: { - final_stats: 331.1 - final_stats: 333.3 - final_stats: 1472.35 - final_stats: 1155 - final_stats: 767.8 - final_stats: 2832.34 - final_stats: 109 - final_stats: 368.696 - final_stats: 865.61556 - final_stats: 722 - final_stats: 0 - final_stats: 1207.91 - final_stats: 290 - final_stats: 469.55 - final_stats: 662 - final_stats: 0 - final_stats: 0 - final_stats: 20901 - final_stats: 0 - final_stats: 0 - final_stats: 5468.1 - final_stats: 843.7 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 21887.5 - final_stats: 75 - final_stats: 75 - final_stats: 75 - final_stats: 75 - final_stats: 130 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -dps_results: { - key: "TestWarlock-AllItems-AshtongueTalismanofShadows-32493" - value: { - dps: 7012.13763 - tps: 6284.30002 - } -} -dps_results: { - key: "TestWarlock-AllItems-AustereEarthsiegeDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-BeamingEarthsiegeDiamond" - value: { - dps: 6876.43633 - tps: 6144.54629 - } -} -dps_results: { - key: "TestWarlock-AllItems-BracingEarthsiegeDiamond" - value: { - dps: 6913.98765 - tps: 6179.79077 - } -} -dps_results: { - key: "TestWarlock-AllItems-ChaoticSkyflareDiamond" - value: { - dps: 6965.67477 - tps: 6233.78473 - } -} -dps_results: { - key: "TestWarlock-AllItems-DarkCoven'sRegalia" - value: { - dps: 7306.91221 - tps: 6557.11843 - } -} -dps_results: { - key: "TestWarlock-AllItems-DeathbringerGarb" - value: { - dps: 6686.94169 - tps: 5964.60903 - } -} -dps_results: { - key: "TestWarlock-AllItems-DestructiveSkyflareDiamond" - value: { - dps: 6879.59729 - tps: 6147.70725 - } -} -dps_results: { - key: "TestWarlock-AllItems-EffulgentSkyflareDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-EmberSkyflareDiamond" - value: { - dps: 6913.98765 - tps: 6179.79077 - } -} -dps_results: { - key: "TestWarlock-AllItems-EnigmaticSkyflareDiamond" - value: { - dps: 6876.43633 - tps: 6144.54629 - } -} -dps_results: { - key: "TestWarlock-AllItems-EnigmaticStarflareDiamond" - value: { - dps: 6873.63254 - tps: 6141.7425 - } -} -dps_results: { - key: "TestWarlock-AllItems-EternalEarthsiegeDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-ForlornSkyflareDiamond" - value: { - dps: 6913.98765 - tps: 6179.79077 - } -} -dps_results: { - key: "TestWarlock-AllItems-ForlornStarflareDiamond" - value: { - dps: 6904.18186 - tps: 6170.4118 - } -} -dps_results: { - key: "TestWarlock-AllItems-Gladiator'sFelshroud" - value: { - dps: 6726.19833 - tps: 6026.96655 - } -} -dps_results: { - key: "TestWarlock-AllItems-Gul'dan'sRegalia" - value: { - dps: 6650.00119 - tps: 5867.21019 - } -} -dps_results: { - key: "TestWarlock-AllItems-ImpassiveSkyflareDiamond" - value: { - dps: 6876.43633 - tps: 6144.54629 - } -} -dps_results: { - key: "TestWarlock-AllItems-ImpassiveStarflareDiamond" - value: { - dps: 6873.63254 - tps: 6141.7425 - } -} -dps_results: { - key: "TestWarlock-AllItems-InsightfulEarthsiegeDiamond" - value: { - dps: 6880.59861 - tps: 6147.65526 - } -} -dps_results: { - key: "TestWarlock-AllItems-InvigoratingEarthsiegeDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-MaleficRaiment" - value: { - dps: 5141.57821 - tps: 4509.33127 - } -} -dps_results: { - key: "TestWarlock-AllItems-PersistentEarthshatterDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-PersistentEarthsiegeDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-PlagueheartGarb" - value: { - dps: 6343.3372 - tps: 5655.37947 - } -} -dps_results: { - key: "TestWarlock-AllItems-PowerfulEarthshatterDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-PowerfulEarthsiegeDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-RelentlessEarthsiegeDiamond" - value: { - dps: 6950.56543 - tps: 6218.67539 - } -} -dps_results: { - key: "TestWarlock-AllItems-RevitalizingSkyflareDiamond" - value: { - dps: 6876.34707 - tps: 6143.35037 - } -} -dps_results: { - key: "TestWarlock-AllItems-SwiftSkyflareDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-SwiftStarflareDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-SwiftWindfireDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-ThunderingSkyflareDiamond" - value: { - dps: 6862.57456 - tps: 6130.68452 - } -} -dps_results: { - key: "TestWarlock-AllItems-TirelessSkyflareDiamond" - value: { - dps: 6913.98765 - tps: 6179.79077 - } -} -dps_results: { - key: "TestWarlock-AllItems-TirelessStarflareDiamond" - value: { - dps: 6904.18186 - tps: 6170.4118 - } -} -dps_results: { - key: "TestWarlock-AllItems-TrenchantEarthshatterDiamond" - value: { - dps: 6904.18186 - tps: 6170.4118 - } -} -dps_results: { - key: "TestWarlock-AllItems-TrenchantEarthsiegeDiamond" - value: { - dps: 6913.98765 - tps: 6179.79077 - } -} -dps_results: { - key: "TestWarlock-Average-Default" - value: { - dps: 7039.7411 - tps: 6303.66034 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-FullBuffs-LongMultiTarget" - value: { - dps: 6105.89801 - tps: 7206.79787 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-FullBuffs-LongSingleTarget" - value: { - dps: 6105.89801 - tps: 5392.16982 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-FullBuffs-ShortSingleTarget" - value: { - dps: 6429.32096 - tps: 5654.46885 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-NoBuffs-LongMultiTarget" - value: { - dps: 3625.26014 - tps: 5483.10127 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-NoBuffs-LongSingleTarget" - value: { - dps: 3625.26014 - tps: 3388.48737 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-NoBuffs-ShortSingleTarget" - value: { - dps: 3513.26902 - tps: 3174.58638 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-FullBuffs-LongMultiTarget" - value: { - dps: 8799.31268 - tps: 9785.51458 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-FullBuffs-LongSingleTarget" - value: { - dps: 6821.24241 - tps: 5816.81013 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-FullBuffs-ShortSingleTarget" - value: { - dps: 7862.16678 - tps: 6685.13114 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-NoBuffs-LongMultiTarget" - value: { - dps: 5616.40976 - tps: 7740.41318 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-NoBuffs-LongSingleTarget" - value: { - dps: 3890.07551 - tps: 3613.00683 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-NoBuffs-ShortSingleTarget" - value: { - dps: 3992.91795 - tps: 3633.61743 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Destro Warlock-FullBuffs-LongMultiTarget" - value: { - dps: 5746.53591 - tps: 6223.58424 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Destro Warlock-FullBuffs-LongSingleTarget" - value: { - dps: 5746.53591 - tps: 4279.97371 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Destro Warlock-FullBuffs-ShortSingleTarget" - value: { - dps: 6800.29892 - tps: 4940.22011 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Destro Warlock-NoBuffs-LongMultiTarget" - value: { - dps: 3010.89085 - tps: 4384.2302 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Destro Warlock-NoBuffs-LongSingleTarget" - value: { - dps: 3010.89085 - tps: 2429.7428 - } -} -dps_results: { - key: "TestWarlock-Settings-Orc-P1-Destro Warlock-NoBuffs-ShortSingleTarget" - value: { - dps: 3356.84944 - tps: 2484.62609 - } -} -dps_results: { - key: "TestWarlock-SwitchInFrontOfTarget-Default" - value: { - dps: 6929.32954 - tps: 6233.78473 - } -} diff --git a/sim/warlock/presets.go b/sim/warlock/presets.go index 805b50bfd0..8d8eb7a4d6 100644 --- a/sim/warlock/presets.go +++ b/sim/warlock/presets.go @@ -5,34 +5,23 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var defaultDestroTalents = &proto.WarlockTalents{ - // destro - ImprovedShadowBolt: 5, - Bane: 5, - Ruin: 5, - Intensity: 2, - DestructiveReach: 2, - Devastation: true, - Aftermath: 2, - ImprovedImmolate: 3, - Emberstorm: 5, - Conflagrate: true, - Backlash: 3, - Shadowburn: true, - ShadowAndFlame: 5, - Backdraft: 3, - EmpoweredImp: 3, - FireAndBrimstone: 5, - ChaosBolt: true, - Shadowfury: true, - Pyroclasm: 3, - DemonicPower: 2, - Cataclysm: 3, - SoulLeech: 3, - ImprovedSoulLeech: 2, - // demo - FelSynergy: 2, - ImprovedImp: 3, +var AfflictionTalents = "2350002030023510253500331151--550000051" +var DemonologyTalents = "-203203301035012530135201351-550000052" +var DestructionTalents = "-03310030003-05203205210331051335230351" +var AfflictionGlyphs = &proto.Glyphs{ + Major1: int32(proto.WarlockMajorGlyph_GlyphOfQuickDecay), + Major2: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap), + Major3: int32(proto.WarlockMajorGlyph_GlyphOfHaunt), +} +var DemonologyGlyphs = &proto.Glyphs{ + Major1: int32(proto.WarlockMajorGlyph_GlyphOfQuickDecay), + Major2: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap), + Major3: int32(proto.WarlockMajorGlyph_GlyphOfFelguard), +} +var DestructionGlyphs = &proto.Glyphs{ + Major1: int32(proto.WarlockMajorGlyph_GlyphOfConflagrate), + Major2: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap), + Major3: int32(proto.WarlockMajorGlyph_GlyphOfIncinerate), } var defaultDestroRotation = &proto.Warlock_Rotation{ @@ -52,7 +41,6 @@ var defaultDestroOptions = &proto.Warlock_Options{ var DefaultDestroWarlock = &proto.Player_Warlock{ Warlock: &proto.Warlock{ - Talents: defaultDestroTalents, Options: defaultDestroOptions, Rotation: defaultDestroRotation, }, @@ -61,39 +49,11 @@ var DefaultDestroWarlock = &proto.Player_Warlock{ // --------------------------------------- var DefaultAfflictionWarlock = &proto.Player_Warlock{ Warlock: &proto.Warlock{ - Talents: defaultAfflictionTalents, Options: defaultAfflictionOptions, Rotation: defaultAfflictionRotation, }, } -var defaultAfflictionTalents = &proto.WarlockTalents{ - // Affliction - ImprovedCurseOfAgony: 2, - Suppression: 3, - ImprovedCorruption: 5, - SoulSiphon: 2, - FelConcentration: 3, - Nightfall: 2, - EmpoweredCorruption: 3, - ShadowEmbrace: 5, - SiphonLife: true, - ImprovedFelhunter: 2, - ShadowMastery: 5, - Eradication: 3, - Contagion: 5, - DeathsEmbrace: 3, - UnstableAffliction: true, - Pandemic: true, - EverlastingAffliction: 5, - Haunt: true, - // Destro - ImprovedShadowBolt: 5, - Bane: 5, - Ruin: 5, - Intensity: 1, -} - var defaultAfflictionOptions = &proto.Warlock_Options{ Armor: proto.Warlock_Options_FelArmor, Summon: proto.Warlock_Options_Felhunter, @@ -110,50 +70,14 @@ var defaultAfflictionRotation = &proto.Warlock_Rotation{ DetonateSeed: true, } -var defaultAfflictionGlyphs = &proto.Glyphs{ - Major1: int32(proto.WarlockMajorGlyph_GlyphOfQuickDecay), - Major2: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap), - Major3: int32(proto.WarlockMajorGlyph_GlyphOfHaunt), -} - // --------------------------------------- var DefaultDemonologyWarlock = &proto.Player_Warlock{ Warlock: &proto.Warlock{ - Talents: defaultDemonologyTalents, Options: defaultDemonologyOptions, Rotation: defaultDemonologyRotation, }, } -var defaultDemonologyTalents = &proto.WarlockTalents{ - // Demonology - ImprovedHealthstone: 2, - DemonicEmbrace: 3, - FelSynergy: 2, - DemonicBrutality: 3, - FelVitality: 3, - SoulLink: true, - DemonicAegis: 3, - UnholyPower: 5, - ManaFeed: true, - MasterConjuror: 2, - MasterDemonologist: 5, - MoltenCore: 3, - DemonicEmpowerment: true, - DemonicKnowledge: 3, - DemonicTactics: 5, - Decimation: 2, - SummonFelguard: true, - Nemesis: 3, - DemonicPact: 5, - Metamorphosis: true, - // Destro - ImprovedShadowBolt: 5, - Bane: 5, - Ruin: 5, - Intensity: 2, -} - var defaultDemonologyOptions = &proto.Warlock_Options{ Armor: proto.Warlock_Options_FelArmor, Summon: proto.Warlock_Options_Felguard, diff --git a/sim/warlock/rotations.go b/sim/warlock/rotations.go index b342fe3b80..3c626a8152 100644 --- a/sim/warlock/rotations.go +++ b/sim/warlock/rotations.go @@ -263,9 +263,6 @@ func (warlock *Warlock) defineRotation() { // Regen Spells: Casts the regen spell that will give you the most mana, includes a error whenever we cast pact on full mana. func (warlock *Warlock) LifeTapOrDarkPact(sim *core.Simulation) { - if warlock.CurrentManaPercent() == 1 { - panic("Life Tap or Dark Pact while full mana") - } if warlock.Talents.DarkPact && warlock.Pet.CurrentMana() > warlock.GetStat(stats.SpellPower)+1200+131 { //Evaluates based on your SP, if DP or LT will give you the highest mana. warlock.DarkPact.Cast(sim, warlock.CurrentTarget) } else { diff --git a/sim/warlock/warlock.go b/sim/warlock/warlock.go index ee6840cb70..e6e227cdab 100644 --- a/sim/warlock/warlock.go +++ b/sim/warlock/warlock.go @@ -8,6 +8,8 @@ import ( "github.com/wowsims/wotlk/sim/core/stats" ) +var TalentTreeSizes = [3]int{28, 27, 26} + type Warlock struct { core.Character Talents *proto.WarlockTalents @@ -186,11 +188,12 @@ func NewWarlock(character core.Character, options *proto.Player) *Warlock { warlock := &Warlock{ Character: character, - Talents: warlockOptions.Talents, + Talents: &proto.WarlockTalents{}, Options: warlockOptions.Options, Rotation: warlockOptions.Rotation, // manaTracker: common.NewManaSpendingRateTracker(), } + core.FillTalentsProto(warlock.Talents.ProtoReflect(), options.TalentsString, TalentTreeSizes) warlock.EnableManaBar() warlock.AddStatDependency(stats.Strength, stats.AttackPower, 1) diff --git a/sim/warlock/warlock_test.go b/sim/warlock/warlock_test.go index 39c511a66e..22dbef544f 100644 --- a/sim/warlock/warlock_test.go +++ b/sim/warlock/warlock_test.go @@ -11,58 +11,61 @@ func init() { RegisterWarlock() } -func TestWarlock(t *testing.T) { +func TestAffliction(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: AfflictionTalents, + Glyphs: AfflictionGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Affliction Warlock", SpecOptions: DefaultAfflictionWarlock}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Demonology Warlock", SpecOptions: DefaultDemonologyWarlock}, - {Label: "Destro Warlock", SpecOptions: DefaultDestroWarlock}, - }, - Glyphs: defaultAfflictionGlyphs, - Consumes: FullConsumes, + ItemFilter: ItemFilter, + })) +} - ItemFilter: core.ItemFilter{ - WeaponTypes: []proto.WeaponType{ - proto.WeaponType_WeaponTypeSword, - proto.WeaponType_WeaponTypeDagger, - }, - HandTypes: []proto.HandType{ - proto.HandType_HandTypeOffHand, - }, - ArmorType: proto.ArmorType_ArmorTypeCloth, - RangedWeaponTypes: []proto.RangedWeaponType{ - proto.RangedWeaponType_RangedWeaponTypeWand, - }, - }, +func TestDemonology(t *testing.T) { + core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ + Class: proto.Class_ClassWarlock, + Race: proto.Race_RaceOrc, + + GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: DemonologyTalents, + Glyphs: DemonologyGlyphs, + Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "Demonology Warlock", SpecOptions: DefaultDemonologyWarlock}, + + ItemFilter: ItemFilter, })) } -// func BenchmarkSimulate(b *testing.B) { -// rsr := &proto.RaidSimRequest{ -// Raid: core.SinglePlayerRaidProto( -// &proto.Player{ -// Race: proto.Race_RaceBloodElf, -// Class: proto.Class_ClassWarlock, -// Equipment: Phase4Gear, -// Consumes: FullConsumes, -// Spec: DefaultOptions, -// Buffs: FullIndividualBuffs, -// }, -// FullPartyBuffs, -// FullRaidBuffs), -// Encounter: &proto.Encounter{ -// Duration: 300, -// Targets: []*proto.Target{ -// FullDebuffTarget, -// }, -// }, -// SimOptions: core.AverageDefaultSimTestOptions, -// } +func TestDestruction(t *testing.T) { + core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ + Class: proto.Class_ClassWarlock, + Race: proto.Race_RaceOrc, + + GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: DestructionTalents, + Glyphs: DestructionGlyphs, + Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: DefaultDestroWarlock}, -// core.RaidBenchmark(b, rsr) -// } + ItemFilter: ItemFilter, + })) +} + +var ItemFilter = core.ItemFilter{ + WeaponTypes: []proto.WeaponType{ + proto.WeaponType_WeaponTypeSword, + proto.WeaponType_WeaponTypeDagger, + }, + HandTypes: []proto.HandType{ + proto.HandType_HandTypeOffHand, + }, + ArmorType: proto.ArmorType_ArmorTypeCloth, + RangedWeaponTypes: []proto.RangedWeaponType{ + proto.RangedWeaponType_RangedWeaponTypeWand, + }, +} diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results index a37a730496..396072f4da 100644 --- a/sim/warrior/dps/TestArms.results +++ b/sim/warrior/dps/TestArms.results @@ -46,891 +46,891 @@ character_stats_results: { dps_results: { key: "TestArms-AllItems-Althor'sAbacus-50359" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-Althor'sAbacus-50366" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-AshtongueTalismanofValor-32485" value: { - dps: 7614.3496 - tps: 6232.87276 + dps: 7790.04019 + tps: 6382.29145 } } dps_results: { key: "TestArms-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7861.00584 - tps: 6433.576 + dps: 8076.02769 + tps: 6620.90406 } } dps_results: { key: "TestArms-AllItems-Bandit'sInsignia-40371" value: { - dps: 7736.72239 - tps: 6327.20015 + dps: 7960.90258 + tps: 6517.5115 } } dps_results: { key: "TestArms-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7560.02228 - tps: 11354.35196 + dps: 7783.35903 + tps: 11541.92245 } } dps_results: { key: "TestArms-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7560.02228 - tps: 11354.35196 + dps: 7783.35903 + tps: 11541.92245 } } dps_results: { key: "TestArms-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7895.69917 - tps: 6462.08374 + dps: 8098.90215 + tps: 6639.48156 } } dps_results: { key: "TestArms-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7654.22635 - tps: 6266.06655 + dps: 7903.33617 + tps: 6484.57207 } } dps_results: { key: "TestArms-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 6656.29418 - tps: 5436.8201 + dps: 6812.09577 + tps: 5574.89844 } } dps_results: { key: "TestArms-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6502.41575 - tps: 5311.39939 + dps: 6690.38102 + tps: 5476.96366 } } dps_results: { key: "TestArms-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6276.58568 - tps: 5133.68462 + dps: 6423.93504 + tps: 5266.34859 } } dps_results: { key: "TestArms-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7857.1697 - tps: 6301.9966 + dps: 8072.47542 + tps: 6485.77092 } } dps_results: { key: "TestArms-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7992.87291 - tps: 6540.30524 + dps: 8251.18558 + tps: 6761.63292 } } dps_results: { key: "TestArms-AllItems-CorpseTongueCoin-50349" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-CorpseTongueCoin-50352" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 hps: 64 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7679.94346 - tps: 6290.46114 + dps: 7877.31182 + tps: 6460.25464 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7680.07397 - tps: 6287.34946 + dps: 7930.70997 + tps: 6502.88996 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-Death'sChoice-47464" value: { - dps: 8115.10357 - tps: 6641.74263 + dps: 8393.25816 + tps: 6875.20552 } } dps_results: { key: "TestArms-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7636.95005 - tps: 6246.70101 + dps: 7855.14407 + tps: 6441.09756 } } dps_results: { key: "TestArms-AllItems-Deathbringer'sWill-50362" value: { - dps: 8003.23285 - tps: 6552.53806 + dps: 8263.72423 + tps: 6771.56369 } } dps_results: { key: "TestArms-AllItems-Deathbringer'sWill-50363" value: { - dps: 8172.65057 - tps: 6686.0345 + dps: 8358.38529 + tps: 6846.20095 } } dps_results: { key: "TestArms-AllItems-Defender'sCode-40257" value: { - dps: 7564.3465 - tps: 6190.18048 + dps: 7784.57579 + tps: 6376.28198 } } dps_results: { key: "TestArms-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7895.01259 - tps: 6461.45144 + dps: 8113.24884 + tps: 6650.47608 } } dps_results: { key: "TestArms-AllItems-DislodgedForeignObject-50348" value: { - dps: 7671.18177 - tps: 6279.79105 + dps: 7984.52742 + tps: 6543.56138 } } dps_results: { key: "TestArms-AllItems-DislodgedForeignObject-50353" value: { - dps: 7746.56887 - tps: 6341.23138 + dps: 7943.85464 + tps: 6507.56544 } } dps_results: { key: "TestArms-AllItems-DreadnaughtBattlegear" value: { - dps: 7299.54422 - tps: 5981.7633 + dps: 7557.99744 + tps: 6202.34545 } } dps_results: { key: "TestArms-AllItems-DreadnaughtPlate" value: { - dps: 6523.38161 - tps: 5314.1761 + dps: 6662.78337 + tps: 5438.4251 } } dps_results: { key: "TestArms-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-EmberSkyflareDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7895.69917 - tps: 6462.08374 + dps: 8098.90215 + tps: 6639.48156 } } dps_results: { key: "TestArms-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7892.20314 - tps: 6459.28567 + dps: 8105.31724 + tps: 6645.32674 } } dps_results: { key: "TestArms-AllItems-EphemeralSnowflake-50260" value: { - dps: 7709.01101 - tps: 6308.98912 + dps: 7922.7082 + tps: 6495.99932 } } dps_results: { key: "TestArms-AllItems-EssenceofGossamer-37220" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7704.44741 - tps: 6309.23665 + dps: 7909.974 + tps: 6485.68224 } } dps_results: { key: "TestArms-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7657.62852 - tps: 6270.94136 + dps: 7862.34468 + tps: 6447.28369 } } dps_results: { key: "TestArms-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-ForethoughtTalisman-40258" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-ForgeEmber-37660" value: { - dps: 7629.04204 - tps: 6245.5406 + dps: 7859.38763 + tps: 6442.38427 } } dps_results: { key: "TestArms-AllItems-ForlornSkyflareDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-ForlornStarflareDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7737.32807 - tps: 6329.2013 + dps: 8017.13357 + tps: 6561.06582 } } dps_results: { key: "TestArms-AllItems-FuturesightRune-38763" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-Gladiator'sBattlegear" value: { - dps: 7675.53279 - tps: 6239.76543 + dps: 7933.29063 + tps: 6457.5499 } } dps_results: { key: "TestArms-AllItems-GlowingTwilightScale-54573" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-GlowingTwilightScale-54589" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7674.09051 - tps: 6282.10643 + dps: 7890.00633 + tps: 6466.02313 } } dps_results: { key: "TestArms-AllItems-Heartpierce-49982" value: { - dps: 7992.87291 - tps: 6540.30524 + dps: 8251.18558 + tps: 6761.63292 } } dps_results: { key: "TestArms-AllItems-Heartpierce-50641" value: { - dps: 7992.87291 - tps: 6540.30524 + dps: 8251.18558 + tps: 6761.63292 } } dps_results: { key: "TestArms-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7895.69917 - tps: 6462.08374 + dps: 8098.90215 + tps: 6639.48156 } } dps_results: { key: "TestArms-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7892.20314 - tps: 6459.28567 + dps: 8105.31724 + tps: 6645.32674 } } dps_results: { key: "TestArms-AllItems-IncisorFragment-37723" value: { - dps: 7757.86505 - tps: 6349.36444 + dps: 7989.35875 + tps: 6551.12473 } } dps_results: { key: "TestArms-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7865.93715 - tps: 6432.54765 + dps: 8088.15162 + tps: 6630.18979 hps: 14.6381 } } dps_results: { key: "TestArms-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7734.76459 - tps: 6325.58119 + dps: 7947.37701 + tps: 6510.31586 } } dps_results: { key: "TestArms-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7676.04458 - tps: 6292.40191 + dps: 7909.62354 + tps: 6491.04852 } } dps_results: { key: "TestArms-AllItems-OfferingofSacrifice-37638" value: { - dps: 7558.85744 - tps: 6186.71203 + dps: 7778.29629 + tps: 6373.21111 } } dps_results: { key: "TestArms-AllItems-OnslaughtArmor" value: { - dps: 5290.984 - tps: 4324.74315 + dps: 5417.30394 + tps: 4432.19297 } } dps_results: { key: "TestArms-AllItems-OnslaughtBattlegear" value: { - dps: 6128.58878 - tps: 4991.72189 + dps: 6302.60145 + tps: 5151.84244 } } dps_results: { key: "TestArms-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7861.93149 - tps: 6428.39301 + dps: 8102.07222 + tps: 6642.58026 } } dps_results: { key: "TestArms-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7865.57782 - tps: 6432.23929 + dps: 8107.72978 + tps: 6646.80249 } } dps_results: { key: "TestArms-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7629.2289 - tps: 6246.11782 + dps: 7813.82848 + tps: 6402.16925 } } dps_results: { key: "TestArms-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7627.10337 - tps: 6243.00904 + dps: 7826.32103 + tps: 6411.77355 } } dps_results: { key: "TestArms-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-PurifiedShardoftheGods" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-ReignoftheDead-47316" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-ReignoftheDead-47477" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7992.53245 - tps: 6539.88779 + dps: 8275.94937 + tps: 6782.90472 } } dps_results: { key: "TestArms-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-RuneofRepulsion-40372" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-SealofthePantheon-36993" value: { - dps: 7565.14665 - tps: 6190.50976 + dps: 7800.59647 + tps: 6396.7789 } } dps_results: { key: "TestArms-AllItems-Shadowmourne-49623" value: { - dps: 7992.87291 - tps: 6540.30524 + dps: 8251.18558 + tps: 6761.63292 } } dps_results: { key: "TestArms-AllItems-ShinyShardoftheGods" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-SiegebreakerBattlegear" value: { - dps: 7700.1953 - tps: 6302.53944 + dps: 7920.1328 + tps: 6490.00624 } } dps_results: { key: "TestArms-AllItems-SiegebreakerPlate" value: { - dps: 6687.80611 - tps: 5458.08655 + dps: 6856.47497 + tps: 5599.37602 } } dps_results: { key: "TestArms-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-SliverofPureIce-50339" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-SliverofPureIce-50346" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-SouloftheDead-40382" value: { - dps: 7663.27141 - tps: 6276.12085 + dps: 7864.86892 + tps: 6449.57285 } } dps_results: { key: "TestArms-AllItems-SparkofHope-45703" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-SparkofLife-37657" value: { - dps: 7575.58788 - tps: 6200.72618 + dps: 7879.5166 + tps: 6459.92078 } } dps_results: { key: "TestArms-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7796.4147 - tps: 6380.65299 + dps: 8051.55666 + tps: 6599.18167 } } dps_results: { key: "TestArms-AllItems-StormshroudArmor" value: { - dps: 6239.07783 - tps: 5095.49345 + dps: 6401.8144 + tps: 5244.04052 } } dps_results: { key: "TestArms-AllItems-SwiftSkyflareDiamond" value: { - dps: 7865.57782 - tps: 6432.23929 + dps: 8107.72978 + tps: 6646.80249 } } dps_results: { key: "TestArms-AllItems-SwiftStarflareDiamond" value: { - dps: 7861.93149 - tps: 6428.39301 + dps: 8102.07222 + tps: 6642.58026 } } dps_results: { key: "TestArms-AllItems-SwiftWindfireDiamond" value: { - dps: 7883.23582 - tps: 6449.15453 + dps: 8087.76165 + tps: 6630.31068 } } dps_results: { key: "TestArms-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-TearsoftheVanquished-47215" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-TheFistsofFury" value: { - dps: 4555.52413 - tps: 3810.13068 + dps: 4724.93341 + tps: 3957.56424 } } dps_results: { key: "TestArms-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 4845.98654 - tps: 4047.83234 + dps: 4997.92009 + tps: 4187.99801 } } dps_results: { key: "TestArms-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7810.73546 - tps: 6394.22912 + dps: 8139.6228 + tps: 6675.43995 } } dps_results: { key: "TestArms-AllItems-TinyAbominationinaJar-50351" value: { - dps: 8022.17164 - tps: 6563.58115 + dps: 8249.30202 + tps: 6756.92131 } } dps_results: { key: "TestArms-AllItems-TinyAbominationinaJar-50706" value: { - dps: 8011.73878 - tps: 6559.65586 + dps: 8320.91587 + tps: 6823.99693 } } dps_results: { key: "TestArms-AllItems-TirelessSkyflareDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-TirelessStarflareDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7564.63659 - tps: 6186.73233 + dps: 7848.49711 + tps: 6429.77905 } } dps_results: { key: "TestArms-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7857.1697 - tps: 6430.49997 + dps: 8072.47542 + tps: 6618.0556 } } dps_results: { key: "TestArms-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6500.74336 - tps: 5311.24339 + dps: 6674.14307 + tps: 5458.44471 } } dps_results: { key: "TestArms-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 5038.33291 - tps: 4236.08404 + dps: 5193.33627 + tps: 4375.51782 } } dps_results: { key: "TestArms-AllItems-WingedTalisman-37844" value: { - dps: 7541.06573 - tps: 6170.93881 + dps: 7781.92408 + tps: 6380.04538 } } dps_results: { key: "TestArms-AllItems-Wrynn'sBattlegear" value: { - dps: 7912.1844 - tps: 6460.03068 + dps: 8148.38508 + tps: 6661.1838 } } dps_results: { key: "TestArms-AllItems-Wrynn'sPlate" value: { - dps: 6674.76616 - tps: 5436.61054 + dps: 6850.86557 + tps: 5593.49625 } } dps_results: { key: "TestArms-AllItems-YmirjarLord'sBattlegear" value: { - dps: 8290.16858 - tps: 6793.67632 + dps: 8546.05281 + tps: 7019.26448 } } dps_results: { key: "TestArms-AllItems-YmirjarLord'sPlate" value: { - dps: 6796.23636 - tps: 5545.01984 + dps: 7063.48084 + tps: 5770.05908 } } dps_results: { key: "TestArms-Average-Default" value: { - dps: 8022.86041 - tps: 6570.38856 + dps: 8275.42172 + tps: 6785.36175 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 10536.51496 - tps: 8982.73392 + dps: 10935.87685 + tps: 9292.79241 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 7960.83823 - tps: 6511.48163 + dps: 8234.43685 + tps: 6749.4583 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 8481.24913 - tps: 7003.18665 + dps: 8780.15104 + tps: 7283.61721 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 6037.07964 - tps: 5248.94361 + dps: 6447.73573 + tps: 5552.37913 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 4223.95381 - tps: 3464.98718 + dps: 4629.81882 + tps: 3799.55684 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4148.41859 - tps: 3430.38722 + dps: 4545.39184 + tps: 3772.70328 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 10643.01408 - tps: 9078.47765 + dps: 11023.46532 + tps: 9365.28265 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 7992.87291 - tps: 6540.30524 + dps: 8251.18558 + tps: 6761.63292 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 8559.0751 - tps: 7071.14212 + dps: 8851.47198 + tps: 7343.34217 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 6065.28413 - tps: 5271.8673 + dps: 6495.86785 + tps: 5595.95653 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 4263.72376 - tps: 3500.01474 + dps: 4654.91428 + tps: 3817.62279 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4243.80396 - tps: 3506.72197 + dps: 4712.28564 + tps: 3909.97249 } } dps_results: { key: "TestArms-SwitchInFrontOfTarget-Default" value: { - dps: 7490.98432 - tps: 6123.19679 + dps: 7611.52151 + tps: 6229.51128 } } diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results index 5d8068d7d5..342d56874f 100644 --- a/sim/warrior/dps/TestFury.results +++ b/sim/warrior/dps/TestFury.results @@ -46,891 +46,891 @@ character_stats_results: { dps_results: { key: "TestFury-AllItems-Althor'sAbacus-50359" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-Althor'sAbacus-50366" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-AshtongueTalismanofValor-32485" value: { - dps: 6224.65997 - tps: 4584.27829 + dps: 6562.03813 + tps: 4862.74835 } } dps_results: { key: "TestFury-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6372.42701 - tps: 4694.43257 + dps: 6711.69846 + tps: 4971.38033 } } dps_results: { key: "TestFury-AllItems-Bandit'sInsignia-40371" value: { - dps: 6397.46936 - tps: 4707.49152 + dps: 6664.94471 + tps: 4937.1904 } } dps_results: { key: "TestFury-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6174.11599 - tps: 9996.61712 + dps: 6509.74408 + tps: 11117.91798 } } dps_results: { key: "TestFury-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6174.11599 - tps: 9996.61712 + dps: 6509.74408 + tps: 11117.91798 } } dps_results: { key: "TestFury-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6401.95357 - tps: 4716.62816 + dps: 6735.96419 + tps: 4992.1335 } } dps_results: { key: "TestFury-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 6256.86051 - tps: 4611.16893 + dps: 6500.10419 + tps: 4820.73543 } } dps_results: { key: "TestFury-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 5085.01069 - tps: 3760.49575 + dps: 5358.7912 + tps: 3986.79381 } } dps_results: { key: "TestFury-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5033.72992 - tps: 3721.72437 + dps: 5321.4397 + tps: 3961.52158 } } dps_results: { key: "TestFury-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 4776.45107 - tps: 3536.00244 + dps: 4997.23888 + tps: 3721.37597 } } dps_results: { key: "TestFury-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6376.61073 - tps: 4603.60246 + dps: 6709.31917 + tps: 4872.01461 } } dps_results: { key: "TestFury-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6553.10229 - tps: 4825.87922 + dps: 6894.70614 + tps: 5107.28938 } } dps_results: { key: "TestFury-AllItems-CorpseTongueCoin-50349" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-CorpseTongueCoin-50352" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 hps: 64 } } dps_results: { key: "TestFury-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6363.90283 - tps: 4685.716 + dps: 6685.01764 + tps: 4952.61199 } } dps_results: { key: "TestFury-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6346.64235 - tps: 4672.53046 + dps: 6661.11018 + tps: 4934.26126 } } dps_results: { key: "TestFury-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-Death'sChoice-47464" value: { - dps: 6711.18765 - tps: 4937.32176 + dps: 6985.0688 + tps: 5171.90115 } } dps_results: { key: "TestFury-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6301.43529 - tps: 4638.82177 + dps: 6618.96418 + tps: 4903.80364 } } dps_results: { key: "TestFury-AllItems-Deathbringer'sWill-50362" value: { - dps: 6671.888 - tps: 4909.77324 + dps: 7018.39658 + tps: 5196.41326 } } dps_results: { key: "TestFury-AllItems-Deathbringer'sWill-50363" value: { - dps: 6773.61999 - tps: 4982.02857 + dps: 7064.46661 + tps: 5230.57834 } } dps_results: { key: "TestFury-AllItems-Defender'sCode-40257" value: { - dps: 6199.35009 - tps: 4567.16218 + dps: 6542.07178 + tps: 4847.96841 } } dps_results: { key: "TestFury-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6421.75274 - tps: 4730.15483 + dps: 6740.54631 + tps: 4995.54679 } } dps_results: { key: "TestFury-AllItems-DislodgedForeignObject-50348" value: { - dps: 6415.39786 - tps: 4721.58989 + dps: 6689.93095 + tps: 4957.48878 } } dps_results: { key: "TestFury-AllItems-DislodgedForeignObject-50353" value: { - dps: 6347.26639 - tps: 4668.6538 + dps: 6672.51048 + tps: 4942.63106 } } dps_results: { key: "TestFury-AllItems-DreadnaughtBattlegear" value: { - dps: 5776.437 - tps: 4265.84772 + dps: 6069.77117 + tps: 4509.39598 } } dps_results: { key: "TestFury-AllItems-DreadnaughtPlate" value: { - dps: 4983.59856 - tps: 3687.51274 + dps: 5235.41674 + tps: 3895.65184 } } dps_results: { key: "TestFury-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-EmberSkyflareDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6401.95357 - tps: 4716.62816 + dps: 6735.96419 + tps: 4992.1335 } } dps_results: { key: "TestFury-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6393.49351 - tps: 4710.45716 + dps: 6730.78725 + tps: 4988.27103 } } dps_results: { key: "TestFury-AllItems-EphemeralSnowflake-50260" value: { - dps: 6324.75434 - tps: 4654.2328 + dps: 6609.30929 + tps: 4898.30883 } } dps_results: { key: "TestFury-AllItems-EssenceofGossamer-37220" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6368.27138 - tps: 4689.97563 + dps: 6689.48919 + tps: 4955.81149 } } dps_results: { key: "TestFury-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6332.06641 - tps: 4663.0113 + dps: 6649.47629 + tps: 4927.7891 } } dps_results: { key: "TestFury-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-ForethoughtTalisman-40258" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-ForgeEmber-37660" value: { - dps: 6260.35209 - tps: 4611.2951 + dps: 6589.51398 + tps: 4882.30504 } } dps_results: { key: "TestFury-AllItems-ForlornSkyflareDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-ForlornStarflareDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6423.54072 - tps: 4729.53023 + dps: 6728.16488 + tps: 4980.01832 } } dps_results: { key: "TestFury-AllItems-FuturesightRune-38763" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-Gladiator'sBattlegear" value: { - dps: 6108.6108 - tps: 4498.5581 + dps: 6396.66304 + tps: 4739.75085 } } dps_results: { key: "TestFury-AllItems-GlowingTwilightScale-54573" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-GlowingTwilightScale-54589" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6333.08607 - tps: 4662.61847 + dps: 6632.55544 + tps: 4914.14339 } } dps_results: { key: "TestFury-AllItems-Heartpierce-49982" value: { - dps: 6553.10229 - tps: 4825.87922 + dps: 6894.70614 + tps: 5107.28938 } } dps_results: { key: "TestFury-AllItems-Heartpierce-50641" value: { - dps: 6553.10229 - tps: 4825.87922 + dps: 6894.70614 + tps: 5107.28938 } } dps_results: { key: "TestFury-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6401.95357 - tps: 4716.62816 + dps: 6735.96419 + tps: 4992.1335 } } dps_results: { key: "TestFury-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6393.49351 - tps: 4710.45716 + dps: 6730.78725 + tps: 4988.27103 } } dps_results: { key: "TestFury-AllItems-IncisorFragment-37723" value: { - dps: 6388.2463 - tps: 4703.56821 + dps: 6714.7354 + tps: 4973.94778 } } dps_results: { key: "TestFury-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6405.42799 - tps: 4718.01484 + dps: 6751.3797 + tps: 5001.087 hps: 14.6381 } } dps_results: { key: "TestFury-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6430.46786 - tps: 4735.53685 + dps: 6710.71722 + tps: 4971.25883 } } dps_results: { key: "TestFury-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6442.55657 - tps: 4738.97804 + dps: 6697.8751 + tps: 4956.47479 } } dps_results: { key: "TestFury-AllItems-OfferingofSacrifice-37638" value: { - dps: 6173.77071 - tps: 4550.58471 + dps: 6509.57317 + tps: 4825.08102 } } dps_results: { key: "TestFury-AllItems-OnslaughtArmor" value: { - dps: 3806.47969 - tps: 2828.8348 + dps: 4077.71224 + tps: 3048.1661 } } dps_results: { key: "TestFury-AllItems-OnslaughtBattlegear" value: { - dps: 4665.24831 - tps: 3457.0052 + dps: 4871.57452 + tps: 3631.08001 } } dps_results: { key: "TestFury-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6382.98814 - tps: 4699.7204 + dps: 6727.93463 + tps: 4982.39915 } } dps_results: { key: "TestFury-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6377.33881 - tps: 4698.07591 + dps: 6754.2059 + tps: 5002.35171 } } dps_results: { key: "TestFury-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6237.71355 - tps: 4595.58919 + dps: 6556.08722 + tps: 4856.02765 } } dps_results: { key: "TestFury-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6224.77052 - tps: 4584.09273 + dps: 6574.92994 + tps: 4869.46903 } } dps_results: { key: "TestFury-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-PurifiedShardoftheGods" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-ReignoftheDead-47316" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-ReignoftheDead-47477" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6549.24845 - tps: 4823.67217 + dps: 6889.38345 + tps: 5102.96957 } } dps_results: { key: "TestFury-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-RuneofRepulsion-40372" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-SealofthePantheon-36993" value: { - dps: 6161.61942 - tps: 4537.90443 + dps: 6501.85668 + tps: 4820.41273 } } dps_results: { key: "TestFury-AllItems-Shadowmourne-49623" value: { - dps: 6553.10229 - tps: 4825.87922 + dps: 6894.70614 + tps: 5107.28938 } } dps_results: { key: "TestFury-AllItems-ShinyShardoftheGods" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-SiegebreakerBattlegear" value: { - dps: 6095.60699 - tps: 4492.31556 + dps: 6438.03495 + tps: 4774.35157 } } dps_results: { key: "TestFury-AllItems-SiegebreakerPlate" value: { - dps: 5158.38968 - tps: 3814.80462 + dps: 5411.44981 + tps: 4024.07557 } } dps_results: { key: "TestFury-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-SliverofPureIce-50339" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-SliverofPureIce-50346" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-SouloftheDead-40382" value: { - dps: 6330.12939 - tps: 4663.27623 + dps: 6653.77573 + tps: 4931.20111 } } dps_results: { key: "TestFury-AllItems-SparkofHope-45703" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-SparkofLife-37657" value: { - dps: 6302.92784 - tps: 4641.10633 + dps: 6595.77976 + tps: 4887.96449 } } dps_results: { key: "TestFury-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6440.89097 - tps: 4744.74587 + dps: 6708.1769 + tps: 4970.32547 } } dps_results: { key: "TestFury-AllItems-StormshroudArmor" value: { - dps: 4717.90914 - tps: 3495.69771 + dps: 4935.31521 + tps: 3679.01375 } } dps_results: { key: "TestFury-AllItems-SwiftSkyflareDiamond" value: { - dps: 6377.33881 - tps: 4698.07591 + dps: 6754.2059 + tps: 5002.35171 } } dps_results: { key: "TestFury-AllItems-SwiftStarflareDiamond" value: { - dps: 6382.98814 - tps: 4699.7204 + dps: 6727.93463 + tps: 4982.39915 } } dps_results: { key: "TestFury-AllItems-SwiftWindfireDiamond" value: { - dps: 6378.10154 - tps: 4696.63438 + dps: 6720.67456 + tps: 4979.70601 } } dps_results: { key: "TestFury-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-TearsoftheVanquished-47215" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-TheFistsofFury" value: { - dps: 4771.60364 - tps: 3526.58713 + dps: 4992.31788 + tps: 3713.09684 } } dps_results: { key: "TestFury-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5087.77668 - tps: 3753.03482 + dps: 5306.43425 + tps: 3938.56769 } } dps_results: { key: "TestFury-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6488.10731 - tps: 4776.86853 + dps: 6762.84923 + tps: 5009.32294 } } dps_results: { key: "TestFury-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6572.42729 - tps: 4839.01915 + dps: 6893.23249 + tps: 5104.12011 } } dps_results: { key: "TestFury-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6592.54039 - tps: 4850.07445 + dps: 6910.84193 + tps: 5116.92223 } } dps_results: { key: "TestFury-AllItems-TirelessSkyflareDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-TirelessStarflareDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6256.80876 - tps: 4605.54908 + dps: 6572.38128 + tps: 4870.76261 } } dps_results: { key: "TestFury-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6376.61073 - tps: 4697.36788 + dps: 6709.31917 + tps: 4971.01775 } } dps_results: { key: "TestFury-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5063.73455 - tps: 3746.67582 + dps: 5332.02793 + tps: 3969.42029 } } dps_results: { key: "TestFury-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 4913.01649 - tps: 3660.27937 + dps: 5207.26196 + tps: 3918.42181 } } dps_results: { key: "TestFury-AllItems-WingedTalisman-37844" value: { - dps: 6182.44248 - tps: 4554.59753 + dps: 6510.78435 + tps: 4823.95487 } } dps_results: { key: "TestFury-AllItems-Wrynn'sBattlegear" value: { - dps: 6212.08474 - tps: 4576.15563 + dps: 6540.01388 + tps: 4849.84472 } } dps_results: { key: "TestFury-AllItems-Wrynn'sPlate" value: { - dps: 5146.61849 - tps: 3804.46835 + dps: 5384.59618 + tps: 4002.78609 } } dps_results: { key: "TestFury-AllItems-YmirjarLord'sBattlegear" value: { - dps: 6807.79797 - tps: 5019.95783 + dps: 7155.78333 + tps: 5301.15618 } } dps_results: { key: "TestFury-AllItems-YmirjarLord'sPlate" value: { - dps: 5358.17475 - tps: 3961.2977 + dps: 5622.61724 + tps: 4178.37775 } } dps_results: { key: "TestFury-Average-Default" value: { - dps: 6583.68925 - tps: 4846.10425 + dps: 6906.11846 + tps: 5115.46758 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 8414.8895 - tps: 6553.29114 + dps: 9135.0533 + tps: 7379.58932 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6469.57816 - tps: 4759.77047 + dps: 6821.74336 + tps: 5054.8238 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7509.9991 - tps: 5525.43515 + dps: 7884.98269 + tps: 5837.18521 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 4508.35874 - tps: 3660.42656 + dps: 4669.81585 + tps: 3873.18164 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3146.82187 - tps: 2343.5513 + dps: 3083.79681 + tps: 2318.15861 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3348.75242 - tps: 2494.14112 + dps: 3257.5045 + tps: 2450.21593 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 8426.19174 - tps: 6570.56552 + dps: 9197.60442 + tps: 7429.88842 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6553.10229 - tps: 4825.87922 + dps: 6894.70614 + tps: 5107.28938 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7566.87947 - tps: 5569.43088 + dps: 7998.73119 + tps: 5917.72207 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 4592.09897 - tps: 3726.0751 + dps: 4666.74179 + tps: 3871.98252 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3177.93994 - tps: 2368.22707 + dps: 3096.31601 + tps: 2326.06422 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3374.05502 - tps: 2520.42783 + dps: 3341.05283 + tps: 2512.05698 } } dps_results: { key: "TestFury-SwitchInFrontOfTarget-Default" value: { - dps: 6031.96295 - tps: 4447.08133 + dps: 6381.78014 + tps: 4728.11166 } } diff --git a/sim/warrior/dps/dps_warrior.go b/sim/warrior/dps/dps_warrior.go index 3cd01e00f7..c95cf805f9 100644 --- a/sim/warrior/dps/dps_warrior.go +++ b/sim/warrior/dps/dps_warrior.go @@ -44,7 +44,7 @@ func NewDpsWarrior(character core.Character, options *proto.Player) *DpsWarrior warOptions := options.GetWarrior() war := &DpsWarrior{ - Warrior: warrior.NewWarrior(character, warOptions.Talents, warrior.WarriorInputs{ + Warrior: warrior.NewWarrior(character, options.TalentsString, warrior.WarriorInputs{ ShoutType: warOptions.Options.Shout, RendCdThreshold: core.DurationFromSeconds(warOptions.Rotation.RendCdThreshold), Munch: warOptions.Options.Munch, diff --git a/sim/warrior/dps/dps_warrior_test.go b/sim/warrior/dps/dps_warrior_test.go index bc3a923d63..5bcf1f31cc 100644 --- a/sim/warrior/dps/dps_warrior_test.go +++ b/sim/warrior/dps/dps_warrior_test.go @@ -18,11 +18,11 @@ func TestFury(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - TalentsString: "32002301233-305053000520310053120500351", - GearSet: core.GearSetCombo{Label: "Fury P1", GearSet: FuryP1Gear}, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsFury}, - - Consumes: FullConsumes, + Talents: FuryTalents, + Glyphs: FuryGlyphs, + GearSet: core.GearSetCombo{Label: "Fury P1", GearSet: FuryP1Gear}, + Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsFury}, ItemFilter: core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypePlate, @@ -44,11 +44,11 @@ func TestArms(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - TalentsString: "3022032023335100102012213231251-305-2033", - GearSet: core.GearSetCombo{Label: "Arms P1", GearSet: FuryP1Gear}, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsArms}, - - Consumes: FullConsumes, + Talents: ArmsTalents, + Glyphs: ArmsGlyphs, + GearSet: core.GearSetCombo{Label: "Arms P1", GearSet: FuryP1Gear}, + Consumes: FullConsumes, + SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsArms}, ItemFilter: core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypePlate, diff --git a/sim/warrior/dps/presets.go b/sim/warrior/dps/presets.go index afdc3f2523..5e5e2caf5b 100644 --- a/sim/warrior/dps/presets.go +++ b/sim/warrior/dps/presets.go @@ -5,9 +5,21 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) +var FuryTalents = "32002301233-305053000520310053120500351" +var FuryGlyphs = &proto.Glyphs{ + Major1: int32(proto.WarriorMajorGlyph_GlyphOfWhirlwind), + Major2: int32(proto.WarriorMajorGlyph_GlyphOfHeroicStrike), + Major3: int32(proto.WarriorMajorGlyph_GlyphOfExecution), +} +var ArmsTalents = "3022032023335100102012213231251-305-2033" +var ArmsGlyphs = &proto.Glyphs{ + Major1: int32(proto.WarriorMajorGlyph_GlyphOfRending), + Major2: int32(proto.WarriorMajorGlyph_GlyphOfMortalStrike), + Major3: int32(proto.WarriorMajorGlyph_GlyphOfExecution), +} + var PlayerOptionsArms = &proto.Player_Warrior{ Warrior: &proto.Warrior{ - Talents: ArmsTalents, Options: warriorOptions, Rotation: armsRotation, }, @@ -15,76 +27,11 @@ var PlayerOptionsArms = &proto.Player_Warrior{ var PlayerOptionsFury = &proto.Player_Warrior{ Warrior: &proto.Warrior{ - Talents: FuryTalents, Options: warriorOptions, Rotation: furyRotation, }, } -var ArmsTalents = &proto.WarriorTalents{ - ImprovedHeroicStrike: 3, - ImprovedRend: 2, - TacticalMastery: 3, - ImprovedOverpower: 2, - AngerManagement: true, - Impale: 2, - DeepWounds: 3, - TwoHandedWeaponSpecialization: 3, - TasteForBlood: 3, - PoleaxeSpecialization: 5, - SweepingStrikes: true, - WeaponMastery: 1, - MortalStrike: true, - StrengthOfArms: 2, - ImprovedSlam: 2, - ImprovedMortalStrike: 3, - UnrelentingAssault: 2, - SuddenDeath: 3, - EndlessRage: true, - BloodFrenzy: 2, - WreckingCrew: 5, - Bladestorm: true, - - ArmoredToTheTeeth: 3, - Cruelty: 5, - - ImprovedBloodrage: 2, - ImprovedThunderClap: 3, - Incite: 3, -} - -var FuryTalents = &proto.WarriorTalents{ - ImprovedHeroicStrike: 3, - ImprovedRend: 2, - IronWill: 2, - TacticalMastery: 3, - AngerManagement: true, - Impale: 2, - DeepWounds: 3, - TwoHandedWeaponSpecialization: 3, - - ArmoredToTheTeeth: 3, - Cruelty: 5, - UnbridledWrath: 2, - ImprovedCleave: 3, - PiercingHowl: true, - CommandingPresence: 1, - DualWieldSpecialization: 5, - ImprovedExecute: 2, - Precision: 3, - DeathWish: true, - ImprovedBerserkerRage: 1, - Flurry: 5, - IntensifyRage: 3, - Bloodthirst: true, - ImprovedWhirlwind: 2, - ImprovedBerserkerStance: 5, - Rampage: true, - Bloodsurge: 3, - UnendingFury: 5, - TitansGrip: true, -} - var armsRotation = &proto.Warrior_Rotation{ UseRend: true, UseMs: true, diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results index 2584fb92e9..6e0467b6c5 100644 --- a/sim/warrior/protection/TestProtectionWarrior.results +++ b/sim/warrior/protection/TestProtectionWarrior.results @@ -885,85 +885,85 @@ dps_results: { dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 1976.16246 - tps: 5324.79979 + dps: 2002.69988 + tps: 5869.62288 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 1976.16246 - tps: 5277.29979 + dps: 2002.69988 + tps: 5822.12288 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 2168.77675 - tps: 5765.41265 + dps: 2197.06016 + tps: 6327.86814 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 1007.94039 - tps: 2736.34156 + dps: 1021.15673 + tps: 2999.56487 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 1007.94039 - tps: 2688.84156 + dps: 1021.15673 + tps: 2952.06487 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 929.39646 - tps: 2508.90513 + dps: 960.02153 + tps: 2784.11121 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 2003.97513 - tps: 5394.94304 + dps: 2030.9558 + tps: 5944.76428 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 2003.97513 - tps: 5347.44304 + dps: 2030.9558 + tps: 5897.26428 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 2187.06701 - tps: 5801.52227 + dps: 2214.71424 + tps: 6370.04785 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 1012.90956 - tps: 2754.22246 + dps: 1027.01078 + tps: 3018.90714 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 1012.90956 - tps: 2706.72246 + dps: 1027.01078 + tps: 2971.40714 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 953.78512 - tps: 2570.95252 + dps: 993.11181 + tps: 2888.40756 } } dps_results: { diff --git a/sim/warrior/protection/presets.go b/sim/warrior/protection/presets.go index 8e1c1859d9..73690ed9bf 100644 --- a/sim/warrior/protection/presets.go +++ b/sim/warrior/protection/presets.go @@ -5,53 +5,20 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -var StandardTalents = &proto.WarriorTalents{ - ImprovedHeroicStrike: 2, - Deflection: 5, - TacticalMastery: 3, - DeepWounds: 3, - Impale: 2, - - ArmoredToTheTeeth: 3, - Cruelty: 2, - - ImprovedThunderClap: 3, - Anticipation: 5, - ShieldSpecialization: 5, - Incite: 3, - ImprovedRevenge: 2, - LastStand: true, - ShieldMastery: 2, - Toughness: 5, - ConcussionBlow: true, - GagOrder: 2, - OneHandedWeaponSpecialization: 5, - Vigilance: true, - ImprovedDefensiveStance: 2, - Vitality: 3, - Warbringer: true, - Devastate: true, - CriticalBlock: 3, - SwordAndBoard: 3, - DamageShield: 2, - Shockwave: true, +var DefaultTalents = "2500030023-302-053351225000012521030113321" +var DefaultGlyphs = &proto.Glyphs{ + Major1: int32(proto.WarriorMajorGlyph_GlyphOfBlocking), + Major2: int32(proto.WarriorMajorGlyph_GlyphOfDevastate), + Major3: int32(proto.WarriorMajorGlyph_GlyphOfVigilance), } var PlayerOptionsBasic = &proto.Player_ProtectionWarrior{ ProtectionWarrior: &proto.ProtectionWarrior{ - Talents: StandardTalents, Options: warriorOptions, Rotation: warriorRotation, }, } -var DefaultGlyphs = &proto.Glyphs{ - Major1: int32(proto.WarriorMajorGlyph_GlyphOfBlocking), - Major2: int32(proto.WarriorMajorGlyph_GlyphOfDevastate), - Major3: int32(proto.WarriorMajorGlyph_GlyphOfVigilance), - // No interesting minor glyphs. -} - var warriorRotation = &proto.ProtectionWarrior_Rotation{ HsRageThreshold: 30, } diff --git a/sim/warrior/protection/protection_warrior.go b/sim/warrior/protection/protection_warrior.go index 05da2ab359..04f86cf201 100644 --- a/sim/warrior/protection/protection_warrior.go +++ b/sim/warrior/protection/protection_warrior.go @@ -37,7 +37,7 @@ func NewProtectionWarrior(character core.Character, options *proto.Player) *Prot warOptions := options.GetProtectionWarrior() war := &ProtectionWarrior{ - Warrior: warrior.NewWarrior(character, warOptions.Talents, warrior.WarriorInputs{ + Warrior: warrior.NewWarrior(character, options.TalentsString, warrior.WarriorInputs{ ShoutType: warOptions.Options.Shout, PrecastShout: warOptions.Options.PrecastShout, PrecastShoutSapphire: warOptions.Options.PrecastShoutSapphire, diff --git a/sim/warrior/protection/protection_warrior_test.go b/sim/warrior/protection/protection_warrior_test.go index a19e4cf4f6..1b50641b74 100644 --- a/sim/warrior/protection/protection_warrior_test.go +++ b/sim/warrior/protection/protection_warrior_test.go @@ -19,11 +19,11 @@ func TestProtectionWarrior(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceHuman}, GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + Talents: DefaultTalents, + Glyphs: DefaultGlyphs, + Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, - Glyphs: DefaultGlyphs, - Consumes: FullConsumes, - IsTank: true, InFrontOfTarget: true, @@ -55,12 +55,14 @@ func BenchmarkSimulate(b *testing.B) { rsr := &proto.RaidSimRequest{ Raid: core.SinglePlayerRaidProto( &proto.Player{ - Race: proto.Race_RaceOrc, - Class: proto.Class_ClassWarrior, - Equipment: P1Gear, - Consumes: FullConsumes, - Spec: PlayerOptionsBasic, - Buffs: core.FullIndividualBuffs, + Race: proto.Race_RaceOrc, + Class: proto.Class_ClassWarrior, + Equipment: P1Gear, + Consumes: FullConsumes, + Spec: PlayerOptionsBasic, + Buffs: core.FullIndividualBuffs, + TalentsString: DefaultTalents, + Glyphs: DefaultGlyphs, InFrontOfTarget: true, }, diff --git a/sim/warrior/warrior.go b/sim/warrior/warrior.go index 594d2968a0..729366364e 100644 --- a/sim/warrior/warrior.go +++ b/sim/warrior/warrior.go @@ -8,6 +8,8 @@ import ( "github.com/wowsims/wotlk/sim/core/stats" ) +var TalentTreeSizes = [3]int{31, 27, 27} + type WarriorInputs struct { ShoutType proto.WarriorShout PrecastShout bool @@ -182,12 +184,13 @@ func (warrior *Warrior) Reset(_ *core.Simulation) { } } -func NewWarrior(character core.Character, talents *proto.WarriorTalents, inputs WarriorInputs) *Warrior { +func NewWarrior(character core.Character, talents string, inputs WarriorInputs) *Warrior { warrior := &Warrior{ Character: character, - Talents: talents, + Talents: &proto.WarriorTalents{}, WarriorInputs: inputs, } + core.FillTalentsProto(warrior.Talents.ProtoReflect(), talents, TalentTreeSizes) warrior.PseudoStats.CanParry = true diff --git a/sim/web/main_test.go b/sim/web/main_test.go index 1228714198..69c55a56d5 100644 --- a/sim/web/main_test.go +++ b/sim/web/main_test.go @@ -19,19 +19,6 @@ var basicSpec = &proto.Player_ElementalShaman{ Rotation: &proto.ElementalShaman_Rotation{ Type: proto.ElementalShaman_Rotation_Adaptive, }, - Talents: &proto.ShamanTalents{ - // ElementalDevastation - ElementalFury: 5, - Convection: 5, - Concussion: 5, - ElementalFocus: true, - CallOfThunder: true, - UnrelentingStorm: 3, - ElementalPrecision: 3, - LightningMastery: 5, - ElementalMastery: true, - LightningOverload: 5, - }, Options: &proto.ElementalShaman_Options{ Shield: proto.ShamanShield_WaterShield, }, diff --git a/ui/core/player.ts b/ui/core/player.ts index e152a2132c..5fdbf9ba7f 100644 --- a/ui/core/player.ts +++ b/ui/core/player.ts @@ -842,7 +842,6 @@ export class Player { database: forExport ? SimDatabase.create() : this.toDatabase(), }), this.getRotation(), - forExport ? this.specTypeFunctions.talentsCreate() : this.getTalents(), this.getSpecOptions()); } diff --git a/ui/core/proto_utils/utils.ts b/ui/core/proto_utils/utils.ts index 260ab0dbd9..8b00b4da4b 100644 --- a/ui/core/proto_utils/utils.ts +++ b/ui/core/proto_utils/utils.ts @@ -541,7 +541,6 @@ export type SpecTypeFunctions = { talentsCopy: (a: SpecTalents) => SpecTalents; talentsToJson: (a: SpecTalents) => any; talentsFromJson: (obj: any) => SpecTalents; - talentsFromPlayer: (player: Player) => SpecTalents; optionsCreate: () => SpecOptions; optionsEquals: (a: SpecOptions, b: SpecOptions) => boolean; @@ -567,9 +566,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => DruidTalents.clone(a as DruidTalents), talentsToJson: (a) => DruidTalents.toJson(a as DruidTalents), talentsFromJson: (obj) => DruidTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'balanceDruid' - ? player.spec.balanceDruid.talents || DruidTalents.create() - : DruidTalents.create(), optionsCreate: () => BalanceDruidOptions.create(), optionsEquals: (a, b) => BalanceDruidOptions.equals(a as BalanceDruidOptions, b as BalanceDruidOptions), @@ -595,9 +591,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => DruidTalents.clone(a as DruidTalents), talentsToJson: (a) => DruidTalents.toJson(a as DruidTalents), talentsFromJson: (obj) => DruidTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'feralDruid' - ? player.spec.feralDruid.talents || DruidTalents.create() - : DruidTalents.create(), optionsCreate: () => FeralDruidOptions.create(), optionsEquals: (a, b) => FeralDruidOptions.equals(a as FeralDruidOptions, b as FeralDruidOptions), @@ -623,9 +616,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => DruidTalents.clone(a as DruidTalents), talentsToJson: (a) => DruidTalents.toJson(a as DruidTalents), talentsFromJson: (obj) => DruidTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'feralTankDruid' - ? player.spec.feralTankDruid.talents || DruidTalents.create() - : DruidTalents.create(), optionsCreate: () => FeralTankDruidOptions.create(), optionsEquals: (a, b) => FeralTankDruidOptions.equals(a as FeralTankDruidOptions, b as FeralTankDruidOptions), @@ -651,9 +641,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => DruidTalents.clone(a as DruidTalents), talentsToJson: (a) => DruidTalents.toJson(a as DruidTalents), talentsFromJson: (obj) => DruidTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'restorationDruid' - ? player.spec.restorationDruid.talents || DruidTalents.create() - : DruidTalents.create(), optionsCreate: () => RestorationDruidOptions.create(), optionsEquals: (a, b) => RestorationDruidOptions.equals(a as RestorationDruidOptions, b as RestorationDruidOptions), @@ -679,9 +666,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => ShamanTalents.clone(a as ShamanTalents), talentsToJson: (a) => ShamanTalents.toJson(a as ShamanTalents), talentsFromJson: (obj) => ShamanTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'elementalShaman' - ? player.spec.elementalShaman.talents || ShamanTalents.create() - : ShamanTalents.create(), optionsCreate: () => ElementalShamanOptions.create(), optionsEquals: (a, b) => ElementalShamanOptions.equals(a as ElementalShamanOptions, b as ElementalShamanOptions), @@ -707,9 +691,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => ShamanTalents.clone(a as ShamanTalents), talentsToJson: (a) => ShamanTalents.toJson(a as ShamanTalents), talentsFromJson: (obj) => ShamanTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'enhancementShaman' - ? player.spec.enhancementShaman.talents || ShamanTalents.create() - : ShamanTalents.create(), optionsCreate: () => EnhancementShamanOptions.create(), optionsEquals: (a, b) => EnhancementShamanOptions.equals(a as EnhancementShamanOptions, b as EnhancementShamanOptions), @@ -735,9 +716,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => ShamanTalents.clone(a as ShamanTalents), talentsToJson: (a) => ShamanTalents.toJson(a as ShamanTalents), talentsFromJson: (obj) => ShamanTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'restorationShaman' - ? player.spec.restorationShaman.talents || ShamanTalents.create() - : ShamanTalents.create(), optionsCreate: () => RestorationShamanOptions.create(), optionsEquals: (a, b) => RestorationShamanOptions.equals(a as RestorationShamanOptions, b as RestorationShamanOptions), @@ -763,9 +741,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => HunterTalents.clone(a as HunterTalents), talentsToJson: (a) => HunterTalents.toJson(a as HunterTalents), talentsFromJson: (obj) => HunterTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'hunter' - ? player.spec.hunter.talents || HunterTalents.create() - : HunterTalents.create(), optionsCreate: () => HunterOptions.create(), optionsEquals: (a, b) => HunterOptions.equals(a as HunterOptions, b as HunterOptions), @@ -791,9 +766,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => MageTalents.clone(a as MageTalents), talentsToJson: (a) => MageTalents.toJson(a as MageTalents), talentsFromJson: (obj) => MageTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'mage' - ? player.spec.mage.talents || MageTalents.create() - : MageTalents.create(), optionsCreate: () => MageOptions.create(), optionsEquals: (a, b) => MageOptions.equals(a as MageOptions, b as MageOptions), @@ -819,9 +791,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => PaladinTalents.clone(a as PaladinTalents), talentsToJson: (a) => PaladinTalents.toJson(a as PaladinTalents), talentsFromJson: (obj) => PaladinTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'holyPaladin' - ? player.spec.holyPaladin.talents || PaladinTalents.create() - : PaladinTalents.create(), optionsCreate: () => HolyPaladinOptions.create(), optionsEquals: (a, b) => HolyPaladinOptions.equals(a as HolyPaladinOptions, b as HolyPaladinOptions), @@ -847,9 +816,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => PaladinTalents.clone(a as PaladinTalents), talentsToJson: (a) => PaladinTalents.toJson(a as PaladinTalents), talentsFromJson: (obj) => PaladinTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'protectionPaladin' - ? player.spec.protectionPaladin.talents || PaladinTalents.create() - : PaladinTalents.create(), optionsCreate: () => ProtectionPaladinOptions.create(), optionsEquals: (a, b) => ProtectionPaladinOptions.equals(a as ProtectionPaladinOptions, b as ProtectionPaladinOptions), @@ -875,9 +841,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => PaladinTalents.clone(a as PaladinTalents), talentsToJson: (a) => PaladinTalents.toJson(a as PaladinTalents), talentsFromJson: (obj) => PaladinTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'retributionPaladin' - ? player.spec.retributionPaladin.talents || PaladinTalents.create() - : PaladinTalents.create(), optionsCreate: () => RetributionPaladinOptions.create(), optionsEquals: (a, b) => RetributionPaladinOptions.equals(a as RetributionPaladinOptions, b as RetributionPaladinOptions), @@ -903,9 +866,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => RogueTalents.clone(a as RogueTalents), talentsToJson: (a) => RogueTalents.toJson(a as RogueTalents), talentsFromJson: (obj) => RogueTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'rogue' - ? player.spec.rogue.talents || RogueTalents.create() - : RogueTalents.create(), optionsCreate: () => RogueOptions.create(), optionsEquals: (a, b) => RogueOptions.equals(a as RogueOptions, b as RogueOptions), @@ -931,9 +891,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => PriestTalents.clone(a as PriestTalents), talentsToJson: (a) => PriestTalents.toJson(a as PriestTalents), talentsFromJson: (obj) => PriestTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'healingPriest' - ? player.spec.healingPriest.talents || PriestTalents.create() - : PriestTalents.create(), optionsCreate: () => HealingPriestOptions.create(), optionsEquals: (a, b) => HealingPriestOptions.equals(a as HealingPriestOptions, b as HealingPriestOptions), @@ -959,9 +916,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => PriestTalents.clone(a as PriestTalents), talentsToJson: (a) => PriestTalents.toJson(a as PriestTalents), talentsFromJson: (obj) => PriestTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'shadowPriest' - ? player.spec.shadowPriest.talents || PriestTalents.create() - : PriestTalents.create(), optionsCreate: () => ShadowPriestOptions.create(), optionsEquals: (a, b) => ShadowPriestOptions.equals(a as ShadowPriestOptions, b as ShadowPriestOptions), @@ -987,9 +941,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => PriestTalents.clone(a as PriestTalents), talentsToJson: (a) => PriestTalents.toJson(a as PriestTalents), talentsFromJson: (obj) => PriestTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'smitePriest' - ? player.spec.smitePriest.talents || PriestTalents.create() - : PriestTalents.create(), optionsCreate: () => SmitePriestOptions.create(), optionsEquals: (a, b) => SmitePriestOptions.equals(a as SmitePriestOptions, b as SmitePriestOptions), @@ -1015,9 +966,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => WarlockTalents.clone(a as WarlockTalents), talentsToJson: (a) => WarlockTalents.toJson(a as WarlockTalents), talentsFromJson: (obj) => WarlockTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'warlock' - ? player.spec.warlock.talents || WarlockTalents.create() - : WarlockTalents.create(), optionsCreate: () => WarlockOptions.create(), optionsEquals: (a, b) => WarlockOptions.equals(a as WarlockOptions, b as WarlockOptions), @@ -1043,9 +991,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => WarriorTalents.clone(a as WarriorTalents), talentsToJson: (a) => WarriorTalents.toJson(a as WarriorTalents), talentsFromJson: (obj) => WarriorTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'warrior' - ? player.spec.warrior.talents || WarriorTalents.create() - : WarriorTalents.create(), optionsCreate: () => WarriorOptions.create(), optionsEquals: (a, b) => WarriorOptions.equals(a as WarriorOptions, b as WarriorOptions), @@ -1071,9 +1016,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => WarriorTalents.clone(a as WarriorTalents), talentsToJson: (a) => WarriorTalents.toJson(a as WarriorTalents), talentsFromJson: (obj) => WarriorTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'protectionWarrior' - ? player.spec.protectionWarrior.talents || WarriorTalents.create() - : WarriorTalents.create(), optionsCreate: () => ProtectionWarriorOptions.create(), optionsEquals: (a, b) => ProtectionWarriorOptions.equals(a as ProtectionWarriorOptions, b as ProtectionWarriorOptions), @@ -1099,9 +1041,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => DeathknightTalents.clone(a as DeathknightTalents), talentsToJson: (a) => DeathknightTalents.toJson(a as DeathknightTalents), talentsFromJson: (obj) => DeathknightTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'deathknight' - ? player.spec.deathknight.talents || DeathknightTalents.create() - : DeathknightTalents.create(), optionsCreate: () => DeathknightOptions.create(), optionsEquals: (a, b) => DeathknightOptions.equals(a as DeathknightOptions, b as DeathknightOptions), @@ -1127,9 +1066,6 @@ export const specTypeFunctions: Record> = { talentsCopy: (a) => DeathknightTalents.clone(a as DeathknightTalents), talentsToJson: (a) => DeathknightTalents.toJson(a as DeathknightTalents), talentsFromJson: (obj) => DeathknightTalents.fromJson(obj), - talentsFromPlayer: (player) => player.spec.oneofKind == 'tankDeathknight' - ? player.spec.tankDeathknight.talents || DeathknightTalents.create() - : DeathknightTalents.create(), optionsCreate: () => TankDeathknightOptions.create(), optionsEquals: (a, b) => TankDeathknightOptions.equals(a as TankDeathknightOptions, b as TankDeathknightOptions), @@ -1369,7 +1305,6 @@ export function withSpecProto( spec: Spec, player: Player, rotation: SpecRotation, - talents: SpecTalents, specOptions: SpecOptions): Player { const copy = Player.clone(player); @@ -1379,7 +1314,6 @@ export function withSpecProto( oneofKind: 'balanceDruid', balanceDruid: BalanceDruid.create({ rotation: rotation as BalanceDruidRotation, - talents: talents as DruidTalents, options: specOptions as BalanceDruidOptions, }), }; @@ -1389,7 +1323,6 @@ export function withSpecProto( oneofKind: 'feralDruid', feralDruid: FeralDruid.create({ rotation: rotation as FeralDruidRotation, - talents: talents as DruidTalents, options: specOptions as FeralDruidOptions, }), }; @@ -1399,7 +1332,6 @@ export function withSpecProto( oneofKind: 'feralTankDruid', feralTankDruid: FeralTankDruid.create({ rotation: rotation as FeralTankDruidRotation, - talents: talents as DruidTalents, options: specOptions as FeralTankDruidOptions, }), }; @@ -1409,7 +1341,6 @@ export function withSpecProto( oneofKind: 'restorationDruid', restorationDruid: RestorationDruid.create({ rotation: rotation as RestorationDruidRotation, - talents: talents as DruidTalents, options: specOptions as RestorationDruidOptions, }), }; @@ -1419,7 +1350,6 @@ export function withSpecProto( oneofKind: 'elementalShaman', elementalShaman: ElementalShaman.create({ rotation: rotation as ElementalShamanRotation, - talents: talents as ShamanTalents, options: specOptions as ElementalShamanOptions, }), }; @@ -1429,7 +1359,6 @@ export function withSpecProto( oneofKind: 'enhancementShaman', enhancementShaman: EnhancementShaman.create({ rotation: rotation as EnhancementShamanRotation, - talents: talents as ShamanTalents, options: specOptions as ElementalShamanOptions, }), }; @@ -1439,7 +1368,6 @@ export function withSpecProto( oneofKind: 'restorationShaman', restorationShaman: RestorationShaman.create({ rotation: rotation as RestorationShamanRotation, - talents: talents as ShamanTalents, options: specOptions as RestorationShamanOptions, }), }; @@ -1449,7 +1377,6 @@ export function withSpecProto( oneofKind: 'hunter', hunter: Hunter.create({ rotation: rotation as HunterRotation, - talents: talents as HunterTalents, options: specOptions as HunterOptions, }), }; @@ -1459,7 +1386,6 @@ export function withSpecProto( oneofKind: 'mage', mage: Mage.create({ rotation: rotation as MageRotation, - talents: talents as MageTalents, options: specOptions as MageOptions, }), }; @@ -1469,7 +1395,6 @@ export function withSpecProto( oneofKind: 'holyPaladin', holyPaladin: HolyPaladin.create({ rotation: rotation as HolyPaladinRotation, - talents: talents as PaladinTalents, options: specOptions as HolyPaladinOptions, }), }; @@ -1479,7 +1404,6 @@ export function withSpecProto( oneofKind: 'protectionPaladin', protectionPaladin: ProtectionPaladin.create({ rotation: rotation as ProtectionPaladinRotation, - talents: talents as PaladinTalents, options: specOptions as ProtectionPaladinOptions, }), }; @@ -1489,7 +1413,6 @@ export function withSpecProto( oneofKind: 'retributionPaladin', retributionPaladin: RetributionPaladin.create({ rotation: rotation as RetributionPaladinRotation, - talents: talents as PaladinTalents, options: specOptions as RetributionPaladinOptions, }), }; @@ -1499,7 +1422,6 @@ export function withSpecProto( oneofKind: 'rogue', rogue: Rogue.create({ rotation: rotation as RogueRotation, - talents: talents as RogueTalents, options: specOptions as RogueOptions, }), }; @@ -1509,7 +1431,6 @@ export function withSpecProto( oneofKind: 'healingPriest', healingPriest: HealingPriest.create({ rotation: rotation as HealingPriestRotation, - talents: talents as PriestTalents, options: specOptions as HealingPriestOptions, }), }; @@ -1519,7 +1440,6 @@ export function withSpecProto( oneofKind: 'shadowPriest', shadowPriest: ShadowPriest.create({ rotation: rotation as ShadowPriestRotation, - talents: talents as PriestTalents, options: specOptions as ShadowPriestOptions, }), }; @@ -1529,7 +1449,6 @@ export function withSpecProto( oneofKind: 'smitePriest', smitePriest: SmitePriest.create({ rotation: rotation as SmitePriestRotation, - talents: talents as PriestTalents, options: specOptions as SmitePriestOptions, }), }; @@ -1539,7 +1458,6 @@ export function withSpecProto( oneofKind: 'warlock', warlock: Warlock.create({ rotation: rotation as WarlockRotation, - talents: talents as WarlockTalents, options: specOptions as WarlockOptions, }), }; @@ -1549,7 +1467,6 @@ export function withSpecProto( oneofKind: 'warrior', warrior: Warrior.create({ rotation: rotation as WarriorRotation, - talents: talents as WarriorTalents, options: specOptions as WarriorOptions, }), }; @@ -1559,7 +1476,6 @@ export function withSpecProto( oneofKind: 'protectionWarrior', protectionWarrior: ProtectionWarrior.create({ rotation: rotation as ProtectionWarriorRotation, - talents: talents as WarriorTalents, options: specOptions as ProtectionWarriorOptions, }), }; @@ -1569,7 +1485,6 @@ export function withSpecProto( oneofKind: 'deathknight', deathknight: Deathknight.create({ rotation: rotation as DeathknightRotation, - talents: talents as DeathknightTalents, options: specOptions as DeathknightOptions, }), }; @@ -1579,7 +1494,6 @@ export function withSpecProto( oneofKind: 'tankDeathknight', tankDeathknight: TankDeathknight.create({ rotation: rotation as TankDeathknightRotation, - talents: talents as DeathknightTalents, options: specOptions as TankDeathknightOptions, }), };