diff --git a/sim/common/sod/item_effects/phase_6.go b/sim/common/sod/item_effects/phase_6.go index 390f07426..08f1b1c18 100644 --- a/sim/common/sod/item_effects/phase_6.go +++ b/sim/common/sod/item_effects/phase_6.go @@ -77,7 +77,7 @@ func init() { core.NewItemEffect(ObsidianChampion, func(agent core.Agent) { character := agent.GetCharacter() vanilla.StrengthOfTheChampionAura(character) - vanilla.EnrageAura446327(character) + //vanilla.EnrageAura446327(character) ObsidianEdgedAura(ObsidianChampion, agent) }) diff --git a/sim/common/vanilla/item_effects.go b/sim/common/vanilla/item_effects.go index 80d116b05..2aac62af5 100644 --- a/sim/common/vanilla/item_effects.go +++ b/sim/common/vanilla/item_effects.go @@ -12,138 +12,115 @@ import ( // Ordered by ID const ( - ShortswordOfVengeance = 754 - FieryWarAxe = 870 - Bloodrazor = 809 - HammerOfTheNorthernWind = 810 - FlurryAxe = 871 - SkullflameShield = 1168 - Nightblade = 1982 - Shadowblade = 2163 - GutRipper = 2164 - HandOfEdwardTheOdd = 2243 - BowOfSearingArrows = 2825 - Gutwrencher = 5616 - Ravager = 7717 - HanzoSword = 8190 - TheJackhammer = 9423 - PendulumOfDoom = 9425 - BloodletterScalpel = 9511 - TheHandOfAntusul = 9639 - GryphonRidersStormhammer = 9651 - Firebreather = 10797 - VilerendSlicer = 11603 - HookfangShanker = 11635 - LinkensSwordOfMastery = 11902 - SearingNeedle = 12531 - PipsSkinner = 12709 - ArcaniteChampion = 12790 - MasterworkStormhammer = 12794 - Frostguard = 12797 - SerpentSlicer = 13035 - TheNeedler = 13060 - SealOfTheDawn = 13209 - JoonhosMercy = 17054 - Deathbringer = 17068 - ViskagTheBloodletter = 17075 - ThrashBlade = 17705 - SatyrsLash = 17752 - MarkOfTheChosen = 17774 - Nightfall = 19169 - EbonHand = 19170 - RuneOfTheDawn = 19812 - ZandalariHeroBadge = 19948 - ZandalariHeroMedallion = 19949 - ZandalariHeroCharm = 19950 - MarkOfTheChampionPhys = 23206 - MarkOfTheChampionSpell = 23207 - BlisteringRagehammer = 220569 // 10626 - SulfurasHandOfRagnaros = 227683 // 17182 - SulfuronHammer = 227684 // 17193 - TemperedBlackAmnesty = 227832 // 19166 - EbonFist = 227842 - HardenedFrostguard = 227887 - FlameWrath = 227934 // 11809 - LordGeneralsSword = 227940 // 11817 - WraithScythe = 227941 - SecondWind = 227967 // 11819 - BurstOfKnowledge = 227972 - HandOfInjustice = 227990 - Ironfoe = 227991 // 11684 - EbonHiltOfMarduk = 227993 // 14576 - FrightskullShaft = 227994 // 14531 - BarovianFamilySword = 227997 // 14541 - Frightalon = 228015 // 14024 - HeadmastersCharge = 228022 // 13937 - GravestoneWarAxe = 228029 // 13983 - FiendishMachete = 228056 // 18310 - RefinedArcaniteChampion = 228125 - TalismanOfEphemeralPower = 228255 // 18820 - GutgoreRipper = 228267 // 17071 - Shadowstrike = 228272 // 17074 - Thunderstrike = 228273 // 17223 - BonereaversEdge = 228288 // 17076 - BonereaversEdgeMolten = 228461 - EssenceOfThePureFlame = 228293 // 18815 - PerditionsBlade = 228296 // 18816 - Typhoon = 228347 // 18542 - EskhandarsLeftClaw = 228349 // 18202 - EskhandarsRightClaw = 228350 // 18203 - BlazefuryMedallion = 228354 // 17111 - EmpyreanDemolisher = 228397 // 17112 - DreadbladeOfTheDestructor = 228410 - PerditionsBladeMolten = 228511 - SkullforgeReaver = 228542 // 13361 - RunebladeOfBaronRivendare = 228543 // 13505 - HeartOfWyrmthalak = 228599 // 22321 - Venomspitter = 228573 // 13183 - SmolderwebsEye = 228576 // 13213 - Chillpike = 228586 // 13148 - FangOfTheCrystalSpider = 228592 // 13218 - BlackhandDoomsaw = 228603 // 12583 - BlackbladeOfShahram = 228606 // 12592 - SeepingWillow = 228666 // 12969 - DraconicInfusedEmblem = 228678 // 22268 - QuelSerrar = 228679 // 18348 - HandOfJustice = 228722 // 11815 - Felstriker = 228757 // 12590 - GutgoreRipperMolten = 229372 - EskhandarsRightClawMolten = 229379 - Thunderfury = 230224 // 19019 - TheUntamedBlade = 230242 // 19334 - DrakeTalonCleaver = 230271 // 19353 - JekliksCrusher = 230911 // 19918 - ZulianSlicer = 230930 // 19901 - HalberdOfSmiting = 230991 // 19874 - NatPaglesBrokenReel = 231271 // 19947 - TigulesHarpoon = 231272 // 19946 - GrileksCarver = 231273 // 19962 - GrileksGrinder = 231274 // 19961 - PitchforkOfMadness = 231277 // 19963 - GrileksCarverBloodied = 231846 - GrileksGrinderBloodied = 231847 - TigulesHarpoonBloodied = 231849 - JekliksCrusherBloodied = 231861 - PitchforkOfMadnessBloodied = 231864 - HalberdOfSmitingBloodied = 231870 - ZulianSlicerBloodied = 231876 - DrakeTalonCleaverShadowflame = 232562 - TheUntamedBladeShadowflame = 232566 - ScarabBrooch = 233601 // 21625 - KalimdorsRevenge = 233621 - JomGabbar = 233627 // 23570 - NeretzekBloodDrinker = 233647 - Speedstone = 233990 - ManslayerOfTheQiraji = 234067 - EyeOfMoam = 234080 // 21473 - DarkmoonCardHeroism = 234176 // 19287 - DarkmoonCardBlueDragon = 234177 // 19288 - DarkmoonCardMaelstrom = 234178 // 19289 - Earthstrike = 234462 - WrathOfCenarius = 234463 // 21190 - KalimdorsRevengeVoidTouched = 234981 - NeretzekBloodDrinkerVoidTouched = 234987 - ManslayerOfTheQirajiVoidTouched = 234990 + ShortswordOfVengeance = 754 + FieryWarAxe = 870 + Bloodrazor = 809 + HammerOfTheNorthernWind = 810 + FlurryAxe = 871 + SkullflameShield = 1168 + Nightblade = 1982 + Shadowblade = 2163 + GutRipper = 2164 + HandOfEdwardTheOdd = 2243 + BowOfSearingArrows = 2825 + Gutwrencher = 5616 + Ravager = 7717 + HanzoSword = 8190 + TheJackhammer = 9423 + PendulumOfDoom = 9425 + BloodletterScalpel = 9511 + TheHandOfAntusul = 9639 + GryphonRidersStormhammer = 9651 + Firebreather = 10797 + VilerendSlicer = 11603 + HookfangShanker = 11635 + LinkensSwordOfMastery = 11902 + SearingNeedle = 12531 + PipsSkinner = 12709 + ArcaniteChampion = 12790 + MasterworkStormhammer = 12794 + Frostguard = 12797 + SerpentSlicer = 13035 + TheNeedler = 13060 + SealOfTheDawn = 13209 + JoonhosMercy = 17054 + Deathbringer = 17068 + ViskagTheBloodletter = 17075 + ThrashBlade = 17705 + SatyrsLash = 17752 + MarkOfTheChosen = 17774 + Nightfall = 19169 + EbonHand = 19170 + RuneOfTheDawn = 19812 + ZandalariHeroBadge = 19948 + ZandalariHeroMedallion = 19949 + ZandalariHeroCharm = 19950 + MarkOfTheChampionPhys = 23206 + MarkOfTheChampionSpell = 23207 + Ragehammer = 10626 + // TODO: These all need to have their values restored to the original version or deleted if original has no effect. + SulfurasHandOfRagnaros = 17182 // TODO: Still has effect/values for SoD item 227683 + SulfuronHammer = 17193 // TODO: Still has effect/values for SoD item 227684 + TemperedBlackAmnesty = 19166 // TODO: Still has effect/values for SoD item 227832 + FlameWrath = 11809 // TODO: Still has effect/values for SoD item 227934 + LordGeneralsSword = 11817 // TODO: Still has effect/values for SoD item 227940 + WraithScythe = 11920 // TODO: Still has effect/values for SoD item 227941 + SecondWind = 11819 // TODO: Still has effect/values for SoD item 227967 + BurstOfKnowledge = 11832 // TODO: Still has effect/values for SoD item 227972 + Ironfoe = 11684 // TODO: Still has effect/values for SoD item 227991 + EbonHiltOfMarduk = 14576 // TODO: Still has effect/values for SoD item 227993 + FrightskullShaft = 14531 // TODO: Still has effect/values for SoD item 227994 + BarovianFamilySword = 14541 // TODO: Still has effect/values for SoD item 227997 + Frightalon = 14024 // TODO: Still has effect/values for SoD item 228015 + HeadmastersCharge = 13937 // TODO: Still has effect/values for SoD item 228022 + GravestoneWarAxe = 13983 // TODO: Still has effect/values for SoD item 228029 + FiendishMachete = 18310 // TODO: Still has effect/values for SoD item 228056 + TalismanOfEphemeralPower = 18820 // TODO: Still has effect/values for SoD item 228255 + GutgoreRipper = 17071 // TODO: Still has effect/values for SoD item 228267 + Shadowstrike = 17074 // TODO: Still has effect/values for SoD item 228272 + Thunderstrike = 17223 // TODO: Still has effect/values for SoD item 228273 + BonereaversEdge = 17076 // TODO: Still has effect/values for SoD item 228288 + EssenceOfThePureFlame = 18815 // TODO: Still has effect/values for SoD item 228293 + PerditionsBlade = 18816 // TODO: Still has effect/values for SoD item 228296 + Typhoon = 18542 // TODO: Still has effect/values for SoD item 228347 + EskhandarsLeftClaw = 18202 // TODO: Still has effect/values for SoD item 228349 + EskhandarsRightClaw = 18203 // TODO: Still has effect/values for SoD item 228350 + BlazefuryMedallion = 17111 // TODO: Still has effect/values for SoD item 228354 + EmpyreanDemolisher = 17112 // TODO: Still has effect/values for SoD item 228397 + SkullforgeReaver = 13361 // TODO: Still has effect/values for SoD item 228542 + RunebladeOfBaronRivendare = 13505 // TODO: Still has effect/values for SoD item 228543 + HeartOfWyrmthalak = 22321 // TODO: Still has effect/values for SoD item 228599 + Venomspitter = 13183 // TODO: Still has effect/values for SoD item 228573 + SmolderwebsEye = 13213 // TODO: Still has effect/values for SoD item 228576 + Chillpike = 13148 // TODO: Still has effect/values for SoD item 228586 + FangOfTheCrystalSpider = 13218 // TODO: Still has effect/values for SoD item 228592 + BlackhandDoomsaw = 12583 // TODO: Still has effect/values for SoD item 228603 + BlackbladeOfShahram = 12592 // TODO: Still has effect/values for SoD item 228606 + SeepingWillow = 12969 // TODO: Still has effect/values for SoD item 228666 + DraconicInfusedEmblem = 22268 // TODO: Still has effect/values for SoD item 228678 + QuelSerrar = 18348 // TODO: Still has effect/values for SoD item 228679 + HandOfJustice = 11815 // TODO: Still has effect/values for SoD item 228722 + Felstriker = 12590 // TODO: Still has effect/values for SoD item 228757 + Thunderfury = 19019 // TODO: Still has effect/values for SoD item 230224 + TheUntamedBlade = 19334 // TODO: Still has effect/values for SoD item 230242 + DrakeTalonCleaver = 19353 // TODO: Still has effect/values for SoD item 230271 + JekliksCrusher = 19918 // TODO: Still has effect/values for SoD item 230911 + ZulianSlicer = 19901 // TODO: Still has effect/values for SoD item 230930 + HalberdOfSmiting = 19874 // TODO: Still has effect/values for SoD item 230991 + NatPaglesBrokenReel = 19947 // TODO: Still has effect/values for SoD item 231271 + TigulesHarpoon = 19946 // TODO: Still has effect/values for SoD item 231272 + GrileksCarver = 19962 // TODO: Still has effect/values for SoD item 231273 + GrileksGrinder = 19961 // TODO: Still has effect/values for SoD item 231274 + PitchforkOfMadness = 19963 // TODO: Still has effect/values for SoD item 231277 + ScarabBrooch = 21625 // TODO: Still has effect/values for SoD item 233601 + KalimdorsRevenge = 21679 // TODO: Still has effect/values for SoD item 233621 + JomGabbar = 23570 // TODO: Still has effect/values for SoD item 233627 + EyeOfMoam = 21473 // TODO: Still has effect/values for SoD item 234080 + DarkmoonCardHeroism = 19287 // TODO: Still has effect/values for SoD item 234176 + DarkmoonCardBlueDragon = 19288 // TODO: Still has effect/values for SoD item 234177 + DarkmoonCardMaelstrom = 19289 // TODO: Still has effect/values for SoD item 234178 + Earthstrike = 21180 // TODO: Still has effect/values for SoD item 234462 + WrathOfCenarius = 21190 // TODO: Still has effect/values for SoD item 234463 ) func init() { @@ -424,10 +401,24 @@ func init() { // TODO: Proc rate based on the original item itemhelpers.CreateWeaponCoHProcDamage(BlackhandDoomsaw, "Blackhand Doomsaw", 0.4, 16549, core.SpellSchoolPhysical, 324, 216, 0, core.DefenseTypeMelee) - // https://www.wowhead.com/classic/item=220569/blistering-ragehammer + // https://www.wowhead.com/classic/item=10626/ragehammer // Chance on hit: Increases damage done by 20 and attack speed by 5% for 15 sec. // TODO: Proc rate assumed and needs testing - itemhelpers.CreateWeaponProcAura(BlisteringRagehammer, "Blistering Ragehammer", 1.0, EnrageAura446327) + itemhelpers.CreateWeaponProcAura(Ragehammer, "Ragehammer", 1.0, func(character *core.Character) *core.Aura { + return character.GetOrRegisterAura(core.Aura{ + ActionID: core.ActionID{SpellID: 12686}, + Label: "Enrage (12686)", + Duration: time.Second * 15, + OnGain: func(aura *core.Aura, sim *core.Simulation) { + character.PseudoStats.BonusPhysicalDamage += 20 + character.MultiplyAttackSpeed(sim, 1.05) + }, + OnExpire: func(aura *core.Aura, sim *core.Simulation) { + character.PseudoStats.BonusPhysicalDamage -= 20 + character.MultiplyAttackSpeed(sim, 1/1.05) + }, + }) + }) itemhelpers.CreateWeaponCoHProcDamage(BloodletterScalpel, "Bloodletter Scalpel", 1.0, 18081, core.SpellSchoolPhysical, 60, 10, 0, core.DefenseTypeMelee) @@ -463,7 +454,6 @@ func init() { // https://www.wowhead.com/classic/item=228461/bonereavers-edge // Chance on hit: Your attacks ignore 700 of your enemies' armor for 10 sec. This effect stacks up to 3 times. itemhelpers.CreateWeaponProcSpell(BonereaversEdge, "Bonereaver's Edge", 2.0, bonereaversEdgeEffect) - itemhelpers.CreateWeaponProcSpell(BonereaversEdgeMolten, "Bonereaver's Edge (Molten)", 2.0, bonereaversEdgeEffect) itemhelpers.CreateWeaponProcSpell(BowOfSearingArrows, "Bow of Searing Arrows", 3.35, func(character *core.Character) *core.Spell { return character.GetOrRegisterSpell(core.SpellConfig{ @@ -495,18 +485,6 @@ func init() { // Chance on hit: Delivers a fatal wound for 300 damage. // Original proc rate 1.0 increased to approximately 1.60 in SoD phase 5 itemhelpers.CreateWeaponCoHProcDamage(DrakeTalonCleaver, "Drake Talon Cleaver", 1.0, 467167, core.SpellSchoolPhysical, 300, 0, 0.0, core.DefenseTypeMelee) // TBD confirm 1 ppm in SoD - // https://www.wowhead.com/classic/item=232562/drake-talon-cleaver - itemhelpers.CreateWeaponCoHProcDamage(DrakeTalonCleaverShadowflame, "Drake Talon Cleaver", 1.0, 467167, core.SpellSchoolPhysical, 300, 0, 0.0, core.DefenseTypeMelee) // TBD confirm 1 ppm in SoD - - // https://www.wowhead.com/classic/item=228410/dreadblade-of-the-destructor - // https://www.wowhead.com/classic/item=228498/dreadblade-of-the-destructor - // TODO: Proc rate assumed and needs testing - itemhelpers.CreateWeaponProcSpell(DreadbladeOfTheDestructor, "Dreadblade of the Destructor", 1.0, dreadbladeOfTheDestructorEffect) - - // https://www.wowhead.com/classic/item=227842/ebon-fist - // Chance on hit: Sends a shadowy bolt at the enemy causing 125 to 275 Shadow damage. - // TODO: Proc rate assumed and needs testing - itemhelpers.CreateWeaponCoHProcDamage(EbonFist, "Ebon Fist", 1.0, 18211, core.SpellSchoolShadow, 125, 150, 0, core.DefenseTypeMagic) // https://www.wowhead.com/classic/item=19170/ebon-hand // Chance on hit: Sends a shadowy bolt at the enemy causing 125 to 275 Shadow damage. @@ -606,7 +584,6 @@ func init() { // Chance on hit: Increases your attack speed by 30% for 5 sec. // Original proc rate 1.0 lowered to 0.6 in SoD phase 5 itemhelpers.CreateWeaponProcAura(EskhandarsRightClaw, "Eskhandar's Right Claw", 0.6, eskhandarsRightClawAura) - itemhelpers.CreateWeaponProcAura(EskhandarsRightClawMolten, "Eskhandar's Right Claw (Molten)", 0.6, eskhandarsRightClawAura) // https://www.wowhead.com/classic/item=13218/fang-of-the-crystal-spider // Chance on hit: Slows target enemy's casting speed and increases the time between melee and ranged attacks by 10% for 10 sec. @@ -956,12 +933,6 @@ func init() { character.PseudoStats.MobTypeAttackPower += 141 } }) - core.NewItemEffect(GrileksCarverBloodied, func(agent core.Agent) { - character := agent.GetCharacter() - if character.CurrentTarget.MobType == proto.MobType_MobTypeDragonkin { - character.PseudoStats.MobTypeAttackPower += 141 - } - }) // https://www.wowhead.com/classic/item=231274/grileks-grinder // +60 Attack Power when fighting Dragonkin. @@ -971,19 +942,12 @@ func init() { character.PseudoStats.MobTypeAttackPower += 60 } }) - core.NewItemEffect(GrileksGrinderBloodied, func(agent core.Agent) { - character := agent.GetCharacter() - if character.CurrentTarget.MobType == proto.MobType_MobTypeDragonkin { - character.PseudoStats.MobTypeAttackPower += 60 - } - }) itemhelpers.CreateWeaponCoHProcDamage(GryphonRidersStormhammer, "Gryphon Rider's Stormhammer", 1.0, 18081, core.SpellSchoolNature, 91, 34, 0, core.DefenseTypeMagic) // https://www.wowhead.com/classic/item=228267/gutgore-ripper // Chance on hit: Sends a shadowy bolt at the enemy causing 150 Shadow damage and lowering all stats by 25 for 30 sec. itemhelpers.CreateWeaponProcSpell(GutgoreRipper, "Gutgore Ripper", 1.0, gutgoreRipperEffect) - itemhelpers.CreateWeaponProcSpell(GutgoreRipperMolten, "Gutgore Ripper (Molten)", 1.0, gutgoreRipperEffect) itemhelpers.CreateWeaponProcSpell(Gutwrencher, "Gutwrencher", 1.0, func(character *core.Character) *core.Spell { return character.GetOrRegisterSpell(core.SpellConfig{ @@ -1020,8 +984,7 @@ func init() { // https://www.wowhead.com/classic/item=230991/halberd-of-smiting // Equip: Chance to decapitate the target on a melee swing, causing 452 to 676 damage. - itemhelpers.CreateWeaponEquipProcDamage(HalberdOfSmiting, "Halberd of Smiting", 2.1, 467819, core.SpellSchoolPhysical, 452, 224, 0.0, core.DefenseTypeMelee) // Works as phantom strike - itemhelpers.CreateWeaponEquipProcDamage(HalberdOfSmitingBloodied, "Halberd of Smiting", 2.1, 467819, core.SpellSchoolPhysical, 452, 224, 0.0, core.DefenseTypeMelee) // Works as phantom strike + itemhelpers.CreateWeaponEquipProcDamage(HalberdOfSmiting, "Halberd of Smiting", 2.1, 467819, core.SpellSchoolPhysical, 452, 224, 0.0, core.DefenseTypeMelee) // Works as phantom strike itemhelpers.CreateWeaponCoHProcDamage(HammerOfTheNorthernWind, "Hammer of the Northern Wind", 3.5, 13439, core.SpellSchoolFrost, 20, 10, 0, core.DefenseTypeMagic) @@ -1086,68 +1049,6 @@ func init() { }) }) - // https://www.wowhead.com/classic/item=227887/hardened-frostguard - // Chance on hit: Target's movement slowed by 30% and increasing the time between attacks by 25% for 5 sec. - // Chance on hit: Inflicts Frost damage to nearby enemies, immobilizing them for up to 8 sec. - // TODO: Proc rate assumed and needs testing - core.NewItemEffect(HardenedFrostguard, func(agent core.Agent) { - character := agent.GetCharacter() - debuffAuras := character.NewEnemyAuraArray(func(unit *core.Unit, _ int32) *core.Aura { - aura := unit.GetOrRegisterAura(core.Aura{ - ActionID: core.ActionID{SpellID: 16927}, - Label: "Chilled (Hardened Frostguard)", - Duration: time.Second * 5, - OnGain: func(aura *core.Aura, sim *core.Simulation) { - aura.Unit.AddMoveSpeedModifier(&aura.ActionID, 0.30) - }, - OnExpire: func(aura *core.Aura, sim *core.Simulation) { - aura.Unit.RemoveMoveSpeedModifier(&aura.ActionID) - }, - }) - core.AtkSpeedReductionEffect(aura, 1.25) - return aura - }) - - novaSpell := character.RegisterSpell(core.SpellConfig{ - ActionID: core.ActionID{SpellID: 463448}, - SpellSchool: core.SpellSchoolFrost, - DefenseType: core.DefenseTypeMagic, - ProcMask: core.ProcMaskEmpty, - BonusCoefficient: 1, - DamageMultiplier: 1, - ThreatMultiplier: 1, - ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { - for _, aoeTarget := range sim.Encounter.TargetUnits { - spell.CalcAndDealDamage(sim, aoeTarget, 28, spell.OutcomeMagicHitAndCrit) - } - }, - }) - - core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Hardened Frostguard", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMeleeMH, - SpellFlagsExclude: core.SpellFlagSuppressWeaponProcs, - PPM: 1.5, // Estimated based on data from WoW Armaments Discord - Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - debuffAuras.Get(result.Target).Activate(sim) - }, - }) - - core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Hardened Frostguard", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMeleeMH, - SpellFlagsExclude: core.SpellFlagSuppressWeaponProcs, - PPM: 1.5, // Estimated based on data from WoW Armaments Discord - Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - novaSpell.Cast(sim, result.Target) - }, - }) - }) - itemhelpers.CreateWeaponProcSpell(HookfangShanker, "Hookfang Shanker", 1.0, func(character *core.Character) *core.Spell { return character.GetOrRegisterSpell(core.SpellConfig{ ActionID: core.ActionID{SpellID: 13526}, @@ -1204,12 +1105,10 @@ func init() { // Chance on hit: Wounds the target for 200 to 220 damage. // Original proc rate 4.0 lowered to 1.5 in SoD phase 5 itemhelpers.CreateWeaponCoHProcDamage(JekliksCrusher, "Jeklik's Crusher", 1.5, 467642, core.SpellSchoolPhysical, 200, 20, 0.0, core.DefenseTypeMelee) - itemhelpers.CreateWeaponCoHProcDamage(JekliksCrusherBloodied, "Jeklik's Crusher", 1.5, 467642, core.SpellSchoolPhysical, 200, 20, 0.0, core.DefenseTypeMelee) itemhelpers.CreateWeaponCoHProcDamage(JoonhosMercy, "Joonho's Mercy", 1.0, 20883, core.SpellSchoolArcane, 70, 0, 0, core.DefenseTypeMagic) - itemhelpers.CreateWeaponCoHProcDamage(KalimdorsRevenge, "Kalimdor's Revenge", 1.25, 1213355, core.SpellSchoolNature, 339, 138, 0, core.DefenseTypeMagic) // TODO Update PPM/scaling from PTR - itemhelpers.CreateWeaponCoHProcDamage(KalimdorsRevengeVoidTouched, "Kalimdor's Revenge", 1.25, 1213355, core.SpellSchoolNature, 339, 138, 0, core.DefenseTypeMagic) // TODO Update PPM/scaling from PTR + itemhelpers.CreateWeaponCoHProcDamage(KalimdorsRevenge, "Kalimdor's Revenge", 1.25, 1213355, core.SpellSchoolNature, 339, 138, 0, core.DefenseTypeMagic) // TODO Update PPM/scaling from PTR itemhelpers.CreateWeaponCoHProcDamage(LinkensSwordOfMastery, "Linken's Sword of Mastery", 1.0, 18089, core.SpellSchoolNature, 45, 30, 0, core.DefenseTypeMagic) @@ -1236,26 +1135,6 @@ func init() { }) }) - core.NewItemEffect(ManslayerOfTheQiraji, func(agent core.Agent) { - character := agent.GetCharacter() - - if !character.AutoAttacks.AutoSwingMelee { - return - } - - manslayerOfTheQirajiAura(character) - }) - - core.NewItemEffect(ManslayerOfTheQirajiVoidTouched, func(agent core.Agent) { - character := agent.GetCharacter() - - if !character.AutoAttacks.AutoSwingMelee { - return - } - - manslayerOfTheQirajiAura(character) - }) - // https://www.wowhead.com/classic/item=12794/masterwork-stormhammer // Chance on hit: Blasts up to 3 targets for 105 to 145 Nature damage. // Estimated based on data from WoW Armaments Discord @@ -1277,46 +1156,6 @@ func init() { }) }) - // https://www.wowhead.com/classic/item=234987/neretzek-the-blood-drinker - // Chance on hit: Steals 171 to 193 life from target enemy. - itemhelpers.CreateWeaponProcSpell(NeretzekBloodDrinker, "Neretzek, The Blood Drinker", 0.8, func(character *core.Character) *core.Spell { // PPM based on old ppm from Armamaments discord - actionID := core.ActionID{SpellID: 1214208} - healthMetrics := character.NewHealthMetrics(actionID) - return character.RegisterSpell(core.SpellConfig{ - ActionID: actionID, - SpellSchool: core.SpellSchoolShadow, - DefenseType: core.DefenseTypeMagic, - ProcMask: core.ProcMaskEmpty, - DamageMultiplier: 1, - ThreatMultiplier: 1, - BonusCoefficient: 1.0, /// TBD - Best guess based on similarity to shadowstrike - ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { - result := spell.CalcAndDealDamage(sim, target, sim.Roll(171, 193), spell.OutcomeMagicHit) - character.GainHealth(sim, result.Damage, healthMetrics) - }, - }) - }) - - // https://www.wowhead.com/classic/item=233647/neretzek-the-blood-drinker - // Chance on hit: Steals 171 to 193 life from target enemy. - itemhelpers.CreateWeaponProcSpell(NeretzekBloodDrinkerVoidTouched, "Neretzek, The Blood Drinker", 0.8, func(character *core.Character) *core.Spell { // PPM based on old ppm from Armamaments discord - actionID := core.ActionID{SpellID: 1214208} - healthMetrics := character.NewHealthMetrics(actionID) - return character.RegisterSpell(core.SpellConfig{ - ActionID: actionID, - SpellSchool: core.SpellSchoolShadow, - DefenseType: core.DefenseTypeMagic, - ProcMask: core.ProcMaskEmpty, - DamageMultiplier: 1, - ThreatMultiplier: 1, - BonusCoefficient: 1.0, // TBD - Best guess based on similarity to shadowstrike - ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { - result := spell.CalcAndDealDamage(sim, target, sim.Roll(171, 193), spell.OutcomeMagicHit) - character.GainHealth(sim, result.Damage, healthMetrics) - }, - }) - }) - itemhelpers.CreateWeaponCoHProcDamage(Nightblade, "Nightblade", 1.0, 18211, core.SpellSchoolShadow, 125, 150, 0, core.DefenseTypeMagic) // https://www.wowhead.com/classic/item=19169/nightfall @@ -1338,7 +1177,6 @@ func init() { // https://www.wowhead.com/classic/item=228296/perditions-blade // Chance on hit: Blasts a target for 98 to 122 Fire damage. itemhelpers.CreateWeaponCoHProcDamage(PerditionsBlade, "Perdition's Blade", 2.8, 461695, core.SpellSchoolFire, 98, 24, 0, core.DefenseTypeMagic) - itemhelpers.CreateWeaponCoHProcDamage(PerditionsBladeMolten, "Perdition's Blade", 2.8, 461695, core.SpellSchoolFire, 98, 24, 0, core.DefenseTypeMagic) // https://www.wowhead.com/classic/item=231277/pitchfork-of-madness // +141 Attack Power when fighting Demons. @@ -1348,12 +1186,6 @@ func init() { character.PseudoStats.MobTypeAttackPower += 141 } }) - core.NewItemEffect(PitchforkOfMadnessBloodied, func(agent core.Agent) { - character := agent.GetCharacter() - if character.CurrentTarget.MobType == proto.MobType_MobTypeDemon { - character.PseudoStats.MobTypeAttackPower += 141 - } - }) // https://www.wowhead.com/classic/item=228679/quelserrar // Chance on hit: When active, grants the wielder 25 defense and 300 armor for 10 sec. @@ -1437,42 +1269,6 @@ func init() { }) }) - // https://www.wowhead.com/classic/item=228125/refined-arcanite-champion - // Chance on hit: Heal self for 270 to 450 and Increases Strength by 120 for 30 sec. - // Chance on hit: Increases damage done by 20 and attack speed by 5% for 15 sec. - // TODO: Proc rate assumed and needs testing - core.NewItemEffect(RefinedArcaniteChampion, func(agent core.Agent) { - character := agent.GetCharacter() - - strengthAura := StrengthOfTheChampionAura(character) - procMask := character.GetProcMaskForItem(RefinedArcaniteChampion) - enrageAura := EnrageAura446327(character) - - core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Refined Arcanite Champion (Strength)", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: procMask, - SpellFlagsExclude: core.SpellFlagSuppressWeaponProcs, - PPM: 1, // Estimated based on data from WoW Armaments Discord - Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - strengthAura.Activate(sim) - }, - }) - - core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Refined Arcanite Champion (Enrage)", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: procMask, - SpellFlagsExclude: core.SpellFlagSuppressWeaponProcs, - PPM: 1, // Estimated based on data from WoW Armaments Discord - Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - enrageAura.Activate(sim) - }, - }) - }) - // https://www.wowhead.com/classic/item=228543/runeblade-of-baron-rivendare // Equip: Increases movement speed and life regeneration rate. // TODO: Movement speed not implemented @@ -1985,20 +1781,6 @@ func init() { }, }) }) - // https://www.wowhead.com/classic/item=232566/the-untamed-blade - itemhelpers.CreateWeaponProcAura(TheUntamedBladeShadowflame, "The Untamed Blade", 0.55, func(character *core.Character) *core.Aura { - return character.RegisterAura(core.Aura{ - ActionID: core.ActionID{SpellID: 23719}, - Label: "Untamed Fury", - Duration: time.Second * 8, - OnGain: func(aura *core.Aura, sim *core.Simulation) { - aura.Unit.AddStatsDynamic(sim, stats.Stats{stats.Strength: 300}) - }, - OnExpire: func(aura *core.Aura, sim *core.Simulation) { - aura.Unit.AddStatsDynamic(sim, stats.Stats{stats.Strength: -300}) - }, - }) - }) itemhelpers.CreateWeaponProcSpell(ThrashBlade, "Thrash Blade", 1.0, func(character *core.Character) *core.Spell { return character.GetOrRegisterSpell(core.SpellConfig{ @@ -2128,12 +1910,6 @@ func init() { character.PseudoStats.MobTypeAttackPower += 99 } }) - core.NewItemEffect(TigulesHarpoonBloodied, func(agent core.Agent) { - character := agent.GetCharacter() - if character.CurrentTarget.MobType == proto.MobType_MobTypeBeast { - character.PseudoStats.MobTypeAttackPower += 99 - } - }) // https://www.wowhead.com/classic/item=228347/typhoon // Chance on hit: Grants an extra attack on your next swing. @@ -2217,7 +1993,6 @@ func init() { // https://www.wowhead.com/classic/item=230930/zulian-slicer // Chance on hit: Slices the enemy for 72 to 96 Nature damage. itemhelpers.CreateWeaponCoHProcDamage(ZulianSlicer, "Zulian Slicer", 1.2, 467738, core.SpellSchoolNature, 72, 24, 0.35, core.DefenseTypeMelee) - itemhelpers.CreateWeaponCoHProcDamage(ZulianSlicerBloodied, "Zulian Slicer", 1.2, 467738, core.SpellSchoolNature, 72, 24, 0.35, core.DefenseTypeMelee) /////////////////////////////////////////////////////////////////////////// // Trinkets @@ -2410,37 +2185,6 @@ func init() { // Use: Increases damage done by magical spells and effects by up to 150, and decreases the magical resistances of your spell targets by 100 for 30 sec. (3 Min Cooldown) core.NewSimpleStatOffensiveTrinketEffect(EyeOfMoam, stats.Stats{stats.SpellDamage: 150, stats.SpellPenetration: 100}, time.Second*30, time.Minute*3) - // https://www.wowhead.com/classic/item=227990/hand-of-injustice - // Equip: 2% chance on ranged hit to gain 1 extra attack. (Proc chance: 2%, 2s cooldown) - core.NewItemEffect(HandOfInjustice, func(agent core.Agent) { - character := agent.GetCharacter() - if !character.AutoAttacks.AutoSwingRanged { - return - } - - icd := core.Cooldown{ - Timer: character.NewTimer(), - Duration: time.Second * 2, - } - - character.GetOrRegisterAura(core.Aura{ - Label: "Hand of Injustice", - Duration: core.NeverExpires, - OnReset: func(aura *core.Aura, sim *core.Simulation) { - aura.Activate(sim) - }, - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if spell.Flags.Matches(core.SpellFlagSuppressEquipProcs) { - return - } - if result.Landed() && spell.ProcMask.Matches(core.ProcMaskRanged) && icd.IsReady(sim) && sim.Proc(0.02, "HandOfInjustice") { - icd.Use(sim) - aura.Unit.AutoAttacks.ExtraRangedAttack(sim, 1, core.ActionID{SpellID: 461164}, spell.ActionID) - } - }, - }) - }) - core.NewItemEffect(HandOfJustice, func(agent core.Agent) { character := agent.GetCharacter() if !character.AutoAttacks.AutoSwingMelee { @@ -2764,14 +2508,6 @@ func init() { } }) - // https://www.wowhead.com/classic/item=233990/speedstone - // Increases your attack speed by 2%. - core.NewItemEffect(Speedstone, func(agent core.Agent) { - character := agent.GetCharacter() - character.PseudoStats.MeleeSpeedMultiplier *= 1.02 - character.PseudoStats.RangedSpeedMultiplier *= 1.02 - }) - // https://www.wowhead.com/classic/item=228255/talisman-of-ephemeral-power // Use: Increases damage and healing done by magical spells and effects by up to 184 for 15 sec. (1 Min, 30 Sec Cooldown) core.NewSimpleStatOffensiveTrinketEffect(TalismanOfEphemeralPower, stats.Stats{stats.SpellPower: 184}, time.Second*15, time.Second*90) @@ -3039,26 +2775,6 @@ func init() { core.AddEffectsToTest = true } -// https://www.wowhead.com/classic/spell=446327/enrage -// Used by: -// - https://www.wowhead.com/classic/item=220569/blistering-ragehammer and -// - https://www.wowhead.com/classic/item=228125/refined-arcanite-champion -func EnrageAura446327(character *core.Character) *core.Aura { - return character.GetOrRegisterAura(core.Aura{ - ActionID: core.ActionID{SpellID: 446327}, - Label: "Enrage (446327)", - Duration: time.Second * 15, - OnGain: func(aura *core.Aura, sim *core.Simulation) { - character.PseudoStats.BonusPhysicalDamage += 20 - character.MultiplyAttackSpeed(sim, 1.05) - }, - OnExpire: func(aura *core.Aura, sim *core.Simulation) { - character.PseudoStats.BonusPhysicalDamage -= 20 - character.MultiplyAttackSpeed(sim, 1/1.05) - }, - }) -} - func BlazefuryTriggerAura(character *core.Character, spellID int32, spellSchool core.SpellSchool, damage float64) { if character.GetSpell(core.ActionID{SpellID: spellID}) != nil { return diff --git a/sim/core/bulksim.go b/sim/core/bulksim.go index a35ac2abc..dbdc98aac 100644 --- a/sim/core/bulksim.go +++ b/sim/core/bulksim.go @@ -4,7 +4,6 @@ import ( "fmt" "math" "runtime" - "runtime/debug" "sort" "strings" "sync/atomic" @@ -57,11 +56,11 @@ type singleBulkSim struct { func (b *bulkSimRunner) Run(signals simsignals.Signals, progress chan *proto.ProgressMetrics) (result *proto.BulkSimResult) { defer func() { - if err := recover(); err != nil { - result = &proto.BulkSimResult{ - Error: &proto.ErrorOutcome{Message: fmt.Sprintf("%v\nStack Trace:\n%s", err, string(debug.Stack()))}, - } - } + // if err := recover(); err != nil { + // result = &proto.BulkSimResult{ + // Error: &proto.ErrorOutcome{Message: fmt.Sprintf("%v\nStack Trace:\n%s", err, string(debug.Stack()))}, + // } + // } signals.Abort.Trigger() }() diff --git a/sim/core/simsignals/api_test.go b/sim/core/simsignals/api_test.go index d9522ff50..1407547b9 100644 --- a/sim/core/simsignals/api_test.go +++ b/sim/core/simsignals/api_test.go @@ -18,14 +18,14 @@ func TestAbort(t *testing.T) { Level: 60, Race: proto.Race_RaceOrc, Class: proto.Class_ClassWarrior, - Equipment: core.GetGearSet("../../../ui/warrior/gear_sets", "phase_4_2h").GearSet, + Equipment: core.GetGearSet("../../../ui/tank_warrior/gear_sets", "placeholder").GearSet, Rotation: &proto.APLRotation{}, Consumes: &proto.Consumes{}, Spec: &proto.Player_Warrior{ Warrior: &proto.Warrior{ Options: &proto.Warrior_Options{ - StartingRage: 50, - Shout: proto.WarriorShout_WarriorShoutBattle, + StartingRage: 50, + Shout: proto.WarriorShout_WarriorShoutBattle, }, }, }, @@ -175,7 +175,7 @@ func TestAbort(t *testing.T) { BaseSettings: rsr, BulkSettings: &proto.BulkSettings{ Combinations: true, - Items: []*proto.ItemSpec{{Id: 19168}, {Id: 228757}}, + Items: []*proto.ItemSpec{{Id: 19168}, {Id: 10761}}, IterationsPerCombo: 9999, FastMode: false, }, diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 61537fbbd..19c12e13a 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -1,416 +1,70 @@ character_stats_results: { - key: "TestBalance-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 79.2 - final_stats: 38.5 - final_stats: 144.1 - final_stats: 139.7 - final_stats: 118.8 - final_stats: 147 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 21 - final_stats: 0 - final_stats: 17 - final_stats: 6 - final_stats: 10.76519 - final_stats: 0 - final_stats: 10 - final_stats: 289.4 - final_stats: 1 - final_stats: 6.84625 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2294.5 - final_stats: 0 - final_stats: 0 - final_stats: 730 - final_stats: 80 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 4.84625 - final_stats: 5 - final_stats: 0 - final_stats: 1657.95 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 10 - final_stats: 15 - final_stats: 162 - final_stats: 22 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestBalance-Phase2-Lvl40-CharacterStats-Default" + key: "TestBalance-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 119.9 - final_stats: 56.1 - final_stats: 214.5 - final_stats: 200.2 - final_stats: 191.4 - final_stats: 265 - final_stats: 35 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 16 - final_stats: 0 - final_stats: 31.75 - final_stats: 3 - final_stats: 14.0052 - final_stats: 0 + final_stats: 239.085 + final_stats: 220.11 + final_stats: 330.22825 + final_stats: 198.605 + final_stats: 231.495 + final_stats: 150 final_stats: 0 - final_stats: 455.8 - final_stats: 3 - final_stats: 7.93359 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 3577 - final_stats: 0 - final_stats: 0 - final_stats: 1139.2 - final_stats: 220 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 4.93359 - final_stats: 5 - final_stats: 0 - final_stats: 2780.4 - final_stats: 18 - final_stats: 40 - final_stats: 30 - final_stats: 45 - final_stats: 40 - final_stats: 423 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestBalance-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 162.756 - final_stats: 149.688 - final_stats: 344.52 - final_stats: 324.324 - final_stats: 213.84 - final_stats: 284 - final_stats: 23 final_stats: 0 final_stats: 0 + final_stats: 49.25 final_stats: 0 + final_stats: 26.1167 final_stats: 0 - final_stats: 23 - final_stats: 33 - final_stats: 5 - final_stats: 23.44864 final_stats: 0 + final_stats: 1288.17 final_stats: 0 - final_stats: 637.512 - final_stats: 5 - final_stats: 24.79147 + final_stats: 24.9055 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 5648.86 + final_stats: 3943.075 final_stats: 0 final_stats: 0 - final_stats: 1370.376 - final_stats: 310 + final_stats: 824.22 + final_stats: 740 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 9.79147 + final_stats: 11.9055 final_stats: 5 final_stats: 0 - final_stats: 4518.36 - final_stats: 25 - final_stats: 45 - final_stats: 50 - final_stats: 60 - final_stats: 50 - final_stats: 324 - final_stats: 0 - final_stats: 85 - final_stats: 0 - } -} -character_stats_results: { - key: "TestBalance-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 212.3 - final_stats: 195.8 - final_stats: 476.905 - final_stats: 349.8 - final_stats: 205.7 - final_stats: 548 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 49.25 - final_stats: 9 - final_stats: 32.64166 - final_stats: 0 - final_stats: 0 - final_stats: 1274.6 - final_stats: 9 - final_stats: 27.69 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 6211 - final_stats: 0 - final_stats: 0 - final_stats: 1958.6 - final_stats: 780 - final_stats: 11 - final_stats: 5.44 - final_stats: 0 - final_stats: 11.13 - final_stats: 5.44 - final_stats: 0 - final_stats: 6690.6525 + final_stats: 5150.54663 final_stats: 27 - final_stats: 254 + final_stats: 60 final_stats: 60 final_stats: 70 final_stats: 60 final_stats: 384 - final_stats: 44 - final_stats: 88 - final_stats: 0 - } -} -character_stats_results: { - key: "TestBalance-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 244.145 - final_stats: 225.17 - final_stats: 570.262 - final_stats: 440.22 - final_stats: 283.36 - final_stats: 710 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 49.25 - final_stats: 9 - final_stats: 40.15167 - final_stats: 0 - final_stats: 0 - final_stats: 1298.29 - final_stats: 9 - final_stats: 34.1585 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 7567.3 - final_stats: 0 - final_stats: 0 - final_stats: 2104.34 - final_stats: 740 - final_stats: 0 - final_stats: 5 final_stats: 0 - final_stats: 12.1585 - final_stats: 5 - final_stats: 0 - final_stats: 7670.901 - final_stats: 27 - final_stats: 100 - final_stats: 90 - final_stats: 120 - final_stats: 60 - final_stats: 384 - final_stats: 18 - final_stats: 65 + final_stats: 35 final_stats: 0 } } stat_weights_results: { - key: "TestBalance-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.02757 - weights: 0 - weights: 0.41031 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.79909 - weights: 0 - weights: 0 - weights: 0.00087 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestBalance-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.03038 - weights: 0 - weights: 0.9877 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 6.88005 - weights: 6.61076 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestBalance-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.28339 - weights: 0 - weights: 1.51483 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 13.43541 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestBalance-Phase4-Lvl60-StatWeights-Default" + key: "TestBalance-Phase5-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: 1.04995 - weights: 0 - weights: 2.27908 - weights: 0 - weights: 0 - weights: 0 + weights: 0.37782 weights: 0 + weights: 0.62387 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 22.37064 weights: 0 weights: 0 weights: 0 + weights: 5.31839 + weights: 3.89922 weights: 0 weights: 0 weights: 0 @@ -437,747 +91,106 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - } -} -stat_weights_results: { - key: "TestBalance-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 3.28351 - weights: 0 - weights: 2.85523 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 weights: 0 - weights: 36.88339 weights: 0 weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-AllItems-FeralheartRaiment" - value: { - dps: 128.8704 - tps: 132.56996 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Average-Default" - value: { - dps: 146.21022 - tps: 148.81363 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 144.34063 - tps: 187.74269 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 144.34063 - tps: 146.51073 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 146.58127 - tps: 150.94115 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 93.24271 - tps: 137.56357 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 93.24271 - tps: 95.45876 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 95.0814 - tps: 99.44127 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 143.77376 - tps: 195.88163 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 143.77376 - tps: 146.37915 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 146.27483 - tps: 150.63471 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 93.194 - tps: 141.80697 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 93.194 - tps: 95.62465 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 94.92637 - tps: 99.28625 - } -} -dps_results: { - key: "TestBalance-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 145.19386 - tps: 147.79925 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-AllItems-FeralheartRaiment" - value: { - dps: 228.65095 - tps: 237.25838 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Average-Default" - value: { - dps: 793.27673 - tps: 803.87156 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 766.75358 - tps: 948.95214 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 766.75358 - tps: 775.86351 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 749.84767 - tps: 762.04076 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 574.52916 - tps: 654.69512 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 574.52916 - tps: 578.53746 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 603.8667 - tps: 610.5742 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 765.43973 - tps: 948.97338 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 765.43973 - tps: 774.61641 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 749.84767 - tps: 762.02548 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 573.4844 - tps: 653.65036 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 573.4844 - tps: 577.4927 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 603.21837 - tps: 609.92587 - } -} -dps_results: { - key: "TestBalance-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 787.85454 - tps: 798.51181 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-AllItems-FeralheartRaiment" - value: { - dps: 516.04833 - tps: 530.65549 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Average-Default" - value: { - dps: 1517.56298 - tps: 1531.34336 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1507.33253 - tps: 1760.34998 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1507.33253 - tps: 1519.9834 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1463.67108 - tps: 1471.97025 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1082.48123 - tps: 1216.04456 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1082.48123 - tps: 1089.15939 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1048.96633 - tps: 1062.7605 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1506.45043 - tps: 1781.06121 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1506.45043 - tps: 1520.18097 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1462.04032 - tps: 1470.32032 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1080.29053 - tps: 1211.32464 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1080.29053 - tps: 1086.84223 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1048.96633 - tps: 1062.7605 - } -} -dps_results: { - key: "TestBalance-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1510.39857 - tps: 1524.17511 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-BloodGuard'sCracklingLeather" - value: { - dps: 1175.43288 - tps: 1193.32023 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-BloodGuard'sLeather" - value: { - dps: 1104.80445 - tps: 1123.07037 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-BloodGuard'sRestoredLeather" - value: { - dps: 1086.51795 - tps: 1104.18896 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-CoagulateBloodguard'sLeathers" - value: { - dps: 1492.9568 - tps: 1511.80781 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-EmeraldDreamkeeperGarb" - value: { - dps: 1084.12369 - tps: 1101.85369 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-EmeraldLeathers" - value: { - dps: 1104.01387 - tps: 1122.27979 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-EmeraldWatcherVestments" - value: { - dps: 1146.10776 - tps: 1163.81318 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-ExiledProphet'sRaiment" - value: { - dps: 1509.18819 - tps: 1527.78353 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-FeralheartRaiment" - value: { - dps: 1092.30314 - tps: 1111.4721 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather" - value: { - dps: 1175.43288 - tps: 1193.32023 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLeather" - value: { - dps: 1104.80445 - tps: 1123.07037 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather" - value: { - dps: 1086.51795 - tps: 1104.18896 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-AllItems-LostWorshipper'sArmor" - value: { - dps: 1594.0091 - tps: 1612.87978 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Average-Default" - value: { - dps: 3256.5454 - tps: 3276.7092 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 5377.3111 - tps: 5805.51574 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3203.49759 - tps: 3222.99229 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3131.76056 - tps: 3146.78098 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2635.94155 - tps: 2816.68837 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1630.03343 - tps: 1639.07077 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1823.79542 - tps: 1838.97918 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 5373.91745 - tps: 5817.1082 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3200.29624 - tps: 3219.7811 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3130.05803 - tps: 3145.02928 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2657.70232 - tps: 2838.44915 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1629.03191 - tps: 1638.06925 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1817.02746 - tps: 1832.21121 - } -} -dps_results: { - key: "TestBalance-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 3222.88605 - tps: 3243.16739 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sCracklingLeather" - value: { - dps: 1509.14151 - tps: 1527.52052 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sLeather" - value: { - dps: 1401.45286 - tps: 1419.86137 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sRestoredLeather" - value: { - dps: 1389.96874 - tps: 1408.21499 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-CoagulateBloodguard'sLeathers" - value: { - dps: 2040.57932 - tps: 1958.79779 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldDreamkeeperGarb" - value: { - dps: 1392.57937 - tps: 1410.8158 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldLeathers" - value: { - dps: 1400.49471 - tps: 1418.90322 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldWatcherVestments" - value: { - dps: 1470.11548 - tps: 1488.37649 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-ExiledProphet'sRaiment" - value: { - dps: 2098.7541 - tps: 2009.26334 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-FeralheartRaiment" - value: { - dps: 1289.14457 - tps: 1307.60874 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather" - value: { - dps: 1509.14151 - tps: 1527.52052 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLeather" - value: { - dps: 1401.45286 - tps: 1419.86137 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather" - value: { - dps: 1389.96874 - tps: 1408.21499 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-AllItems-LostWorshipper'sArmor" - value: { - dps: 2205.49207 - tps: 2124.44545 } } dps_results: { key: "TestBalance-Phase5-Lvl60-Average-Default" value: { - dps: 4509.15073 - tps: 4370.99611 + dps: 627.91657 + tps: 648.91937 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6725.44361 - tps: 7012.4374 + dps: 637.43732 + tps: 876.00415 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4460.64653 - tps: 4313.37678 + dps: 500.50216 + tps: 513.48758 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4287.47853 - tps: 4176.70169 + dps: 646.78239 + tps: 667.57115 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3017.67225 - tps: 3131.07649 + dps: 246.78487 + tps: 427.5317 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 2054.19541 - tps: 1987.55808 + dps: 195.64652 + tps: 204.68386 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2415.01379 - tps: 2378.71372 + dps: 361.0815 + tps: 376.26525 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6714.75356 - tps: 7001.14193 + dps: 634.031 + tps: 870.63116 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4448.17004 - tps: 4297.33567 + dps: 494.51054 + tps: 507.41238 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4298.1124 - tps: 4186.22617 + dps: 646.78239 + tps: 667.57115 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3005.29104 - tps: 3118.10615 + dps: 241.68414 + tps: 422.43096 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 2057.9131 - tps: 1990.05782 + dps: 192.73883 + tps: 201.77617 } } dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2405.58281 - tps: 2368.49664 + dps: 361.5953 + tps: 376.77906 } } dps_results: { key: "TestBalance-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4482.26674 - tps: 4333.12828 + dps: 614.87792 + tps: 636.01809 } } diff --git a/sim/druid/balance/balance_test.go b/sim/druid/balance/balance_test.go index ef1cb6331..1715c64a0 100644 --- a/sim/druid/balance/balance_test.go +++ b/sim/druid/balance/balance_test.go @@ -14,75 +14,6 @@ func init() { func TestBalance(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassDruid, - Level: 25, - Race: proto.Race_RaceTauren, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase1Talents, - GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "phase_1"), - Rotation: core.GetAplRotation("../../../ui/balance_druid/apls", "phase_1"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsAdaptive}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassDruid, - Level: 40, - Race: proto.Race_RaceTauren, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase2Talents, - GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "phase_2"), - Rotation: core.GetAplRotation("../../../ui/balance_druid/apls", "phase_2"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsAdaptive}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassDruid, - Level: 50, - Race: proto.Race_RaceTauren, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase3Talents, - GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "phase_3"), - Rotation: core.GetAplRotation("../../../ui/balance_druid/apls", "phase_3"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsAdaptive}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassDruid, - Phase: 4, - Level: 60, - Race: proto.Race_RaceTauren, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "phase_4"), - Rotation: core.GetAplRotation("../../../ui/balance_druid/apls", "phase_4"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsAdaptive}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassDruid, Phase: 5, @@ -91,7 +22,7 @@ func TestBalance(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceNightElf}, Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "phase_5"), + GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/balance_druid/apls", "phase_5"), Buffs: core.FullBuffsPhase5, Consumes: Phase5Consumes, diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 45bc85e13..d5467bec2 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -1,400 +1,57 @@ character_stats_results: { - key: "TestFeral-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 136.4 - final_stats: 134.2 - final_stats: 163.9 - final_stats: 74.8 - final_stats: 92.4 - final_stats: 25 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3 - final_stats: 5 - final_stats: 4.99396 - final_stats: 0 - final_stats: 0 - final_stats: 691 - final_stats: 2 - final_stats: 16.6555 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 1321 - final_stats: 0 - final_stats: 0 - final_stats: 1154.4 - final_stats: 112 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 14.6555 - final_stats: 5 - final_stats: 0 - final_stats: 1865.85 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 10 - final_stats: 10 - final_stats: 271 - final_stats: 0 - final_stats: 0 - final_stats: 59 - } -} -character_stats_results: { - key: "TestFeral-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 266.552 - final_stats: 203.5 - final_stats: 258.5 - final_stats: 101.816 - final_stats: 129.8 - final_stats: 42 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 24.75 - final_stats: 3 - final_stats: 13.44722 - final_stats: 0 - final_stats: 0 - final_stats: 1233.604 - final_stats: 3 - final_stats: 26.53165 - final_stats: 3 - final_stats: 0 - final_stats: 0 - final_stats: 2101.24 - final_stats: 0 - final_stats: 0 - final_stats: 1568 - final_stats: 272 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 19.53165 - final_stats: 5 - final_stats: 0 - final_stats: 3242.4 - final_stats: 18 - final_stats: 30 - final_stats: 40 - final_stats: 45 - final_stats: 40 - final_stats: 363 - final_stats: 0 - final_stats: 0 - final_stats: 89 - } -} -character_stats_results: { - key: "TestFeral-Phase3-Lvl50-CharacterStats-Default" + key: "TestFeral-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 399.168 - final_stats: 390.852 - final_stats: 343.332 - final_stats: 154.44 - final_stats: 188.892 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 25 - final_stats: 4 - final_stats: 19.96602 - final_stats: 0 - final_stats: 0 - final_stats: 1805.188 - final_stats: 4 - final_stats: 47.11661 - final_stats: 3 - final_stats: 0 - final_stats: 0 - final_stats: 3100.6 - final_stats: 0 + final_stats: 362.802 + final_stats: 251.735 + final_stats: 330.22825 + final_stats: 238.326 + final_stats: 231.495 final_stats: 0 - final_stats: 2089.704 - final_stats: 325 final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 28.11661 - final_stats: 5 - final_stats: 0 - final_stats: 4505.886 - final_stats: 20 - final_stats: 30 - final_stats: 45 - final_stats: 55 - final_stats: 45 - final_stats: 384 - final_stats: 0 - final_stats: 65 - final_stats: 114 - } -} -character_stats_results: { - key: "TestFeral-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 563.64 - final_stats: 418 - final_stats: 485.76 - final_stats: 289.08 - final_stats: 205.7 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 + final_stats: 41.25 final_stats: 0 + final_stats: 26.78004 final_stats: 0 - final_stats: 41.25 - final_stats: 5 - final_stats: 34.62764 final_stats: 0 + final_stats: 2037.339 final_stats: 0 - final_stats: 3014.28 - final_stats: 5 - final_stats: 51.8 + final_stats: 34.48675 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 7300.2 + final_stats: 6538.89 final_stats: 0 final_stats: 0 - final_stats: 2439 - final_stats: 831 + final_stats: 887.47 + final_stats: 780 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 25.8 + final_stats: 17.48675 final_stats: 5 final_stats: 0 - final_stats: 6783.63 + final_stats: 5150.54663 final_stats: 27 - final_stats: 226 + final_stats: 60 final_stats: 60 final_stats: 70 final_stats: 60 final_stats: 384 final_stats: 0 final_stats: 0 - final_stats: 358 - } -} -character_stats_results: { - key: "TestFeral-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 768.108 - final_stats: 610.995 - final_stats: 567.3525 - final_stats: 306.636 - final_stats: 236.555 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 5 - final_stats: 33.92082 - final_stats: 0 - final_stats: 0 - final_stats: 3667.211 - final_stats: 5 - final_stats: 60.44975 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 7563.54 - final_stats: 0 - final_stats: 0 - final_stats: 2954.99 - final_stats: 902 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 35.44975 - final_stats: 5 - final_stats: 0 - final_stats: 7640.35125 - final_stats: 27 - final_stats: 73 - final_stats: 110 - final_stats: 140 - final_stats: 60 - final_stats: 384 - final_stats: 0 final_stats: 0 - final_stats: 338 - } -} -stat_weights_results: { - key: "TestFeral-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0.57597 - weights: 0.54932 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.2618 - weights: 1.98611 - weights: 2.18884 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestFeral-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0.9041 - weights: 0.86991 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.39517 - weights: 4.80323 - weights: 4.96052 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestFeral-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 1.50564 - weights: 1.56862 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.63369 - weights: 17.03719 - weights: 11.3234 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 } } stat_weights_results: { - key: "TestFeral-Phase4-Lvl60-StatWeights-Default" + key: "TestFeral-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.10467 - weights: 2.19569 + weights: 0.75026 + weights: 0.72272 weights: 0 weights: 0 weights: 0 @@ -410,9 +67,10 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.79723 + weights: 0.24721 + weights: 2.10282 + weights: 5.90116 weights: 0 - weights: 24.29356 weights: 0 weights: 0 weights: 0 @@ -436,1588 +94,271 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestFeral-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 2.807 - weights: 3.00076 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.92457 - weights: 0 - weights: 22.74368 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-AllItems-FeralheartRaiment" - value: { - dps: 259.99638 - tps: 187.12944 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Average-Default" - value: { - dps: 263.46375 - tps: 189.55497 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-NoBleed-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 130.12817 - tps: 143.06928 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-NoBleed-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 130.12817 - tps: 94.92491 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-NoBleed-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 174.25584 - tps: 127.99919 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-NoBleed-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 58.31376 - tps: 92.06404 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-NoBleed-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 58.31376 - tps: 43.93583 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-NoBleed-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 82.45284 - tps: 62.81906 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 130.12817 - tps: 143.06928 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 130.12817 - tps: 94.92491 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 174.25584 - tps: 127.99919 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 58.31376 - tps: 92.06404 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 58.31376 - tps: 43.93583 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Default-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 82.45284 - tps: 62.81906 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Flower-Aoe-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 130.12817 - tps: 143.06928 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Flower-Aoe-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 130.12817 - tps: 94.92491 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Flower-Aoe-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 174.25584 - tps: 127.99919 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Flower-Aoe-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 58.31376 - tps: 92.06404 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Flower-Aoe-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 58.31376 - tps: 43.93583 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-NightElf-phase_1-Flower-Aoe-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 82.45284 - tps: 62.81906 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-NoBleed-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 121.23635 - tps: 136.12492 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-NoBleed-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 121.23635 - tps: 88.58016 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-NoBleed-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 166.51564 - tps: 122.50365 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-NoBleed-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 57.43589 - tps: 89.07701 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-NoBleed-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 57.43589 - tps: 43.19436 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-NoBleed-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 80.94792 - tps: 61.75057 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 121.23635 - tps: 136.12492 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 121.23635 - tps: 88.58016 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 166.51564 - tps: 122.50365 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 57.43589 - tps: 89.07701 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 57.43589 - tps: 43.19436 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Default-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 80.94792 - tps: 61.75057 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Flower-Aoe-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 121.23635 - tps: 136.12492 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Flower-Aoe-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 121.23635 - tps: 88.58016 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Flower-Aoe-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 166.51564 - tps: 122.50365 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Flower-Aoe-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 57.43589 - tps: 89.07701 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Flower-Aoe-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 57.43589 - tps: 43.19436 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-Settings-Tauren-phase_1-Flower-Aoe-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 80.94792 - tps: 61.75057 - } -} -dps_results: { - key: "TestFeral-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 188.3412 - tps: 135.51428 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-AllItems-FeralheartRaiment" - value: { - dps: 499.6551 - tps: 364.88474 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Average-Default" - value: { - dps: 767.20451 - tps: 554.30822 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 495.45224 - tps: 388.82255 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 460.46597 - tps: 329.11186 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 573.86473 - tps: 410.64178 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 287.81031 - tps: 215.20999 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 270.58031 - tps: 192.83256 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 345.52688 - tps: 248.9268 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 495.45224 - tps: 388.82255 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 460.46597 - tps: 329.11186 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 573.86473 - tps: 410.64178 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 287.81031 - tps: 215.20999 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 270.58031 - tps: 192.83256 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 345.52688 - tps: 248.9268 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 495.45224 - tps: 388.82255 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 460.46597 - tps: 329.11186 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 573.86473 - tps: 410.64178 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 287.81031 - tps: 215.20999 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 270.58031 - tps: 192.83256 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 345.52688 - tps: 248.9268 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 494.18379 - tps: 387.04263 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 458.8393 - tps: 327.91312 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 572.05552 - tps: 409.30455 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 288.5413 - tps: 216.64076 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 271.14505 - tps: 193.2877 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 345.86283 - tps: 249.43618 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 494.18379 - tps: 387.04263 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 458.8393 - tps: 327.91312 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 572.05552 - tps: 409.30455 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 288.5413 - tps: 216.64076 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 271.14505 - tps: 193.2877 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 345.86283 - tps: 249.43618 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 494.18379 - tps: 387.04263 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 458.8393 - tps: 327.91312 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 572.05552 - tps: 409.30455 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 288.5413 - tps: 216.64076 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 271.14505 - tps: 193.2877 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 345.86283 - tps: 249.43618 - } -} -dps_results: { - key: "TestFeral-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 432.80358 - tps: 307.29054 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-AllItems-FeralheartRaiment" - value: { - dps: 884.1435 - tps: 642.00247 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Average-Default" - value: { - dps: 1842.80035 - tps: 1318.75716 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1324.30277 - tps: 1057.711 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1251.48966 - tps: 894.50779 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1411.67676 - tps: 1005.64864 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 625.27627 - tps: 522.1808 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 599.51289 - tps: 429.7499 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 727.70393 - tps: 521.0413 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1324.30277 - tps: 1057.711 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1251.48966 - tps: 894.50779 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1411.67676 - tps: 1005.64864 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 625.27627 - tps: 522.1808 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 599.51289 - tps: 429.7499 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 727.70393 - tps: 521.0413 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1324.30277 - tps: 1057.711 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1251.48966 - tps: 894.50779 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1411.67676 - tps: 1005.64864 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 625.27627 - tps: 522.1808 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 599.51289 - tps: 429.7499 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 727.70393 - tps: 521.0413 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1358.59406 - tps: 1088.11274 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1285.80514 - tps: 919.21297 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1448.84142 - tps: 1032.03861 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 623.0009 - tps: 518.31903 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 597.24853 - tps: 428.04184 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 724.23447 - tps: 519.36518 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1358.59406 - tps: 1088.11274 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1285.80514 - tps: 919.21297 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1448.84142 - tps: 1032.03861 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 623.0009 - tps: 518.31903 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 597.24853 - tps: 428.04184 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 724.23447 - tps: 519.36518 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1358.59406 - tps: 1088.11274 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1285.80514 - tps: 919.21297 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1448.84142 - tps: 1032.03861 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 623.0009 - tps: 518.31903 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 597.24853 - tps: 428.04184 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 724.23447 - tps: 519.36518 - } -} -dps_results: { - key: "TestFeral-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1207.76656 - tps: 861.46902 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sCracklingLeather" - value: { - dps: 1318.9688 - tps: 963.24276 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sLeather" - value: { - dps: 1367.94014 - tps: 998.03005 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sRestoredLeather" - value: { - dps: 1289.85312 - tps: 942.60684 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-CoagulateBloodguard'sLeathers" - value: { - dps: 2045.83969 - tps: 1470.25664 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldDreamkeeperGarb" - value: { - dps: 1293.68103 - tps: 945.13436 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldLeathers" - value: { - dps: 1360.56657 - tps: 992.78487 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldWatcherVestments" - value: { - dps: 1300.25622 - tps: 949.83716 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-ExiledProphet'sRaiment" - value: { - dps: 1907.06742 - tps: 1379.89451 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-FeralheartRaiment" - value: { - dps: 1398.68854 - tps: 1019.8123 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather" - value: { - dps: 1318.9688 - tps: 963.24276 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLeather" - value: { - dps: 1367.94014 - tps: 998.03005 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather" - value: { - dps: 1289.85312 - tps: 942.60684 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-AllItems-LostWorshipper'sArmor" - value: { - dps: 1961.66225 - tps: 1419.95266 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Average-Default" - value: { - dps: 3688.81482 - tps: 2642.63042 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 16379.98997 - tps: 11921.51585 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2454.08724 - tps: 1758.06549 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2695.29814 - tps: 1925.90835 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 6665.23844 - tps: 4887.23219 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1173.68945 - tps: 841.78509 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1437.46952 - tps: 1027.79034 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 16379.98997 - tps: 11921.51585 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2454.08724 - tps: 1758.06549 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2695.29814 - tps: 1925.90835 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 6665.23844 - tps: 4887.23219 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1173.68945 - tps: 841.78509 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1437.46952 - tps: 1027.79034 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 16379.98997 - tps: 11921.51585 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2454.08724 - tps: 1758.06549 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2695.29814 - tps: 1925.90835 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 6665.23844 - tps: 4887.23219 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1173.68945 - tps: 841.78509 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1437.46952 - tps: 1027.79034 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 17297.83741 - tps: 12573.389 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2590.67922 - tps: 1854.94594 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2846.32107 - tps: 2033.08596 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 6707.41635 - tps: 4920.12812 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1170.08659 - tps: 839.22031 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1433.81258 - tps: 1025.19391 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 17297.83741 - tps: 12573.389 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2590.67922 - tps: 1854.94594 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2846.32107 - tps: 2033.08596 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 6707.41635 - tps: 4920.12812 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1170.08659 - tps: 839.22031 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1433.81258 - tps: 1025.19391 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 17297.83741 - tps: 12573.389 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2590.67922 - tps: 1854.94594 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2846.32107 - tps: 2033.08596 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 6707.41635 - tps: 4920.12812 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1170.08659 - tps: 839.22031 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1433.81258 - tps: 1025.19391 - } -} -dps_results: { - key: "TestFeral-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 2745.70388 - tps: 1961.13694 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sCracklingLeather" - value: { - dps: 1424.07453 - tps: 1037.05192 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sLeather" - value: { - dps: 1478.71687 - tps: 1076.31383 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sRestoredLeather" - value: { - dps: 1394.22227 - tps: 1015.805 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-CoagulateBloodguard'sLeathers" - value: { - dps: 2382.08321 - tps: 1708.73505 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldDreamkeeperGarb" - value: { - dps: 1399.95757 - tps: 1020.09506 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldLeathers" - value: { - dps: 1471.29689 - tps: 1071.03567 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldWatcherVestments" - value: { - dps: 1406.75162 - tps: 1024.87983 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-ExiledProphet'sRaiment" - value: { - dps: 2223.45848 - tps: 1603.69232 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-FeralheartRaiment" - value: { - dps: 1503.83484 - tps: 1092.5593 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather" - value: { - dps: 1424.07453 - tps: 1037.05192 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLeather" - value: { - dps: 1478.71687 - tps: 1076.31383 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather" - value: { - dps: 1394.22227 - tps: 1015.805 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-AllItems-LostWorshipper'sArmor" - value: { - dps: 2269.16802 - tps: 1636.9215 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Average-Default" value: { - dps: 4684.15085 - tps: 3348.55934 + dps: 790.00436 + tps: 585.35839 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3447.70151 - tps: 2716.76305 + dps: 469.50516 + tps: 566.57795 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3406.54067 - tps: 2433.82403 + dps: 444.08535 + tps: 327.02998 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3687.19531 - tps: 2629.86683 + dps: 523.39685 + tps: 383.77484 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1459.348 - tps: 1189.10088 + dps: 181.39652 + tps: 305.24379 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1437.09912 - tps: 1029.26061 + dps: 166.99752 + tps: 127.4363 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1711.58661 - tps: 1222.41347 + dps: 210.30186 + tps: 167.41165 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3447.70151 - tps: 2716.76305 + dps: 469.50516 + tps: 566.57795 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3406.54067 - tps: 2433.82403 + dps: 444.08535 + tps: 327.02998 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3687.19531 - tps: 2629.86683 + dps: 523.39685 + tps: 383.77484 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1459.348 - tps: 1189.10088 + dps: 181.39652 + tps: 305.24379 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1437.09912 - tps: 1029.26061 + dps: 166.99752 + tps: 127.4363 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1711.58661 - tps: 1222.41347 + dps: 210.30186 + tps: 167.41165 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3447.70151 - tps: 2716.76305 + dps: 469.50516 + tps: 566.57795 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3406.54067 - tps: 2433.82403 + dps: 444.08535 + tps: 327.02998 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3687.19531 - tps: 2629.86683 + dps: 523.39685 + tps: 383.77484 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1459.348 - tps: 1189.10088 + dps: 181.39652 + tps: 305.24379 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1437.09912 - tps: 1029.26061 + dps: 166.99752 + tps: 127.4363 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1711.58661 - tps: 1222.41347 + dps: 210.30186 + tps: 167.41165 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3437.52755 - tps: 2719.45884 + dps: 468.71049 + tps: 565.71674 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3396.38856 - tps: 2427.72941 + dps: 442.99381 + tps: 326.22329 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3680.76336 - tps: 2625.30745 + dps: 522.97467 + tps: 384.13266 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1463.52847 - tps: 1189.54598 + dps: 180.76748 + tps: 305.07322 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1440.94135 - tps: 1031.99352 + dps: 166.51698 + tps: 127.11686 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1711.72726 - tps: 1222.51333 + dps: 210.58222 + tps: 167.65243 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3437.52755 - tps: 2719.45884 + dps: 468.71049 + tps: 565.71674 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3396.38856 - tps: 2427.72941 + dps: 442.99381 + tps: 326.22329 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3680.76336 - tps: 2625.30745 + dps: 522.97467 + tps: 384.13266 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1463.52847 - tps: 1189.54598 + dps: 180.76748 + tps: 305.07322 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1440.94135 - tps: 1031.99352 + dps: 166.51698 + tps: 127.11686 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1711.72726 - tps: 1222.51333 + dps: 210.58222 + tps: 167.65243 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3437.52755 - tps: 2719.45884 + dps: 468.71049 + tps: 565.71674 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3396.38856 - tps: 2427.72941 + dps: 442.99381 + tps: 326.22329 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3680.76336 - tps: 2625.30745 + dps: 522.97467 + tps: 384.13266 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1463.52847 - tps: 1189.54598 + dps: 180.76748 + tps: 305.07322 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1440.94135 - tps: 1031.99352 + dps: 166.51698 + tps: 127.11686 } } dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1711.72726 - tps: 1222.51333 + dps: 210.58222 + tps: 167.65243 } } dps_results: { key: "TestFeral-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3384.53432 - tps: 2413.28573 + dps: 419.10818 + tps: 297.5668 } } diff --git a/sim/druid/feral/feral_test.go b/sim/druid/feral/feral_test.go index de210ff16..f4ace1766 100644 --- a/sim/druid/feral/feral_test.go +++ b/sim/druid/feral/feral_test.go @@ -14,91 +14,6 @@ func init() { func TestFeral(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassDruid, - Level: 25, - Race: proto.Race_RaceTauren, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase1Talents, - GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "phase_1"), - Rotation: core.GetAplRotation("../../../ui/feral_druid/apls", "phase_1"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsMonoCat}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Default-NoBleed", SpecOptions: PlayerOptionsMonoCatNoBleed}, - {Label: "Flower-Aoe", SpecOptions: PlayerOptionsFlowerCatAoe}, - }, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassDruid, - Level: 40, - Race: proto.Race_RaceTauren, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase2Talents, - GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "phase_2"), - Rotation: core.GetAplRotation("../../../ui/feral_druid/apls", "phase_2"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsMonoCat}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Default-NoBleed", SpecOptions: PlayerOptionsMonoCatNoBleed}, - {Label: "Flower-Aoe", SpecOptions: PlayerOptionsFlowerCatAoe}, - }, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassDruid, - Level: 50, - Race: proto.Race_RaceTauren, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase3Talents, - GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "phase_3"), - Rotation: core.GetAplRotation("../../../ui/feral_druid/apls", "phase_3"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsMonoCat}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Default-NoBleed", SpecOptions: PlayerOptionsMonoCatNoBleed}, - {Label: "Flower-Aoe", SpecOptions: PlayerOptionsFlowerCatAoe}, - }, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassDruid, - Phase: 4, - Level: 60, - Race: proto.Race_RaceTauren, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "phase_4"), - Rotation: core.GetAplRotation("../../../ui/feral_druid/apls", "phase_4"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsMonoCat}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Default-NoBleed", SpecOptions: PlayerOptionsMonoCatNoBleed}, - {Label: "Flower-Aoe", SpecOptions: PlayerOptionsFlowerCatAoe}, - }, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassDruid, Phase: 5, @@ -107,7 +22,7 @@ func TestFeral(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceNightElf}, Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "phase_5"), + GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/feral_druid/apls", "phase_5"), Buffs: core.FullBuffsPhase5, Consumes: Phase4Consumes, diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results index 8b9032c84..db0d582fa 100644 --- a/sim/hunter/TestBM.results +++ b/sim/hunter/TestBM.results @@ -1,12 +1,12 @@ character_stats_results: { key: "TestBM-Phase2-Lvl40-CharacterStats-Default" value: { - final_stats: 148.83 - final_stats: 268.62 - final_stats: 272.25 - final_stats: 114.95 - final_stats: 105.27 - final_stats: 42 + final_stats: 157.3 + final_stats: 287.98 + final_stats: 280.72 + final_stats: 137.94 + final_stats: 164.56 + final_stats: 54 final_stats: 0 final_stats: 0 final_stats: 0 @@ -14,33 +14,33 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 24.75 - final_stats: 3 - final_stats: 14.3703 final_stats: 0 + final_stats: 13.92435 final_stats: 0 - final_stats: 871.45 - final_stats: 3 - final_stats: 12.13919 final_stats: 0 + final_stats: 769.28 final_stats: 0 + final_stats: 14.72579 final_stats: 0 - final_stats: 2549.25 final_stats: 0 final_stats: 0 - final_stats: 1932.24 - final_stats: 975.24 + final_stats: 2894.1 + final_stats: 0 + final_stats: 0 + final_stats: 2413.96 + final_stats: 931.96 final_stats: 0 final_stats: 5 final_stats: 0 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 3209.5 + final_stats: 3294.2 final_stats: 13 + final_stats: 56 + final_stats: 30 final_stats: 30 - final_stats: 40 final_stats: 30 - final_stats: 40 final_stats: 263 final_stats: 0 final_stats: 14 @@ -51,7 +51,7 @@ stat_weights_results: { key: "TestBM-Phase2-Lvl40-StatWeights-Default" value: { weights: 0 - weights: 0.83264 + weights: 0.58766 weights: 0 weights: 0 weights: 0 @@ -67,9 +67,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.33717 - weights: 8.57363 - weights: 8.14959 + weights: 0.19191 + weights: 3.61319 + weights: 5.09173 weights: 0 weights: 0 weights: 0 @@ -77,7 +77,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.06893 + weights: 0.06835 weights: 0 weights: 0 weights: 0 @@ -96,367 +96,185 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestBM-Phase2-Lvl40-AllItems-BeastmasterArmor" - value: { - dps: 477.29959 - tps: 214.92885 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-AllItems-SignetofBeasts-209823" - value: { - dps: 808.0949 - tps: 340.43512 - } -} dps_results: { key: "TestBM-Phase2-Lvl40-Average-Default" value: { - dps: 818.73263 - tps: 344.37775 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 2111.43436 - tps: 1923.44599 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 831.83353 - tps: 355.69161 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 867.41378 - tps: 353.96424 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 1182.52408 - tps: 1199.21227 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 434.09248 - tps: 185.56831 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 467.95545 - tps: 186.61132 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 556.57559 - tps: 643.46998 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 496.63992 - tps: 251.95128 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 528.94392 - tps: 257.52358 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 307.51001 - tps: 536.18044 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 265.62892 - tps: 150.00096 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 290.24358 - tps: 151.43728 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 588.32737 - tps: 660.16255 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 483.35479 - tps: 227.53079 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 500.30084 - tps: 225.55935 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 296.5761 - tps: 493.24333 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 244.32809 - tps: 120.61839 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 260.67917 - tps: 113.98916 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 763.39636 - tps: 872.05659 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 688.36186 - tps: 435.88792 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 738.22283 - tps: 452.39557 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 442.58479 - tps: 670.13818 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 390.75778 - tps: 268.90429 - } -} -dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 407.58329 - tps: 273.02195 + dps: 577.36541 + tps: 212.43802 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 2042.71494 - tps: 1854.97667 + dps: 702.67128 + tps: 650.71626 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 814.91137 - tps: 342.43074 + dps: 584.86098 + tps: 218.51977 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 846.08133 - tps: 341.87736 + dps: 616.41092 + tps: 216.45058 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 1176.31568 - tps: 1181.18535 + dps: 360.51189 + tps: 452.28923 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 438.60748 - tps: 184.65027 + dps: 296.74737 + tps: 113.47152 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 471.18905 - tps: 184.23543 + dps: 321.48935 + tps: 107.44892 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 557.30098 - tps: 634.93469 + dps: 560.10245 + tps: 645.58564 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 499.00162 - tps: 248.41299 + dps: 493.68414 + tps: 255.44216 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 534.11719 - tps: 254.49205 + dps: 529.10625 + tps: 262.11263 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 308.47463 - tps: 523.2971 + dps: 313.26914 + tps: 550.40814 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 269.62121 - tps: 147.30795 + dps: 267.26398 + tps: 153.82492 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 293.45122 - tps: 149.64126 + dps: 286.67815 + tps: 152.21472 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 591.51729 - tps: 650.26745 + dps: 693.34958 + tps: 645.01731 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 486.92853 - tps: 219.7845 + dps: 576.3945 + tps: 212.41222 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 512.85589 - tps: 220.10545 + dps: 607.65554 + tps: 216.18587 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 301.52518 - tps: 483.55216 + dps: 366.02844 + tps: 444.77435 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 249.42193 - tps: 117.86031 + dps: 302.17989 + tps: 113.88646 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 267.72972 - tps: 111.72929 + dps: 325.17094 + tps: 106.82092 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 765.35555 - tps: 872.8561 + dps: 563.82711 + tps: 641.00958 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 689.0001 - tps: 428.24238 + dps: 497.06986 + tps: 250.94563 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 741.22873 - tps: 447.56431 + dps: 533.14302 + tps: 257.87923 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 443.92302 - tps: 665.72501 + dps: 314.56779 + tps: 545.19151 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 394.21995 - tps: 266.68332 + dps: 270.06529 + tps: 150.8604 } } dps_results: { - key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget" + key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 409.3325 - tps: 269.6274 + dps: 290.17077 + tps: 150.84949 } } dps_results: { key: "TestBM-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 777.64075 - tps: 316.99786 + dps: 552.69608 + tps: 194.90041 } } diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results index 9ff8d565b..041708109 100644 --- a/sim/hunter/TestMM.results +++ b/sim/hunter/TestMM.results @@ -1,61 +1,12 @@ -character_stats_results: { - key: "TestMM-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 145.2 - final_stats: 312.18 - final_stats: 255.31 - final_stats: 95.59 - final_stats: 110.11 - final_stats: 42 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 24.75 - final_stats: 3 - final_stats: 13.90372 - final_stats: 0 - final_stats: 0 - final_stats: 879.38 - final_stats: 3 - final_stats: 18.45905 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2258.85 - final_stats: 0 - final_stats: 0 - final_stats: 1698.36 - final_stats: 1106.36 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3040.1 - final_stats: 13 - final_stats: 30 - final_stats: 40 - final_stats: 30 - final_stats: 40 - final_stats: 303 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} character_stats_results: { key: "TestMM-Phase4-Lvl60-CharacterStats-Default" value: { - final_stats: 260.15 - final_stats: 713.9 - final_stats: 576.081 - final_stats: 219.01 - final_stats: 177.87 - final_stats: 150 + final_stats: 284.35 + final_stats: 485.21 + final_stats: 453.629 + final_stats: 205.7 + final_stats: 235.95 + final_stats: 162 final_stats: 0 final_stats: 0 final_stats: 0 @@ -63,93 +14,44 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 47.25 - final_stats: 6 - final_stats: 40.21367 + final_stats: 3 + final_stats: 27.99405 final_stats: 0 final_stats: 0 - final_stats: 2023.05 - final_stats: 6 - final_stats: 50.49271 + final_stats: 1767.56 + final_stats: 3 + final_stats: 34.17047 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 4725.15 + final_stats: 4525.5 final_stats: 0 final_stats: 0 - final_stats: 3901.8 - final_stats: 2503.8 + final_stats: 2808.42 + final_stats: 2026.42 final_stats: 0 final_stats: 5 final_stats: 0 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 7788.6786 + final_stats: 6490.6874 final_stats: 27 - final_stats: 139 + final_stats: 86 final_stats: 60 final_stats: 60 final_stats: 60 final_stats: 384 final_stats: 0 final_stats: 35 - final_stats: 172 - } -} -stat_weights_results: { - key: "TestMM-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0.40813 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.12204 - weights: 3.84043 - weights: 3.7996 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.03507 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 + final_stats: 0 } } stat_weights_results: { key: "TestMM-Phase4-Lvl60-StatWeights-Default" value: { weights: 0 - weights: 0.51989 + weights: 0.23296 weights: 0 weights: 0 weights: 0 @@ -165,9 +67,10 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.19892 + weights: 0.12617 + weights: 5.53908 + weights: 2.03505 weights: 0 - weights: 4.90566 weights: 0 weights: 0 weights: 0 @@ -175,7 +78,6 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.04117 weights: 0 weights: 0 weights: 0 @@ -194,304 +96,115 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestMM-Phase2-Lvl40-AllItems-BeastmasterArmor" - value: { - dps: 328.09741 - tps: 168.0823 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-AllItems-SignetofBeasts-209823" - value: { - dps: 335.26238 - tps: 176.16483 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Average-Default" - value: { - dps: 338.87135 - tps: 180.1118 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 624.2973 - tps: 598.65928 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 568.16923 - tps: 422.03862 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 569.04836 - tps: 414.64161 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 348.72327 - tps: 434.11494 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 306.97251 - tps: 237.16588 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 312.16387 - tps: 233.3933 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 630.36455 - tps: 606.36585 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 572.36936 - tps: 419.85674 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 573.86434 - tps: 413.78045 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 354.54498 - tps: 433.85574 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 310.53017 - tps: 236.8477 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 314.19536 - tps: 231.05193 - } -} -dps_results: { - key: "TestMM-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 325.47093 - tps: 166.47132 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-BeastmasterArmor" - value: { - dps: 528.3181 - tps: 528.43012 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-BloodGuard'sChain" - value: { - dps: 723.19917 - tps: 723.31093 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-BloodlashBow-216516" - value: { - dps: 834.93251 - tps: 835.04427 - } -} dps_results: { key: "TestMM-Phase4-Lvl60-AllItems-DevilsaurEye-19991" value: { - dps: 834.22017 - tps: 834.33193 + dps: 385.45292 + tps: 397.92424 } } dps_results: { key: "TestMM-Phase4-Lvl60-AllItems-DevilsaurTooth-19992" value: { - dps: 827.18372 - tps: 827.29548 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-DreadHunter'sChain" - value: { - dps: 616.93074 - tps: 617.0425 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-GurubashiPitFighter'sBow-221450" - value: { - dps: 836.41645 - tps: 836.52821 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-Knight-Lieutenant'sChain" - value: { - dps: 723.19917 - tps: 723.31093 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-Maelstrom'sWrath-231320" - value: { - dps: 838.18341 - tps: 838.29517 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-SignetofBeasts-209823" - value: { - dps: 822.86159 - tps: 822.97335 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sBelt-231322" - value: { - dps: 784.62467 - tps: 784.73643 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sBracers-231323" - value: { - dps: 714.6078 - tps: 714.71955 - } -} -dps_results: { - key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sMantle-231321" - value: { - dps: 820.27459 - tps: 820.38634 + dps: 379.50916 + tps: 391.98672 } } dps_results: { key: "TestMM-Phase4-Lvl60-Average-Default" value: { - dps: 845.5785 - tps: 845.69711 + dps: 377.76606 + tps: 390.19957 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 4539.77602 - tps: 5193.83831 + dps: 432.4596 + tps: 594.49712 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2590.3072 - tps: 2622.95054 + dps: 283.51518 + tps: 291.60722 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2558.93529 - tps: 2590.16492 + dps: 278.1341 + tps: 288.02347 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2410.48889 - tps: 3032.21399 + dps: 205.33253 + tps: 422.96515 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1233.13855 - tps: 1264.22481 + dps: 132.98515 + tps: 143.86679 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1296.73989 - tps: 1320.46777 + dps: 130.93154 + tps: 135.29141 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 4906.56104 - tps: 5542.61192 + dps: 477.90082 + tps: 639.68157 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2759.8206 - tps: 2791.68378 + dps: 318.40933 + tps: 326.51804 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2834.43041 - tps: 2865.77113 + dps: 324.82767 + tps: 334.67743 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2410.23549 - tps: 3004.99165 + dps: 206.35769 + tps: 439.80957 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1222.25493 - tps: 1251.99274 + dps: 134.92853 + tps: 146.60113 } } dps_results: { - key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1316.62719 - tps: 1340.35507 + dps: 136.21434 + tps: 140.57421 } } dps_results: { key: "TestMM-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 697.40433 - tps: 697.51609 + dps: 258.31819 + tps: 270.70581 } } diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results index 135662b5a..3a4dbe411 100644 --- a/sim/hunter/TestSV.results +++ b/sim/hunter/TestSV.results @@ -1,61 +1,12 @@ -character_stats_results: { - key: "TestSV-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 148.83 - final_stats: 308.913 - final_stats: 272.25 - final_stats: 114.95 - final_stats: 105.27 - final_stats: 42 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 24.75 - final_stats: 6 - final_stats: 14.3703 - final_stats: 0 - final_stats: 0 - final_stats: 911.743 - final_stats: 6 - final_stats: 16.36006 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2549.25 - final_stats: 0 - final_stats: 0 - final_stats: 2012.826 - final_stats: 1055.826 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3530.45 - final_stats: 13 - final_stats: 30 - final_stats: 40 - final_stats: 30 - final_stats: 40 - final_stats: 263 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} character_stats_results: { key: "TestSV-Phase4-Lvl60-CharacterStats-Default" value: { - final_stats: 360.58 - final_stats: 782.023 - final_stats: 546.8595 + final_stats: 284.35 + final_stats: 557.9915 + final_stats: 453.629 final_stats: 205.7 - final_stats: 177.87 - final_stats: 150 + final_stats: 235.95 + final_stats: 162 final_stats: 0 final_stats: 0 final_stats: 0 @@ -63,93 +14,44 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 47.25 - final_stats: 6 - final_stats: 39.99405 + final_stats: 3 + final_stats: 27.99405 final_stats: 0 final_stats: 0 - final_stats: 2163.603 - final_stats: 6 - final_stats: 51.78023 + final_stats: 1840.3415 + final_stats: 3 + final_stats: 38.54604 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 4525.5 final_stats: 0 final_stats: 0 - final_stats: 4050.046 - final_stats: 2512.046 + final_stats: 2953.983 + final_stats: 2071.983 final_stats: 0 final_stats: 5 final_stats: 0 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 7337.8188 + final_stats: 6368.2216 final_stats: 27 - final_stats: 141 + final_stats: 86 final_stats: 60 final_stats: 60 final_stats: 60 final_stats: 384 final_stats: 0 final_stats: 35 - final_stats: 189 - } -} -stat_weights_results: { - key: "TestSV-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0.91561 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.37232 - weights: 5.15137 - weights: 7.01658 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.03906 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 + final_stats: 0 } } stat_weights_results: { key: "TestSV-Phase4-Lvl60-StatWeights-Default" value: { weights: 0 - weights: 2.77141 + weights: 0.19405 weights: 0 weights: 0 weights: 0 @@ -165,9 +67,10 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.40215 + weights: 0.1326 + weights: 8.48818 + weights: 0.33843 weights: 0 - weights: 19.33636 weights: 0 weights: 0 weights: 0 @@ -175,7 +78,6 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.42954 weights: 0 weights: 0 weights: 0 @@ -194,304 +96,115 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestSV-Phase2-Lvl40-AllItems-BeastmasterArmor" - value: { - dps: 387.32602 - tps: 239.81593 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-AllItems-SignetofBeasts-209823" - value: { - dps: 760.81738 - tps: 370.3552 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Average-Default" - value: { - dps: 770.33542 - tps: 378.51295 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 2170.05959 - tps: 2058.56105 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 783.71156 - tps: 390.35 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 816.44472 - tps: 402.64329 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 1230.81992 - tps: 1268.81957 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 416.3667 - tps: 205.706 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 446.61753 - tps: 209.09232 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 2122.11238 - tps: 2011.58922 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 769.28899 - tps: 376.31165 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 782.70857 - tps: 370.30639 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 1245.89334 - tps: 1276.6515 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 419.33191 - tps: 204.57415 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 445.37888 - tps: 203.03654 - } -} -dps_results: { - key: "TestSV-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 723.41364 - tps: 349.96895 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-BeastmasterArmor" - value: { - dps: 984.45878 - tps: 759.21652 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-BloodGuard'sChain" - value: { - dps: 1113.9582 - tps: 865.91283 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-BloodlashBow-216516" - value: { - dps: 1528.57884 - tps: 1535.64746 - } -} dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurEye-19991" value: { - dps: 3072.79102 - tps: 2692.51043 + dps: 448.97614 + tps: 481.26078 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurTooth-19992" value: { - dps: 3046.49378 - tps: 2669.40421 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-DreadHunter'sChain" - value: { - dps: 1769.97622 - tps: 1506.27506 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-GurubashiPitFighter'sBow-221450" - value: { - dps: 1562.08023 - tps: 1569.14885 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-Knight-Lieutenant'sChain" - value: { - dps: 1113.9582 - tps: 865.91283 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-Maelstrom'sWrath-231320" - value: { - dps: 3045.00627 - tps: 2670.32775 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-SignetofBeasts-209823" - value: { - dps: 2949.60271 - tps: 2575.18981 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sBelt-231322" - value: { - dps: 2701.82403 - tps: 2368.33091 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sBracers-231323" - value: { - dps: 2855.80301 - tps: 2495.06921 - } -} -dps_results: { - key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sMantle-231321" - value: { - dps: 2929.91055 - tps: 2569.94276 + dps: 440.88422 + tps: 473.1475 } } dps_results: { key: "TestSV-Phase4-Lvl60-Average-Default" value: { - dps: 3044.0598 - tps: 2660.81517 + dps: 439.81411 + tps: 472.10359 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3859.30653 - tps: 3875.22226 + dps: 1470.73024 + tps: 2111.53099 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2806.88757 - tps: 2430.75895 + dps: 433.72896 + tps: 465.73911 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2782.47443 - tps: 2414.52266 + dps: 425.87165 + tps: 456.4752 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2554.37297 - tps: 2799.76089 + dps: 787.43264 + tps: 1376.78002 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1377.06687 - tps: 1215.27414 + dps: 165.08097 + tps: 194.89199 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1378.70808 - tps: 1196.03338 + dps: 161.72304 + tps: 166.08292 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 4120.14074 - tps: 4129.01498 + dps: 1472.77201 + tps: 2116.43199 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2999.79945 - tps: 2607.89461 + dps: 439.9932 + tps: 472.12516 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3002.62748 - tps: 2624.46433 + dps: 427.89813 + tps: 458.4693 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2554.36581 - tps: 2793.38954 + dps: 788.38504 + tps: 1373.75761 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1369.57004 - tps: 1205.98993 + dps: 164.50575 + tps: 193.60437 } } dps_results: { - key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1398.67792 - tps: 1217.0359 + dps: 163.63804 + tps: 167.99792 } } dps_results: { key: "TestSV-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2822.79793 - tps: 2516.15224 + dps: 302.568 + tps: 333.99325 } } diff --git a/sim/hunter/hunter_test.go b/sim/hunter/hunter_test.go index f9b188a2f..9daf7aa89 100644 --- a/sim/hunter/hunter_test.go +++ b/sim/hunter/hunter_test.go @@ -14,23 +14,6 @@ func init() { func TestBM(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - // { - // Class: proto.Class_ClassHunter, - // Level: 25, - // Race: proto.Race_RaceOrc, - // OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - // Talents: Phase1BMTalents, - // GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "phase1"), - // Rotation: core.GetAplRotation("../../ui/hunter/apls", "p1_weave"), - // Buffs: core.FullBuffsPhase1, - // Consumes: Phase1Consumes, - // SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase1PlayerOptions}, - - // ItemFilter: ItemFilters, - // EPReferenceStat: proto.Stat_StatAttackPower, - // StatsToWeigh: Stats, - // }, { Class: proto.Class_ClassHunter, Level: 40, @@ -38,13 +21,12 @@ func TestBM(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceNightElf}, Talents: Phase2BMTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p2_melee"), + GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), Rotation: core.GetAplRotation("../../ui/hunter/apls", "p2_melee"), Buffs: core.FullBuffsPhase2, Consumes: Phase2Consumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase2PlayerOptions}, - OtherGearSets: []core.GearSetCombo{core.GetGearSet("../../ui/hunter/gear_sets", "p2_ranged_bm")}, OtherRotations: []core.RotationCombo{core.GetAplRotation("../../ui/hunter/apls", "p2_ranged_bm")}, ItemFilter: ItemFilters, @@ -56,40 +38,6 @@ func TestBM(t *testing.T) { func TestMM(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - // { - // Class: proto.Class_ClassHunter, - // Level: 25, - // Race: proto.Race_RaceOrc, - // OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - // Talents: Phase1MMTalents, - // GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "phase1"), - // Rotation: core.GetAplRotation("../../ui/hunter/apls", "p1_weave"), - // Buffs: core.FullBuffsPhase1, - // Consumes: Phase1Consumes, - // SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase1PlayerOptions}, - - // ItemFilter: ItemFilters, - // EPReferenceStat: proto.Stat_StatAttackPower, - // StatsToWeigh: Stats, - // }, - { - Class: proto.Class_ClassHunter, - Level: 40, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase2MMTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p2_ranged_mm"), - Rotation: core.GetAplRotation("../../ui/hunter/apls", "p2_ranged_mm"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase2PlayerOptions}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassHunter, Phase: 4, @@ -98,7 +46,7 @@ func TestMM(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceDwarf}, Talents: Phase4RangedMMTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p4_ranged"), + GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), Rotation: core.GetAplRotation("../../ui/hunter/apls", "p4_ranged"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, @@ -113,40 +61,6 @@ func TestMM(t *testing.T) { func TestSV(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - // { - // Class: proto.Class_ClassHunter, - // Level: 25, - // Race: proto.Race_RaceOrc, - // OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - // Talents: Phase1SVTalents, - // GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "phase1"), - // Rotation: core.GetAplRotation("../../ui/hunter/apls", "p1_weave"), - // Buffs: core.FullBuffsPhase1, - // Consumes: Phase1Consumes, - // SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase1PlayerOptions}, - - // ItemFilter: ItemFilters, - // EPReferenceStat: proto.Stat_StatAttackPower, - // StatsToWeigh: Stats, - // }, - { - Class: proto.Class_ClassHunter, - Level: 40, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase2SVTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p2_melee"), - Rotation: core.GetAplRotation("../../ui/hunter/apls", "p2_melee"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase2PlayerOptions}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassHunter, Phase: 4, @@ -155,7 +69,7 @@ func TestSV(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceDwarf}, Talents: Phase4WeaveTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p4_weave"), + GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), Rotation: core.GetAplRotation("../../ui/hunter/apls", "p4_weave"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index 9e9ee2bde..2d75ad3b3 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -1,180 +1,33 @@ character_stats_results: { - key: "TestArcane-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 57.2 - final_stats: 35.2 - final_stats: 96.8 - final_stats: 159.5 - final_stats: 116.6 - final_stats: 127 - final_stats: 9 - final_stats: 21 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 17 - final_stats: 5 - final_stats: 22.77625 - final_stats: 0 - final_stats: 10 - final_stats: 198.2 - final_stats: 0 - final_stats: 5.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2623.5 - final_stats: 0 - final_stats: 0 - final_stats: 351.4 - final_stats: 80 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 1103 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 15 - final_stats: 162 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestArcane-Phase2-Lvl40-CharacterStats-Default" + key: "TestArcane-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 82.5 - final_stats: 36.3 - final_stats: 169.4 - final_stats: 224.4 - final_stats: 189.2 - final_stats: 284 - final_stats: 16 - final_stats: 10 - final_stats: 15 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 36.75 - final_stats: 2 - final_stats: 29.39344 - final_stats: 0 - final_stats: 0 - final_stats: 308.5 - final_stats: 2 - final_stats: 7.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4332.9 - final_stats: 0 - final_stats: 0 - final_stats: 487.6 - final_stats: 220 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 2144 - final_stats: 23 - final_stats: 45 - final_stats: 35 - final_stats: 57 - final_stats: 48 - final_stats: 423 + final_stats: 189.75 + final_stats: 197.34 + final_stats: 292.40475 + final_stats: 244.145 + final_stats: 242.88 + final_stats: 150 final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestArcane-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 169.4 - final_stats: 176 - final_stats: 388.355 - final_stats: 388.3 - final_stats: 215.6 - final_stats: 628 - final_stats: 50 final_stats: 40 final_stats: 15 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 44.25 - final_stats: 3 - final_stats: 48.72344 - final_stats: 0 - final_stats: 0 - final_stats: 989.4 - final_stats: 3 - final_stats: 22.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 7433.25 - final_stats: 0 - final_stats: 0 - final_stats: 984 - final_stats: 740 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 5373.55 - final_stats: 42 - final_stats: 141 - final_stats: 75 - final_stats: 75 - final_stats: 75 - final_stats: 384 - final_stats: 0 - final_stats: 65 - final_stats: 0 - } -} -character_stats_results: { - key: "TestArcane-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 194.81 - final_stats: 202.4 - final_stats: 538.2575 - final_stats: 487.025 - final_stats: 297.275 - final_stats: 575 - final_stats: 0 - final_stats: 40 - final_stats: 212 + final_stats: 41.25 final_stats: 0 - final_stats: 23 + final_stats: 25.30164 final_stats: 0 - final_stats: 41.25 - final_stats: 3 - final_stats: 35.38202 final_stats: 0 + final_stats: 1009.75 final_stats: 0 - final_stats: 1014.81 - final_stats: 3 - final_stats: 21.2 + final_stats: 16.2 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 9062.2125 + final_stats: 5054.6925 final_stats: 0 final_stats: 0 - final_stats: 1111.8 + final_stats: 394.68 final_stats: 740 final_stats: 0 final_stats: 5 @@ -182,163 +35,16 @@ character_stats_results: { final_stats: 3.2 final_stats: 5 final_stats: 0 - final_stats: 6872.575 + final_stats: 4414.0475 final_stats: 52 - final_stats: 92 - final_stats: 105 - final_stats: 115 + final_stats: 85 + final_stats: 85 + final_stats: 85 final_stats: 85 final_stats: 384 - final_stats: 18 - final_stats: 65 final_stats: 0 - } -} -stat_weights_results: { - key: "TestArcane-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.49428 - weights: 0 - weights: 0.41068 - weights: 0.32407 - weights: 0.08661 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.56737 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestArcane-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.16616 - weights: 0 - weights: 0.50258 - weights: 0.50258 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 2.5367 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestArcane-Phase4-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.77344 - weights: 0 - weights: 1.21905 - weights: 1.0925 - weights: 0.12655 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 14.42223 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 + final_stats: 35 + final_stats: 0 } } stat_weights_results: { @@ -347,18 +53,19 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.63261 + weights: 0.14047 weights: 0 - weights: 2.10047 + weights: 0.55155 weights: 0 weights: 0 - weights: 1.98788 + weights: 0.55155 weights: 0 weights: 0 weights: 0 weights: 0 + weights: 5.21299 + weights: 3.05963 weights: 0 - weights: 24.57942 weights: 0 weights: 0 weights: 0 @@ -387,412 +94,103 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Average-Default" - value: { - dps: 175.57237 - tps: 108.53427 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Gnome-p1_generic-Arcane-p1_arcane-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 623.3458 - tps: 434.03135 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Gnome-p1_generic-Arcane-p1_arcane-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 173.61604 - tps: 107.17082 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Gnome-p1_generic-Arcane-p1_arcane-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 195.51376 - tps: 124.14972 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Gnome-p1_generic-Arcane-p1_arcane-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 397.79978 - tps: 299.6301 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Gnome-p1_generic-Arcane-p1_arcane-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 110.23092 - tps: 69.18606 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Gnome-p1_generic-Arcane-p1_arcane-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 130.2385 - tps: 85.18914 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Troll-p1_generic-Arcane-p1_arcane-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 600.82823 - tps: 422.36083 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Troll-p1_generic-Arcane-p1_arcane-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 166.53263 - tps: 103.01278 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Troll-p1_generic-Arcane-p1_arcane-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 199.85974 - tps: 126.96188 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Troll-p1_generic-Arcane-p1_arcane-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 397.39973 - tps: 301.1897 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Troll-p1_generic-Arcane-p1_arcane-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 108.86503 - tps: 68.45651 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-Settings-Troll-p1_generic-Arcane-p1_arcane-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 133.29436 - tps: 87.02265 - } -} -dps_results: { - key: "TestArcane-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 181.36969 - tps: 111.91418 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Average-Default" - value: { - dps: 429.84693 - tps: 269.44485 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Gnome-p2_arcane-Arcane-p2_arcane-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 446.82332 - tps: 502.98385 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Gnome-p2_arcane-Arcane-p2_arcane-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 446.82332 - tps: 279.83849 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Gnome-p2_arcane-Arcane-p2_arcane-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 487.32639 - tps: 309.46881 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Gnome-p2_arcane-Arcane-p2_arcane-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 341.53789 - tps: 318.40481 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Gnome-p2_arcane-Arcane-p2_arcane-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 341.53789 - tps: 210.59684 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Gnome-p2_arcane-Arcane-p2_arcane-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 378.53636 - tps: 238.83099 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Troll-p2_arcane-Arcane-p2_arcane-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 444.01535 - tps: 499.51646 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Troll-p2_arcane-Arcane-p2_arcane-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 444.01535 - tps: 278.06457 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Troll-p2_arcane-Arcane-p2_arcane-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 484.7397 - tps: 308.31254 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Troll-p2_arcane-Arcane-p2_arcane-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 341.42597 - tps: 318.32738 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Troll-p2_arcane-Arcane-p2_arcane-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 341.42597 - tps: 210.52917 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-Settings-Troll-p2_arcane-Arcane-p2_arcane-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 375.38575 - tps: 236.76381 - } -} -dps_results: { - key: "TestArcane-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 434.41122 - tps: 272.37622 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-AllItems-Sorcerer'sRegalia" - value: { - dps: 738.64832 - tps: 774.10139 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Average-Default" - value: { - dps: 2060.69217 - tps: 2083.8894 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2085.88242 - tps: 2486.84489 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2085.88242 - tps: 2105.93055 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2341.45102 - tps: 2358.88096 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 980.25939 - tps: 1224.39883 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 980.25939 - tps: 992.46636 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1250.73439 - tps: 1265.21601 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2087.93997 - tps: 2495.35874 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2087.93997 - tps: 2108.31091 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2371.01326 - tps: 2390.23127 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 977.35726 - tps: 1225.98831 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 977.35726 - tps: 989.78881 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1264.62377 - tps: 1281.48918 - } -} -dps_results: { - key: "TestArcane-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 2056.94194 - tps: 2080.08547 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-AllItems-Sorcerer'sRegalia" - value: { - dps: 961.54552 - tps: 823.92965 } } dps_results: { key: "TestArcane-Phase5-Lvl60-Average-Default" value: { - dps: 3226.48756 - tps: 1942.90969 + dps: 423.59907 + tps: 436.26143 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6849.67078 - tps: 2071.10215 + dps: 419.54165 + tps: 642.32182 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3210.46604 - tps: 1935.5737 + dps: 419.54165 + tps: 430.68066 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 3971.95721 - tps: 2400.54546 + dps: 426.46434 + tps: 437.93292 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3966.87859 - tps: 1192.3179 + dps: 203.18659 + tps: 426.03873 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1735.26037 - tps: 1047.94514 + dps: 203.18659 + tps: 214.3292 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2155.43315 - tps: 1299.01506 + dps: 228.65746 + tps: 241.87026 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6841.97166 - tps: 2068.92524 + dps: 423.05088 + tps: 658.58871 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3223.83387 - tps: 1943.28197 + dps: 423.05088 + tps: 434.82777 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4008.35582 - tps: 2412.98967 + dps: 443.94384 + tps: 457.79252 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3969.69136 - tps: 1200.64371 + dps: 200.62813 + tps: 424.2142 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1751.78154 - tps: 1057.8692 + dps: 200.62813 + tps: 211.80744 } } dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2191.71638 - tps: 1316.09811 + dps: 237.18443 + tps: 250.39723 } } dps_results: { key: "TestArcane-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3226.19944 - tps: 1945.00115 + dps: 423.04928 + tps: 434.91161 } } diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index 35da5dab6..acd437572 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -1,229 +1,33 @@ character_stats_results: { - key: "TestFire-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 58.3 - final_stats: 36.3 - final_stats: 103.4 - final_stats: 145.2 - final_stats: 117.7 - final_stats: 120 - final_stats: 0 - final_stats: 54 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 17 - final_stats: 5 - final_stats: 22.097 - final_stats: 0 - final_stats: 10 - final_stats: 199.3 - final_stats: 0 - final_stats: 5.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2379 - final_stats: 0 - final_stats: 0 - final_stats: 357.6 - final_stats: 80 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 1169 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 15 - final_stats: 162 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestFire-Phase2-Lvl40-CharacterStats-Default" + key: "TestFire-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 82.5 - final_stats: 36.3 - final_stats: 169.4 - final_stats: 224.4 - final_stats: 189.2 - final_stats: 284 + final_stats: 189.75 + final_stats: 197.34 + final_stats: 292.40475 + final_stats: 244.145 + final_stats: 242.88 + final_stats: 150 final_stats: 0 - final_stats: 26 - final_stats: 15 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 36.75 - final_stats: 2 - final_stats: 29.39344 - final_stats: 0 - final_stats: 0 - final_stats: 308.5 - final_stats: 2 - final_stats: 7.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3939 - final_stats: 0 - final_stats: 0 - final_stats: 487.6 - final_stats: 220 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 2144 - final_stats: 18 final_stats: 40 - final_stats: 30 - final_stats: 52 - final_stats: 43 - final_stats: 423 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestFire-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 119.988 - final_stats: 135.432 - final_stats: 275.616 - final_stats: 318.384 - final_stats: 234.036 - final_stats: 238 - final_stats: 0 - final_stats: 145 - final_stats: 22 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 33 - final_stats: 0 - final_stats: 41.9179 - final_stats: 0 - final_stats: 0 - final_stats: 441.988 - final_stats: 0 - final_stats: 18.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 5543.76 - final_stats: 0 - final_stats: 0 - final_stats: 760.864 - final_stats: 310 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 3531.16 - final_stats: 20 - final_stats: 55 - final_stats: 45 - final_stats: 45 - final_stats: 45 - final_stats: 324 - final_stats: 35 - final_stats: 85 - final_stats: 0 - } -} -character_stats_results: { - key: "TestFire-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 169.4 - final_stats: 176 - final_stats: 371.91 - final_stats: 383.9 - final_stats: 215.6 - final_stats: 624 - final_stats: 0 - final_stats: 93 final_stats: 15 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 41.25 - final_stats: 3 - final_stats: 49.64952 - final_stats: 0 - final_stats: 0 - final_stats: 989.4 - final_stats: 3 - final_stats: 23.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 6691.5 - final_stats: 0 - final_stats: 0 - final_stats: 969 - final_stats: 740 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 5209.1 - final_stats: 27 - final_stats: 114 - final_stats: 60 - final_stats: 60 - final_stats: 68 - final_stats: 384 - final_stats: 0 - final_stats: 65 - final_stats: 0 - } -} -character_stats_results: { - key: "TestFire-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 194.81 - final_stats: 202.4 - final_stats: 548.44075 - final_stats: 499.675 - final_stats: 313.72 - final_stats: 738 - final_stats: 0 - final_stats: 40 - final_stats: 15 - final_stats: 0 final_stats: 0 + final_stats: 25.30164 final_stats: 0 - final_stats: 41.25 - final_stats: 3 - final_stats: 42.59454 final_stats: 0 + final_stats: 1009.75 final_stats: 0 - final_stats: 1014.81 - final_stats: 3 - final_stats: 28.2 + final_stats: 16.2 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 8428.125 + final_stats: 4595.175 final_stats: 0 final_stats: 0 - final_stats: 1137.8 + final_stats: 394.68 final_stats: 740 final_stats: 0 final_stats: 5 @@ -231,183 +35,37 @@ character_stats_results: { final_stats: 3.2 final_stats: 5 final_stats: 0 - final_stats: 6974.4075 + final_stats: 4414.0475 final_stats: 27 - final_stats: 77 - final_stats: 90 - final_stats: 100 + final_stats: 60 + final_stats: 60 + final_stats: 60 final_stats: 60 final_stats: 384 - final_stats: 18 - final_stats: 65 + final_stats: 0 + final_stats: 35 final_stats: 0 } } stat_weights_results: { - key: "TestFire-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.29747 - weights: 0 - weights: 0.33263 - weights: 0 - weights: 0.33263 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.74414 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestFire-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 1.02117 - weights: 0 - weights: 0.58156 - weights: 0 - weights: 0.58156 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 5.69593 - weights: 5.88578 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestFire-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.61519 - weights: 0 - weights: 1.33056 - weights: 0 - weights: 1.33056 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 11.41832 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestFire-Phase4-Lvl60-StatWeights-Default" + key: "TestFire-Phase5-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: 3.88065 + weights: 0.69843 weights: 0 - weights: 1.98343 + weights: 0.53538 weights: 0 - weights: 1.98343 + weights: 0.53538 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 + weights: 6.24672 + weights: 5.42721 weights: 0 - weights: 20.73157 weights: 0 weights: 0 weights: 0 @@ -436,559 +94,103 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestFire-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 1.57419 - weights: 0 - weights: 2.39184 - weights: 0 - weights: 2.39184 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 32.94408 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Average-Default" - value: { - dps: 114.92709 - tps: 83.7163 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Gnome-p1_fire-Fire-p1_fire-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 392.14506 - tps: 340.10503 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Gnome-p1_fire-Fire-p1_fire-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 129.2112 - tps: 93.72801 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Gnome-p1_fire-Fire-p1_fire-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 183.18916 - tps: 135.96619 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Gnome-p1_fire-Fire-p1_fire-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 236.59523 - tps: 231.22015 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Gnome-p1_fire-Fire-p1_fire-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 82.61914 - tps: 61.11357 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Gnome-p1_fire-Fire-p1_fire-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 140.54578 - tps: 106.11583 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Troll-p1_fire-Fire-p1_fire-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 318.0572 - tps: 288.24353 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Troll-p1_fire-Fire-p1_fire-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 109.45071 - tps: 79.89567 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Troll-p1_fire-Fire-p1_fire-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 182.53787 - tps: 135.51029 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Troll-p1_fire-Fire-p1_fire-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 215.19477 - tps: 216.23983 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Troll-p1_fire-Fire-p1_fire-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 77.19564 - tps: 57.31712 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-Settings-Troll-p1_fire-Fire-p1_fire-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 140.98143 - tps: 106.42078 - } -} -dps_results: { - key: "TestFire-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 113.98668 - tps: 83.07085 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Average-Default" - value: { - dps: 419.88943 - tps: 305.64481 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Gnome-p2_fire-Fire-p2_fire-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 1410.55942 - tps: 1214.36615 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Gnome-p2_fire-Fire-p2_fire-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 414.82314 - tps: 302.4846 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Gnome-p2_fire-Fire-p2_fire-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 599.36772 - tps: 439.09457 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Gnome-p2_fire-Fire-p2_fire-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 981.91023 - tps: 828.43367 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Gnome-p2_fire-Fire-p2_fire-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 241.32003 - tps: 176.17417 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Gnome-p2_fire-Fire-p2_fire-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 466.32767 - tps: 341.65625 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Troll-p2_fire-Fire-p2_fire-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 1353.05077 - tps: 1168.9636 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Troll-p2_fire-Fire-p2_fire-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 390.1976 - tps: 284.79266 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Troll-p2_fire-Fire-p2_fire-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 598.36184 - tps: 438.28984 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Troll-p2_fire-Fire-p2_fire-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 953.0247 - tps: 807.29803 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Troll-p2_fire-Fire-p2_fire-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 237.27424 - tps: 173.31361 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-Settings-Troll-p2_fire-Fire-p2_fire-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 447.55973 - tps: 328.33961 - } -} -dps_results: { - key: "TestFire-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 413.1911 - tps: 300.89637 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Average-Default" - value: { - dps: 1214.37266 - tps: 868.44914 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 2557.1203 - tps: 2155.68628 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1215.96066 - tps: 869.40375 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1252.3521 - tps: 894.31319 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1071.4812 - tps: 1025.34203 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 554.16681 - tps: 402.05124 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 742.09537 - tps: 544.80982 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 2543.95539 - tps: 2151.91587 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1210.82141 - tps: 866.10437 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1276.96716 - tps: 916.9725 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1050.7044 - tps: 1009.82508 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 534.57543 - tps: 388.26579 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 741.03752 - tps: 543.98952 - } -} -dps_results: { - key: "TestFire-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1219.44362 - tps: 872.20824 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-AllItems-Sorcerer'sRegalia" - value: { - dps: 840.48361 - tps: 803.82597 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Average-Default" - value: { - dps: 3001.06827 - tps: 1972.1994 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 3049.44649 - tps: 2551.33966 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3049.44649 - tps: 2000.13505 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3476.20477 - tps: 2242.25903 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 833.70959 - tps: 883.54911 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 833.70959 - tps: 543.33188 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1645.24917 - tps: 1053.60661 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 3010.72438 - tps: 2523.30419 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3010.72438 - tps: 1978.56779 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3594.48987 - tps: 2326.14064 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 766.805 - tps: 832.60461 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 766.805 - tps: 497.28403 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1674.73169 - tps: 1078.63593 - } -} -dps_results: { - key: "TestFire-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 3020.37964 - tps: 1985.52329 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-AllItems-Sorcerer'sRegalia" - value: { - dps: 1206.2969 - tps: 882.52242 } } dps_results: { key: "TestFire-Phase5-Lvl60-Average-Default" value: { - dps: 3702.73784 - tps: 2134.09335 + dps: 447.09766 + tps: 336.89339 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 16407.93282 - tps: 9714.39566 + dps: 469.38612 + tps: 817.07023 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3699.90474 - tps: 2137.41771 + dps: 469.38612 + tps: 352.99528 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4448.55448 - tps: 2565.57358 + dps: 534.93262 + tps: 406.79961 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 5163.17202 - tps: 3165.74673 + dps: 153.53092 + tps: 386.88161 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1008.57945 - tps: 595.03911 + dps: 153.53092 + tps: 121.44214 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1966.15283 - tps: 1150 + dps: 271.60025 + tps: 210.66001 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 15853.19775 - tps: 9391.6087 + dps: 449.68048 + tps: 795.79882 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3667.32848 - tps: 2119.907 + dps: 449.68048 + tps: 338.82746 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4444.63571 - tps: 2569.78667 + dps: 531.34039 + tps: 404.22955 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 5220.12261 - tps: 3188.56792 + dps: 149.51397 + tps: 383.70706 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 983.97355 - tps: 579.78841 + dps: 149.51397 + tps: 118.61214 } } dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1970.74534 - tps: 1152.89052 + dps: 259.6432 + tps: 202.15974 } } dps_results: { key: "TestFire-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3748.08077 - tps: 2161.39735 + dps: 449.68048 + tps: 338.82746 } } diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index 5121b863d..98063484b 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -1,131 +1,33 @@ character_stats_results: { - key: "TestFrost-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 119.988 - final_stats: 135.432 - final_stats: 275.616 - final_stats: 324.324 - final_stats: 234.036 - final_stats: 250 - final_stats: 0 - final_stats: 132 - final_stats: 22 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 33 - final_stats: 0 - final_stats: 22.04324 - final_stats: 0 - final_stats: 0 - final_stats: 441.988 - final_stats: 0 - final_stats: 18.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 5632.86 - final_stats: 0 - final_stats: 0 - final_stats: 760.864 - final_stats: 310 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 3531.16 - final_stats: 20 - final_stats: 55 - final_stats: 45 - final_stats: 45 - final_stats: 45 - final_stats: 324 - final_stats: 35 - final_stats: 85 - final_stats: 0 - } -} -character_stats_results: { - key: "TestFrost-Phase4-Lvl60-CharacterStats-Default" + key: "TestFrost-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 169.4 - final_stats: 176 - final_stats: 388.355 - final_stats: 396 - final_stats: 215.6 - final_stats: 608 + final_stats: 189.75 + final_stats: 197.34 + final_stats: 292.40475 + final_stats: 244.145 + final_stats: 242.88 + final_stats: 150 final_stats: 0 final_stats: 40 - final_stats: 35 + final_stats: 15 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 41.25 - final_stats: 4 - final_stats: 36.8528 - final_stats: 0 final_stats: 0 - final_stats: 989.4 - final_stats: 4 - final_stats: 23.2 + final_stats: 25.30164 final_stats: 0 final_stats: 0 + final_stats: 1009.75 final_stats: 0 - final_stats: 6873 + final_stats: 16.2 final_stats: 0 final_stats: 0 - final_stats: 984 - final_stats: 740 - final_stats: 0 - final_stats: 5 final_stats: 0 - final_stats: 3.2 - final_stats: 5 + final_stats: 4595.175 final_stats: 0 - final_stats: 5373.55 - final_stats: 27 - final_stats: 126 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 384 final_stats: 0 - final_stats: 65 - final_stats: 0 - } -} -character_stats_results: { - key: "TestFrost-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 194.81 - final_stats: 202.4 - final_stats: 560.07875 - final_stats: 511.06 - final_stats: 318.78 - final_stats: 555 - final_stats: 0 - final_stats: 40 - final_stats: 189 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 3 - final_stats: 38.78581 - final_stats: 0 - final_stats: 0 - final_stats: 1014.81 - final_stats: 3 - final_stats: 24.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 8598.9 - final_stats: 0 - final_stats: 0 - final_stats: 1111.8 + final_stats: 394.68 final_stats: 740 final_stats: 0 final_stats: 5 @@ -133,114 +35,16 @@ character_stats_results: { final_stats: 3.2 final_stats: 5 final_stats: 0 - final_stats: 7090.7875 + final_stats: 4414.0475 final_stats: 31 - final_stats: 81 - final_stats: 84 - final_stats: 94 + final_stats: 64 + final_stats: 64 + final_stats: 64 final_stats: 64 final_stats: 384 - final_stats: 18 - final_stats: 65 final_stats: 0 - } -} -stat_weights_results: { - key: "TestFrost-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.25142 - weights: 0 - weights: 1.14049 - weights: 0 - weights: 1.00905 - weights: 0.13145 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 12.06637 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestFrost-Phase4-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 1.7582 - weights: 0 - weights: 2.08213 - weights: 0 - weights: 1.85709 - weights: 0.22504 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 25.31337 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 + final_stats: 35 + final_stats: 0 } } stat_weights_results: { @@ -249,18 +53,19 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.30982 + weights: 0.17139 weights: 0 - weights: 2.01654 + weights: 0.60621 weights: 0 weights: 0 - weights: 1.91277 + weights: 0.60621 weights: 0 weights: 0 weights: 0 weights: 0 + weights: 5.73089 + weights: 3.26892 weights: 0 - weights: 18.96179 weights: 0 weights: 0 weights: 0 @@ -289,314 +94,103 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Average-Default" - value: { - dps: 1008.51935 - tps: 788.87558 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 998.71552 - tps: 1031.91237 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 998.71552 - tps: 781.43675 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1046.37028 - tps: 807.57977 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 522.53735 - tps: 577.01767 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 522.53735 - tps: 397.04743 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 577.25988 - tps: 444.85932 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 998.33819 - tps: 1031.5394 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 998.33819 - tps: 780.99436 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1056.4551 - tps: 816.02181 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 524.37699 - tps: 571.15493 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 524.37699 - tps: 397.98576 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 580.56853 - tps: 447.22368 - } -} -dps_results: { - key: "TestFrost-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1000.14426 - tps: 782.59835 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-AllItems-Sorcerer'sRegalia" - value: { - dps: 866.74455 - tps: 692.16307 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Average-Default" - value: { - dps: 2904.26763 - tps: 2385.18404 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2903.65503 - tps: 2888.59189 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2903.65503 - tps: 2384.5322 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3118.04811 - tps: 2551.77417 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 928.46555 - tps: 1082.58398 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 928.46555 - tps: 758.50608 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1530.72229 - tps: 1243.34223 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2885.46222 - tps: 2869.31363 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2885.46222 - tps: 2370.55491 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3177.14381 - tps: 2598.68714 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 918.89321 - tps: 1075.01044 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 918.89321 - tps: 750.83413 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1584.81355 - tps: 1283.55869 - } -} -dps_results: { - key: "TestFrost-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 2886.48871 - tps: 2370.42606 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-AllItems-Sorcerer'sRegalia" - value: { - dps: 1080.45417 - tps: 675.1976 } } dps_results: { key: "TestFrost-Phase5-Lvl60-Average-Default" value: { - dps: 3193.73752 - tps: 1358.80609 + dps: 466.41494 + tps: 339.62146 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6537.78901 - tps: 1493.76068 + dps: 459.84004 + tps: 554.39982 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3174.15308 - tps: 1348.99778 + dps: 459.84004 + tps: 333.51361 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 3825.54899 - tps: 1635.23004 + dps: 453.80537 + tps: 329.72212 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3958.34555 - tps: 947.60776 + dps: 241.91386 + tps: 380.75106 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1860.10908 - tps: 789.48441 + dps: 241.91386 + tps: 179.91027 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2204.9901 - tps: 931.314 + dps: 259.24829 + tps: 195.5056 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6490.21889 - tps: 1504.24107 + dps: 460.19999 + tps: 557.8486 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3195.36991 - tps: 1359.00799 + dps: 460.19999 + tps: 333.92543 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 3870.6489 - tps: 1653.41095 + dps: 468.8742 + tps: 340.5635 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3922.4925 - tps: 948.00085 + dps: 241.26078 + tps: 387.21741 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1868.20021 - tps: 792.66016 + dps: 241.26078 + tps: 179.79929 } } dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2218.80338 - tps: 936.28233 + dps: 266.34851 + tps: 200.47575 } } dps_results: { key: "TestFrost-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3199.21121 - tps: 1361.01759 + dps: 460.51737 + tps: 334.19823 } } diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go index 04cab3fd6..fd68e4903 100644 --- a/sim/mage/mage_test.go +++ b/sim/mage/mage_test.go @@ -14,58 +14,6 @@ func init() { func TestArcane(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassMage, - Level: 25, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase1TalentsArcane, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p1_generic"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p1_arcane"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Arcane", SpecOptions: PlayerOptionsArcane}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassMage, - Level: 40, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase2TalentsArcane, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p2_arcane"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p2_arcane"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Arcane", SpecOptions: PlayerOptionsArcane}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassMage, - Phase: 4, - Level: 60, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase4TalentsArcane, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p4_arcane"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p4_arcane"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Arcane", SpecOptions: PlayerOptionsArcane}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassMage, Phase: 5, @@ -74,7 +22,7 @@ func TestArcane(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceGnome}, Talents: Phase5TalentsArcane, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p5_arcane"), + GearSet: core.GetGearSet("../../ui/mage/gear_sets", "blank"), Rotation: core.GetAplRotation("../../ui/mage/apls", "p5_spellfrost"), Buffs: core.FullBuffsPhase5, Consumes: Phase5Consumes, @@ -89,75 +37,6 @@ func TestArcane(t *testing.T) { func TestFire(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassMage, - Level: 25, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase1TalentsFire, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p1_fire"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p1_fire"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Fire", SpecOptions: PlayerOptionsFire}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassMage, - Level: 40, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase2TalentsFire, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p2_fire"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p2_fire"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Fire", SpecOptions: PlayerOptionsFire}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassMage, - Level: 50, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase3TalentsFire, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p3_fire"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p3_fire"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Fire", SpecOptions: PlayerOptionsFire}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassMage, - Phase: 4, - Level: 60, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase5TalentsFire, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p4_fire"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p4_fire"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Fire", SpecOptions: PlayerOptionsFire}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassMage, Phase: 5, @@ -166,7 +45,7 @@ func TestFire(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceGnome}, Talents: Phase5TalentsFire, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p5_fire"), + GearSet: core.GetGearSet("../../ui/mage/gear_sets", "blank"), Rotation: core.GetAplRotation("../../ui/mage/apls", "p5_fire"), Buffs: core.FullBuffsPhase5, Consumes: Phase5Consumes, @@ -181,41 +60,6 @@ func TestFire(t *testing.T) { func TestFrost(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassMage, - Level: 50, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase3TalentsFrost, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p3_frost_ffb"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p3_frost"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Frost", SpecOptions: PlayerOptionsFrost}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassMage, - Phase: 4, - Level: 60, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase4TalentsFrost, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p4_frost"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p4_frost"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Frost", SpecOptions: PlayerOptionsFrost}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassMage, Phase: 5, @@ -224,7 +68,7 @@ func TestFrost(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceGnome}, Talents: phase5talentsfrost, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p5_frost"), + GearSet: core.GetGearSet("../../ui/mage/gear_sets", "blank"), Rotation: core.GetAplRotation("../../ui/mage/apls", "p5_spellfrost"), Buffs: core.FullBuffsPhase5, Consumes: Phase5Consumes, diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 436252ee9..50d7ce9e8 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -1,11 +1,11 @@ character_stats_results: { key: "TestProtection-Phase4-Lvl60-CharacterStats-Default" value: { - final_stats: 347.6 - final_stats: 187 - final_stats: 727.375 - final_stats: 149.6 - final_stats: 173.25 + final_stats: 204.6 + final_stats: 133.1 + final_stats: 322.575 + final_stats: 145.2 + final_stats: 168.63 final_stats: 174 final_stats: 0 final_stats: 0 @@ -14,63 +14,63 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 49.6 - final_stats: 4 - final_stats: 26.99832 final_stats: 0 + final_stats: 26.92484 final_stats: 0 - final_stats: 1947.2 - final_stats: 7 - final_stats: 30.1622 final_stats: 0 + final_stats: 1661.2 + final_stats: 3 + final_stats: 27.43486 final_stats: 0 final_stats: 0 - final_stats: 3476 final_stats: 0 + final_stats: 3410 final_stats: 0 - final_stats: 8044.16 + final_stats: 0 + final_stats: 650.2 final_stats: 780 - final_stats: 149 - final_stats: 12.96 - final_stats: 174 - final_stats: 16.1222 - final_stats: 15.96 + final_stats: 10 + final_stats: 5.4 + final_stats: 0 + final_stats: 7.83486 + final_stats: 10.4 final_stats: 0 - final_stats: 8774.75 + final_stats: 4726.75 final_stats: 27 - final_stats: 263 final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 464 - final_stats: 55 - final_stats: 65 + final_stats: 60 + final_stats: 384 + final_stats: 0 + final_stats: 35 final_stats: 0 } } stat_weights_results: { key: "TestProtection-Phase4-Lvl60-StatWeights-Default" value: { - weights: 0.91087 - weights: 1.03274 + weights: 0.36704 + weights: 0.15161 weights: 0 - weights: 0.00071 weights: 0 - weights: 0.17223 weights: 0 + weights: 0.12327 weights: 0 weights: 0 - weights: 0.0909 weights: 0 + weights: 0.04771 weights: 0 weights: 0 - weights: 2.66892 - weights: 1.61062 weights: 0 + weights: 1.31118 + weights: 0.10337 weights: 0 - weights: 0.40238 weights: 0 - weights: 15.5099 - weights: 9.74475 + weights: 0.16683 + weights: 4.02803 + weights: 2.58215 + weights: 3.01164 weights: 0 weights: 0 weights: 0 @@ -78,9 +78,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.95397 + weights: 0.24653 + weights: 0 weights: 0 - weights: 0.74571 weights: 0 weights: 0 weights: 0 @@ -94,173 +94,110 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate" - value: { - dps: 1309.84314 - tps: 2329.80932 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-Hero'sBrand-231328" - value: { - dps: 1692.48093 - tps: 3424.97994 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" - value: { - dps: 1310.04906 - tps: 2330.5869 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" - value: { - dps: 1381.41684 - tps: 2452.59131 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457" - value: { - dps: 1719.142 - tps: 3482.49535 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate" - value: { - dps: 1480.16542 - tps: 2946.56335 } } dps_results: { key: "TestProtection-Phase4-Lvl60-AllItems-SanctifiedOrb-20512" value: { - dps: 1719.142 - tps: 3482.49535 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-SoulforgeArmor" - value: { - dps: 1117.96862 - tps: 1689.22632 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" - value: { - dps: 1496.08664 - tps: 3040.52826 - } -} -dps_results: { - key: "TestProtection-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" - value: { - dps: 1667.62362 - tps: 3384.30959 + dps: 374.99981 + tps: 564.50695 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Average-Default" value: { - dps: 1707.18079 - tps: 3459.31792 + dps: 376.83423 + tps: 565.34083 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 681.83431 - tps: 2070.54521 + dps: 59.36548 + tps: 118.35105 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 269.39149 - tps: 826.88154 + dps: 34.03927 + tps: 64.69938 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 523.06955 - tps: 1502.34047 + dps: 112.13566 + tps: 213.4513 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 164.92483 - tps: 440.62758 + dps: 22.30737 + tps: 30.35962 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 76.86067 - tps: 211.70163 + dps: 9.5994 + tps: 17.64761 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 180.90216 - tps: 488.34252 + dps: 36.70836 + tps: 68.60544 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 691.99183 - tps: 2102.47752 + dps: 60.9097 + tps: 120.65148 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 276.60478 - tps: 842.72187 + dps: 34.60885 + tps: 65.69439 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 528.32577 - tps: 1515.64655 + dps: 112.08841 + tps: 213.36153 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 149.45549 - tps: 372.38138 + dps: 22.40271 + tps: 30.4429 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 82.31927 - tps: 209.51257 + dps: 9.59269 + tps: 17.62888 } } dps_results: { - key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestProtection-Phase4-Lvl60-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 185.6251 - tps: 486.11689 + dps: 37.36273 + tps: 69.81873 } } dps_results: { key: "TestProtection-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1415.97022 - tps: 2865.5984 + dps: 323.54588 + tps: 488.30051 } } diff --git a/sim/paladin/protection/protection_test.go b/sim/paladin/protection/protection_test.go index f424f6b02..cddc75f6b 100644 --- a/sim/paladin/protection/protection_test.go +++ b/sim/paladin/protection/protection_test.go @@ -21,7 +21,7 @@ func TestProtection(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceDwarf}, Talents: Phase4ProtTalents, - GearSet: core.GetGearSet("../../../ui/protection_paladin/gear_sets", "p4prot"), + GearSet: core.GetGearSet("../../../ui/protection_paladin/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/protection_paladin/apls", "p4prot"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results index 2431313cb..6c7c7fc8d 100644 --- a/sim/paladin/retribution/TestExodin.results +++ b/sim/paladin/retribution/TestExodin.results @@ -1,94 +1,45 @@ character_stats_results: { - key: "TestExodin-Phase4-Lvl60-CharacterStats-Default" + key: "TestExodin-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 471.9 - final_stats: 188.1 - final_stats: 535.095 - final_stats: 162.8 - final_stats: 173.25 - final_stats: 204 + final_stats: 382.6625 + final_stats: 265.65 + final_stats: 370.96125 + final_stats: 166.98 + final_stats: 193.9245 + final_stats: 216 final_stats: 0 final_stats: 10 final_stats: 0 - final_stats: 127 + final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 49.6 - final_stats: 4 - final_stats: 38.21876 final_stats: 0 + final_stats: 28.28857 final_stats: 0 - final_stats: 2424.8 - final_stats: 7 - final_stats: 41.21786 final_stats: 0 + final_stats: 1825.325 + final_stats: 3 + final_stats: 34.14189 final_stats: 0 final_stats: 0 - final_stats: 3674 final_stats: 0 + final_stats: 3736.7 final_stats: 0 - final_stats: 5154.2 - final_stats: 1009 + final_stats: 0 + final_stats: 915.3 + final_stats: 810 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 10.21786 + final_stats: 14.14189 final_stats: 5 final_stats: 0 - final_stats: 6851.95 + final_stats: 5210.6125 final_stats: 27 - final_stats: 109 - final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -character_stats_results: { - key: "TestExodin-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 826.551 - final_stats: 361.79 - final_stats: 619.7235 - final_stats: 172.04 - final_stats: 199.2375 - final_stats: 228 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 127 - final_stats: 0 - final_stats: 0 - final_stats: 49.6 - final_stats: 4 - final_stats: 41.37307 - final_stats: 0 - final_stats: 0 - final_stats: 2792.102 - final_stats: 7 - final_stats: 52.00657 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3812.6 - final_stats: 0 - final_stats: 0 - final_stats: 6089.58 - final_stats: 889 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 19.00657 - final_stats: 5 - final_stats: 0 - final_stats: 7698.235 - final_stats: 27 final_stats: 60 - final_stats: 110 - final_stats: 120 final_stats: 60 final_stats: 384 final_stats: 0 @@ -96,78 +47,29 @@ character_stats_results: { final_stats: 0 } } -stat_weights_results: { - key: "TestExodin-Phase4-Lvl60-StatWeights-Default" - value: { - weights: 2.08924 - weights: 1.32549 - weights: 0 - weights: 0 - weights: 0 - weights: 0.71332 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 9.70432 - weights: 1.75474 - weights: 0 - weights: 0 - weights: 0.86332 - weights: 0 - weights: 20.5932 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestExodin-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.92004 - weights: 1.28357 - weights: 0 + weights: 0.48158 + weights: 0.23677 weights: 0 weights: 0 - weights: 0.9338 weights: 0 + weights: 0.30579 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 17.1092 - weights: 2.70635 weights: 0 + weights: 0.33937 + weights: 0.13953 weights: 0 - weights: 1.04924 weights: 0 - weights: 31.44168 + weights: 0.17304 + weights: 5.10241 + weights: 3.67606 weights: 0 weights: 0 weights: 0 @@ -194,339 +96,106 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate" - value: { - dps: 1365.35127 - tps: 1400.55117 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-Hero'sBrand-231328" - value: { - dps: 3261.63152 - tps: 3294.18106 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" - value: { - dps: 1365.51854 - tps: 1401.57388 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" - value: { - dps: 1464.56379 - tps: 1501.92216 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457" - value: { - dps: 3306.97394 - tps: 3339.03831 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate" - value: { - dps: 1609.09952 - tps: 1646.84562 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-SanctifiedOrb-20512" - value: { - dps: 3178.5478 - tps: 3210.69657 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-SoulforgeArmor" - value: { - dps: 1240.02823 - tps: 1276.52587 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" - value: { - dps: 1443.71624 - tps: 1481.57599 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" - value: { - dps: 1691.8112 - tps: 1729.66143 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Average-Default" - value: { - dps: 3289.83957 - tps: 3321.83201 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 1485.28105 - tps: 2026.72163 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 635.06881 - tps: 662.36013 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 714.57228 - tps: 745.51515 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 600.37781 - tps: 970.82097 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 269.33743 - tps: 287.84914 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 369.76825 - tps: 393.09976 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 1515.87995 - tps: 2064.49478 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 648.37752 - tps: 675.86928 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 717.41863 - tps: 748.4031 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 604.13882 - tps: 975.50681 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 275.30928 - tps: 293.88819 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 372.66311 - tps: 396.09591 - } -} -dps_results: { - key: "TestExodin-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 2722.28793 - tps: 2757.08753 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" - value: { - dps: 1700.55388 - tps: 1736.33205 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-Hero'sBrand-231328" - value: { - dps: 4600.24241 - tps: 4639.28899 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" - value: { - dps: 1700.83818 - tps: 1737.43554 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" - value: { - dps: 1821.63546 - tps: 1859.45513 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457" - value: { - dps: 4685.83167 - tps: 4724.35554 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" - value: { - dps: 1988.83998 - tps: 2026.73597 - } -} dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-SanctifiedOrb-20512" value: { - dps: 4554.95191 - tps: 4592.91136 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-SoulforgeArmor" - value: { - dps: 1538.71107 - tps: 1575.69119 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" - value: { - dps: 1838.29441 - tps: 1876.37952 - } -} -dps_results: { - key: "TestExodin-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" - value: { - dps: 2116.26236 - tps: 2154.33996 + dps: 434.80422 + tps: 471.79262 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Average-Default" value: { - dps: 4673.58072 - tps: 4711.62448 + dps: 434.83832 + tps: 471.85994 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 2524.64357 - tps: 3139.63852 + dps: 33.76824 + tps: 228.4784 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1084.29782 - tps: 1116.68705 + dps: 12.17537 + tps: 21.91088 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1171.83821 - tps: 1210.65475 + tps: 15.18376 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 805.89881 - tps: 1173.89325 + dps: 17.29442 + tps: 138.1484 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 357.55888 - tps: 375.99991 + dps: 3.20235 + tps: 9.24505 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 509.95279 - tps: 534.19584 + dps: 2.71827 + tps: 2.71827 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 2574.53614 - tps: 3196.90154 + dps: 34.86921 + tps: 228.98937 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1088.33163 - tps: 1120.88766 + dps: 11.95106 + tps: 21.65707 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1180.31137 - tps: 1219.35343 + tps: 15.18376 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 817.31141 - tps: 1186.11427 + dps: 16.16378 + tps: 196.91061 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 366.40482 - tps: 384.81847 + dps: 2.7663 + tps: 11.80364 } } dps_results: { - key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestExodin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 507.29631 - tps: 531.54807 + dps: 1.27796 + tps: 16.46172 } } dps_results: { key: "TestExodin-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3845.56477 - tps: 3887.31597 + dps: 359.95305 + tps: 394.99937 } } diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index c490e5e94..a1de0bf99 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -1,1465 +1,267 @@ character_stats_results: { - key: "TestRetribution-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 176 - final_stats: 111.1 - final_stats: 150.7 - final_stats: 58.3 - final_stats: 58.905 - final_stats: 25 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 18 - final_stats: 3 - final_stats: 5.58131 - final_stats: 0 - final_stats: 0 - final_stats: 642 - final_stats: 0 - final_stats: 19.64325 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 1146.5 - final_stats: 0 - final_stats: 0 - final_stats: 1541.2 - final_stats: 98 - final_stats: 8 - final_stats: 5.32 - final_stats: 0 - final_stats: 12.96325 - final_stats: 5.32 - final_stats: 0 - final_stats: 1593 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 10 - final_stats: 141 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestRetribution-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 264 - final_stats: 170.5 - final_stats: 293.7 - final_stats: 89.1 - final_stats: 100.485 - final_stats: 42 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 30 - final_stats: 2 - final_stats: 14.69186 - final_stats: 0 - final_stats: 0 - final_stats: 1040 - final_stats: 2 - final_stats: 23.33405 - final_stats: 3 - final_stats: 0 - final_stats: 0 - final_stats: 2043.5 - final_stats: 0 - final_stats: 0 - final_stats: 2299 - final_stats: 294 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 13.33405 - final_stats: 5 - final_stats: 0 - final_stats: 3378 - final_stats: 18 - final_stats: 30 - final_stats: 40 - final_stats: 35 - final_stats: 40 - final_stats: 263 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestRetribution-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 441.6984 - final_stats: 211.464 - final_stats: 393.228 - final_stats: 133.056 - final_stats: 158.4198 - final_stats: 30 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 30 - final_stats: 4 - final_stats: 22.16112 - final_stats: 0 - final_stats: 0 - final_stats: 1697.3968 - final_stats: 4 - final_stats: 36.51472 - final_stats: 3 - final_stats: 0 - final_stats: 0 - final_stats: 2972.84 - final_stats: 0 - final_stats: 0 - final_stats: 4122.928 - final_stats: 489 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 13.51472 - final_stats: 5 - final_stats: 0 - final_stats: 4718.28 - final_stats: 20 - final_stats: 30 - final_stats: 45 - final_stats: 45 - final_stats: 45 - final_stats: 324 - final_stats: 0 - final_stats: 100 - final_stats: 0 - } -} -character_stats_results: { - key: "TestRetribution-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 645.656 - final_stats: 292.215 - final_stats: 635.72575 - final_stats: 187.22 - final_stats: 199.2375 - final_stats: 204 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 122 - final_stats: 0 - final_stats: 0 - final_stats: 49.6 - final_stats: 6 - final_stats: 39.62657 - final_stats: 0 - final_stats: 0 - final_stats: 2570.312 - final_stats: 9 - final_stats: 47.48608 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4040.3 - final_stats: 0 - final_stats: 0 - final_stats: 5426.43 - final_stats: 1029 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 15.48608 - final_stats: 5 - final_stats: 0 - final_stats: 7858.2575 - final_stats: 27 - final_stats: 139 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 358 - } -} -character_stats_results: { - key: "TestRetribution-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 802.8955 - final_stats: 399.74 - final_stats: 640.09 - final_stats: 172.04 - final_stats: 199.2375 - final_stats: 240 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 86 - final_stats: 0 - final_stats: 0 - final_stats: 49.6 - final_stats: 4 - final_stats: 40.37307 - final_stats: 0 - final_stats: 0 - final_stats: 2759.791 - final_stats: 7 - final_stats: 52.92684 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3812.6 - final_stats: 0 - final_stats: 0 - final_stats: 6098.48 - final_stats: 904 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 20.92684 - final_stats: 5 - final_stats: 0 - final_stats: 7901.9 - final_stats: 27 - final_stats: 60 - final_stats: 110 - final_stats: 100 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestRetribution-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0.45448 - weights: 0.27056 - weights: 0 - weights: 0 - weights: 0 - weights: 0.13776 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.21068 - weights: 0 - weights: 0 - weights: 0 - weights: 0.20658 - weights: 1.69537 - weights: 2.19509 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestRetribution-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0.66066 - weights: 0.3795 - weights: 0 - weights: 0 - weights: 0 - weights: 0.2217 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 1.74055 - weights: 0.08283 - weights: 0 - weights: 0 - weights: 0.3003 - weights: 5.10188 - weights: 5.19765 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestRetribution-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 1.13609 - weights: 1.54767 - weights: 0 - weights: 0 - weights: 0 - weights: 0.2796 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 2.68167 - weights: 0.46614 - weights: 0 - weights: 0 - weights: 0.4303 - weights: 13.06784 - weights: 9.7732 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestRetribution-Phase4-Lvl60-StatWeights-Default" - value: { - weights: 2.63426 - weights: 2.1278 - weights: 0 - weights: 0 - weights: 0 - weights: 0.40961 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 8.10129 - weights: 0.78095 - weights: 0 - weights: 0 - weights: 0.94656 - weights: 1.40777 - weights: 26.92219 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestRetribution-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 2.98646 - weights: 2.63389 - weights: 0 - weights: 0 - weights: 0 - weights: 0.51187 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 11.10187 - weights: 0.72436 - weights: 0 - weights: 0 - weights: 1.04849 - weights: 2.12294 - weights: 40.66965 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-AllItems-SoulforgeArmor" - value: { - dps: 196.34485 - tps: 198.08435 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Average-Default" - value: { - dps: 250.06189 - tps: 256.87542 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1ret-P1 Seal of Command Ret-p1ret-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 167.50332 - tps: 306.6883 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1ret-P1 Seal of Command Ret-p1ret-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 93.30431 - tps: 100.26355 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1ret-P1 Seal of Command Ret-p1ret-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 107.1902 - tps: 116.24559 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1ret-P1 Seal of Command Ret-p1ret-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 101.60732 - tps: 206.79361 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1ret-P1 Seal of Command Ret-p1ret-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 52.72011 - tps: 57.97942 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1ret-P1 Seal of Command Ret-p1ret-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 65.53939 - tps: 73.52817 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1ret-P1 Seal of Command Ret-p1ret-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 169.62065 - tps: 309.87873 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1ret-P1 Seal of Command Ret-p1ret-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 94.08671 - tps: 101.09961 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1ret-P1 Seal of Command Ret-p1ret-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 107.77021 - tps: 116.88029 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1ret-P1 Seal of Command Ret-p1ret-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 100.04509 - tps: 206.33357 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1ret-P1 Seal of Command Ret-p1ret-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 53.07122 - tps: 58.38564 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1ret-P1 Seal of Command Ret-p1ret-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 65.6961 - tps: 73.7386 - } -} -dps_results: { - key: "TestRetribution-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 233.26457 - tps: 240.27747 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-AllItems-SoulforgeArmor" - value: { - dps: 325.60669 - tps: 333.41375 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Average-Default" - value: { - dps: 548.61548 - tps: 562.12304 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 419.18903 - tps: 658.81985 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 204.79834 - tps: 216.65936 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 227.66526 - tps: 239.38324 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 234.29971 - tps: 393.64451 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 107.82373 - tps: 115.83897 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 132.14217 - tps: 142.86628 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 417.04106 - tps: 653.55207 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 204.8499 - tps: 216.6593 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 228.45203 - tps: 240.17033 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 236.71967 - tps: 397.45738 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 108.2034 - tps: 116.26073 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 132.42077 - tps: 143.20117 - } -} -dps_results: { - key: "TestRetribution-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 514.43962 - tps: 527.77771 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-AllItems-SoulforgeArmor" - value: { - dps: 733.93401 - tps: 768.73884 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Average-Default" - value: { - dps: 1135.62899 - tps: 1174.35939 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1436.37297 - tps: 1983.23056 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 335.23267 - tps: 362.55732 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 400.52869 - tps: 428.14686 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 511.7067 - tps: 785.58458 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 138.35953 - tps: 152.05343 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 194.61283 - tps: 212.41416 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1437.10672 - tps: 1986.58416 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 341.16056 - tps: 368.59347 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 403.14615 - tps: 430.79101 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 500.45425 - tps: 775.49746 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 141.79319 - tps: 155.54535 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 195.88752 - tps: 213.7768 - } -} -dps_results: { - key: "TestRetribution-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1072.02188 - tps: 1110.27079 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate" - value: { - dps: 1763.3917 - tps: 1803.01105 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-Hero'sBrand-231328" - value: { - dps: 3767.05587 - tps: 3816.23588 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" - value: { - dps: 1732.62272 - tps: 1771.57311 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" - value: { - dps: 1858.63262 - tps: 1898.7405 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457" - value: { - dps: 3809.80346 - tps: 3858.95339 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate" - value: { - dps: 2338.36158 - tps: 2389.47207 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-SanctifiedOrb-20512" - value: { - dps: 3708.61658 - tps: 3757.61109 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-SoulforgeArmor" - value: { - dps: 1609.20285 - tps: 1648.15954 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" - value: { - dps: 3319.85068 - tps: 3368.89728 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" - value: { - dps: 2450.24524 - tps: 2493.1316 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Average-Default" - value: { - dps: 3810.22051 - tps: 3859.39721 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 173.24126 - tps: 373.85142 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 147.19839 - tps: 157.2289 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 424.06937 - tps: 442.03105 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 57.90535 - tps: 238.65218 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 47.57767 - tps: 56.61501 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 113.20927 - tps: 128.39303 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2191.43807 - tps: 2756.14223 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1028.12205 - tps: 1057.21437 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1174.08396 - tps: 1207.44356 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 699.39198 - tps: 1070.89266 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 357.22025 - tps: 375.77439 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 481.03563 - tps: 504.47483 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 134.96661 - tps: 330.85677 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 117.06984 - tps: 126.86435 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 375.21782 - tps: 392.66324 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 44.67389 - tps: 225.42071 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 37.46651 - tps: 46.50385 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 88.86678 - tps: 104.05054 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 346.62788 - tps: 775.98482 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 303.10741 - tps: 324.57525 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - tps: 15.18376 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 240.11438 - tps: 575.40679 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 183.16826 - tps: 199.93288 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 66.18046 - tps: 84.53547 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 174.66036 - tps: 375.56552 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 148.53943 - tps: 158.58469 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 424.30396 - tps: 442.26563 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 57.71908 - tps: 238.4659 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 46.52561 - tps: 55.56295 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 116.22168 - tps: 131.40544 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2235.35457 - tps: 2802.20945 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1033.33084 - tps: 1062.31456 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1174.0042 - tps: 1207.43621 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 691.19729 - tps: 1063.6203 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 356.09037 - tps: 374.74305 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 486.28353 - tps: 509.76991 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 135.21901 - tps: 331.01083 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 117.22433 - tps: 127.01392 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 380.90459 - tps: 398.35001 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 43.88909 - tps: 224.63592 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 36.52855 - tps: 45.56589 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 89.52059 - tps: 104.70435 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 357.8814 - tps: 789.66137 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 311.56706 - tps: 333.17573 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - tps: 15.18376 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 239.36515 - tps: 575.14597 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 185.94433 - tps: 202.72274 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 67.55519 - tps: 85.92895 - } -} -dps_results: { - key: "TestRetribution-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 3060.78208 - tps: 3109.45956 - } -} -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" - value: { - dps: 2480.86309 - tps: 2538.07545 - } -} -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-Hero'sBrand-231328" - value: { - dps: 4591.39488 - tps: 4647.59841 - } -} -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" - value: { - dps: 2478.97087 - tps: 2536.81226 - } -} -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" - value: { - dps: 2635.03539 - tps: 2694.42591 - } -} -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457" + key: "TestRetribution-Phase5-Lvl60-CharacterStats-Default" value: { - dps: 4685.84133 - tps: 4742.1406 + final_stats: 382.6625 + final_stats: 265.65 + final_stats: 370.96125 + final_stats: 166.98 + final_stats: 193.9245 + final_stats: 216 + final_stats: 0 + final_stats: 10 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 49.6 + final_stats: 0 + final_stats: 28.28857 + final_stats: 0 + final_stats: 0 + final_stats: 1825.325 + final_stats: 3 + final_stats: 34.14189 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 3736.7 + final_stats: 0 + final_stats: 0 + final_stats: 915.3 + final_stats: 810 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 14.14189 + final_stats: 5 + final_stats: 0 + final_stats: 5210.6125 + final_stats: 27 + final_stats: 60 + final_stats: 60 + final_stats: 60 + final_stats: 60 + final_stats: 384 + final_stats: 0 + final_stats: 35 + final_stats: 0 } } -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" +stat_weights_results: { + key: "TestRetribution-Phase5-Lvl60-StatWeights-Default" value: { - dps: 4015.88509 - tps: 4079.32353 + weights: 0.49621 + weights: 0.25075 + weights: 0 + weights: 0 + weights: 0 + weights: 0.15957 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.79635 + weights: 0.11957 + weights: 0 + weights: 0 + weights: 0.1783 + weights: 4.20294 + weights: 3.61558 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-SanctifiedOrb-20512" value: { - dps: 4540.1775 - tps: 4596.09113 - } -} -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-SoulforgeArmor" - value: { - dps: 1982.79704 - tps: 2034.59381 - } -} -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" - value: { - dps: 3934.52498 - tps: 3990.952 - } -} -dps_results: { - key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" - value: { - dps: 4237.11268 - tps: 4294.80933 + dps: 415.82717 + tps: 452.28725 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Average-Default" value: { - dps: 4640.59871 - tps: 4697.0404 + dps: 411.03302 + tps: 447.44782 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 842.81736 - tps: 1093.38086 + dps: 46.72259 + tps: 249.88942 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 750.75012 - tps: 763.29796 + dps: 25.04347 + tps: 35.23623 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1171.74296 - tps: 1191.91714 + dps: 31.03628 + tps: 47.71962 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 186.04551 - tps: 366.79234 + dps: 17.00278 + tps: 148.46724 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 154.42317 - tps: 163.46051 + dps: 4.22273 + tps: 10.79595 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 343.56898 - tps: 358.75274 + dps: 9.52005 + tps: 24.7038 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 45.33345 - tps: 231.58694 + tps: 180.74683 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 41.98591 - tps: 51.29859 + tps: 9.03734 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 93.85226 - tps: 109.74893 + tps: 15.18376 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 15.33826 - tps: 193.58055 + tps: 161.49484 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 14.18331 - tps: 23.09542 + tps: 8.07474 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-ShortSingleTarget" value: { tps: 15.18376 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 878.55915 - tps: 1130.10598 + dps: 46.71268 + tps: 249.87951 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 782.0752 - tps: 794.68204 + dps: 22.30078 + tps: 32.47387 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1172.71439 - tps: 1192.91315 + dps: 31.09763 + tps: 47.78097 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 188.48315 - tps: 369.22997 + dps: 17.04798 + tps: 163.54506 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 154.37303 - tps: 163.41037 + dps: 4.30057 + tps: 11.62543 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 346.84906 - tps: 362.03282 + dps: 9.22059 + tps: 24.40435 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 43.96805 - tps: 230.31987 + tps: 180.74683 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 40.62051 - tps: 49.9381 + tps: 9.03734 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 95.45496 - tps: 111.35164 + tps: 15.18376 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 17.05148 - tps: 197.79831 + tps: 180.74683 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 15.95254 - tps: 24.98988 + tps: 9.03734 } } dps_results: { - key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestRetribution-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-ShortSingleTarget" value: { tps: 15.18376 } @@ -1467,7 +269,7 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3763.99455 - tps: 3819.39576 + dps: 346.11786 + tps: 380.70208 } } diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results index 713ded36d..ea9b305fc 100644 --- a/sim/paladin/retribution/TestShockadin.results +++ b/sim/paladin/retribution/TestShockadin.results @@ -1,159 +1,61 @@ character_stats_results: { - key: "TestShockadin-Phase2-Lvl40-CharacterStats-Default" + key: "TestShockadin-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 281.93 - final_stats: 179.3 - final_stats: 280.5 - final_stats: 98.01 - final_stats: 100.485 - final_stats: 42 + final_stats: 382.6625 + final_stats: 265.65 + final_stats: 370.96125 + final_stats: 183.678 + final_stats: 193.9245 + final_stats: 216 final_stats: 0 final_stats: 10 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 30 - final_stats: 2 - final_stats: 14.91105 - final_stats: 0 - final_stats: 0 - final_stats: 1075.86 - final_stats: 2 - final_stats: 18.98613 - final_stats: 3 - final_stats: 0 - final_stats: 0 - final_stats: 2177.15 - final_stats: 0 - final_stats: 0 - final_stats: 2316.6 - final_stats: 294 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 13.98613 - final_stats: 5 - final_stats: 0 - final_stats: 3246 - final_stats: 18 - final_stats: 30 - final_stats: 40 - final_stats: 35 - final_stats: 40 - final_stats: 263 - final_stats: 0 - final_stats: 14 - final_stats: 69 - } -} -character_stats_results: { - key: "TestShockadin-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 576.081 - final_stats: 279.565 - final_stats: 647.36375 - final_stats: 435.5395 - final_stats: 205.87875 - final_stats: 425 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 201 + final_stats: 49.6 final_stats: 0 + final_stats: 28.56742 final_stats: 0 - final_stats: 49.6 - final_stats: 5 - final_stats: 38.77351 final_stats: 0 + final_stats: 1825.325 final_stats: 0 - final_stats: 2212.162 - final_stats: 5 - final_stats: 40.84599 + final_stats: 34.14189 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 7765.0925 + final_stats: 3987.17 final_stats: 0 final_stats: 0 - final_stats: 8513.13 + final_stats: 915.3 final_stats: 810 final_stats: 0 final_stats: 5 - final_stats: 51 - final_stats: 14.84599 + final_stats: 0 + final_stats: 14.14189 final_stats: 5 final_stats: 0 - final_stats: 7974.6375 + final_stats: 5210.6125 final_stats: 27 - final_stats: 90 - final_stats: 90 - final_stats: 100 + final_stats: 60 + final_stats: 60 + final_stats: 60 final_stats: 60 final_stats: 384 - final_stats: 73 - final_stats: 65 final_stats: 0 - } -} -stat_weights_results: { - key: "TestShockadin-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0.71804 - weights: 0.1204 - weights: 0 - weights: 0 - weights: 0 - weights: 0.18035 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 1.77931 - weights: 0.17672 - weights: 0 - weights: 0 - weights: 0.29671 - weights: 5.15293 - weights: 4.57561 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 + final_stats: 35 + final_stats: 0 } } stat_weights_results: { key: "TestShockadin-Phase5-Lvl60-StatWeights-Default" value: { - weights: 0.51264 - weights: 0.50408 + weights: 0.29868 + weights: 0.19354 weights: 0 weights: 0 weights: 0 - weights: 1.44786 + weights: 0.51161 weights: 0 weights: 0 weights: 0 @@ -161,13 +63,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.44674 - weights: 9.09872 + weights: 2.00016 + weights: 0.44883 weights: 0 weights: 0 - weights: 0.18421 - weights: 7.44886 - weights: 21.17216 + weights: 0.10732 + weights: 2.14741 + weights: 2.99483 weights: 0 weights: 0 weights: 0 @@ -194,255 +96,108 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestShockadin-Phase2-Lvl40-AllItems-SoulforgeArmor" - value: { - dps: 384.17911 - tps: 403.88708 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Average-Default" - value: { - dps: 512.17379 - tps: 536.51048 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 545.35844 - tps: 824.06297 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 147.15029 - tps: 161.05377 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 174.53791 - tps: 190.39564 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 257.61526 - tps: 442.56154 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 77.75211 - tps: 86.99943 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 105.39775 - tps: 116.32798 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 557.35472 - tps: 836.37459 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 146.71806 - tps: 160.67813 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 176.27547 - tps: 192.16162 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 263.72985 - tps: 450.00713 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 77.95938 - tps: 87.27325 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 107.47706 - tps: 118.46779 - } -} -dps_results: { - key: "TestShockadin-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 480.57571 - tps: 504.7627 - } -} -dps_results: { - key: "TestShockadin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" - value: { - dps: 1937.75204 - tps: 1992.03688 - } -} -dps_results: { - key: "TestShockadin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" - value: { - dps: 1945.62167 - tps: 1998.88875 - } -} -dps_results: { - key: "TestShockadin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" - value: { - dps: 1967.21865 - tps: 2019.71208 - } -} -dps_results: { - key: "TestShockadin-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457" - value: { - dps: 3931.23716 - tps: 4019.31504 - } -} -dps_results: { - key: "TestShockadin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" - value: { - dps: 2896.19097 - tps: 2983.02472 - } -} dps_results: { key: "TestShockadin-Phase5-Lvl60-AllItems-SanctifiedOrb-20512" value: { - dps: 3648.67195 - tps: 3736.1671 - } -} -dps_results: { - key: "TestShockadin-Phase5-Lvl60-AllItems-SoulforgeArmor" - value: { - dps: 1588.86569 - tps: 1628.59778 + dps: 525.49474 + tps: 567.44917 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-Average-Default" value: { - dps: 4001.70247 - tps: 4086.75764 + dps: 525.42593 + tps: 567.45423 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3753.72737 - tps: 4534.88227 + dps: 309.27347 + tps: 526.3053 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1632.78555 - tps: 1672.18546 + dps: 96.24543 + tps: 107.0331 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2704.58106 - tps: 2776.13017 + dps: 197.03366 + tps: 214.52825 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 1098.36369 - tps: 1366.86051 + dps: 125.29427 + tps: 306.04109 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 544.42138 - tps: 558.14414 + dps: 45.14838 + tps: 54.18572 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1301.13021 - tps: 1330.80355 + dps: 101.54221 + tps: 116.72597 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3804.49005 - tps: 4602.28495 + dps: 309.89343 + tps: 527.51526 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1657.60359 - tps: 1697.50558 + dps: 96.35163 + tps: 107.13931 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2706.69208 - tps: 2777.85952 + dps: 197.5688 + tps: 215.08797 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 1112.62264 - tps: 1383.28614 + dps: 127.21285 + tps: 307.95967 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 548.27259 - tps: 561.94118 + dps: 45.52463 + tps: 54.56197 } } dps_results: { - key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestShockadin-Phase5-Lvl60-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1304.67967 - tps: 1334.35301 + dps: 102.1587 + tps: 117.34245 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3773.97992 - tps: 3859.29032 + dps: 467.06201 + tps: 506.5581 } } diff --git a/sim/paladin/retribution/retribution_test.go b/sim/paladin/retribution/retribution_test.go index 7a4c3f899..8220a91d9 100644 --- a/sim/paladin/retribution/retribution_test.go +++ b/sim/paladin/retribution/retribution_test.go @@ -13,78 +13,6 @@ func init() { func TestRetribution(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassPaladin, - Level: 25, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase1RetTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p1ret"), - Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p1ret"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P1 Seal of Command Ret", SpecOptions: PlayerOptionsSealofCommand}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassPaladin, - Level: 40, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase2RetTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p2retsoc"), - Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p2ret"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P2 Seal of Command Ret", SpecOptions: PlayerOptionsSealofCommand}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassPaladin, - Level: 50, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase3RetTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p3retsom"), - Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p3ret"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P3 Seal of Martyrdom Ret", SpecOptions: PlayerOptionsSealofMartyrdom}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassPaladin, - Phase: 4, - Level: 60, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase45RetTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p4ret-twisting-6pcT1"), - Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p4ret-twisting-6pcT1"), - - OtherGearSets: []core.GearSetCombo{core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p4rettwist")}, - OtherRotations: []core.RotationCombo{core.GetAplRotation("../../../ui/retribution_paladin/apls", "p4ret")}, - Buffs: core.FullBuffsPhase5, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P4 Seal of Martyrdom Ret", SpecOptions: PlayerOptionsSealofMartyrdom}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassPaladin, Phase: 5, @@ -93,7 +21,7 @@ func TestRetribution(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceDwarf}, Talents: Phase45RetTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p5twisting"), + GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5ret-twist-4DR-3.5-3.6"), OtherRotations: []core.RotationCombo{core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5ret-twist-4DR-3.7-4.0")}, Buffs: core.FullBuffsPhase5, @@ -109,24 +37,6 @@ func TestRetribution(t *testing.T) { func TestExodin(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassPaladin, - Phase: 4, - Level: 60, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase45RetTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p4ret-exodin-6pcT1"), - Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p4ret-exodin-6pcT1"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P4 Seal of Martyrdom Ret", SpecOptions: PlayerOptionsSealofMartyrdom}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassPaladin, Phase: 5, @@ -135,7 +45,7 @@ func TestExodin(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceDwarf}, Talents: Phase45RetTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p5exodin"), + GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5ret-exodin-6CF2DR"), Buffs: core.FullBuffsPhase5, Consumes: Phase5Consumes, @@ -150,23 +60,6 @@ func TestExodin(t *testing.T) { func TestShockadin(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassPaladin, - Level: 40, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase2ShockadinTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p2retsom"), - Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p2ret"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P2 Seal of Martyrdom Shockadin", SpecOptions: PlayerOptionsSealofMartyrdom}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassPaladin, Phase: 5, @@ -175,7 +68,7 @@ func TestShockadin(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceDwarf}, Talents: Phase45ShockadinTalents, - GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p5shockadin"), + GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5Shockadin"), Buffs: core.FullBuffsPhase5, Consumes: Phase5Consumes, diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index e9e93a015..d1caa3a7c 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -1,180 +1,33 @@ character_stats_results: { - key: "TestShadow-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 60.5 - final_stats: 37.4 - final_stats: 132 - final_stats: 134.2 - final_stats: 126.5 - final_stats: 133 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 17 - final_stats: 6 - final_stats: 6.93294 - final_stats: 0 - final_stats: 10 - final_stats: 201.5 - final_stats: 1 - final_stats: 5 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2230 - final_stats: 0 - final_stats: 0 - final_stats: 363.8 - final_stats: 80 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3 - final_stats: 5 - final_stats: 0 - final_stats: 1442 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 20 - final_stats: 162 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestShadow-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 91.3 - final_stats: 49.5 - final_stats: 221.1 - final_stats: 211.2 - final_stats: 166.1 - final_stats: 242 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 57 - final_stats: 35.75 - final_stats: 1 - final_stats: 13.48128 - final_stats: 0 - final_stats: 0 - final_stats: 317.3 - final_stats: 1 - final_stats: 6 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3799 - final_stats: 0 - final_stats: 0 - final_stats: 507 - final_stats: 220 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3 - final_stats: 5 - final_stats: 0 - final_stats: 2668 - final_stats: 21 - final_stats: 43 - final_stats: 33 - final_stats: 38 - final_stats: 46 - final_stats: 453 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestShadow-Phase3-Lvl50-CharacterStats-Default" + key: "TestShadow-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 124.74 - final_stats: 138.996 - final_stats: 313.632 - final_stats: 313.632 - final_stats: 219.78 - final_stats: 258 - final_stats: 23 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 + final_stats: 196.075 + final_stats: 203.665 + final_stats: 389.58205 + final_stats: 237.82 + final_stats: 249.205 final_stats: 150 - final_stats: 33 - final_stats: 2 - final_stats: 20.32355 - final_stats: 0 - final_stats: 0 - final_stats: 446.74 - final_stats: 2 - final_stats: 16 - final_stats: 0 - final_stats: 0 final_stats: 0 - final_stats: 5590.48 final_stats: 0 final_stats: 0 - final_stats: 764.992 - final_stats: 310 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3 - final_stats: 5 - final_stats: 0 - final_stats: 3928.32 - final_stats: 23 - final_stats: 33 - final_stats: 48 - final_stats: 48 - final_stats: 48 - final_stats: 324 - final_stats: 0 - final_stats: 85 - final_stats: 0 - } -} -character_stats_results: { - key: "TestShadow-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 174.9 - final_stats: 181.5 - final_stats: 623.2655 - final_stats: 405.9 - final_stats: 221.1 - final_stats: 312 final_stats: 0 final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 368 + final_stats: 40 final_stats: 41.25 final_stats: 0 - final_stats: 38.61912 + final_stats: 25.79538 final_stats: 0 final_stats: 0 - final_stats: 994.9 + final_stats: 1016.075 final_stats: 0 - final_stats: 26 + final_stats: 16 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 7184.5 + final_stats: 4663.3 final_stats: 0 final_stats: 0 - final_stats: 1012 + final_stats: 407.33 final_stats: 740 final_stats: 0 final_stats: 5 @@ -182,232 +35,36 @@ character_stats_results: { final_stats: 3 final_stats: 5 final_stats: 0 - final_stats: 7749.655 + final_stats: 5412.8205 final_stats: 27 - final_stats: 211 final_stats: 60 final_stats: 60 - final_stats: 80 - final_stats: 384 - final_stats: 0 - final_stats: 65 - final_stats: 0 - } -} -character_stats_results: { - key: "TestShadow-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 201.135 - final_stats: 208.725 - final_stats: 726.2112 - final_stats: 492.085 - final_stats: 309.925 - final_stats: 434 - final_stats: 57 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 400 - final_stats: 41.25 - final_stats: 0 - final_stats: 39.06703 - final_stats: 0 - final_stats: 0 - final_stats: 1021.135 - final_stats: 0 - final_stats: 25 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 8477.275 - final_stats: 0 - final_stats: 0 - final_stats: 1146.45 - final_stats: 740 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3 - final_stats: 5 - final_stats: 0 - final_stats: 8779.112 - final_stats: 27 - final_stats: 77 - final_stats: 110 - final_stats: 110 + final_stats: 60 final_stats: 60 final_stats: 384 - final_stats: 18 - final_stats: 65 + final_stats: 0 + final_stats: 35 final_stats: 0 } } stat_weights_results: { - key: "TestShadow-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.09845 - weights: 0 - weights: 0.28779 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.22206 - weights: 0 - weights: 0 - weights: 0.35552 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestShadow-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.20322 - weights: 0 - weights: 0.79989 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.79989 - weights: 0 - weights: 3.37582 - weights: 1.75144 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestShadow-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.12116 - weights: 0 - weights: 1.11907 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 1.11907 - weights: 0 - weights: 0 - weights: 8.30415 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestShadow-Phase4-Lvl60-StatWeights-Default" + key: "TestShadow-Phase5-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: 0.35849 + weights: 0.02449 weights: 0 - weights: 2.01848 + weights: 0.28478 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 2.01848 + weights: 0.28478 weights: 0 - weights: 0 - weights: 24.21514 + weights: 2.29964 + weights: 1.03979 weights: 0 weights: 0 weights: 0 @@ -439,675 +96,101 @@ stat_weights_results: { weights: 0 } } -stat_weights_results: { - key: "TestShadow-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.42686 - weights: 0 - weights: 1.97704 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 1.97704 - weights: 0 - weights: 0 - weights: 31.00677 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-AllItems-VestmentsoftheVirtuous" - value: { - dps: 54.36378 - tps: 57.48017 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Average-Default" - value: { - dps: 93.53633 - tps: 79.30304 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-NightElf-phase_1-Basic-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 100.10629 - tps: 175.5393 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-NightElf-phase_1-Basic-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 100.10629 - tps: 86.04815 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-NightElf-phase_1-Basic-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 111.63412 - tps: 102.88622 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-NightElf-phase_1-Basic-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 65.6391 - tps: 141.15886 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-NightElf-phase_1-Basic-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 65.6391 - tps: 58.09447 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-NightElf-phase_1-Basic-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 84.05868 - tps: 77.80328 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-Troll-phase_1-Basic-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 93.80721 - tps: 167.75791 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-Troll-phase_1-Basic-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 93.80721 - tps: 79.41626 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-Troll-phase_1-Basic-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 109.51728 - tps: 99.36415 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-Troll-phase_1-Basic-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 64.05334 - tps: 138.39347 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-Troll-phase_1-Basic-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 64.05334 - tps: 56.37407 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-Settings-Troll-phase_1-Basic-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 81.59331 - tps: 74.77153 - } -} -dps_results: { - key: "TestShadow-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 93.80721 - tps: 79.41626 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-AllItems-VestmentsoftheVirtuous" - value: { - dps: 179.51888 - tps: 153.3209 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Average-Default" - value: { - dps: 604.18557 - tps: 483.54868 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-NightElf-phase_2-Basic-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 600.20382 - tps: 768.44148 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-NightElf-phase_2-Basic-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 600.20382 - tps: 480.53926 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-NightElf-phase_2-Basic-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 578.45429 - tps: 469.09776 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-NightElf-phase_2-Basic-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 388.77481 - tps: 513.55036 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-NightElf-phase_2-Basic-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 388.77481 - tps: 308.86023 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-NightElf-phase_2-Basic-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 461.61371 - tps: 361.97431 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-Troll-phase_2-Basic-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 601.08194 - tps: 766.26741 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-Troll-phase_2-Basic-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 601.08194 - tps: 480.94223 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-Troll-phase_2-Basic-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 578.20861 - tps: 468.90971 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-Troll-phase_2-Basic-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 387.28439 - tps: 509.00476 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-Troll-phase_2-Basic-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 387.28439 - tps: 306.72763 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-Settings-Troll-phase_2-Basic-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 468.42881 - tps: 363.25374 - } -} -dps_results: { - key: "TestShadow-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 603.24599 - tps: 482.79269 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-AllItems-VestmentsoftheVirtuous" - value: { - dps: 298.07732 - tps: 238.11806 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Average-Default" - value: { - dps: 1259.46614 - tps: 1010.78927 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1678.47552 - tps: 1725.73518 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1255.26588 - tps: 1007.79151 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1271.6623 - tps: 958.01156 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 805.5744 - tps: 886.37244 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 686.13848 - tps: 541.71161 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 846.98826 - tps: 641.43741 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-Troll-phase_3-Basic-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1657.08874 - tps: 1704.14363 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-Troll-phase_3-Basic-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1251.90072 - tps: 1005.11565 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-Troll-phase_3-Basic-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1271.29533 - tps: 958.73179 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-Troll-phase_3-Basic-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 791.69092 - tps: 872.19876 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-Troll-phase_3-Basic-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 671.05917 - tps: 529.51348 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-Settings-Troll-phase_3-Basic-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 846.65454 - tps: 640.88208 - } -} -dps_results: { - key: "TestShadow-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1258.52726 - tps: 1010.74515 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-AllItems-BenevolentProphet'sVestments" - value: { - dps: 2126.49565 - tps: 2033.42716 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-AllItems-VestmentsoftheVirtuous" - value: { - dps: 644.67171 - tps: 590.783 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Average-Default" - value: { - dps: 3577.5574 - tps: 3329.98401 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 4018.92598 - tps: 4301.03346 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3542.37015 - tps: 3287.49548 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3445.62947 - tps: 3054.5152 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 1749.87786 - tps: 1977.39454 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1934.0184 - tps: 1787.54131 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1899.77112 - tps: 1671.89258 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 4031.65565 - tps: 4323.58653 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3542.62278 - tps: 3288.42085 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3461.46556 - tps: 3070.15778 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 1742.89371 - tps: 1971.38243 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1922.41991 - tps: 1776.94359 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1898.56766 - tps: 1671.58597 - } -} -dps_results: { - key: "TestShadow-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 3551.29103 - tps: 3299.989 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-AllItems-BenevolentProphet'sVestments" - value: { - dps: 2303.37414 - tps: 2196.60908 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-AllItems-VestmentsoftheVirtuous" - value: { - dps: 669.59721 - tps: 612.74355 - } -} dps_results: { key: "TestShadow-Phase5-Lvl60-Average-Default" value: { - dps: 3938.48466 - tps: 3652.67311 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 4151.49571 - tps: 4407.90775 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3894.7257 - tps: 3605.74128 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3715.7376 - tps: 3259.35092 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 1947.32934 - tps: 2173.69072 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2085.32068 - tps: 1916.94075 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2030.76538 - tps: 1771.15734 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 4977.95313 - tps: 5078.79479 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3916.68341 - tps: 3625.47885 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3740.12217 - tps: 3287.44094 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2617.74879 - tps: 2869.2623 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 2194.9368 - tps: 2022.61847 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 2119.93667 - tps: 1854.55768 + dps: 366.05398 + tps: 333.90373 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 4132.35567 - tps: 4403.09784 + dps: 850.70643 + tps: 1046.56122 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3887.71336 - tps: 3600.08806 + dps: 361.36994 + tps: 326.91127 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3708.37818 - tps: 3255.15346 + dps: 456.96536 + tps: 332.97219 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1934.65508 - tps: 2161.30503 + dps: 327.74159 + tps: 482.77496 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2080.64919 - tps: 1912.55585 + dps: 204.62535 + tps: 188.61664 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2027.14341 - tps: 1768.44163 + dps: 258.60161 + tps: 194.83899 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 4959.02461 - tps: 5067.68561 + dps: 847.43525 + tps: 1070.71069 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3910.66177 - tps: 3620.14517 + dps: 365.47664 + tps: 331.22931 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3734.87465 - tps: 3285.81305 + dps: 450.40569 + tps: 329.14729 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t2-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2607.62442 - tps: 2861.27817 + dps: 324.12485 + tps: 484.28596 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t2-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2191.17188 - tps: 2019.17659 + dps: 207.49383 + tps: 193.07266 } } dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t2-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2115.49697 - tps: 1852.33082 + dps: 253.13845 + tps: 192.77275 } } dps_results: { key: "TestShadow-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3907.54532 - tps: 3621.57207 + dps: 365.47664 + tps: 331.22931 } } diff --git a/sim/priest/shadow/shadow_priest_test.go b/sim/priest/shadow/shadow_priest_test.go index 94fbcfcf1..b1df1faf5 100644 --- a/sim/priest/shadow/shadow_priest_test.go +++ b/sim/priest/shadow/shadow_priest_test.go @@ -14,75 +14,6 @@ func init() { func TestShadow(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassPriest, - Level: 25, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase1Talents, - GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "phase_1"), - Rotation: core.GetAplRotation("../../../ui/shadow_priest/apls", "phase_1"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassPriest, - Level: 40, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase2Talents, - GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "phase_2"), - Rotation: core.GetAplRotation("../../../ui/shadow_priest/apls", "phase_2"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassPriest, - Level: 50, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase3Talents, - GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "phase_3"), - Rotation: core.GetAplRotation("../../../ui/shadow_priest/apls", "phase_3"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassPriest, - Level: 60, - Phase: 4, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "phase_4"), - Rotation: core.GetAplRotation("../../../ui/shadow_priest/apls", "phase_4"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassPriest, Level: 60, @@ -90,11 +21,8 @@ func TestShadow(t *testing.T) { Race: proto.Race_RaceTroll, OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "phase_5_t1"), - OtherGearSets: []core.GearSetCombo{ - core.GetGearSet("../../../ui/shadow_priest/gear_sets", "phase_5_t2"), - }, + Talents: Phase4Talents, + GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/shadow_priest/apls", "phase_5"), Buffs: core.FullBuffsPhase5, Consumes: Phase4Consumes, diff --git a/sim/rogue/dps_rogue/TestAssassination.results b/sim/rogue/dps_rogue/TestAssassination.results index 7cf89b2be..a61fc5ce9 100644 --- a/sim/rogue/dps_rogue/TestAssassination.results +++ b/sim/rogue/dps_rogue/TestAssassination.results @@ -1,60 +1,11 @@ -character_stats_results: { - key: "TestAssassination-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 84.7 - final_stats: 167.2 - final_stats: 141.9 - final_stats: 45.1 - final_stats: 58.905 - final_stats: 25 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 18 - final_stats: 3 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 546.9 - final_stats: 2 - final_stats: 22.91744 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 1069.4 - final_stats: 295.2 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 31.83488 - final_stats: 5 - final_stats: 0 - final_stats: 1557 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 10 - final_stats: 141 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} character_stats_results: { key: "TestAssassination-Phase2-Lvl40-CharacterStats-Default" value: { - final_stats: 170.5 - final_stats: 250.8 - final_stats: 256.3 - final_stats: 61.6 - final_stats: 83.16 + final_stats: 80.3 + final_stats: 119.9 + final_stats: 156.2 + final_stats: 59.4 + final_stats: 80.85 final_stats: 42 final_stats: 0 final_stats: 0 @@ -63,93 +14,44 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 24 - final_stats: 4 - final_stats: 9 + final_stats: 0 + final_stats: 7 final_stats: 0 final_stats: 0 - final_stats: 887.3 - final_stats: 4 - final_stats: 23.94448 + final_stats: 598.2 final_stats: 0 + final_stats: 14.66644 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 1536.6 - final_stats: 538.8 + final_stats: 0 + final_stats: 502.8 + final_stats: 339.9 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 27.88896 + final_stats: 13.33288 final_stats: 5 final_stats: 0 - final_stats: 3086 - final_stats: 18 + final_stats: 2085 + final_stats: 13 + final_stats: 30 + final_stats: 30 + final_stats: 30 final_stats: 30 - final_stats: 40 - final_stats: 35 - final_stats: 40 final_stats: 263 final_stats: 0 final_stats: 0 final_stats: 0 } } -stat_weights_results: { - key: "TestAssassination-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0.30559 - weights: 0.5116 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.27781 - weights: 2.47318 - weights: 2.20149 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestAssassination-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.37633 - weights: 0.63635 + weights: 0.09138 + weights: 0.1235 weights: 0 weights: 0 weights: 0 @@ -165,9 +67,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.34212 - weights: 5.22022 - weights: 4.34088 + weights: 0.08308 + weights: 0.28223 + weights: 0.50977 weights: 0 weights: 0 weights: 0 @@ -194,213 +96,65 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestAssassination-Phase1-Lvl25-AllItems-DarkmantleArmor" - value: { - dps: 144.79724 - tps: 102.80604 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Average-Default" - value: { - dps: 273.37217 - tps: 194.09424 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 118.86068 - tps: 84.39108 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 118.86068 - tps: 84.39108 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 126.93042 - tps: 90.1206 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 59.16857 - tps: 42.00969 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 59.16857 - tps: 42.00969 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 62.62966 - tps: 44.46706 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 115.49504 - tps: 82.00148 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 115.49504 - tps: 82.00148 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 123.43102 - tps: 87.63602 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 59.42089 - tps: 42.18883 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 59.42089 - tps: 42.18883 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 63.05157 - tps: 44.76661 - } -} -dps_results: { - key: "TestAssassination-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 261.72602 - tps: 185.82548 - } -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-AllItems-DarkmantleArmor" - value: { - dps: 207.17383 - tps: 147.09342 - } -} dps_results: { key: "TestAssassination-Phase2-Lvl40-Average-Default" value: { - dps: 575.99965 - tps: 408.95975 + dps: 51.89712 + tps: 36.84696 } } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 279.78754 - tps: 198.64915 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 279.78754 - tps: 198.64915 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 300.39224 - tps: 213.27849 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 156.2515 - tps: 110.93856 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 156.2515 - tps: 110.93856 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 167.14676 - tps: 118.6742 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 272.90152 - tps: 193.76008 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 272.90152 - tps: 193.76008 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 292.30493 - tps: 207.5365 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 157.06939 - tps: 111.51927 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 157.06939 - tps: 111.51927 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" + value: {} } dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 167.28493 - tps: 118.7723 - } + key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" + value: {} } dps_results: { key: "TestAssassination-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 555.66525 - tps: 394.52233 + dps: 48.35335 + tps: 34.33088 } } diff --git a/sim/rogue/dps_rogue/TestCombat.results b/sim/rogue/dps_rogue/TestCombat.results index 864384bc5..23479d785 100644 --- a/sim/rogue/dps_rogue/TestCombat.results +++ b/sim/rogue/dps_rogue/TestCombat.results @@ -1,60 +1,11 @@ -character_stats_results: { - key: "TestCombat-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 84.7 - final_stats: 167.2 - final_stats: 141.9 - final_stats: 45.1 - final_stats: 58.905 - final_stats: 25 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 18 - final_stats: 3 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 546.9 - final_stats: 7 - final_stats: 17.91744 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 1069.4 - final_stats: 295.2 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 36.83488 - final_stats: 5 - final_stats: 0 - final_stats: 1557 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 10 - final_stats: 141 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} character_stats_results: { key: "TestCombat-Phase2-Lvl40-CharacterStats-Default" value: { - final_stats: 170.5 - final_stats: 250.8 - final_stats: 256.3 - final_stats: 61.6 - final_stats: 83.16 + final_stats: 80.3 + final_stats: 119.9 + final_stats: 156.2 + final_stats: 59.4 + final_stats: 80.85 final_stats: 42 final_stats: 0 final_stats: 0 @@ -63,93 +14,44 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 24 - final_stats: 4 - final_stats: 9 final_stats: 0 + final_stats: 7 final_stats: 0 - final_stats: 887.3 - final_stats: 9 - final_stats: 23.94448 + final_stats: 0 + final_stats: 598.2 + final_stats: 5 + final_stats: 9.66644 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 1536.6 - final_stats: 538.8 + final_stats: 502.8 + final_stats: 339.9 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 32.88896 + final_stats: 18.33288 final_stats: 5 final_stats: 0 - final_stats: 3086 - final_stats: 18 + final_stats: 2085 + final_stats: 13 + final_stats: 30 + final_stats: 30 + final_stats: 30 final_stats: 30 - final_stats: 40 - final_stats: 35 - final_stats: 40 final_stats: 263 final_stats: 0 final_stats: 0 final_stats: 0 } } -stat_weights_results: { - key: "TestCombat-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0.24272 - weights: 0.45075 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.22065 - weights: 1.85171 - weights: 1.82161 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestCombat-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.36156 - weights: 0.59368 + weights: 0.09344 + weights: 0.12666 weights: 0 weights: 0 weights: 0 @@ -165,9 +67,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.32869 - weights: 3.92986 - weights: 3.74848 + weights: 0.08495 + weights: 0.57082 + weights: 0.54939 weights: 0 weights: 0 weights: 0 @@ -194,213 +96,65 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestCombat-Phase1-Lvl25-AllItems-DarkmantleArmor" - value: { - dps: 258.17768 - tps: 183.30616 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Average-Default" - value: { - dps: 214.72666 - tps: 152.45593 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Human-p1_combat-No Poisons-basic_strike_25-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 51.52808 - tps: 36.58494 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Human-p1_combat-No Poisons-basic_strike_25-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 51.52808 - tps: 36.58494 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Human-p1_combat-No Poisons-basic_strike_25-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 54.4007 - tps: 38.6245 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Human-p1_combat-No Poisons-basic_strike_25-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 24.57447 - tps: 17.44787 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Human-p1_combat-No Poisons-basic_strike_25-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 24.57447 - tps: 17.44787 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Human-p1_combat-No Poisons-basic_strike_25-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 26.45341 - tps: 18.78192 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Orc-p1_combat-No Poisons-basic_strike_25-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 49.40973 - tps: 35.08091 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Orc-p1_combat-No Poisons-basic_strike_25-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 49.40973 - tps: 35.08091 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Orc-p1_combat-No Poisons-basic_strike_25-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 52.08545 - tps: 36.98067 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Orc-p1_combat-No Poisons-basic_strike_25-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 24.48192 - tps: 17.38216 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Orc-p1_combat-No Poisons-basic_strike_25-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 24.48192 - tps: 17.38216 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-Settings-Orc-p1_combat-No Poisons-basic_strike_25-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 26.20644 - tps: 18.60657 - } -} -dps_results: { - key: "TestCombat-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 202.00594 - tps: 143.42422 - } -} -dps_results: { - key: "TestCombat-Phase2-Lvl40-AllItems-DarkmantleArmor" - value: { - dps: 264.57647 - tps: 187.8493 - } -} dps_results: { key: "TestCombat-Phase2-Lvl40-Average-Default" value: { - dps: 531.71169 - tps: 377.5153 + dps: 52.93561 + tps: 37.58429 } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 208.03987 - tps: 147.70831 - } + key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 180.26207 - tps: 127.98607 - } + key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 237.45502 - tps: 168.59307 - } + key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 115.41787 - tps: 81.94669 - } + key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 100.40169 - tps: 71.2852 - } + key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 132.7893 - tps: 94.2804 - } + key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 207.74219 - tps: 147.49695 - } + key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 178.5406 - tps: 126.76382 - } + key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 233.52889 - tps: 165.80551 - } + key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 118.77544 - tps: 84.33057 - } + key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 102.44067 - tps: 72.73288 - } + key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" + value: {} } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 133.65744 - tps: 94.89678 - } + key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" + value: {} } dps_results: { key: "TestCombat-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 507.43522 - tps: 360.27901 + dps: 49.69395 + tps: 35.28271 } } diff --git a/sim/rogue/dps_rogue/dps_rogue_test.go b/sim/rogue/dps_rogue/dps_rogue_test.go index f51e2df63..dff395faf 100644 --- a/sim/rogue/dps_rogue/dps_rogue_test.go +++ b/sim/rogue/dps_rogue/dps_rogue_test.go @@ -13,23 +13,6 @@ func init() { func TestCombat(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassRogue, - Level: 25, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: CombatDagger25Talents, - GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "p1_combat"), - Rotation: core.GetAplRotation("../../../ui/rogue/apls", "basic_strike_25"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultCombatRogue}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassRogue, Level: 40, @@ -37,7 +20,7 @@ func TestCombat(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceOrc}, Talents: CombatDagger40Talents, - GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "p2_daggers"), + GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/rogue/apls", "mutilate"), Buffs: core.FullBuffsPhase2, Consumes: Phase2Consumes, @@ -52,23 +35,6 @@ func TestCombat(t *testing.T) { func TestAssassination(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassRogue, - Level: 25, - Race: proto.Race_RaceHuman, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Assassination25Talents, - GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "p1_daggers"), - Rotation: core.GetAplRotation("../../../ui/rogue/apls", "mutilate"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultAssassinationRogue}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassRogue, Level: 40, @@ -76,7 +42,7 @@ func TestAssassination(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceOrc}, Talents: Assassination40Talents, - GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "p2_daggers"), + GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/rogue/apls", "mutilate"), Buffs: core.FullBuffsPhase2, Consumes: Phase2Consumes, diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index e020dd98f..989a99b84 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1,159 +1,12 @@ character_stats_results: { - key: "TestElemental-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 81.4 - final_stats: 44 - final_stats: 152.9 - final_stats: 136.4 - final_stats: 108.9 - final_stats: 135 - final_stats: 0 - final_stats: 19 - final_stats: 0 - final_stats: 0 - final_stats: 14 - final_stats: 0 - final_stats: 21 - final_stats: 6 - final_stats: 8.05608 - final_stats: 0 - final_stats: 10 - final_stats: 343.8 - final_stats: 1 - final_stats: 7.9724 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2271 - final_stats: 0 - final_stats: 0 - final_stats: 742 - final_stats: 80 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 5.9724 - final_stats: 5 - final_stats: 0 - final_stats: 1606 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 15 - final_stats: 162 - final_stats: 22 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestElemental-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 128.7 - final_stats: 59.4 - final_stats: 244.2 - final_stats: 204.6 - final_stats: 133.1 - final_stats: 249 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 17 - final_stats: 0 - final_stats: 39.75 - final_stats: 4 - final_stats: 14.66052 - final_stats: 0 - final_stats: 0 - final_stats: 553.4 - final_stats: 4 - final_stats: 8.95898 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3764 - final_stats: 0 - final_stats: 0 - final_stats: 1842.8 - final_stats: 220 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 5.95898 - final_stats: 5 - final_stats: 0 - final_stats: 2872 - final_stats: 21 - final_stats: 43 - final_stats: 33 - final_stats: 38 - final_stats: 43 - final_stats: 263 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestElemental-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 199.584 - final_stats: 153.252 - final_stats: 358.776 - final_stats: 313.632 - final_stats: 196.02 - final_stats: 281 - final_stats: 0 - final_stats: 40 - final_stats: 23 - final_stats: 0 - final_stats: 23 - final_stats: 0 - final_stats: 33 - final_stats: 4 - final_stats: 25.82355 - final_stats: 0 - final_stats: 0 - final_stats: 811.168 - final_stats: 4 - final_stats: 29.89512 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 5963.454 - final_stats: 0 - final_stats: 0 - final_stats: 2047.504 - final_stats: 310 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 10.89512 - final_stats: 5 - final_stats: 0 - final_stats: 4354.76 - final_stats: 23 - final_stats: 43 - final_stats: 48 - final_stats: 48 - final_stats: 48 - final_stats: 434 - final_stats: 0 - final_stats: 555.448 - final_stats: 0 - } -} -character_stats_results: { - key: "TestElemental-Phase4-Lvl60-CharacterStats-Default" + key: "TestElemental-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 229.9 - final_stats: 198 - final_stats: 495.88 - final_stats: 366.3 - final_stats: 193.6 - final_stats: 542 + final_stats: 259.325 + final_stats: 222.64 + final_stats: 365.14225 + final_stats: 199.87 + final_stats: 217.58 + final_stats: 186 final_stats: 0 final_stats: 40 final_stats: 0 @@ -161,265 +14,57 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 41.25 - final_stats: 8 - final_stats: 35.49047 + final_stats: 3 + final_stats: 27.6778 final_stats: 0 final_stats: 0 - final_stats: 1389.8 - final_stats: 8 - final_stats: 30.7584 + final_stats: 1448.65 + final_stats: 3 + final_stats: 26.01011 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 6734.5 + final_stats: 4238.05 final_stats: 0 final_stats: 0 - final_stats: 5511 + final_stats: 829.28 final_stats: 740 final_stats: 0 final_stats: 5 - final_stats: 45 - final_stats: 11.7584 + final_stats: 0 + final_stats: 13.01011 final_stats: 5 final_stats: 0 - final_stats: 6501.8 + final_stats: 5194.4225 final_stats: 27 - final_stats: 246 - final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 384 - final_stats: 55 - final_stats: 644.45 - final_stats: 0 - } -} -character_stats_results: { - key: "TestElemental-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 264.385 - final_stats: 227.7 - final_stats: 640.09 - final_stats: 478.17 - final_stats: 246.675 - final_stats: 669 - final_stats: 0 - final_stats: 40 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 9 - final_stats: 40.38107 - final_stats: 0 - final_stats: 0 - final_stats: 1458.77 - final_stats: 9 - final_stats: 34.26716 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 8412.55 - final_stats: 0 - final_stats: 0 - final_stats: 6344.4 - final_stats: 740 - final_stats: 0 - final_stats: 5 - final_stats: 55 - final_stats: 13.26716 - final_stats: 5 - final_stats: 0 - final_stats: 7943.9 - final_stats: 27 final_stats: 60 - final_stats: 90 - final_stats: 90 final_stats: 60 final_stats: 384 - final_stats: 73 - final_stats: 782.255 + final_stats: 0 + final_stats: 35 final_stats: 0 } } stat_weights_results: { - key: "TestElemental-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.01788 - weights: 0 - weights: 0.53816 - weights: 0 - weights: 0.21497 - weights: 0 - weights: 0 - weights: 0.32319 - weights: 0 - weights: 0 - weights: 0 - weights: 0.4687 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestElemental-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 1.31163 - weights: 0 - weights: 0.86918 - weights: 0 - weights: 0.26525 - weights: 0 - weights: 0 - weights: 0.60394 - weights: 0 - weights: 0 - weights: 6.4922 - weights: 3.21495 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestElemental-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 2.15021 - weights: 0 - weights: 1.12387 - weights: 0 - weights: 0.35097 - weights: 0 - weights: 0 - weights: 0.77289 - weights: 0 - weights: 0 - weights: 14.88779 - weights: 8.65897 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestElemental-Phase4-Lvl60-StatWeights-Default" + key: "TestElemental-Phase5-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: 3.31169 - weights: 0 - weights: 1.71556 - weights: 0 - weights: 0.54389 - weights: 0 - weights: 0 - weights: 1.17167 - weights: 0 - weights: 0 - weights: 29.28029 - weights: 14.09683 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 + weights: 1.09248 weights: 0 + weights: 0.80904 weights: 0 + weights: 0.11555 weights: 0 weights: 0 + weights: 0.69349 weights: 0 weights: 0 + weights: 6.9332 + weights: 4.39118 weights: 0 weights: 0 weights: 0 @@ -437,27 +82,6 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - } -} -stat_weights_results: { - key: "TestElemental-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 4.26325 - weights: 0 - weights: 2.10544 - weights: 0 - weights: 0.53297 - weights: 0 - weights: 0 - weights: 1.57247 - weights: 0 - weights: 0 - weights: 0 - weights: 25.16907 - weights: 0 weights: 0 weights: 0 weights: 0 @@ -470,623 +94,103 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Average-Default" - value: { - dps: 190.52825 - tps: 152.29783 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Orc-phase_1-Adaptive-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 180.15842 - tps: 340.76113 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Orc-phase_1-Adaptive-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 180.15842 - tps: 143.08418 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Orc-phase_1-Adaptive-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 182.1356 - tps: 142.68431 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Orc-phase_1-Adaptive-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 128.84995 - tps: 293.62985 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Orc-phase_1-Adaptive-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 128.84995 - tps: 104.35881 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Orc-phase_1-Adaptive-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 131.16525 - tps: 103.22209 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Troll-phase_1-Adaptive-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 180.09799 - tps: 340.74731 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Troll-phase_1-Adaptive-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 180.09799 - tps: 143.03181 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Troll-phase_1-Adaptive-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 181.9815 - tps: 142.5469 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Troll-phase_1-Adaptive-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 128.82718 - tps: 293.45138 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Troll-phase_1-Adaptive-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 128.82718 - tps: 104.33298 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-Settings-Troll-phase_1-Adaptive-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 131.16525 - tps: 103.22275 - } -} -dps_results: { - key: "TestElemental-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 188.15947 - tps: 150.83792 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Average-Default" - value: { - dps: 620.06422 - tps: 516.61227 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 712.24503 - tps: 1174.12424 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 591.6183 - tps: 493.80758 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 607.68837 - tps: 504.84936 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 376.32857 - tps: 726.53472 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 322.57443 - tps: 270.30199 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 420.83777 - tps: 350.00157 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 715.20419 - tps: 1173.71573 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 599.20782 - tps: 497.18595 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 620.94544 - tps: 509.92034 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 377.95597 - tps: 730.95732 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 320.34563 - tps: 267.46998 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 431.47472 - tps: 356.95339 - } -} -dps_results: { - key: "TestElemental-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 619.28394 - tps: 516.77132 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Average-Default" - value: { - dps: 1639.51416 - tps: 1407.36232 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 3566.40307 - tps: 3580.37421 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1585.52217 - tps: 1365.15831 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1681.2282 - tps: 1476.36559 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1736.16623 - tps: 1889.08507 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 932.22426 - tps: 819.28417 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 989.5091 - tps: 878.5067 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 3594.44684 - tps: 3612.81342 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1605.92397 - tps: 1381.35853 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1664.92427 - tps: 1457.12339 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1706.54835 - tps: 1862.68202 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 943.07847 - tps: 827.37147 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 985.9274 - tps: 877.21645 - } -} -dps_results: { - key: "TestElemental-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1617.95562 - tps: 1389.62472 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" - value: { - dps: 1391.14774 - tps: 1458.33909 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sMail" - value: { - dps: 1390.78449 - tps: 1457.76439 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail" - value: { - dps: 1508.29061 - tps: 1573.23398 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldChainmail" - value: { - dps: 1470.54948 - tps: 1536.40182 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldLadenChain" - value: { - dps: 1389.77682 - tps: 1456.67124 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldScalemail" - value: { - dps: 1390.01033 - tps: 1456.90475 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" - value: { - dps: 2541.64787 - tps: 2577.07634 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-AllItems-TheFiveThunders" - value: { - dps: 1291.34069 - tps: 1283.62875 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Average-Default" - value: { - dps: 3477.44049 - tps: 2112.27213 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 6127.71812 - tps: 4134.00871 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3375.89031 - tps: 2046.28699 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3490.38917 - tps: 2146.57101 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2474.29406 - tps: 1935.57248 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1621.25767 - tps: 1005.6523 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1683.06399 - tps: 1056.4697 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 6153.70196 - tps: 4143.44757 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 3427.3961 - tps: 2078.38082 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 3503.45737 - tps: 2151.55002 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2406.50389 - tps: 1883.54124 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 1636.3824 - tps: 1014.02491 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1703.36954 - tps: 1067.08844 - } -} -dps_results: { - key: "TestElemental-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 3441.50878 - tps: 2085.67216 - } -} -dps_results: { - key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail" - value: { - dps: 1470.75568 - tps: 1496.7579 - } -} -dps_results: { - key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sMail" - value: { - dps: 1470.17275 - tps: 1496.03859 - } -} -dps_results: { - key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail" - value: { - dps: 1596.40551 - tps: 1622.50922 - } -} -dps_results: { - key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldChainmail" - value: { - dps: 1552.76155 - tps: 1577.57954 - } -} -dps_results: { - key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldLadenChain" - value: { - dps: 1468.92699 - tps: 1494.82204 - } -} -dps_results: { - key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldScalemail" - value: { - dps: 1469.24941 - tps: 1495.14447 - } -} -dps_results: { - key: "TestElemental-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail" - value: { - dps: 2790.16465 - tps: 2787.59094 - } -} -dps_results: { - key: "TestElemental-Phase5-Lvl60-AllItems-TheFiveThunders" - value: { - dps: 1294.07794 - tps: 1276.75543 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Average-Default" value: { - dps: 4652.78971 - tps: 2794.75637 + dps: 672.95578 + tps: 677.91111 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Orc-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 8646.67945 - tps: 4240.41863 + dps: 1341.60726 + tps: 1291.62489 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Orc-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4536.14952 - tps: 2731.04377 + dps: 626.5589 + tps: 628.08134 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Orc-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4924.24615 - tps: 3050.42567 + dps: 716.89938 + tps: 725.56093 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Orc-blank-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4439.57898 - tps: 2263.38624 + dps: 453.56239 + tps: 678.48833 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Orc-blank-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 2034.55219 - tps: 1235.26834 + dps: 204.00015 + tps: 208.96293 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Orc-blank-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2210.74517 - tps: 1379.28335 + dps: 307.53315 + tps: 319.6936 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Troll-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 8628.66139 - tps: 4269.68014 + dps: 1320.91048 + tps: 1297.77723 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Troll-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4538.53263 - tps: 2720.62233 + dps: 624.42618 + tps: 626.23169 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Troll-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4880.15364 - tps: 3006.84227 + dps: 739.66558 + tps: 749.90851 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Troll-blank-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4426.03907 - tps: 2258.06706 + dps: 420.30746 + tps: 676.11031 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Troll-blank-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 2033.67111 - tps: 1230.72853 + dps: 205.14144 + tps: 210.4885 } } dps_results: { - key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" + key: "TestElemental-Phase5-Lvl60-Settings-Troll-blank-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2193.19622 - tps: 1363.37787 + dps: 302.12587 + tps: 314.5904 } } dps_results: { key: "TestElemental-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4570.74321 - tps: 2745.5151 + dps: 672.25324 + tps: 677.51161 } } diff --git a/sim/shaman/elemental/elemental_test.go b/sim/shaman/elemental/elemental_test.go index e779ec868..100fc5150 100644 --- a/sim/shaman/elemental/elemental_test.go +++ b/sim/shaman/elemental/elemental_test.go @@ -14,75 +14,6 @@ func init() { func TestElemental(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassShaman, - Level: 25, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Phase1Talents, - GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "phase_1"), - Rotation: core.GetAplRotation("../../../ui/elemental_shaman/apls", "phase_1"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassShaman, - Level: 40, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Phase2Talents, - GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "phase_2"), - Rotation: core.GetAplRotation("../../../ui/elemental_shaman/apls", "phase_2"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassShaman, - Level: 50, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Phase3Talents, - GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "phase_3"), - Rotation: core.GetAplRotation("../../../ui/elemental_shaman/apls", "phase_3"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassShaman, - Phase: 4, - Level: 60, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "phase_4"), - Rotation: core.GetAplRotation("../../../ui/elemental_shaman/apls", "phase_4"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassShaman, Phase: 5, @@ -91,7 +22,7 @@ func TestElemental(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceOrc}, Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "phase_5"), + GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/elemental_shaman/apls", "phase_5"), Buffs: core.FullBuffsPhase5, Consumes: Phase5Consumes, diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 5ca62d7fd..ca13e9b2e 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1,190 +1,43 @@ character_stats_results: { - key: "TestEnhancement-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 140.8 - final_stats: 129.8 - final_stats: 148.5 - final_stats: 61.6 - final_stats: 68.2 - final_stats: 25 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4 - final_stats: 9 - final_stats: 4.89952 - final_stats: 0 - final_stats: 0 - final_stats: 544.2 - final_stats: 6 - final_stats: 21.30358 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 1206.45 - final_stats: 0 - final_stats: 0 - final_stats: 1063.6 - final_stats: 134 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 14.30358 - final_stats: 5 - final_stats: 0 - final_stats: 1562 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 10 - final_stats: 211 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestEnhancement-Phase2-Lvl40-CharacterStats-Default" + key: "TestEnhancement-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 174.9 - final_stats: 171.6 - final_stats: 261.8 - final_stats: 136.4 - final_stats: 124.3 - final_stats: 42 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 + final_stats: 309.925 + final_stats: 254.265 + final_stats: 365.14225 + final_stats: 187.22 + final_stats: 217.58 + final_stats: 150 final_stats: 0 - final_stats: 0 - final_stats: 28.75 - final_stats: 9 - final_stats: 14.87368 - final_stats: 0 - final_stats: 0 - final_stats: 819.8 - final_stats: 9 - final_stats: 24.00372 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2878.05 - final_stats: 0 - final_stats: 0 - final_stats: 2044.2 - final_stats: 394 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 14.00372 - final_stats: 5 - final_stats: 0 - final_stats: 3048 - final_stats: 18 - final_stats: 30 - final_stats: 40 - final_stats: 35 final_stats: 40 - final_stats: 303 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestEnhancement-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 367.092 - final_stats: 264.924 - final_stats: 371.844 - final_stats: 238.788 - final_stats: 181.764 - final_stats: 0 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 31 - final_stats: 6 - final_stats: 23.26679 - final_stats: 0 - final_stats: 0 - final_stats: 1377.184 - final_stats: 7 - final_stats: 38.59544 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4784.661 final_stats: 0 final_stats: 0 - final_stats: 2787.848 - final_stats: 521 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 17.59544 - final_stats: 5 - final_stats: 0 - final_stats: 4485.44 - final_stats: 20 - final_stats: 30 - final_stats: 45 - final_stats: 45 - final_stats: 45 - final_stats: 324 - final_stats: 0 - final_stats: 79 - final_stats: 0 - } -} -character_stats_results: { - key: "TestEnhancement-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 449.9 - final_stats: 257.4 - final_stats: 476.905 - final_stats: 253 - final_stats: 193.6 - final_stats: 184 - final_stats: 0 - final_stats: 40 final_stats: 0 final_stats: 0 + final_stats: 41.25 final_stats: 0 + final_stats: 26.46402 final_stats: 0 - final_stats: 41.25 - final_stats: 12 - final_stats: 36.5757 final_stats: 0 + final_stats: 1589.85 final_stats: 0 - final_stats: 2033.8 - final_stats: 14 - final_stats: 43.77592 + final_stats: 34.61666 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 5286.75 + final_stats: 4250.715 final_stats: 0 final_stats: 0 - final_stats: 3042.8 - final_stats: 944 + final_stats: 892.53 + final_stats: 780 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 14.77592 + final_stats: 14.61666 final_stats: 5 final_stats: 0 - final_stats: 6312.05 + final_stats: 5194.4225 final_stats: 27 - final_stats: 244 + final_stats: 60 final_stats: 60 final_stats: 60 final_stats: 60 @@ -194,211 +47,15 @@ character_stats_results: { final_stats: 0 } } -character_stats_results: { - key: "TestEnhancement-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 581.9 - final_stats: 321.31 - final_stats: 651.728 - final_stats: 318.78 - final_stats: 227.7 - final_stats: 185 - final_stats: 0 - final_stats: 40 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 19 - final_stats: 37.68738 - final_stats: 0 - final_stats: 0 - final_stats: 2413.8 - final_stats: 19 - final_stats: 47.02255 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 6322.785 - final_stats: 0 - final_stats: 0 - final_stats: 3605.62 - final_stats: 1060 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 18.02255 - final_stats: 5 - final_stats: 0 - final_stats: 8060.28 - final_stats: 27 - final_stats: 90 - final_stats: 80 - final_stats: 80 - final_stats: 60 - final_stats: 384 - final_stats: 44 - final_stats: 58 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestEnhancement-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0.34791 - weights: 0.24301 - weights: 0 - weights: 0 - weights: 0 - weights: 0.11876 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.15814 - weights: 1.30734 - weights: 1.64885 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestEnhancement-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 1.00002 - weights: 1.15332 - weights: 0 - weights: 0 - weights: 0 - weights: 0.34202 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.45455 - weights: 4.44572 - weights: 7.77853 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { - key: "TestEnhancement-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 1.60363 - weights: 0.84987 - weights: 0 - weights: 0 - weights: 0 - weights: 0.43178 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.67493 - weights: 5.44052 - weights: 10.248 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestEnhancement-Phase4-Lvl60-StatWeights-Default" + key: "TestEnhancement-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.07035 - weights: 0.46188 + weights: 0.35917 + weights: 0.25331 weights: 0 weights: 0 weights: 0 - weights: 0.7562 + weights: 0.24094 weights: 0 weights: 0 weights: 0 @@ -410,9 +67,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.94107 - weights: 27.35923 - weights: 10.41943 + weights: 0.14196 + weights: 1.09562 + weights: 2.91414 weights: 0 weights: 0 weights: 0 @@ -439,1410 +96,185 @@ stat_weights_results: { weights: 0 } } -stat_weights_results: { - key: "TestEnhancement-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 2.53261 - weights: 1.31136 - weights: 0 - weights: 0 - weights: 0 - weights: 0.83964 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 1.00103 - weights: 29.31526 - weights: 10.97444 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Average-Default" - value: { - dps: 161.19866 - tps: 160.36085 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Auto-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 51.68454 - tps: 185.17712 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Auto-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 51.68454 - tps: 50.81783 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Auto-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 55.42695 - tps: 52.40402 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Auto-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 32.08244 - tps: 136.12744 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Auto-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 32.08244 - tps: 31.86969 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Auto-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 39.21889 - tps: 37.13662 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Delay OH-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 51.68454 - tps: 185.17712 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Delay OH-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 51.68454 - tps: 50.81783 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Delay OH-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 55.42695 - tps: 52.40402 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Delay OH-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 32.08244 - tps: 136.12744 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Delay OH-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 32.08244 - tps: 31.86969 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Orc-phase_1-Sync Delay OH-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 39.21889 - tps: 37.13662 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Auto-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 51.05358 - tps: 182.87281 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Auto-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 51.05358 - tps: 50.1594 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Auto-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 54.9142 - tps: 51.89127 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Auto-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 31.99865 - tps: 134.26405 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Auto-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 31.99865 - tps: 31.50255 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Auto-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 38.82445 - tps: 36.74218 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Delay OH-phase_1-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 51.05358 - tps: 182.87281 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Delay OH-phase_1-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 51.05358 - tps: 50.1594 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Delay OH-phase_1-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 54.9142 - tps: 51.89127 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Delay OH-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 31.99865 - tps: 134.26405 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Delay OH-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 31.99865 - tps: 31.50255 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-Settings-Troll-phase_1-Sync Delay OH-phase_1-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 38.82445 - tps: 36.74218 - } -} -dps_results: { - key: "TestEnhancement-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 152.48211 - tps: 151.58792 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Average-Default" - value: { - dps: 775.74948 - tps: 819.33036 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget" - value: { - dps: 373.25907 - tps: 408.28028 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 372.52215 - tps: 405.60382 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 371.90429 - tps: 406.9692 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" - value: { - dps: 202.03599 - tps: 224.65533 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 233.15759 - tps: 264.28867 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 229.59439 - tps: 260.91744 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget" - value: { - dps: 373.25907 - tps: 408.28028 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 372.52215 - tps: 405.60382 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 371.90429 - tps: 406.9692 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" - value: { - dps: 202.03599 - tps: 224.65533 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 233.15759 - tps: 264.28867 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 229.59439 - tps: 260.91744 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget" - value: { - dps: 376.08059 - tps: 413.51262 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 380.30962 - tps: 413.63983 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 380.05254 - tps: 413.56715 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" - value: { - dps: 198.57114 - tps: 221.28473 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 236.61606 - tps: 267.98648 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 232.71414 - tps: 263.39494 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget" - value: { - dps: 376.08059 - tps: 413.51262 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 380.30962 - tps: 413.63983 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 380.05254 - tps: 413.56715 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" - value: { - dps: 198.57114 - tps: 221.28473 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 236.61606 - tps: 267.98648 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 232.71414 - tps: 263.39494 - } -} -dps_results: { - key: "TestEnhancement-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 717.90037 - tps: 758.25366 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Average-Default" - value: { - dps: 1722.57549 - tps: 1261.16602 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget" - value: { - dps: 895.49969 - tps: 661.60776 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 891.31605 - tps: 662.23479 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 891.90613 - tps: 665.13155 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" - value: { - dps: 426.79777 - tps: 323.93773 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 471.23374 - tps: 365.13607 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 476.80941 - tps: 369.58547 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget" - value: { - dps: 895.49969 - tps: 661.60776 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 891.31605 - tps: 662.23479 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 891.90613 - tps: 665.13155 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" - value: { - dps: 426.79777 - tps: 323.93773 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 471.23374 - tps: 365.13607 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 476.80941 - tps: 369.58547 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget" - value: { - dps: 892.65308 - tps: 664.72312 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 900.08497 - tps: 669.39976 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 902.12493 - tps: 671.46149 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" - value: { - dps: 417.87294 - tps: 318.2289 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 474.77486 - tps: 369.07529 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 478.57498 - tps: 369.69885 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget" - value: { - dps: 892.65308 - tps: 664.72312 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 900.08497 - tps: 669.39976 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 902.12493 - tps: 671.46149 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" - value: { - dps: 417.87294 - tps: 318.2289 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget" - value: { - dps: 474.77486 - tps: 369.07529 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 478.57498 - tps: 369.69885 - } -} -dps_results: { - key: "TestEnhancement-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1599.6876 - tps: 1170.61979 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" - value: { - dps: 1864.63695 - tps: 1889.51393 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sMail" - value: { - dps: 1933.25273 - tps: 1956.86113 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail" - value: { - dps: 1970.48593 - tps: 1996.17433 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldChainmail" - value: { - dps: 1909.54718 - tps: 1934.63157 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldLadenChain" - value: { - dps: 1863.52665 - tps: 1888.64065 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldScalemail" - value: { - dps: 1910.34731 - tps: 1934.54807 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" - value: { - dps: 2837.20892 - tps: 2898.1127 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-AllItems-TheFiveThunders" - value: { - dps: 1538.61473 - tps: 1571.33148 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Average-Default" - value: { - dps: 3756.48207 - tps: 2679.76479 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1647.92471 - tps: 1669.95849 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1017.02888 - tps: 734.31856 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1102.03869 - tps: 723.69253 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 671.95281 - tps: 912.40285 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 434.97338 - tps: 323.07943 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 538.79804 - tps: 364.6705 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1647.92471 - tps: 1669.95849 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1017.02888 - tps: 734.31856 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1102.03869 - tps: 723.69253 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 671.95281 - tps: 912.40285 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 434.97338 - tps: 323.07943 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 538.79804 - tps: 364.6705 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 2917.33696 - tps: 2564.99462 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1468.08801 - tps: 1049.04138 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1538.8124 - tps: 1031.91708 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1184.9604 - tps: 1283.94052 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 600.71296 - tps: 438.61172 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 714.87573 - tps: 487.0621 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 2917.33696 - tps: 2564.99462 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1468.08801 - tps: 1049.04138 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1538.8124 - tps: 1031.91708 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1184.9604 - tps: 1283.94052 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 600.71296 - tps: 438.61172 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 714.87573 - tps: 487.0621 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1644.43382 - tps: 1670.75787 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1024.76391 - tps: 740.17875 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1102.24031 - tps: 724.29529 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 669.80948 - tps: 912.32981 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 433.00735 - tps: 321.73579 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 538.07634 - tps: 364.8159 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1644.43382 - tps: 1670.75787 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1024.76391 - tps: 740.17875 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1102.24031 - tps: 724.29529 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 669.80948 - tps: 912.32981 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 433.00735 - tps: 321.73579 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 538.07634 - tps: 364.8159 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 2919.19193 - tps: 2576.76871 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1456.96585 - tps: 1041.39487 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1537.92415 - tps: 1030.623 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1166.4698 - tps: 1271.78075 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 593.90598 - tps: 434.44162 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 714.66571 - tps: 487.4162 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 2919.19193 - tps: 2576.76871 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1456.96585 - tps: 1041.39487 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1537.92415 - tps: 1030.623 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1166.4698 - tps: 1271.78075 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 593.90598 - tps: 434.44162 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 714.66571 - tps: 487.4162 - } -} -dps_results: { - key: "TestEnhancement-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 3038.3214 - tps: 2165.94136 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail" - value: { - dps: 2004.35599 - tps: 2018.10964 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sMail" - value: { - dps: 2080.94272 - tps: 2093.27791 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail" - value: { - dps: 2136.86054 - tps: 2149.679 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldChainmail" - value: { - dps: 2053.30608 - tps: 2066.60698 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldLadenChain" - value: { - dps: 2004.13401 - tps: 2017.95981 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldScalemail" - value: { - dps: 2050.69239 - tps: 2063.58912 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail" - value: { - dps: 3298.42321 - tps: 3345.02873 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-AllItems-TheFiveThunders" - value: { - dps: 1656.68535 - tps: 1684.44568 - } -} dps_results: { key: "TestEnhancement-Phase5-Lvl60-Average-Default" value: { - dps: 4494.16683 - tps: 3199.90278 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 2229.26248 - tps: 2101.70856 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1390.21665 - tps: 991.22248 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1481.89855 - tps: 986.62346 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 862.5327 - tps: 1064.94751 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 566.85456 - tps: 414.75499 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 683.43732 - tps: 468.32115 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 2229.26248 - tps: 2101.70856 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1390.21665 - tps: 991.22248 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1481.89855 - tps: 986.62346 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 862.5327 - tps: 1064.94751 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 566.85456 - tps: 414.75499 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 683.43732 - tps: 468.32115 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 3579.82597 - tps: 3042.7302 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1666.81437 - tps: 1189.58492 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1872.01158 - tps: 1265.65497 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1489.73813 - tps: 1609.08068 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 666.1923 - tps: 486.99103 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 840.44119 - tps: 574.37328 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 3579.82597 - tps: 3042.7302 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 1666.81437 - tps: 1189.58492 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 1872.01158 - tps: 1265.65497 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" - value: { - dps: 1489.73813 - tps: 1609.08068 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" - value: { - dps: 666.1923 - tps: 486.99103 - } -} -dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" - value: { - dps: 840.44119 - tps: 574.37328 + dps: 464.11124 + tps: 536.93181 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 2201.32843 - tps: 2083.26697 + dps: 444.9234 + tps: 1223.36454 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1384.10045 - tps: 989.6056 + dps: 243.60587 + tps: 314.39053 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1483.75711 - tps: 987.12336 + dps: 242.69644 + tps: 314.55301 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 841.95032 - tps: 1051.206 + dps: 150.67655 + tps: 620.93931 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 558.37904 - tps: 408.39066 + dps: 89.89647 + tps: 115.64539 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 683.55623 - tps: 468.89558 + dps: 112.39769 + tps: 142.61766 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 2201.32843 - tps: 2083.26697 + dps: 444.9234 + tps: 1223.36454 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1384.10045 - tps: 989.6056 + dps: 243.60587 + tps: 314.39053 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1483.75711 - tps: 987.12336 + dps: 242.69644 + tps: 314.55301 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 841.95032 - tps: 1051.206 + dps: 150.67655 + tps: 620.93931 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 558.37904 - tps: 408.39066 + dps: 89.89647 + tps: 115.64539 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 683.55623 - tps: 468.89558 + dps: 112.39769 + tps: 142.61766 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3558.57675 - tps: 3037.2645 + dps: 442.78265 + tps: 1220.6077 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1653.68457 - tps: 1180.64918 + dps: 248.42012 + tps: 322.69053 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1871.9414 - tps: 1265.98741 + dps: 242.60023 + tps: 315.25556 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1479.35736 - tps: 1604.53929 + dps: 146.66276 + tps: 608.09518 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 660.71475 - tps: 481.9224 + dps: 88.46662 + tps: 113.50845 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 840.11016 - tps: 574.63875 + dps: 112.37858 + tps: 143.48008 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3558.57675 - tps: 3037.2645 + dps: 442.78265 + tps: 1220.6077 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1653.68457 - tps: 1180.64918 + dps: 248.42012 + tps: 322.69053 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1871.9414 - tps: 1265.98741 + dps: 242.60023 + tps: 315.25556 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1479.35736 - tps: 1604.53929 + dps: 146.66276 + tps: 608.09518 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 660.71475 - tps: 481.9224 + dps: 88.46662 + tps: 113.50845 } } dps_results: { - key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 840.11016 - tps: 574.63875 + dps: 112.37858 + tps: 143.48008 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3694.82427 - tps: 2630.83207 + dps: 411.0518 + tps: 481.64665 } } diff --git a/sim/shaman/enhancement/enhancement_test.go b/sim/shaman/enhancement/enhancement_test.go index 6be21e770..2c33109e7 100644 --- a/sim/shaman/enhancement/enhancement_test.go +++ b/sim/shaman/enhancement/enhancement_test.go @@ -14,96 +14,6 @@ func init() { func TestEnhancement(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassShaman, - Level: 25, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Phase1Talents, - GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_1"), - Rotation: core.GetAplRotation("../../../ui/enhancement_shaman/apls", "phase_1"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Sync Auto", SpecOptions: PlayerOptionsSyncAuto}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Sync Delay OH", SpecOptions: PlayerOptionsSyncDelayOH}, - }, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassShaman, - Level: 40, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Phase2Talents, - GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_2"), - Rotation: core.GetAplRotation("../../../ui/enhancement_shaman/apls", "phase_2"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2ConsumesWFWF, - OtherConsumes: []core.ConsumesCombo{ - Phase2ConsumesWFFT, - }, - SpecOptions: core.SpecOptionsCombo{Label: "Sync Auto", SpecOptions: PlayerOptionsSyncAuto}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Sync Delay OH", SpecOptions: PlayerOptionsSyncDelayOH}, - }, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassShaman, - Level: 50, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Phase3Talents, - GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_3"), - Rotation: core.GetAplRotation("../../../ui/enhancement_shaman/apls", "phase_3"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3ConsumesWFWF, - OtherConsumes: []core.ConsumesCombo{ - Phase3ConsumesWFFT, - }, - SpecOptions: core.SpecOptionsCombo{Label: "Sync Auto", SpecOptions: PlayerOptionsSyncAuto}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Sync Delay OH", SpecOptions: PlayerOptionsSyncDelayOH}, - }, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassShaman, - Phase: 4, - Level: 60, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceOrc}, - - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_4_dw"), - OtherGearSets: []core.GearSetCombo{ - core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_4_2h"), - }, - Rotation: core.GetAplRotation("../../../ui/enhancement_shaman/apls", "phase_4"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4ConsumesWFWF, - SpecOptions: core.SpecOptionsCombo{Label: "Sync Auto", SpecOptions: PlayerOptionsSyncAuto}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "Sync Delay OH", SpecOptions: PlayerOptionsSyncDelayOH}, - }, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassShaman, Phase: 5, @@ -112,10 +22,10 @@ func TestEnhancement(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceOrc}, Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_5_dw"), - OtherGearSets: []core.GearSetCombo{ - core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_5_2h"), - }, + GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "blank"), + // OtherGearSets: []core.GearSetCombo{ + // core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_5_2h"), + // }, Rotation: core.GetAplRotation("../../../ui/enhancement_shaman/apls", "phase_5"), Buffs: core.FullBuffsPhase5, Consumes: Phase4ConsumesWFWF, diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results index 1e8cfdc89..ed2f24cf3 100644 --- a/sim/shaman/warden/TestWardenShaman.results +++ b/sim/shaman/warden/TestWardenShaman.results @@ -1,12 +1,12 @@ character_stats_results: { key: "TestWardenShaman-Phase4-Lvl60-CharacterStats-Default" value: { - final_stats: 400.4 - final_stats: 225.5 - final_stats: 607.2 - final_stats: 295.9 - final_stats: 193.6 - final_stats: 87 + final_stats: 269.5 + final_stats: 221.1 + final_stats: 317.515 + final_stats: 162.8 + final_stats: 189.2 + final_stats: 24 final_stats: 0 final_stats: 40 final_stats: 0 @@ -14,48 +14,48 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 41.25 - final_stats: 6 - final_stats: 35.30071 final_stats: 0 + final_stats: 26.05132 final_stats: 0 - final_stats: 1881.8 - final_stats: 6 - final_stats: 40.1554 final_stats: 0 + final_stats: 1509 final_stats: 0 + final_stats: 32.93188 final_stats: 0 - final_stats: 5678.5 final_stats: 0 final_stats: 0 - final_stats: 5820 - final_stats: 891 - final_stats: 34 - final_stats: 21.36 - final_stats: 45 - final_stats: 15.5154 - final_stats: 6.36 + final_stats: 3682 final_stats: 0 - final_stats: 8815 + final_stats: 0 + final_stats: 826.2 + final_stats: 780 + final_stats: 0 + final_stats: 10 + final_stats: 0 + final_stats: 13.93188 + final_stats: 5 + final_stats: 0 + final_stats: 5918.15 final_stats: 27 - final_stats: 251 + final_stats: 60 final_stats: 60 final_stats: 60 final_stats: 60 final_stats: 384 - final_stats: 55 - final_stats: 65 + final_stats: 0 + final_stats: 35 final_stats: 0 } } stat_weights_results: { key: "TestWardenShaman-Phase4-Lvl60-StatWeights-Default" value: { - weights: 1.10827 + weights: 0.30619 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 0.48771 + weights: 0.24441 weights: 0 weights: 0 weights: 0 @@ -67,7 +67,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.50376 + weights: 0.13918 + weights: 0 weights: 0 weights: 0 weights: 0 @@ -78,7 +79,6 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.94961 weights: 0 weights: 0 weights: 0 @@ -94,159 +94,103 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - } -} -dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" - value: { - dps: 1153.83821 - tps: 1192.87636 - } -} -dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sMail" - value: { - dps: 1201.90518 - tps: 1239.38377 - } -} -dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail" - value: { - dps: 1191.48492 - tps: 1233.25083 - } -} -dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldChainmail" - value: { - dps: 1181.3229 - tps: 1220.24068 - } -} -dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldLadenChain" - value: { - dps: 1153.67096 - tps: 1192.31616 - } -} -dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldScalemail" - value: { - dps: 1186.55774 - tps: 1224.33803 - } -} -dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" - value: { - dps: 1769.46092 - tps: 1960.14912 - } -} -dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-AllItems-TheFiveThunders" - value: { - dps: 1054.18792 - tps: 1085.80313 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Average-Default" value: { - dps: 1985.99978 - tps: 1588.10868 + dps: 422.97807 + tps: 499.09774 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2101.66159 - tps: 3009.69377 + dps: 999.57947 + tps: 962.47178 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 931.52822 - tps: 809.74366 + dps: 221.44878 + tps: 292.88457 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1259.74654 - tps: 1066.91449 + dps: 231.27534 + tps: 313.09316 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 658.49062 - tps: 1180.96779 + dps: 338.93776 + tps: 592.039 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 328.2284 - tps: 270.62747 + dps: 83.80546 + tps: 122.00432 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 529.26001 - tps: 423.669 + dps: 122.43003 + tps: 181.33723 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2083.40141 - tps: 2983.04069 + dps: 1014.57069 + tps: 954.5221 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 931.22534 - tps: 808.16133 + dps: 220.81782 + tps: 291.59742 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1247.20494 - tps: 1061.35936 + dps: 232.36226 + tps: 318.68043 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 646.2783 - tps: 1161.1969 + dps: 328.07216 + tps: 589.79097 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 321.95332 - tps: 265.02609 + dps: 81.51148 + tps: 118.83441 } } dps_results: { - key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 511.10838 - tps: 407.18634 + dps: 116.52384 + tps: 172.11843 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1710.63317 - tps: 1389.29758 + dps: 381.4182 + tps: 457.92841 } } diff --git a/sim/shaman/warden/warden_test.go b/sim/shaman/warden/warden_test.go index b82a2d6f6..55ce30508 100644 --- a/sim/shaman/warden/warden_test.go +++ b/sim/shaman/warden/warden_test.go @@ -21,7 +21,7 @@ func TestWardenShaman(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceOrc}, Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/warden_shaman/gear_sets", "phase_4_enh_tank"), + GearSet: core.GetGearSet("../../../ui/warden_shaman/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/warden_shaman/apls", "phase_4_enh_tank"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results index 25b138151..b81ceaca4 100644 --- a/sim/warlock/dps/TestAffliction.results +++ b/sim/warlock/dps/TestAffliction.results @@ -1,257 +1,61 @@ character_stats_results: { - key: "TestAffliction-Phase2-Lvl40-CharacterStats-Default" + key: "TestAffliction-Phase4-Lvl60-CharacterStats-Default" value: { - final_stats: 93.5 - final_stats: 39.6 - final_stats: 180.4 - final_stats: 225.5 - final_stats: 182.6 - final_stats: 423.3 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 28 - final_stats: 36.75 - final_stats: 1 - final_stats: 15.6081 - final_stats: 0 - final_stats: 0 - final_stats: 319.5 - final_stats: 1 - final_stats: 8.76408 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4025.5 - final_stats: 0 - final_stats: 0 - final_stats: 945.2 - final_stats: 220 - final_stats: 0 - final_stats: 5 + final_stats: 185.9 + final_stats: 194.7 + final_stats: 418.715 + final_stats: 247.5 + final_stats: 228.8 + final_stats: 559.4 final_stats: 0 - final_stats: 4.76408 - final_stats: 5 - final_stats: 0 - final_stats: 2258 - final_stats: 18 final_stats: 40 - final_stats: 30 - final_stats: 52 - final_stats: 40 - final_stats: 453 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestAffliction-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 135.432 - final_stats: 142.56 - final_stats: 325.512 - final_stats: 364.716 - final_stats: 231.66 - final_stats: 487.83 - final_stats: 23 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 63 - final_stats: 31 - final_stats: 2 - final_stats: 23.14021 - final_stats: 0 - final_stats: 0 - final_stats: 457.432 - final_stats: 2 - final_stats: 24.38253 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 6353.74 - final_stats: 0 - final_stats: 0 - final_stats: 1115.12 - final_stats: 310 - final_stats: 0 + final_stats: 159 + final_stats: 45.25 final_stats: 5 - final_stats: 0 - final_stats: 10.38253 - final_stats: 5 - final_stats: 0 - final_stats: 4054.12 - final_stats: 20 - final_stats: 30 - final_stats: 45 - final_stats: 45 - final_stats: 45 - final_stats: 324 - final_stats: 0 - final_stats: 100 - final_stats: 0 - } -} -character_stats_results: { - key: "TestAffliction-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 188.1 - final_stats: 187 - final_stats: 433.895 - final_stats: 357.5 - final_stats: 235.4 - final_stats: 756.7 - final_stats: 23 - final_stats: 40 + final_stats: 28.78375 final_stats: 0 final_stats: 0 + final_stats: 1005.9 final_stats: 0 - final_stats: 77 - final_stats: 41.25 - final_stats: 6 - final_stats: 37.59875 + final_stats: 24.735 final_stats: 0 final_stats: 0 - final_stats: 1008.1 - final_stats: 6 - final_stats: 33.35 final_stats: 0 + final_stats: 4805.5 final_stats: 0 final_stats: 0 - final_stats: 6455.5 - final_stats: 0 - final_stats: 0 - final_stats: 1379 + final_stats: 1335.4 final_stats: 740 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 11.35 + final_stats: 11.735 final_stats: 5 final_stats: 0 - final_stats: 5872.95 + final_stats: 5721.15 final_stats: 27 - final_stats: 134 + final_stats: 76 + final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 68 final_stats: 384 final_stats: 0 - final_stats: 65 + final_stats: 35 final_stats: 0 } } -stat_weights_results: { - key: "TestAffliction-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.23318 - weights: 0 - weights: 0.70353 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 3.15253 - weights: 2.11549 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestAffliction-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 2.53656 - weights: 0 - weights: 1.15059 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 10.15243 - weights: 10.218 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestAffliction-Phase4-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: 2.96543 + weights: 0.08341 weights: 0 - weights: 1.96256 + weights: 0.3449 weights: 0 weights: 0 weights: 0 @@ -259,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 10.55878 - weights: 21.34366 + weights: 4.41737 + weights: 0.9114 weights: 0 weights: 0 weights: 0 @@ -292,243 +96,67 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestAffliction-Phase2-Lvl40-AllItems-DeathmistRaiment" - value: { - dps: 208.6707 - tps: 167.50895 - hps: 110.68198 - } -} -dps_results: { - key: "TestAffliction-Phase2-Lvl40-Average-Default" - value: { - dps: 628.03296 - tps: 605.63353 - hps: 212.55681 - } -} -dps_results: { - key: "TestAffliction-Phase2-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 624.98924 - tps: 1290.3817 - hps: 214.7696 - } -} -dps_results: { - key: "TestAffliction-Phase2-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 624.98924 - tps: 602.71476 - hps: 214.7696 - } -} -dps_results: { - key: "TestAffliction-Phase2-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 602.21016 - tps: 569.32101 - hps: 177.25342 - } -} -dps_results: { - key: "TestAffliction-Phase2-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 399.7127 - tps: 1090.49257 - hps: 137.00503 - } -} -dps_results: { - key: "TestAffliction-Phase2-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 399.7127 - tps: 391.69676 - hps: 137.00503 - } -} -dps_results: { - key: "TestAffliction-Phase2-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 395.97844 - tps: 377.48052 - hps: 119.58087 - } -} -dps_results: { - key: "TestAffliction-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 627.51269 - tps: 605.15797 - hps: 213.31786 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-AllItems-DeathmistRaiment" - value: { - dps: 364.69077 - tps: 241.70868 - hps: 160.33128 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-Average-Default" - value: { - dps: 1531.02654 - tps: 1331.16812 - hps: 374.09172 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-Settings-Orc-nf.ruin-Affliction Warlock-nf.ruin-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 2293.17189 - tps: 3096.3493 - hps: 371.13784 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-Settings-Orc-nf.ruin-Affliction Warlock-nf.ruin-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1517.84308 - tps: 1318.8169 - hps: 370.96281 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-Settings-Orc-nf.ruin-Affliction Warlock-nf.ruin-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1563.4882 - tps: 1353.56125 - hps: 372.08637 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-Settings-Orc-nf.ruin-Affliction Warlock-nf.ruin-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1424.08599 - tps: 2364.95404 - hps: 224.08099 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-Settings-Orc-nf.ruin-Affliction Warlock-nf.ruin-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 843.45562 - tps: 738.07288 - hps: 224.67108 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-Settings-Orc-nf.ruin-Affliction Warlock-nf.ruin-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 859.23524 - tps: 763.97888 - hps: 225.46369 - } -} -dps_results: { - key: "TestAffliction-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1517.64631 - tps: 1318.32865 - hps: 373.35552 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-DeathmistRaiment" - value: { - dps: 645.14768 - tps: 452.49557 - hps: 270.79764 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-InfernalPactEssence-216509" - value: { - dps: 3048.2967 - tps: 2871.07193 - hps: 647.62383 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-Kezan'sUnstoppableTaint-231346" - value: { - dps: 3124.2962 - tps: 2950.35553 - hps: 645.48312 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-NightmareProphet'sGarb" - value: { - dps: 1321.50648 - tps: 1111.90605 - hps: 320.86936 - } -} dps_results: { key: "TestAffliction-Phase4-Lvl60-Average-Default" value: { - dps: 3151.82255 - tps: 2976.0768 - hps: 642.47761 + dps: 605.36873 + tps: 420.86046 + hps: 249.49185 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3134.63852 - tps: 4368.77991 - hps: 652.92846 + dps: 601.81989 + tps: 882.40919 + hps: 249.54621 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3134.63852 - tps: 2960.34073 - hps: 652.92846 + dps: 601.81989 + tps: 417.25929 + hps: 249.54621 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2943.01379 - tps: 2737.32798 - hps: 579.79383 + dps: 635.23102 + tps: 452.37798 + hps: 233.80946 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1483.41865 - tps: 2905.92662 - hps: 356.33254 + dps: 309.62727 + tps: 753.08531 + hps: 119.91401 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1483.41865 - tps: 1427.04827 - hps: 356.33254 + dps: 309.62727 + tps: 225.68241 + hps: 119.91401 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1429.99839 - tps: 1344.64608 - hps: 318.51428 + dps: 336.06092 + tps: 251.24791 + hps: 113.60254 } } dps_results: { key: "TestAffliction-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3151.80551 - tps: 2977.38602 - hps: 650.58947 + dps: 601.81989 + tps: 417.25929 + hps: 249.54621 } } diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results index 5a5c65119..ca48e60ad 100644 --- a/sim/warlock/dps/TestDemonology.results +++ b/sim/warlock/dps/TestDemonology.results @@ -1,47 +1,47 @@ character_stats_results: { key: "TestDemonology-Phase2-Lvl40-CharacterStats-Default" value: { - final_stats: 93.5 - final_stats: 39.6 - final_stats: 209.99 - final_stats: 221.1 - final_stats: 173.47 - final_stats: 416.735 + final_stats: 99 + final_stats: 60.5 + final_stats: 297.275 + final_stats: 165 + final_stats: 123.31 + final_stats: 390.655 final_stats: 0 - final_stats: 38 + final_stats: 10 final_stats: 0 final_stats: 0 final_stats: 0 + final_stats: 119 + final_stats: 28.75 + final_stats: 5 + final_stats: 15.023 final_stats: 0 - final_stats: 36.75 - final_stats: 2 - final_stats: 25.49282 final_stats: 0 + final_stats: 325 final_stats: 0 - final_stats: 319.5 - final_stats: 2 - final_stats: 18.76408 + final_stats: 9.2229 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 3959.5 + final_stats: 3118 final_stats: 0 final_stats: 0 - final_stats: 917.2 + final_stats: 946 final_stats: 220 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 4.76408 + final_stats: 6.2229 final_stats: 5 final_stats: 0 - final_stats: 2553.9 - final_stats: 18 - final_stats: 40 + final_stats: 3426.75 + final_stats: 13 + final_stats: 46 + final_stats: 30 final_stats: 30 - final_stats: 52 - final_stats: 40 - final_stats: 423 + final_stats: 30 + final_stats: 263 final_stats: 0 final_stats: 14 final_stats: 0 @@ -53,9 +53,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.07502 + weights: 0.00163 weights: 0 - weights: 0.5585 + weights: 0.06564 weights: 0 weights: 0 weights: 0 @@ -63,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 3.93801 - weights: 1.9172 + weights: 0 + weights: 0.1072 weights: 0 weights: 0 weights: 0 @@ -94,68 +94,61 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-AllItems-DeathmistRaiment" - value: { - dps: 59.3953 - tps: 62.48955 } } dps_results: { key: "TestDemonology-Phase2-Lvl40-Average-Default" value: { - dps: 484.27493 - tps: 504.23087 + dps: 58.07694 + tps: 61.02938 } } dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-P2-Consumes-LongMultiTarget" + key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 483.45543 - tps: 843.6292 + dps: 57.78387 + tps: 70.56708 } } dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-P2-Consumes-LongSingleTarget" + key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 483.45543 - tps: 503.6318 + dps: 57.78387 + tps: 60.69183 } } dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-P2-Consumes-ShortSingleTarget" + key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 517.82057 - tps: 538.5217 + dps: 61.01446 + tps: 74.47527 } } dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-P2-Consumes-LongMultiTarget" + key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 321.12088 - tps: 715.71815 + dps: 41.79227 + tps: 43.38676 } } dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-P2-Consumes-LongSingleTarget" + key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 321.12088 - tps: 342.70951 + dps: 41.79227 + tps: 43.38676 } } dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-P2-Consumes-ShortSingleTarget" + key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 347.91021 - tps: 358.72849 + dps: 43.72992 + tps: 52.0126 } } dps_results: { key: "TestDemonology-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 483.45543 - tps: 503.6318 + dps: 57.78387 + tps: 60.69183 } } diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results index 16869b1c7..4faabed4e 100644 --- a/sim/warlock/dps/TestDestruction.results +++ b/sim/warlock/dps/TestDestruction.results @@ -1,355 +1,61 @@ character_stats_results: { - key: "TestDestruction-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 66 - final_stats: 36.3 - final_stats: 112.2 - final_stats: 140.8 - final_stats: 118.8 - final_stats: 239.4 - final_stats: 0 - final_stats: 54 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 17 - final_stats: 5 - final_stats: 7.74032 - final_stats: 0 - final_stats: 10 - final_stats: 207 - final_stats: 0 - final_stats: 7.29967 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2330 - final_stats: 0 - final_stats: 0 - final_stats: 519.6 - final_stats: 80 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 5.29967 - final_stats: 5 - final_stats: 0 - final_stats: 1221 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 15 - final_stats: 162 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestDestruction-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 93.5 - final_stats: 39.6 - final_stats: 179.3 - final_stats: 212.3 - final_stats: 182.6 - final_stats: 419.3 - final_stats: 0 - final_stats: 24 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 39.75 - final_stats: 2 - final_stats: 15.26226 - final_stats: 0 - final_stats: 0 - final_stats: 319.5 - final_stats: 2 - final_stats: 8.76408 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3827.5 - final_stats: 0 - final_stats: 0 - final_stats: 917.2 - final_stats: 220 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 4.76408 - final_stats: 5 - final_stats: 0 - final_stats: 2247 - final_stats: 18 - final_stats: 40 - final_stats: 30 - final_stats: 52 - final_stats: 30 - final_stats: 423 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestDestruction-Phase3-Lvl50-CharacterStats-Default" + key: "TestDestruction-Phase4-Lvl60-CharacterStats-Default" value: { - final_stats: 135.432 - final_stats: 142.56 - final_stats: 342.52416 - final_stats: 354.024 - final_stats: 220.04136 - final_stats: 461.02068 - final_stats: 0 - final_stats: 33 - final_stats: 0 - final_stats: 0 + final_stats: 185.9 + final_stats: 194.7 + final_stats: 481.52225 + final_stats: 247.5 + final_stats: 217.36 + final_stats: 553.68 final_stats: 0 final_stats: 40 - final_stats: 31 - final_stats: 4 - final_stats: 34.92209 - final_stats: 0 - final_stats: 0 - final_stats: 457.432 - final_stats: 4 - final_stats: 36.38253 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 6193.36 - final_stats: 0 - final_stats: 0 - final_stats: 1221.12 - final_stats: 310 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 10.38253 + final_stats: 159 + final_stats: 45.25 final_stats: 5 + final_stats: 28.78375 final_stats: 0 - final_stats: 4224.2416 - final_stats: 20 - final_stats: 30 - final_stats: 45 - final_stats: 45 - final_stats: 45 - final_stats: 434 - final_stats: 35 - final_stats: 100 final_stats: 0 - } -} -character_stats_results: { - key: "TestDestruction-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 188.1 - final_stats: 187 - final_stats: 488.796 - final_stats: 377.3 - final_stats: 223.63 - final_stats: 744.815 - final_stats: 0 - final_stats: 80 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 40 - final_stats: 41.25 - final_stats: 10 - final_stats: 45.92545 + final_stats: 1005.9 final_stats: 0 + final_stats: 24.735 final_stats: 0 - final_stats: 1008.1 - final_stats: 9 - final_stats: 41.35 final_stats: 0 final_stats: 0 + final_stats: 4805.5 final_stats: 0 - final_stats: 6752.5 final_stats: 0 - final_stats: 0 - final_stats: 1369 + final_stats: 1335.4 final_stats: 740 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 11.35 + final_stats: 11.735 final_stats: 5 final_stats: 0 - final_stats: 6421.96 + final_stats: 6349.2225 final_stats: 27 - final_stats: 99 + final_stats: 76 final_stats: 60 final_stats: 60 final_stats: 60 final_stats: 384 final_stats: 0 - final_stats: 65 + final_stats: 35 final_stats: 0 } } -stat_weights_results: { - key: "TestDestruction-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: -0.00316 - weights: 0 - weights: 0.52028 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 1.32014 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestDestruction-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: -0.35845 - weights: 0 - weights: 1.04686 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 5.94017 - weights: 5.25615 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestDestruction-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.36613 - weights: 0 - weights: 0.86124 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 14.96802 - weights: 9.48471 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestDestruction-Phase4-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: 1.97465 + weights: 0.08659 weights: 0 - weights: 1.79586 + weights: 0.38179 weights: 0 weights: 0 weights: 0 @@ -357,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 9.1494 - weights: 23.5847 + weights: 4.68646 + weights: 1.52727 weights: 0 weights: 0 weights: 0 @@ -390,283 +96,59 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestDestruction-Phase1-Lvl25-AllItems-DeathmistRaiment" - value: { - dps: 86.87702 - tps: 42.40319 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Average-Default" - value: { - dps: 275.8344 - tps: 235.38593 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 272.95519 - tps: 378.56056 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 272.95519 - tps: 232.34102 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 284.26584 - tps: 239.19247 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 215.65612 - tps: 332.88358 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 215.65612 - tps: 180.75691 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 222.90119 - tps: 188.44899 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 274.69269 - tps: 234.07853 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-AllItems-DeathmistRaiment" - value: { - dps: 111.5936 - tps: 65.75444 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Average-Default" - value: { - dps: 754.46387 - tps: 659.70131 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 745.84047 - tps: 1002.18474 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 745.84047 - tps: 651.25253 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 780.81698 - tps: 683.15764 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 495.72604 - tps: 806.40174 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 495.72604 - tps: 434.15323 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 524.13836 - tps: 463.08989 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 748.40384 - tps: 653.84084 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-AllItems-DeathmistRaiment" - value: { - dps: 375.48174 - tps: 251.02524 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Average-Default" - value: { - dps: 1689.59821 - tps: 1520.03729 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 2639.34698 - tps: 3114.90086 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1679.52864 - tps: 1513.5457 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1787.07272 - tps: 1610.44396 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1651.16728 - tps: 2235.69185 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 941.49743 - tps: 848.36031 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1005.25821 - tps: 923.33822 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1677.86695 - tps: 1511.07639 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-DeathmistRaiment" - value: { - dps: 501.35777 - tps: 247.7124 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-InfernalPactEssence-216509" - value: { - dps: 3514.22617 - tps: 3163.30485 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-Kezan'sUnstoppableTaint-231346" - value: { - dps: 3562.18188 - tps: 3198.97917 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-NightmareProphet'sGarb" - value: { - dps: 2628.62327 - tps: 2391.47643 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-ZilaGular-223214" - value: { - dps: 3491.83251 - tps: 3145.69464 - } -} dps_results: { key: "TestDestruction-Phase4-Lvl60-Average-Default" value: { - dps: 3624.6769 - tps: 3262.13851 + dps: 567.34014 + tps: 338.83207 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3579.15462 - tps: 4248.6354 + dps: 569.29241 + tps: 578.88259 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3579.15462 - tps: 3216.25032 + dps: 569.29241 + tps: 341.56951 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3694.33537 - tps: 3327.15173 + dps: 596.32416 + tps: 390.53835 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1923.51659 - tps: 2887.10261 + dps: 299.2257 + tps: 559.51689 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1923.51659 - tps: 1734.0736 + dps: 299.2257 + tps: 187.70796 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1932.97754 - tps: 1728.86963 + dps: 319.59389 + tps: 216.51448 } } dps_results: { key: "TestDestruction-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3596.12212 - tps: 3234.84983 + dps: 569.29241 + tps: 341.56951 } } diff --git a/sim/warlock/dps/dps_warlock_test.go b/sim/warlock/dps/dps_warlock_test.go index 0e97379fe..c58363ce2 100644 --- a/sim/warlock/dps/dps_warlock_test.go +++ b/sim/warlock/dps/dps_warlock_test.go @@ -14,38 +14,6 @@ func init() { func TestAffliction(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassWarlock, - Level: 40, - Race: proto.Race_RaceOrc, - - Talents: Phase2AfflictionTalents, - GearSet: core.GetGearSet("../../../ui/warlock/gear_sets/p2", "shadow"), - Rotation: core.GetAplRotation("../../../ui/warlock/apls/p2", "affliction"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Affliction Warlock", SpecOptions: DefaultAfflictionWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassWarlock, - Level: 50, - Race: proto.Race_RaceOrc, - - Talents: Phase3NFRuinTalents, - GearSet: core.GetGearSet("../../../ui/warlock/gear_sets/p3", "nf.ruin"), - Rotation: core.GetAplRotation("../../../ui/warlock/apls/p3", "nf.ruin"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Affliction Warlock", SpecOptions: DefaultAfflictionWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassWarlock, Phase: 4, @@ -53,7 +21,7 @@ func TestAffliction(t *testing.T) { Race: proto.Race_RaceOrc, Talents: Phase4AffTalents, - GearSet: core.GetGearSet("../../../ui/warlock/gear_sets/p4", "affliction"), + GearSet: core.GetGearSet("../../../ui/warlock/gear_sets", "placeholder"), Rotation: core.GetAplRotation("../../../ui/warlock/apls/p4", "affliction"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, @@ -74,7 +42,7 @@ func TestDemonology(t *testing.T) { Race: proto.Race_RaceOrc, Talents: Phase2DemonologyTalents, - GearSet: core.GetGearSet("../../../ui/warlock/gear_sets/p2", "fire.succubus"), + GearSet: core.GetGearSet("../../../ui/warlock/gear_sets", "placeholder"), Rotation: core.GetAplRotation("../../../ui/warlock/apls/p2", "demonology"), Buffs: core.FullBuffsPhase2, Consumes: Phase2Consumes, @@ -89,54 +57,6 @@ func TestDemonology(t *testing.T) { func TestDestruction(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassWarlock, - Level: 25, - Race: proto.Race_RaceOrc, - - Talents: Phase1DestructionTalents, - GearSet: core.GetGearSet("../../../ui/warlock/gear_sets/p1", "destruction"), - Rotation: core.GetAplRotation("../../../ui/warlock/apls/p1", "destruction"), - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: DefaultDestroWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassWarlock, - Level: 40, - Race: proto.Race_RaceOrc, - - Talents: Phase2DestructionTalents, - GearSet: core.GetGearSet("../../../ui/warlock/gear_sets/p2", "fire.imp"), - Rotation: core.GetAplRotation("../../../ui/warlock/apls/p2", "fire.imp"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: DefaultDestroWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassWarlock, - Level: 50, - Race: proto.Race_RaceOrc, - - Talents: Phase3BackdraftTalents, - GearSet: core.GetGearSet("../../../ui/warlock/gear_sets/p3", "backdraft"), - Rotation: core.GetAplRotation("../../../ui/warlock/apls/p3", "backdraft"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: DefaultDestroWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassWarlock, Phase: 4, @@ -144,7 +64,7 @@ func TestDestruction(t *testing.T) { Race: proto.Race_RaceOrc, Talents: Phase4DestroTalents, - GearSet: core.GetGearSet("../../../ui/warlock/gear_sets/p4", "destruction"), + GearSet: core.GetGearSet("../../../ui/warlock/gear_sets", "placeholder"), Rotation: core.GetAplRotation("../../../ui/warlock/apls/p4", "destruction"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, diff --git a/sim/warlock/pet.go b/sim/warlock/pet.go index 548ab33c0..967fe53e9 100644 --- a/sim/warlock/pet.go +++ b/sim/warlock/pet.go @@ -145,6 +145,7 @@ func (wp *WarlockPet) Initialize() { } func (wp *WarlockPet) Reset(_ *core.Simulation) { + wp.manaPooling = false } func (wp *WarlockPet) ExecuteCustomRotation(sim *core.Simulation) { diff --git a/sim/warlock/tank/TestAffliction.results b/sim/warlock/tank/TestAffliction.results index bce6cfa07..0ff32251a 100644 --- a/sim/warlock/tank/TestAffliction.results +++ b/sim/warlock/tank/TestAffliction.results @@ -1,159 +1,61 @@ -character_stats_results: { - key: "TestAffliction-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 74.8 - final_stats: 45.1 - final_stats: 156.86 - final_stats: 144.1 - final_stats: 118.085 - final_stats: 252.0425 - final_stats: 0 - final_stats: 32 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 17 - final_stats: 6 - final_stats: 7.88189 - final_stats: 0 - final_stats: 10 - final_stats: 215.8 - final_stats: 1 - final_stats: 8.09959 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2379.5 - final_stats: 0 - final_stats: 0 - final_stats: 544.2 - final_stats: 80 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 6.09959 - final_stats: 5 - final_stats: 0 - final_stats: 1667.6 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 15 - final_stats: 162 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} character_stats_results: { key: "TestAffliction-Phase4-Lvl60-CharacterStats-Default" value: { final_stats: 183.7 final_stats: 182.6 - final_stats: 629.97 - final_stats: 254.1 + final_stats: 296.01 + final_stats: 185.9 final_stats: 221.1 - final_stats: 606.55 + final_stats: 320.55 final_stats: 0 final_stats: 40 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 40 - final_stats: 45.25 - final_stats: 8 - final_stats: 28.89265 + final_stats: 41.25 + final_stats: 0 + final_stats: 25.76735 final_stats: 0 final_stats: 0 final_stats: 1003.7 - final_stats: 8 - final_stats: 26.13 final_stats: 0 + final_stats: 24.13 final_stats: 0 final_stats: 0 - final_stats: 4904.5 final_stats: 0 + final_stats: 3881.5 final_stats: 0 - final_stats: 2115.2 + final_stats: 0 + final_stats: 749.2 final_stats: 740 - final_stats: 121 - final_stats: 9.84 final_stats: 0 - final_stats: 15.97 - final_stats: 9.84 + final_stats: 5 + final_stats: 0 + final_stats: 11.13 + final_stats: 5 final_stats: 0 - final_stats: 7833.7 + final_stats: 4494.1 final_stats: 27 - final_stats: 161 final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 1124 + final_stats: 60 + final_stats: 384 final_stats: 0 - final_stats: 65 + final_stats: 35 final_stats: 0 } } -stat_weights_results: { - key: "TestAffliction-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: -1.81093 - weights: 0 - weights: 0.5063 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.64636 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestAffliction-Phase4-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: 4.42859 + weights: -0.09672 weights: 0 - weights: 0.98682 + weights: 0.59324 weights: 0 weights: 0 weights: 0 @@ -161,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 12.48955 - weights: 9.1609 + weights: 9.16777 + weights: 3.27353 weights: 0 weights: 0 weights: 0 @@ -194,177 +96,59 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestAffliction-Phase1-Lvl25-AllItems-DeathmistRaiment" - value: { - dps: 120.06911 - tps: 96.16488 - hps: 58.11955 - } -} -dps_results: { - key: "TestAffliction-Phase1-Lvl25-Average-Default" - value: { - dps: 213.50988 - tps: 499.52026 - hps: 66.56174 - } -} -dps_results: { - key: "TestAffliction-Phase1-Lvl25-Settings-Orc-p1.affi.tank-Affliction Warlock-p1.affi.tank-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 312.14823 - tps: 1333.8189 - hps: 55.49603 - } -} -dps_results: { - key: "TestAffliction-Phase1-Lvl25-Settings-Orc-p1.affi.tank-Affliction Warlock-p1.affi.tank-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 213.25222 - tps: 499.73068 - hps: 66.64964 - } -} -dps_results: { - key: "TestAffliction-Phase1-Lvl25-Settings-Orc-p1.affi.tank-Affliction Warlock-p1.affi.tank-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 220.1176 - tps: 512.51417 - hps: 65.38334 - } -} -dps_results: { - key: "TestAffliction-Phase1-Lvl25-Settings-Orc-p1.affi.tank-Affliction Warlock-p1.affi.tank-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 235.32268 - tps: 1162.74118 - hps: 37.19579 - } -} -dps_results: { - key: "TestAffliction-Phase1-Lvl25-Settings-Orc-p1.affi.tank-Affliction Warlock-p1.affi.tank-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 158.81469 - tps: 370.88886 - hps: 43.11072 - } -} -dps_results: { - key: "TestAffliction-Phase1-Lvl25-Settings-Orc-p1.affi.tank-Affliction Warlock-p1.affi.tank-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 165.67695 - tps: 384.49791 - hps: 44.03105 - } -} -dps_results: { - key: "TestAffliction-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 213.31742 - tps: 499.84608 - hps: 66.64964 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-DeathmistRaiment" - value: { - dps: 1284.10688 - tps: 1449.92251 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-InfernalPactEssence-216509" - value: { - dps: 2000.301 - tps: 3975.27716 - hps: 446.46635 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-Kezan'sUnstoppableTaint-231346" - value: { - dps: 1987.66399 - tps: 3959.47508 - hps: 434.10525 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-NightmareProphet'sGarb" - value: { - dps: 1615.91059 - tps: 3218.28771 - } -} -dps_results: { - key: "TestAffliction-Phase4-Lvl60-AllItems-ZilaGular-223214" - value: { - dps: 1998.4494 - tps: 3975.27716 - hps: 446.46635 - } -} dps_results: { key: "TestAffliction-Phase4-Lvl60-Average-Default" value: { - dps: 2018.36234 - tps: 4013.77381 - hps: 449.53134 + dps: 876.99009 + tps: 945.07448 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 4059.57505 - tps: 12138.29037 - hps: 458.58615 + dps: 855.98589 + tps: 1998.94104 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1939.01643 - tps: 3841.46323 - hps: 452.92932 + dps: 855.98589 + tps: 913.26973 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1949.9847 - tps: 3897.53802 - hps: 436.31133 + dps: 877.21082 + tps: 961.58852 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2098.93908 - tps: 7485.79654 - hps: 240.82809 + dps: 415.44139 + tps: 1594.67898 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 921.75234 - tps: 1818.85556 - hps: 242.36155 + dps: 415.44139 + tps: 453.9737 } } dps_results: { - key: "TestAffliction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 914.13 - tps: 1826.16293 - hps: 205.84953 + dps: 427.57823 + tps: 471.95315 } } dps_results: { key: "TestAffliction-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1980.50315 - tps: 3941.12874 - hps: 449.69936 + dps: 866.40495 + tps: 928.42446 } } diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results index 3ab633e06..f509b6aa9 100644 --- a/sim/warlock/tank/TestDemonology.results +++ b/sim/warlock/tank/TestDemonology.results @@ -1,168 +1,70 @@ -character_stats_results: { - key: "TestDemonology-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 96.8 - final_stats: 53.9 - final_stats: 294.745 - final_stats: 221.1 - final_stats: 142.12 - final_stats: 382.06 - final_stats: 0 - final_stats: 42.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 32.75 - final_stats: 1 - final_stats: 14.49282 - final_stats: 0 - final_stats: 0 - final_stats: 322.8 - final_stats: 1 - final_stats: 8.76222 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3959.5 - final_stats: 0 - final_stats: 0 - final_stats: 1177.8 - final_stats: 220 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 5.76222 - final_stats: 5 - final_stats: 0 - final_stats: 3401.45 - final_stats: 18 - final_stats: 40 - final_stats: 30 - final_stats: 35 - final_stats: 40 - final_stats: 655 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} character_stats_results: { key: "TestDemonology-Phase4-Lvl60-CharacterStats-Default" value: { final_stats: 183.7 final_stats: 182.6 - final_stats: 724.4655 - final_stats: 254.1 + final_stats: 340.4115 + final_stats: 185.9 final_stats: 210.045 - final_stats: 601.0225 + final_stats: 315.0225 final_stats: 0 - final_stats: 40 + final_stats: 61 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 40 - final_stats: 45.25 - final_stats: 8 - final_stats: 28.89265 + final_stats: 41.25 + final_stats: 0 + final_stats: 25.76735 final_stats: 0 final_stats: 0 final_stats: 1003.7 - final_stats: 8 - final_stats: 26.13 final_stats: 0 + final_stats: 24.13 final_stats: 0 final_stats: 0 - final_stats: 4904.5 final_stats: 0 + final_stats: 3881.5 final_stats: 0 - final_stats: 2115.2 + final_stats: 0 + final_stats: 749.2 final_stats: 740 - final_stats: 121 - final_stats: 9.84 final_stats: 0 - final_stats: 15.97 - final_stats: 9.84 + final_stats: 5 + final_stats: 0 + final_stats: 11.13 + final_stats: 5 final_stats: 0 - final_stats: 8778.655 + final_stats: 4938.115 final_stats: 27 - final_stats: 161 final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 1124 + final_stats: 60 + final_stats: 384 final_stats: 0 - final_stats: 65 + final_stats: 35 final_stats: 0 } } -stat_weights_results: { - key: "TestDemonology-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: -0.04236 - weights: 0 - weights: 0.48642 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 3.54801 - weights: 1.09783 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestDemonology-Phase4-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: -0.37627 weights: 0 - weights: 0.82603 weights: 0 + weights: 0.03574 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 18.58084 - weights: 8.34795 + weights: 0 + weights: 0.63672 + weights: 0.32625 weights: 0 weights: 0 weights: 0 @@ -192,181 +94,69 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-AllItems-DeathmistRaiment" - value: { - dps: 107.53626 - tps: 115.28647 - hps: 106.55339 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-Average-Default" - value: { - dps: 348.3998 - tps: 1046.8307 - hps: 127.42003 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 329.38375 - tps: 1961.24492 - hps: 126.4656 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 329.38375 - tps: 1005.80574 - hps: 126.4656 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 346.3568 - tps: 1030.68333 - hps: 122.59504 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 214.97551 - tps: 1689.19916 - hps: 82.08125 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 214.97551 - tps: 676.28619 - hps: 82.08125 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 227.57521 - tps: 696.02011 - hps: 80.80027 - } -} -dps_results: { - key: "TestDemonology-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 344.52232 - tps: 1039.0853 - hps: 128.86662 - } -} -dps_results: { - key: "TestDemonology-Phase4-Lvl60-AllItems-DeathmistRaiment" - value: { - dps: 109.79237 - tps: 120.77467 - hps: 4.3855 - } -} -dps_results: { - key: "TestDemonology-Phase4-Lvl60-AllItems-InfernalPactEssence-216509" - value: { - dps: 2253.2068 - tps: 4592.07365 - hps: 402.51414 - } -} -dps_results: { - key: "TestDemonology-Phase4-Lvl60-AllItems-Kezan'sUnstoppableTaint-231346" - value: { - dps: 2326.0892 - tps: 4547.47334 - hps: 395.53501 - } -} -dps_results: { - key: "TestDemonology-Phase4-Lvl60-AllItems-NightmareProphet'sGarb" - value: { - dps: 1223.38191 - tps: 1337.13652 - hps: 217.87458 - } -} -dps_results: { - key: "TestDemonology-Phase4-Lvl60-AllItems-ZilaGular-223214" - value: { - dps: 2253.2068 - tps: 4592.07365 - hps: 402.51414 } } dps_results: { key: "TestDemonology-Phase4-Lvl60-Average-Default" value: { - dps: 2261.35125 - tps: 4625.87505 - hps: 410.19321 + dps: 57.03346 + tps: 65.29883 + hps: 3.23594 } } dps_results: { - key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2846.62906 - tps: 9134.65909 - hps: 413.40117 + dps: 42.35086 + tps: 105.86104 + hps: 3.17281 } } dps_results: { - key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2199.06432 - tps: 4447.82641 - hps: 411.69711 + dps: 42.35086 + tps: 50.67079 + hps: 3.17281 } } dps_results: { - key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2171.73853 - tps: 4420.23142 - hps: 403.79946 + dps: 64.87184 + tps: 91.41221 + hps: 16.47716 } } dps_results: { - key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1189.69605 - tps: 5890.09727 - hps: 212.13146 + dps: 20.24215 + tps: 78.72015 + hps: 1.57632 } } dps_results: { - key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 896.88394 - tps: 2079.88969 - hps: 219.54433 + dps: 20.24215 + tps: 25.67848 + hps: 1.57632 } } dps_results: { - key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 899.15945 - tps: 2120.97008 - hps: 215.97381 + dps: 33.98654 + tps: 48.23407 + hps: 8.38795 } } dps_results: { key: "TestDemonology-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2216.22136 - tps: 4510.2395 - hps: 402.96262 + dps: 50.73099 + tps: 59.07058 + hps: 3.17281 } } diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results index d85f5e07e..b368231c4 100644 --- a/sim/warlock/tank/TestDestruction.results +++ b/sim/warlock/tank/TestDestruction.results @@ -1,355 +1,61 @@ -character_stats_results: { - key: "TestDestruction-Phase1-Lvl25-CharacterStats-Default" - value: { - final_stats: 74.8 - final_stats: 45.1 - final_stats: 136.4 - final_stats: 144.1 - final_stats: 124.3 - final_stats: 255.15 - final_stats: 0 - final_stats: 32 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 17 - final_stats: 6 - final_stats: 7.88189 - final_stats: 0 - final_stats: 10 - final_stats: 215.8 - final_stats: 1 - final_stats: 8.09959 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2379.5 - final_stats: 0 - final_stats: 0 - final_stats: 544.2 - final_stats: 80 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 6.09959 - final_stats: 5 - final_stats: 0 - final_stats: 1463 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 15 - final_stats: 162 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestDestruction-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 96.8 - final_stats: 53.9 - final_stats: 290.95 - final_stats: 217.8 - final_stats: 142.12 - final_stats: 380.06 - final_stats: 0 - final_stats: 24 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 35.75 - final_stats: 1 - final_stats: 14.40636 - final_stats: 0 - final_stats: 0 - final_stats: 322.8 - final_stats: 1 - final_stats: 8.76222 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3910 - final_stats: 0 - final_stats: 0 - final_stats: 1177.8 - final_stats: 220 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 5.76222 - final_stats: 5 - final_stats: 0 - final_stats: 3363.5 - final_stats: 18 - final_stats: 40 - final_stats: 30 - final_stats: 35 - final_stats: 30 - final_stats: 655 - final_stats: 0 - final_stats: 14 - final_stats: 0 - } -} -character_stats_results: { - key: "TestDestruction-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 135.432 - final_stats: 142.56 - final_stats: 401.544 - final_stats: 261.36 - final_stats: 230.472 - final_stats: 451.236 - final_stats: 0 - final_stats: 33 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 40 - final_stats: 25 - final_stats: 5 - final_stats: 20.03174 - final_stats: 0 - final_stats: 0 - final_stats: 457.432 - final_stats: 5 - final_stats: 23.38253 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4803.4 - final_stats: 0 - final_stats: 0 - final_stats: 1609.12 - final_stats: 310 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 10.38253 - final_stats: 5 - final_stats: 0 - final_stats: 4814.44 - final_stats: 20 - final_stats: 30 - final_stats: 45 - final_stats: 45 - final_stats: 45 - final_stats: 824 - final_stats: 35 - final_stats: 100 - final_stats: 0 - } -} character_stats_results: { key: "TestDestruction-Phase4-Lvl60-CharacterStats-Default" value: { final_stats: 183.7 final_stats: 182.6 - final_stats: 629.97 - final_stats: 254.1 + final_stats: 296.01 + final_stats: 185.9 final_stats: 221.1 - final_stats: 606.55 + final_stats: 320.55 final_stats: 0 final_stats: 40 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 40 - final_stats: 45.25 - final_stats: 8 - final_stats: 28.89265 + final_stats: 41.25 + final_stats: 0 + final_stats: 25.76735 final_stats: 0 final_stats: 0 final_stats: 1003.7 - final_stats: 8 - final_stats: 26.13 + final_stats: 0 + final_stats: 24.13 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 4904.5 + final_stats: 3881.5 final_stats: 0 final_stats: 0 - final_stats: 2115.2 + final_stats: 749.2 final_stats: 740 - final_stats: 121 - final_stats: 9.84 final_stats: 0 - final_stats: 15.97 - final_stats: 9.84 + final_stats: 5 + final_stats: 0 + final_stats: 11.13 + final_stats: 5 final_stats: 0 - final_stats: 7833.7 + final_stats: 4494.1 final_stats: 27 - final_stats: 161 final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 1124 + final_stats: 60 + final_stats: 384 final_stats: 0 - final_stats: 65 + final_stats: 35 final_stats: 0 } } -stat_weights_results: { - key: "TestDestruction-Phase1-Lvl25-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.11551 - weights: 0 - weights: 0.40116 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.87208 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestDestruction-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.01029 - weights: 0 - weights: 0.63318 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 4.73093 - weights: 3.12965 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestDestruction-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.59158 - weights: 0 - weights: 1.36274 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 7.49641 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestDestruction-Phase4-Lvl60-StatWeights-Default" value: { weights: 0 weights: 0 weights: 0 - weights: 0.79094 + weights: 0.24263 weights: 0 - weights: 0.77668 + weights: 1.86432 weights: 0 weights: 0 weights: 0 @@ -357,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 15.66822 - weights: 11.3956 + weights: 9.00586 + weights: 3.74242 weights: 0 weights: 0 weights: 0 @@ -390,303 +96,59 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestDestruction-Phase1-Lvl25-AllItems-DeathmistRaiment" - value: { - dps: 92.67207 - tps: 49.71363 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Average-Default" - value: { - dps: 193.68179 - tps: 465.25688 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-p1.destro.tank-Destruction Warlock-p1.destro.tank-FullBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 193.44266 - tps: 773.19279 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-p1.destro.tank-Destruction Warlock-p1.destro.tank-FullBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 193.44266 - tps: 466.00958 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-p1.destro.tank-Destruction Warlock-p1.destro.tank-FullBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 200.91439 - tps: 491.75527 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-p1.destro.tank-Destruction Warlock-p1.destro.tank-NoBuffs-P1-Consumes-LongMultiTarget" - value: { - dps: 153.34625 - tps: 667.12404 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-p1.destro.tank-Destruction Warlock-p1.destro.tank-NoBuffs-P1-Consumes-LongSingleTarget" - value: { - dps: 153.34625 - tps: 354.22715 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-Settings-Orc-p1.destro.tank-Destruction Warlock-p1.destro.tank-NoBuffs-P1-Consumes-ShortSingleTarget" - value: { - dps: 156.38352 - tps: 379.16646 - } -} -dps_results: { - key: "TestDestruction-Phase1-Lvl25-SwitchInFrontOfTarget-Default" - value: { - dps: 193.50786 - tps: 466.12497 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-AllItems-DeathmistRaiment" - value: { - dps: 119.82255 - tps: 58.34481 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Average-Default" - value: { - dps: 449.8731 - tps: 1262.46953 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 439.07807 - tps: 1843.22532 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 424.21331 - tps: 1201.84556 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 432.77884 - tps: 1210.22356 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 294.31964 - tps: 1488.46312 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 282.87471 - tps: 791.64744 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 296.67128 - tps: 804.67039 - } -} -dps_results: { - key: "TestDestruction-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 441.4212 - tps: 1239.34757 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-AllItems-DeathmistRaiment" - value: { - dps: 310.39069 - tps: 188.65171 - hps: 158.79545 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Average-Default" - value: { - dps: 1284.51439 - tps: 2618.06185 - hps: 266.80205 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1899.30685 - tps: 5469.18544 - hps: 267.71884 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 1245.77 - tps: 2552.33059 - hps: 264.86029 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 1239.06775 - tps: 2500.95125 - hps: 249.07773 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 1194.04913 - tps: 4162.73008 - hps: 152.59337 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 697.13011 - tps: 1410.86832 - hps: 150.17073 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 690.22328 - tps: 1391.79405 - hps: 147.82664 - } -} -dps_results: { - key: "TestDestruction-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1266.2489 - tps: 2579.61262 - hps: 264.7561 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-DeathmistRaiment" - value: { - dps: 1329.85818 - tps: 1590.50579 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-InfernalPactEssence-216509" - value: { - dps: 2026.77276 - tps: 4207.32274 - hps: 425.86314 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-Kezan'sUnstoppableTaint-231346" - value: { - dps: 2013.64777 - tps: 4193.16 - hps: 413.07278 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-NightmareProphet'sGarb" - value: { - dps: 1664.70649 - tps: 3486.83317 - } -} -dps_results: { - key: "TestDestruction-Phase4-Lvl60-AllItems-ZilaGular-223214" - value: { - dps: 2024.60636 - tps: 4207.32274 - hps: 425.86314 - } -} dps_results: { key: "TestDestruction-Phase4-Lvl60-Average-Default" value: { - dps: 2037.85148 - tps: 4225.97503 - hps: 417.42547 + dps: 892.39546 + tps: 1012.82501 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 4008.31613 - tps: 12026.02112 - hps: 421.57713 + dps: 879.32915 + tps: 2021.09328 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1953.78702 - tps: 4055.08496 - hps: 409.8628 + dps: 879.32915 + tps: 990.96138 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1953.71553 - tps: 4049.56198 - hps: 400.71028 + dps: 914.78567 + tps: 1068.64745 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2077.29254 - tps: 7392.23846 - hps: 228.94945 + dps: 421.16044 + tps: 1558.22274 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 923.40054 - tps: 1902.56724 - hps: 224.92193 + dps: 421.16044 + tps: 476.10434 } } dps_results: { - key: "TestDestruction-Phase4-Lvl60-Settings-Orc-p4_destro_aff_tank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 926.45485 - tps: 1952.07812 - hps: 196.40581 + dps: 435.02186 + tps: 491.31887 } } dps_results: { key: "TestDestruction-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1987.43397 - tps: 4131.18703 - hps: 408.2506 + dps: 884.66326 + tps: 1002.37498 } } diff --git a/sim/warlock/tank/tank_warlock_test.go b/sim/warlock/tank/tank_warlock_test.go index b1e5d3309..916e255f1 100644 --- a/sim/warlock/tank/tank_warlock_test.go +++ b/sim/warlock/tank/tank_warlock_test.go @@ -14,22 +14,6 @@ func init() { func TestAffliction(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassWarlock, - Level: 25, - Race: proto.Race_RaceOrc, - - GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "p1.affi.tank"), - Rotation: core.GetAplRotation("../../../ui/tank_warlock/apls", "p1.affi.tank"), - Talents: Phase1AfflictionTalents, - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Affliction Warlock", SpecOptions: DefaultAfflictionWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassWarlock, Phase: 4, @@ -37,7 +21,7 @@ func TestAffliction(t *testing.T) { Race: proto.Race_RaceOrc, Talents: Phase4AffTalents, - GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "p4_destro_aff_tank"), + GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/tank_warlock/apls", "p4_destro_aff_tank"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, @@ -52,22 +36,6 @@ func TestAffliction(t *testing.T) { func TestDemonology(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassWarlock, - Level: 40, - Race: proto.Race_RaceOrc, - - GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "p2.demo.tank"), - Rotation: core.GetAplRotation("../../../ui/tank_warlock/apls", "p2.demo.tank"), - Talents: Phase2DemonologyTalents, - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Demonology Warlock", SpecOptions: DefaultDemonologyWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassWarlock, Phase: 4, @@ -75,7 +43,7 @@ func TestDemonology(t *testing.T) { Race: proto.Race_RaceOrc, Talents: Phase4DemoTalents, - GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "p4_demo_tank"), + GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/tank_warlock/apls", "p4_demo_tank"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, @@ -90,54 +58,6 @@ func TestDemonology(t *testing.T) { func TestDestruction(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassWarlock, - Level: 25, - Race: proto.Race_RaceOrc, - - GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "p1.destro.tank"), - Rotation: core.GetAplRotation("../../../ui/tank_warlock/apls", "p1.destro.tank"), - Talents: Phase1DestructionTalents, - Buffs: core.FullBuffsPhase1, - Consumes: Phase1Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: DefaultDestroWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassWarlock, - Level: 40, - Race: proto.Race_RaceOrc, - - Talents: Phase2DestructionTalents, - GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "p2.destro.tank"), - Rotation: core.GetAplRotation("../../../ui/tank_warlock/apls", "p2.destro.tank"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: DefaultDestroWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassWarlock, - Level: 50, - Race: proto.Race_RaceOrc, - - Talents: Phase3DestructionTalents, - GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "p3.destro.tank"), - Rotation: core.GetAplRotation("../../../ui/tank_warlock/apls", "p3.destro.tank"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: DefaultDestroWarlock}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassWarlock, Phase: 4, @@ -145,7 +65,7 @@ func TestDestruction(t *testing.T) { Race: proto.Race_RaceOrc, Talents: Phase4DestroTalents, - GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "p4_destro_aff_tank"), + GearSet: core.GetGearSet("../../../ui/tank_warlock/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/tank_warlock/apls", "p4_destro_aff_tank"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results index 80bef3fff..7e256966d 100644 --- a/sim/warrior/dps_warrior/TestDualWieldWarrior.results +++ b/sim/warrior/dps_warrior/TestDualWieldWarrior.results @@ -1,143 +1,45 @@ character_stats_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-CharacterStats-Default" + key: "TestDualWieldWarrior-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 288.2 - final_stats: 195.8 - final_stats: 281.6 - final_stats: 60.5 - final_stats: 79.2 - final_stats: 42 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 24.75 - final_stats: 3 - final_stats: 8 - final_stats: 0 - final_stats: 0 - final_stats: 1014.4 - final_stats: 3 - final_stats: 23.84164 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2143.6 - final_stats: 322 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 14.84164 - final_stats: 5 - final_stats: 0 - final_stats: 3285 - final_stats: 18 - final_stats: 30 - final_stats: 40 - final_stats: 35 - final_stats: 40 - final_stats: 263 + final_stats: 369.38 + final_stats: 279.565 + final_stats: 388.41825 + final_stats: 112.585 + final_stats: 150.535 final_stats: 0 final_stats: 0 final_stats: 0 - } -} -character_stats_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 609.4 - final_stats: 347.6 - final_stats: 511.06 - final_stats: 102.3 - final_stats: 135.3 - final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 + final_stats: 41.25 final_stats: 0 + final_stats: 21 final_stats: 0 - final_stats: 41.25 - final_stats: 6 - final_stats: 30 final_stats: 0 + final_stats: 1768.76 final_stats: 0 - final_stats: 2340.8 - final_stats: 6 - final_stats: 48.38 + final_stats: 35.97825 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 5324.2 - final_stats: 872 + final_stats: 943.13 + final_stats: 780 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 17.38 + final_stats: 13.97825 final_stats: 5 final_stats: 0 - final_stats: 6919.6 + final_stats: 5693.1825 final_stats: 27 - final_stats: 209 final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -character_stats_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 771.65 - final_stats: 530.035 - final_stats: 680.823 - final_stats: 117.645 - final_stats: 155.595 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 5 - final_stats: 26 - final_stats: 0 - final_stats: 0 - final_stats: 2751.3 - final_stats: 5 - final_stats: 53.50175 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 6345.07 - final_stats: 958 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 26.50175 - final_stats: 5 - final_stats: 0 - final_stats: 8617.23 - final_stats: 27 - final_stats: 70 - final_stats: 90 - final_stats: 90 final_stats: 60 final_stats: 384 final_stats: 0 @@ -145,109 +47,11 @@ character_stats_results: { final_stats: 0 } } -stat_weights_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 2.45535 - weights: 1.17012 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.68943 - weights: 7.14328 - weights: 7.71936 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -stat_weights_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-StatWeights-Default" - value: { - weights: 2.41835 - weights: 1.49098 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.97095 - weights: 7.91575 - weights: 25.78469 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.80984 - weights: 1.39912 + weights: 1.245 + weights: 0.5701 weights: 0 weights: 0 weights: 0 @@ -263,9 +67,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.44271 - weights: 38.00802 - weights: 27.29314 + weights: 0.92361 + weights: 2.32883 + weights: 6.43994 weights: 0 weights: 0 weights: 0 @@ -292,402 +96,101 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-AllItems-BattlegearofHeroism" - value: { - dps: 552.49921 - tps: 490.75198 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Average-Default" - value: { - dps: 591.50733 - tps: 522.64383 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 54.54091 - tps: 88.52855 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 12.03378 - tps: 12.48338 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 23.3326 - tps: 22.36508 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 28.74889 - tps: 64.29621 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 6.12957 - tps: 7.61036 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Human-phase_2_dw-Fury-phase_2_fury-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 10.88212 - tps: 12.29853 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-FullBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 58.95105 - tps: 92.85491 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-FullBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 12.8727 - tps: 13.41499 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-FullBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 29.76942 - tps: 29.24052 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-NoBuffs-P2-Consumes-LongMultiTarget" - value: { - dps: 31.47319 - tps: 66.96599 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-NoBuffs-P2-Consumes-LongSingleTarget" - value: { - dps: 6.48815 - tps: 7.939 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-Settings-Orc-phase_2_dw-Fury-phase_2_fury-NoBuffs-P2-Consumes-ShortSingleTarget" - value: { - dps: 14.14128 - tps: 15.48814 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 554.0365 - tps: 490.55822 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BattlegearofHeroism" - value: { - dps: 2091.66454 - tps: 1843.81436 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Average-Default" - value: { - dps: 3733.83763 - tps: 2928.25253 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 1703.92938 - tps: 1629.31977 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 536.57449 - tps: 484.94771 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 734.83379 - tps: 641.13374 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 771.47964 - tps: 814.26555 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 267.89319 - tps: 270.69185 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 370.22181 - tps: 349.65945 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 1819.00008 - tps: 1767.63053 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 554.71918 - tps: 499.08325 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 766.95397 - tps: 664.79879 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 808.0255 - tps: 861.77431 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 268.87524 - tps: 270.42504 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 384.58615 - tps: 359.50764 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 2921.88761 - tps: 2293.81637 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism" - value: { - dps: 2213.78724 - tps: 1935.15098 - } -} dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Average-Default" value: { - dps: 4451.20607 - tps: 3463.82531 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 2049.98385 - tps: 1886.22477 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 551.99607 - tps: 474.43667 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 770.71789 - tps: 638.82054 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 860.85537 - tps: 876.59587 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 225.31058 - tps: 226.5843 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 334.87549 - tps: 308.04848 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 1575.55745 - tps: 1523.09005 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 443.12993 - tps: 390.62164 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 572.55118 - tps: 499.88168 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 632.29559 - tps: 701.9405 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 171.8154 - tps: 185.62851 - } -} -dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 228.44002 - tps: 232.21732 + dps: 419.18478 + tps: 433.2523 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-blank-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2162.45829 - tps: 1993.03598 + dps: 86.32195 + tps: 176.11699 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-blank-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 560.24186 - tps: 479.84152 + dps: 26.25766 + tps: 31.7459 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-blank-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 820.77332 - tps: 668.71836 + dps: 66.47472 + tps: 70.75896 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-blank-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 933.37356 - tps: 943.17679 + dps: 24.04481 + tps: 117.50593 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-blank-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 233.4688 - tps: 231.36552 + dps: 7.53873 + tps: 16.01018 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-blank-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 360.25022 - tps: 323.2778 + dps: 18.02046 + tps: 30.1201 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-blank-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1355.06557 - tps: 1320.37037 + dps: 96.36696 + tps: 185.49523 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-blank-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 450.06382 - tps: 391.26714 + dps: 28.76528 + tps: 33.46086 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-blank-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 597.20269 - tps: 482.66014 + dps: 74.4003 + tps: 77.3003 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-blank-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 537.59266 - tps: 615.5602 + dps: 27.08594 + tps: 120.26242 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-blank-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 175.25615 - tps: 186.67488 + dps: 8.12668 + tps: 16.17496 } } dps_results: { - key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-blank-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 241.61242 - tps: 230.53495 + dps: 21.06169 + tps: 32.6309 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3497.25092 - tps: 2709.13209 + dps: 331.758 + tps: 349.74796 } } diff --git a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results index 0a2bffec5..50d281e4e 100644 --- a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results +++ b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results @@ -1,60 +1,11 @@ -character_stats_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-CharacterStats-Default" - value: { - final_stats: 382.536 - final_stats: 324.324 - final_stats: 419.364 - final_stats: 92.664 - final_stats: 125.928 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 25 - final_stats: 4 - final_stats: 20 - final_stats: 0 - final_stats: 0 - final_stats: 1278.072 - final_stats: 5 - final_stats: 46.78376 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 2889.648 - final_stats: 361 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 19.78376 - final_stats: 5 - final_stats: 0 - final_stats: 5092.64 - final_stats: 20 - final_stats: 30 - final_stats: 45 - final_stats: 50 - final_stats: 45 - final_stats: 324 - final_stats: 0 - final_stats: 65 - final_stats: 0 - } -} character_stats_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 791.89 - final_stats: 541.42 - final_stats: 685.18725 - final_stats: 117.645 - final_stats: 155.595 + final_stats: 369.38 + final_stats: 279.565 + final_stats: 388.41825 + final_stats: 112.585 + final_stats: 150.535 final_stats: 0 final_stats: 0 final_stats: 0 @@ -63,32 +14,32 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 41.25 - final_stats: 5 - final_stats: 25 final_stats: 0 + final_stats: 21 final_stats: 0 - final_stats: 2793.78 - final_stats: 5 - final_stats: 53.071 final_stats: 0 + final_stats: 1768.76 + final_stats: 0 + final_stats: 35.97825 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 6354.84 - final_stats: 960 + final_stats: 0 + final_stats: 943.13 + final_stats: 780 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 27.071 + final_stats: 13.97825 final_stats: 5 final_stats: 0 - final_stats: 8660.8725 + final_stats: 5693.1825 final_stats: 27 - final_stats: 70 - final_stats: 100 - final_stats: 100 + final_stats: 60 + final_stats: 60 + final_stats: 60 final_stats: 60 final_stats: 384 final_stats: 0 @@ -96,61 +47,11 @@ character_stats_results: { final_stats: 0 } } -stat_weights_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-StatWeights-Default" - value: { - weights: 1.1254 - weights: 0.63407 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.43907 - weights: 15.86411 - weights: 10.92638 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} stat_weights_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.21428 - weights: 1.7221 - weights: 0 + weights: 0.74166 + weights: 0.41613 weights: 0 weights: 0 weights: 0 @@ -165,9 +66,10 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.90727 weights: 0 - weights: 22.21408 + weights: 1.18726 + weights: 2.80362 + weights: 7.74962 weights: 0 weights: 0 weights: 0 @@ -194,297 +96,101 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-AllItems-BattlegearofHeroism" - value: { - dps: 804.07368 - tps: 692.40005 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Average-Default" - value: { - dps: 1157.02583 - tps: 988.64456 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 311.93399 - tps: 422.81782 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 85.35464 - tps: 78.69443 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 156.56447 - tps: 140.37652 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 144.93241 - tps: 267.03375 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 40.42559 - tps: 41.52574 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 79.52972 - tps: 76.60471 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 354.55544 - tps: 463.06259 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 93.41748 - tps: 85.52153 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 167.59146 - tps: 149.3685 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongMultiTarget" - value: { - dps: 163.28195 - tps: 284.2972 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongSingleTarget" - value: { - dps: 43.80006 - tps: 44.37163 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-ShortSingleTarget" - value: { - dps: 84.55613 - tps: 80.62378 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase3-Lvl50-SwitchInFrontOfTarget-Default" - value: { - dps: 1077.61243 - tps: 922.80077 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism" - value: { - dps: 1662.50805 - tps: 1409.09944 - } -} dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Average-Default" value: { - dps: 4431.17269 - tps: 3359.30851 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 955.39059 - tps: 721.38511 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 937.06718 - tps: 613.7884 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1232.56461 - tps: 818.82598 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 441.93432 - tps: 388.52249 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 430.77432 - tps: 286.26301 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 569.2119 - tps: 382.93865 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 678.56804 - tps: 556.00605 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 666.84861 - tps: 453.6154 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 1029.13845 - tps: 730.26201 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 296.19377 - tps: 298.42432 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 288.46377 - tps: 198.92227 - } -} -dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 454.88625 - tps: 324.89379 + dps: 466.40921 + tps: 440.79546 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-blank-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 984.25997 - tps: 743.21253 + dps: 47.26332 + tps: 129.6756 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-blank-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 966.70169 - tps: 636.1508 + dps: 45.49215 + tps: 42.32472 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-blank-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1325.92274 - tps: 885.17257 + dps: 106.18413 + tps: 90.78064 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-blank-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 456.49013 - tps: 398.85616 + dps: 13.43995 + tps: 102.11998 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-blank-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 445.64513 - tps: 296.79643 + dps: 12.36495 + tps: 15.32603 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-blank-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 611.24418 - tps: 412.39214 + dps: 22.35486 + tps: 23.71722 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-blank-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 702.45391 - tps: 574.74726 + dps: 50.69348 + tps: 132.41972 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-blank-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 690.95529 - tps: 472.44091 + dps: 48.91337 + tps: 45.06169 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-blank-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1110.55468 - tps: 791.68289 + dps: 119.79812 + tps: 101.67183 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-blank-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 296.47458 - tps: 299.9171 + dps: 14.73775 + tps: 103.15822 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-blank-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 288.89958 - tps: 200.60653 + dps: 13.66275 + tps: 16.36428 } } dps_results: { - key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-blank-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 480.19315 - tps: 346.15525 + dps: 27.46043 + tps: 27.80168 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3648.16757 - tps: 2746.4092 + dps: 373.30127 + tps: 356.09118 } } diff --git a/sim/warrior/dps_warrior/dps_warrior_test.go b/sim/warrior/dps_warrior/dps_warrior_test.go index 9d01b9775..23bedefa4 100644 --- a/sim/warrior/dps_warrior/dps_warrior_test.go +++ b/sim/warrior/dps_warrior/dps_warrior_test.go @@ -14,41 +14,6 @@ func init() { func TestDualWieldWarrior(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassWarrior, - Level: 40, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceHuman}, - - Talents: P2FuryTalents, - GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "phase_2_dw"), - Rotation: core.GetAplRotation("../../../ui/warrior/apls", "phase_2_fury"), - Buffs: core.FullBuffsPhase2, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Fury", SpecOptions: PlayerOptionsFury}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - { - Class: proto.Class_ClassWarrior, - Phase: 4, - Level: 60, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceHuman}, - - Talents: P4FuryTalents, - GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "phase_4_dw"), - Rotation: core.GetAplRotation("../../../ui/warrior/apls", "phase_4_fury"), - Buffs: core.FullBuffsPhase4, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Fury", SpecOptions: PlayerOptionsFury}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassWarrior, Phase: 5, @@ -56,11 +21,8 @@ func TestDualWieldWarrior(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - Talents: P4FuryTalents, - GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "phase_5_dw_t1"), - OtherGearSets: []core.GearSetCombo{ - core.GetGearSet("../../../ui/warrior/gear_sets", "phase_5_dw_t2"), - }, + Talents: P4FuryTalents, + GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/warrior/apls", "phase_5_dw"), Buffs: core.FullBuffsPhase5, Consumes: Phase4Consumes, @@ -75,23 +37,6 @@ func TestDualWieldWarrior(t *testing.T) { func TestTwoHandedWarrior(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassWarrior, - Level: 50, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceHuman}, - - Talents: P3ArmsTalents, - GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "phase_3_2h"), - Rotation: core.GetAplRotation("../../../ui/warrior/apls", "phase_3_arms"), - Buffs: core.FullBuffsPhase3, - Consumes: Phase3Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Arms", SpecOptions: PlayerOptionsArms}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, { Class: proto.Class_ClassWarrior, Phase: 5, @@ -99,11 +44,8 @@ func TestTwoHandedWarrior(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - Talents: P4FuryTalents, - GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "phase_5_2h_t1"), - OtherGearSets: []core.GearSetCombo{ - core.GetGearSet("../../../ui/warrior/gear_sets", "phase_5_2h_t2"), - }, + Talents: P4FuryTalents, + GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "blank"), Rotation: core.GetAplRotation("../../../ui/warrior/apls", "phase_5_2h"), Buffs: core.FullBuffsPhase5, Consumes: Phase4Consumes, diff --git a/sim/warrior/tank_warrior/TestTankWarrior.results b/sim/warrior/tank_warrior/TestTankWarrior.results index 978f286e5..c4b9359bc 100644 --- a/sim/warrior/tank_warrior/TestTankWarrior.results +++ b/sim/warrior/tank_warrior/TestTankWarrior.results @@ -1,12 +1,12 @@ character_stats_results: { key: "TestTankWarrior-Phase4-Lvl60-CharacterStats-Default" value: { - final_stats: 415.8 - final_stats: 269.5 - final_stats: 759 - final_stats: 102.3 - final_stats: 135.3 - final_stats: 0 + final_stats: 346.5 + final_stats: 378.4 + final_stats: 441.485 + final_stats: 148.5 + final_stats: 203.5 + final_stats: 12 final_stats: 0 final_stats: 0 final_stats: 0 @@ -14,34 +14,34 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 41.25 - final_stats: 5 - final_stats: 22 + final_stats: 0 + final_stats: 21 final_stats: 0 final_stats: 0 - final_stats: 1895.6 - final_stats: 6 - final_stats: 33.475 + final_stats: 1751 final_stats: 0 + final_stats: 39.92 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 7581 - final_stats: 814 - final_stats: 165 - final_stats: 16.6 - final_stats: 158 - final_stats: 20.075 - final_stats: 11.6 final_stats: 0 - final_stats: 10599 - final_stats: 32 - final_stats: 271 + final_stats: 4924.8 + final_stats: 856 + final_stats: 10 + final_stats: 10.4 + final_stats: 37 + final_stats: 19.32 + final_stats: 5.4 + final_stats: 0 + final_stats: 7423.85 + final_stats: 27 + final_stats: 86 + final_stats: 60 final_stats: 60 final_stats: 60 - final_stats: 65 - final_stats: 524 + final_stats: 384 final_stats: 0 final_stats: 0 final_stats: 0 @@ -50,7 +50,7 @@ character_stats_results: { stat_weights_results: { key: "TestTankWarrior-Phase4-Lvl60-StatWeights-Default" value: { - weights: 1.01547 + weights: 0.3417 weights: 0 weights: 0 weights: 0 @@ -67,7 +67,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.175 + weights: 0.05737 weights: 0 weights: 0 weights: 0 @@ -78,9 +78,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.53917 + weights: 0.90168 weights: 0 - weights: 0.52803 + weights: 0.44848 weights: 0 weights: 0 weights: 0 @@ -96,108 +96,101 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-AllItems-BattlegearofHeroism" - value: { - dps: 922.6751 - tps: 1885.5839 - } -} dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Average-Default" value: { - dps: 1536.9516 - tps: 3964.69393 + dps: 590.73761 + tps: 1325.88118 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-placeholder-Arms-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 445.08433 - tps: 1263.16714 + dps: 63.5008 + tps: 324.09056 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-placeholder-Arms-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 115.23529 - tps: 380.02153 + dps: 59.0615 + tps: 215.56889 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-placeholder-Arms-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 171.70318 - tps: 547.99725 + dps: 91.35066 + tps: 332.67215 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-placeholder-Arms-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 144.50986 - tps: 568.28568 + dps: 30.5266 + tps: 231.45092 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-placeholder-Arms-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 49.70933 - tps: 200.50334 + dps: 27.80014 + tps: 125.48994 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-placeholder-Arms-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 70.80419 - tps: 281.6908 + dps: 42.11579 + tps: 189.78435 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-placeholder-Arms-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 460.04462 - tps: 1290.23871 + dps: 65.66424 + tps: 330.25827 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-placeholder-Arms-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 119.20551 - tps: 389.52976 + dps: 61.22495 + tps: 221.7366 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-placeholder-Arms-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 179.49649 - tps: 564.64747 + dps: 93.06704 + tps: 337.63858 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-placeholder-Arms-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 144.77341 - tps: 569.0788 + dps: 30.58814 + tps: 231.63073 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-placeholder-Arms-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 49.73817 - tps: 200.63862 + dps: 27.86168 + tps: 125.66975 } } dps_results: { - key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-placeholder-Arms-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 70.55182 - tps: 281.26874 + dps: 42.20866 + tps: 190.05631 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1306.3395 - tps: 3415.73511 + dps: 482.13058 + tps: 1097.99877 } } diff --git a/sim/warrior/tank_warrior/tank_warrior_test.go b/sim/warrior/tank_warrior/tank_warrior_test.go index cdf3dbc15..6d8cc3d78 100644 --- a/sim/warrior/tank_warrior/tank_warrior_test.go +++ b/sim/warrior/tank_warrior/tank_warrior_test.go @@ -22,7 +22,7 @@ func TestTankWarrior(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceHuman}, Talents: P4Talents, - GearSet: core.GetGearSet("../../../ui/tank_warrior/gear_sets", "phase_4_tanky"), + GearSet: core.GetGearSet("../../../ui/tank_warrior/gear_sets", "placeholder"), Rotation: core.GetAplRotation("../../../ui/tank_warrior/apls", "phase_4"), Buffs: core.FullBuffsPhase4, Consumes: Phase4Consumes, diff --git a/ui/balance_druid/gear_sets/blank.gear.json b/ui/balance_druid/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/balance_druid/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/phase_1.gear.json b/ui/balance_druid/gear_sets/phase_1.gear.json deleted file mode 100644 index af468807f..000000000 --- a/ui/balance_druid/gear_sets/phase_1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211507}, - {"id":209686}, - {"id":215365}, - {"id":15340,"randomSuffix":1993}, - {"id":211509,"enchant":847,"rune":414799}, - {"id":209578,"enchant":823}, - {"id":211455,"rune":414684}, - {"id":209685}, - {"id":209684,"rune":417157}, - {"id":210795,"enchant":247}, - {"id":20426}, - {"id":209668}, - {"id":21566}, - {"id":211450}, - {"id":209561,"enchant":723}, - {}, - {"id":209576} - ] -} diff --git a/ui/balance_druid/gear_sets/phase_2.gear.json b/ui/balance_druid/gear_sets/phase_2.gear.json deleted file mode 100644 index eaedd2e07..000000000 --- a/ui/balance_druid/gear_sets/phase_2.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215381}, - {"id":213345}, - {"id":213301}, - {"id":216620,"enchant":849}, - {"id":213312,"enchant":866,"rune":414799}, - {"id":19597,"enchant":905}, - {"id":10019,"enchant":856,"rune":414684}, - {"id":213321,"rune":408248}, - {"id":213331,"rune":417157}, - {"id":215378,"enchant":849,"rune":408258}, - {"id":19520}, - {"id":213283}, - {"id":213347}, - {"id":211450}, - {"id":213410,"enchant":7210}, - {"id":216498}, - {"id":216490} - ] -} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/phase_3.gear.json b/ui/balance_druid/gear_sets/phase_3.gear.json deleted file mode 100644 index c7bcce34a..000000000 --- a/ui/balance_druid/gear_sets/phase_3.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":220523,"enchant":1509,"rune":417135}, - {"id":220623}, - {"id":11624,"enchant":7325}, - {"id":220611,"enchant":1888}, - {"id":220672,"enchant":928,"rune":414799}, - {"id":19596,"enchant":1883,"rune":414719}, - {"id":220544,"enchant":856,"rune":414684}, - {"id":223192,"rune":408248}, - {"id":220673,"enchant":1509,"rune":417157}, - {"id":220675,"enchant":911,"rune":408258}, - {"id":220628}, - {"id":221440}, - {"id":213347}, - {"id":220634}, - {"id":220586,"enchant":803}, - {"id":220598}, - {"id":216490} - ] -} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/phase_4.gear.json b/ui/balance_druid/gear_sets/phase_4.gear.json deleted file mode 100644 index a69682a29..000000000 --- a/ui/balance_druid/gear_sets/phase_4.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226658,"enchant":1505,"rune":417135}, - {"id":228289}, - {"id":226653,"enchant":7563}, - {"id":228100,"enchant":7564,"rune":439748}, - {"id":226656,"enchant":1891,"rune":414799}, - {"id":226655,"enchant":1883,"rune":414719}, - {"id":226777,"rune":414684}, - {"id":226657,"rune":408248}, - {"id":226651,"enchant":1505,"rune":417157}, - {"id":226774,"enchant":911,"rune":408258}, - {"id":227454,"rune":442896}, - {"id":228287,"rune":442893}, - {"id":228255}, - {"id":228686}, - {"id":227886,"enchant":2504}, - {"id":19315}, - {"id":228180} - ] -} diff --git a/ui/balance_druid/gear_sets/phase_5.gear.json b/ui/balance_druid/gear_sets/phase_5.gear.json deleted file mode 100644 index 8e4af0cb2..000000000 --- a/ui/balance_druid/gear_sets/phase_5.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231249,"enchant":7614,"rune":417135}, - {"id":231316}, - {"id":231251,"enchant":2605}, - {"id":230804,"enchant":7564,"rune":439748}, - {"id":231317,"enchant":1891,"rune":414799}, - {"id":231253,"enchant":1883,"rune":414719}, - {"id":231248,"rune":414684}, - {"id":228256,"rune":408248}, - {"id":231250,"enchant":7614,"rune":417157}, - {"id":231247,"enchant":911,"rune":408258}, - {"id":228687,"rune":442896}, - {"id":228243,"rune":442893}, - {"id":230810}, - {"id":231280}, - {"id":224281,"enchant":2504}, - {}, - {"id":228180} - ] -} diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts index 1fe60e97f..1e110acec 100644 --- a/ui/balance_druid/presets.ts +++ b/ui/balance_druid/presets.ts @@ -26,11 +26,7 @@ import Phase2APL from './apls/phase_2.apl.json'; import Phase3APL from './apls/phase_3.apl.json'; import Phase4APL from './apls/phase_4.apl.json'; import Phase5APL from './apls/phase_5.apl.json'; -import Phase1Gear from './gear_sets/phase_1.gear.json'; -import Phase2Gear from './gear_sets/phase_2.gear.json'; -import Phase3Gear from './gear_sets/phase_3.gear.json'; -import Phase4Gear from './gear_sets/phase_4.gear.json'; -import Phase5Gear from './gear_sets/phase_5.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -40,21 +36,11 @@ import Phase5Gear from './gear_sets/phase_5.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearPhase1 = PresetUtils.makePresetGear('Phase 1', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); -export const GearPhase2 = PresetUtils.makePresetGear('Phase 2', Phase2Gear, { customCondition: player => player.getLevel() === 40 }); -export const GearPhase3 = PresetUtils.makePresetGear('Phase 3', Phase3Gear, { customCondition: player => player.getLevel() === 50 }); -export const GearPhase4 = PresetUtils.makePresetGear('Phase 4', Phase4Gear, { customCondition: player => player.getLevel() === 60 }); -export const GearPhase5 = PresetUtils.makePresetGear('Phase 5', Phase5Gear, { customCondition: player => player.getLevel() === 60 }); - -export const GearPresets = { - [Phase.Phase1]: [GearPhase1], - [Phase.Phase2]: [GearPhase2], - [Phase.Phase3]: [GearPhase3], - [Phase.Phase4]: [GearPhase4], - [Phase.Phase5]: [GearPhase5], -}; +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); + +export const GearPresets = {}; -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/balance_druid/sim.ts b/ui/balance_druid/sim.ts index 0348f4555..f85a0d05c 100644 --- a/ui/balance_druid/sim.ts +++ b/ui/balance_druid/sim.ts @@ -125,11 +125,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBalanceDruid, { ...Presets.APLPresets[Phase.Phase1], ], gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], }, @@ -156,10 +152,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBalanceDruid, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, }, }, diff --git a/ui/elemental_shaman/gear_sets/blank.gear.json b/ui/elemental_shaman/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/elemental_shaman/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/elemental_shaman/gear_sets/phase_1.gear.json b/ui/elemental_shaman/gear_sets/phase_1.gear.json deleted file mode 100644 index b91aa9296..000000000 --- a/ui/elemental_shaman/gear_sets/phase_1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211507}, - {"id":209686}, - {"id":215365}, - {"id":7356,"randomSuffix":1880}, - {"id":211509,"enchant":847,"rune":408438}, - {"id":209578,"enchant":823}, - {"id":211455,"rune":408490}, - {"id":209685}, - {"id":209684,"rune":425336}, - {"id":210795,"enchant":247}, - {"id":20426}, - {"id":209668}, - {"id":21566}, - {"id":211450}, - {"id":209561,"enchant":723}, - {}, - {"id":209575} - ] -} diff --git a/ui/elemental_shaman/gear_sets/phase_2.gear.json b/ui/elemental_shaman/gear_sets/phase_2.gear.json deleted file mode 100644 index f8926215e..000000000 --- a/ui/elemental_shaman/gear_sets/phase_2.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215114}, - {"id":213345}, - {"id":213303}, - {"id":216620,"enchant":903}, - {"id":213315,"enchant":866,"rune":408438}, - {"id":213318,"enchant":905}, - {"id":211502,"enchant":856,"rune":408490}, - {"id":213324,"rune":415100}, - {"id":213334,"rune":425336}, - {"id":213338,"enchant":724,"rune":425874}, - {"id":213283}, - {"id":19520}, - {"id":213347}, - {"id":211450}, - {"id":213410,"enchant":7210}, - {"id":7714,"enchant":7210}, - {"id":215436} - ] -} \ No newline at end of file diff --git a/ui/elemental_shaman/gear_sets/phase_3.gear.json b/ui/elemental_shaman/gear_sets/phase_3.gear.json deleted file mode 100644 index e317135fb..000000000 --- a/ui/elemental_shaman/gear_sets/phase_3.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215114,"enchant":1509,"rune":415231}, - {"id":220623}, - {"id":220745,"enchant":7325}, - {"id":220611,"enchant":903}, - {"id":220535,"enchant":928,"rune":408438}, - {"id":220538,"enchant":1883,"rune":432056}, - {"id":211502,"rune":408490}, - {"id":220553,"rune":415100}, - {"id":220661,"enchant":1509,"rune":425336}, - {"id":220662,"enchant":911,"rune":425874}, - {"id":221440}, - {"id":220628}, - {"id":223195}, - {"id":213347}, - {"id":220586}, - {"id":220597}, - {"id":220607} - ] -} diff --git a/ui/elemental_shaman/gear_sets/phase_4.gear.json b/ui/elemental_shaman/gear_sets/phase_4.gear.json deleted file mode 100644 index 822bec772..000000000 --- a/ui/elemental_shaman/gear_sets/phase_4.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":228353,"enchant":1505,"rune":415231}, - {"id":228289}, - {"id":226624,"enchant":7563}, - {"id":228100,"enchant":7564,"rune":440569}, - {"id":226619,"enchant":1891,"rune":408438}, - {"id":226626,"enchant":1883,"rune":432056}, - {"id":226621,"rune":408490}, - {"id":226625,"rune":415100}, - {"id":227839,"enchant":1505,"rune":408514}, - {"id":226620,"enchant":911,"rune":408696}, - {"id":228287,"rune":442896}, - {"id":228687,"rune":442894}, - {"id":228255}, - {"id":228081}, - {"id":227886,"enchant":2504}, - {"id":228142,"enchant":7603}, - {"id":228176} - ] -} diff --git a/ui/elemental_shaman/gear_sets/phase_5.gear.json b/ui/elemental_shaman/gear_sets/phase_5.gear.json deleted file mode 100644 index 3b0849b7c..000000000 --- a/ui/elemental_shaman/gear_sets/phase_5.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":230812,"enchant":7627,"rune":415231}, - {"id":228289}, - {"id":231217,"enchant":2605}, - {"id":230804,"rune":440569}, - {"id":231221,"enchant":1891,"rune":408438}, - {"id":231215,"enchant":1883,"rune":432056}, - {"id":231214,"rune":408490}, - {"id":231216,"rune":415100}, - {"id":230279,"enchant":7627,"rune":408514}, - {"id":231220,"enchant":911,"rune":408696}, - {"id":230281,"rune":442894}, - {"id":228287,"rune":442896}, - {"id":231281}, - {"id":230273}, - {"id":231387,"enchant":2568}, - {"id":231890,"enchant":7603}, - {"id":232409} - ] -} diff --git a/ui/elemental_shaman/presets.ts b/ui/elemental_shaman/presets.ts index 59f69a028..61f044221 100644 --- a/ui/elemental_shaman/presets.ts +++ b/ui/elemental_shaman/presets.ts @@ -27,11 +27,7 @@ import Phase2APL from './apls/phase_2.apl.json'; import Phase3APL from './apls/phase_3.apl.json'; import Phase4APL from './apls/phase_4.apl.json'; import Phase5APL from './apls/phase_5.apl.json'; -import Phase1Gear from './gear_sets/phase_1.gear.json'; -import Phase2Gear from './gear_sets/phase_2.gear.json'; -import Phase3Gear from './gear_sets/phase_3.gear.json'; -import Phase4Gear from './gear_sets/phase_4.gear.json'; -import Phase5Gear from './gear_sets/phase_5.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -41,21 +37,11 @@ import Phase5Gear from './gear_sets/phase_5.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearPhase1 = PresetUtils.makePresetGear('Phase 1', Phase1Gear); -export const GearPhase2 = PresetUtils.makePresetGear('Phase 2', Phase2Gear); -export const GearPhase3 = PresetUtils.makePresetGear('Phase 3', Phase3Gear); -export const GearPhase4 = PresetUtils.makePresetGear('Phase 4', Phase4Gear); -export const GearPhase5 = PresetUtils.makePresetGear('Phase 5', Phase5Gear); - -export const GearPresets = { - [Phase.Phase1]: [GearPhase1], - [Phase.Phase2]: [GearPhase2], - [Phase.Phase3]: [GearPhase3], - [Phase.Phase4]: [GearPhase4], - [Phase.Phase5]: [GearPhase5], -}; +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); + +export const GearPresets = {}; -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/elemental_shaman/sim.ts b/ui/elemental_shaman/sim.ts index c992f375a..7ae240709 100644 --- a/ui/elemental_shaman/sim.ts +++ b/ui/elemental_shaman/sim.ts @@ -125,11 +125,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecElementalShaman, { ], // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], }, @@ -155,12 +151,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecElementalShaman, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, - 2: Presets.GearPresets[Phase.Phase2][0].gear, + 1: Presets.DefaultGear.gear, + 2: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, - 2: Presets.GearPresets[Phase.Phase2][0].gear, + 1: Presets.DefaultGear.gear, + 2: Presets.DefaultGear.gear, }, }, }, diff --git a/ui/enhancement_shaman/gear_sets/phase_1.gear.json b/ui/enhancement_shaman/gear_sets/phase_1.gear.json deleted file mode 100644 index f19492f2c..000000000 --- a/ui/enhancement_shaman/gear_sets/phase_1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211789}, - {"id":209422}, - {"id":14573}, - {"id":213087,"enchant":247}, - {"id":211512,"enchant":847,"rune":408496}, - {"id":209524,"enchant":823}, - {"id":211423,"rune":408507}, - {"id":16659}, - {"id":10410,"rune":425336}, - {"id":211511}, - {"id":211467}, - {"id":13097}, - {"id":211449}, - {"id":4381}, - {"id":209436,"enchant":241}, - {"id":1454,"enchant":241}, - {"id":209575} - ] -} diff --git a/ui/enhancement_shaman/gear_sets/phase_2.gear.json b/ui/enhancement_shaman/gear_sets/phase_2.gear.json deleted file mode 100644 index 7972f3f7b..000000000 --- a/ui/enhancement_shaman/gear_sets/phase_2.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166}, - {"id":213344}, - {"id":213304}, - {"id":16336,"enchant":849}, - {"id":213314,"enchant":866,"rune":408496}, - {"id":213317,"enchant":856}, - {"id":211423,"enchant":856,"rune":408507}, - {"id":213325,"rune":408498}, - {"id":213333,"rune":425336}, - {"id":213339,"enchant":849,"rune":425874}, - {"id":19512}, - {"id":213284}, - {"id":211449}, - {"id":213348}, - {"id":213409,"enchant":7210}, - {"id":213442,"enchant":7210}, - {"id":209575} - ] -} \ No newline at end of file diff --git a/ui/enhancement_shaman/gear_sets/phase_3.gear.json b/ui/enhancement_shaman/gear_sets/phase_3.gear.json deleted file mode 100644 index 62e0b64e6..000000000 --- a/ui/enhancement_shaman/gear_sets/phase_3.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":221782,"enchant":1506,"rune":415140}, - {"id":220624}, - {"id":220527,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220657,"enchant":928,"rune":408496}, - {"id":19583,"enchant":1885,"rune":432134}, - {"id":220542,"enchant":856,"rune":408507}, - {"id":220552,"rune":408498}, - {"id":220658,"enchant":1506,"rune":425336}, - {"id":220659,"enchant":1887,"rune":408696}, - {"id":220626}, - {"id":19511}, - {"id":19120}, - {"id":221442}, - {"id":220576,"enchant":2563}, - {"id":220576,"enchant":2563}, - {"id":220607} - ] -} diff --git a/ui/enhancement_shaman/gear_sets/phase_4_2h.gear.json b/ui/enhancement_shaman/gear_sets/phase_4_2h.gear.json deleted file mode 100644 index d1f99bcd7..000000000 --- a/ui/enhancement_shaman/gear_sets/phase_4_2h.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226638,"enchant":2543,"rune":415140}, - {"id":228759}, - {"id":226640,"enchant":7563}, - {"id":228360,"enchant":7564,"rune":440580}, - {"id":226635,"enchant":1891,"rune":436364}, - {"id":226642,"enchant":1885,"rune":432134}, - {"id":227848,"enchant":931,"rune":408490}, - {"id":226641,"rune":408498}, - {"id":227847,"enchant":1505,"rune":409324}, - {"id":226636,"enchant":911,"rune":408696}, - {"id":228261,"rune":442881}, - {"id":228080,"rune":442896}, - {"id":228722}, - {"id":228078}, - {"id":227683,"enchant":1900}, - {}, - {"id":228177} - ] -} diff --git a/ui/enhancement_shaman/gear_sets/phase_4_dw.gear.json b/ui/enhancement_shaman/gear_sets/phase_4_dw.gear.json deleted file mode 100644 index 2fda1cd31..000000000 --- a/ui/enhancement_shaman/gear_sets/phase_4_dw.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226638,"enchant":1505,"rune":415140}, - {"id":228685}, - {"id":226640,"enchant":7563}, - {"id":228383,"enchant":7564,"rune":440580}, - {"id":226635,"enchant":1891,"rune":408496}, - {"id":226642,"enchant":1885,"rune":432134}, - {"id":227848,"enchant":931,"rune":408507}, - {"id":226641,"rune":408498}, - {"id":227847,"enchant":1505,"rune":409324}, - {"id":226636,"enchant":911,"rune":408696}, - {"id":228286,"rune":442876}, - {"id":228287,"rune":442896}, - {"id":228722}, - {"id":228078}, - {"id":17068,"enchant":1900}, - {"id":17068,"enchant":1900}, - {"id":228177} - ] -} diff --git a/ui/enhancement_shaman/gear_sets/phase_5_2h.gear.json b/ui/enhancement_shaman/gear_sets/phase_5_2h.gear.json deleted file mode 100644 index 15134456c..000000000 --- a/ui/enhancement_shaman/gear_sets/phase_5_2h.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231227,"enchant":7626,"rune":415140}, - {"id":231307}, - {"id":231225,"enchant":2606}, - {"id":230842,"enchant":849,"rune":440580}, - {"id":227024,"enchant":1891,"rune":436364}, - {"id":231223,"enchant":1885,"rune":432134}, - {"id":231222,"enchant":931,"rune":408490}, - {"id":231224,"rune":408498}, - {"id":231226,"enchant":7626,"rune":409324}, - {"id":227023,"enchant":1887,"rune":408696}, - {"id":228261,"rune":442894}, - {"id":230839,"rune":442876}, - {"id":230273}, - {"id":231779}, - {"id":230271,"enchant":1900}, - {}, - {"id":228177} - ] -} diff --git a/ui/enhancement_shaman/gear_sets/phase_5_dw.gear.json b/ui/enhancement_shaman/gear_sets/phase_5_dw.gear.json deleted file mode 100644 index 65fa3983a..000000000 --- a/ui/enhancement_shaman/gear_sets/phase_5_dw.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232219,"enchant":7627,"rune":415140}, - {"id":231306}, - {"id":232217,"enchant":2606}, - {"id":228383,"enchant":849,"rune":440580}, - {"id":227024,"enchant":1891,"rune":408496}, - {"id":232215,"enchant":1885,"rune":432056}, - {"id":232220,"enchant":931,"rune":408507}, - {"id":226641,"rune":408498}, - {"id":226639,"enchant":7627,"rune":409324}, - {"id":227023,"enchant":911,"rune":408696}, - {"id":228261,"rune":442876}, - {"id":230839,"rune":442890}, - {"id":230282}, - {"id":230273}, - {"id":230276,"enchant":1900}, - {"id":231815,"enchant":1900}, - {"id":232416} - ] -} diff --git a/ui/enhancement_shaman/presets.ts b/ui/enhancement_shaman/presets.ts index 23e386b01..a5b495313 100644 --- a/ui/enhancement_shaman/presets.ts +++ b/ui/enhancement_shaman/presets.ts @@ -28,13 +28,7 @@ import Phase2APL from './apls/phase_2.apl.json'; import Phase3APL from './apls/phase_3.apl.json'; import Phase4APL from './apls/phase_4.apl.json'; import Phase5APL from './apls/phase_5.apl.json'; -import Phase1Gear from './gear_sets/phase_1.gear.json'; -import Phase2Gear from './gear_sets/phase_2.gear.json'; -import Phase3Gear from './gear_sets/phase_3.gear.json'; -import Phase4Gear2H from './gear_sets/phase_4_2h.gear.json'; -import Phase4GearDW from './gear_sets/phase_4_dw.gear.json'; -import Phase5Gear2H from './gear_sets/phase_5_2h.gear.json'; -import Phase5GearDW from './gear_sets/phase_5_dw.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -43,23 +37,11 @@ import Phase5GearDW from './gear_sets/phase_5_dw.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearPhase1 = PresetUtils.makePresetGear('Phase 1', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); -export const GearPhase2 = PresetUtils.makePresetGear('Phase 2', Phase2Gear, { customCondition: player => player.getLevel() === 40 }); -export const GearPhase3 = PresetUtils.makePresetGear('Phase 3', Phase3Gear, { customCondition: player => player.getLevel() === 50 }); -export const GearDWPhase4 = PresetUtils.makePresetGear('Phase 4 DW', Phase4GearDW, { customCondition: player => player.getLevel() === 60 }); -export const Gear2HPhase4 = PresetUtils.makePresetGear('Phase 4 2H', Phase4Gear2H, { customCondition: player => player.getLevel() === 60 }); -export const GearDWPhase5 = PresetUtils.makePresetGear('Phase 5 DW', Phase5GearDW, { customCondition: player => player.getLevel() === 60 }); -export const Gear2HPhase5 = PresetUtils.makePresetGear('Phase 5 2H', Phase5Gear2H, { customCondition: player => player.getLevel() === 60 }); - -export const GearPresets = { - [Phase.Phase1]: [GearPhase1], - [Phase.Phase2]: [GearPhase2], - [Phase.Phase3]: [GearPhase3], - [Phase.Phase4]: [GearDWPhase4, Gear2HPhase4], - [Phase.Phase5]: [GearDWPhase5, Gear2HPhase5], -}; +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); + +export const GearPresets = {}; -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/enhancement_shaman/sim.ts b/ui/enhancement_shaman/sim.ts index 9307deb85..a9e665c75 100644 --- a/ui/enhancement_shaman/sim.ts +++ b/ui/enhancement_shaman/sim.ts @@ -145,11 +145,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecEnhancementShaman, { ...Presets.APLPresets[Phase.Phase1], ], gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], }, @@ -176,10 +172,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecEnhancementShaman, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, }, }, diff --git a/ui/feral_druid/gear_sets/blank.gear.json b/ui/feral_druid/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/feral_druid/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/feral_druid/gear_sets/phase_1.gear.json b/ui/feral_druid/gear_sets/phase_1.gear.json deleted file mode 100644 index e00d407a9..000000000 --- a/ui/feral_druid/gear_sets/phase_1.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":211510}, - {"id":209422}, - {"id":209692}, - {"id":213087,"enchant":247}, - {"id":211512,"enchant":847,"rune":407977}, - {"id":209524,"enchant":823}, - {"id":211423,"rune":407995}, - {"id":209421}, - {"id":10410,"rune":407988}, - {"id":211511,"enchant":247}, - {"id":20439}, - {"id":6321}, - {"id":211449}, - {"id":4381}, - {"id":209577,"enchant":723}, - {}, - {"id":209576} -]} diff --git a/ui/feral_druid/gear_sets/phase_2.gear.json b/ui/feral_druid/gear_sets/phase_2.gear.json deleted file mode 100644 index f763350cb..000000000 --- a/ui/feral_druid/gear_sets/phase_2.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166}, - {"id":213344}, - {"id":9647}, - {"id":213307,"enchant":849}, - {"id":213313,"enchant":866,"rune":407977}, - {"id":19590,"enchant":856}, - {"id":211423,"enchant":856,"rune":407995}, - {"id":213322,"rune":417141}, - {"id":213332,"rune":407988}, - {"id":213341,"enchant":849,"rune":417046}, - {"id":213284}, - {"id":19512}, - {"id":211449}, - {"id":213348}, - {"id":210741,"enchant":34}, - {}, - {"id":209576} - ] -} \ No newline at end of file diff --git a/ui/feral_druid/gear_sets/phase_3.gear.json b/ui/feral_druid/gear_sets/phase_3.gear.json deleted file mode 100644 index 73c01f2f1..000000000 --- a/ui/feral_druid/gear_sets/phase_3.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166,"enchant":7124,"rune":417145}, - {"id":13089}, - {"id":220747,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220779,"enchant":928,"rune":407977}, - {"id":19590,"enchant":856,"rune":414719}, - {"id":21319,"enchant":1887,"rune":407995}, - {"id":213322,"rune":417141}, - {"id":220778,"enchant":1508,"rune":407988}, - {"id":220780,"enchant":1887,"rune":417046}, - {"id":19511}, - {"id":12014,"randomSuffix":692}, - {"id":223195}, - {"id":221307}, - {"id":220596,"enchant":34}, - {}, - {"id":220606} - ] -} diff --git a/ui/feral_druid/gear_sets/phase_4.gear.json b/ui/feral_druid/gear_sets/phase_4.gear.json deleted file mode 100644 index b1d108ca1..000000000 --- a/ui/feral_druid/gear_sets/phase_4.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226659,"enchant":7124,"rune":417145}, - {"id":228685}, - {"id":226665,"enchant":7328}, - {"id":228290,"enchant":7564,"rune":439510}, - {"id":226661,"enchant":1891,"rune":407977}, - {"id":226662,"enchant":1885,"rune":414719}, - {"id":228257,"enchant":927,"rune":407995}, - {"id":226660,"rune":417141}, - {"id":226666,"enchant":1505,"rune":407988}, - {"id":226663,"enchant":1887,"rune":417046}, - {"id":228286,"rune":442896}, - {"id":228261,"rune":453622}, - {"id":228078}, - {"id":228089}, - {"id":227683,"enchant":1900}, - {}, - {"id":22397} - ] -} diff --git a/ui/feral_druid/gear_sets/phase_5.gear.json b/ui/feral_druid/gear_sets/phase_5.gear.json deleted file mode 100644 index a4f78a200..000000000 --- a/ui/feral_druid/gear_sets/phase_5.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231257,"enchant":7124,"rune":417145}, - {"id":231803}, - {"id":231259,"enchant":2606}, - {"id":230842,"enchant":849,"rune":439510}, - {"id":231254,"enchant":1891,"rune":407977}, - {"id":231261,"enchant":1885,"rune":414719}, - {"id":232100,"enchant":927,"rune":407995}, - {"id":232096,"rune":417141}, - {"id":232098,"enchant":7615,"rune":407988}, - {"id":232101,"enchant":1887,"rune":417046}, - {"id":230734,"rune":453622}, - {"id":228261,"rune":442896}, - {"id":231779}, - {"id":230282}, - {"id":224282,"enchant":1900}, - {}, - {"id":220606} - ] -} diff --git a/ui/feral_druid/presets.ts b/ui/feral_druid/presets.ts index 8f6d6a5b7..6de5e1216 100644 --- a/ui/feral_druid/presets.ts +++ b/ui/feral_druid/presets.ts @@ -28,11 +28,7 @@ import Phase2APL from './apls/phase_2.apl.json'; import Phase3APL from './apls/phase_3.apl.json'; import Phase4APL from './apls/phase_4.apl.json'; import Phase5APL from './apls/phase_5.apl.json'; -import Phase1Gear from './gear_sets/phase_1.gear.json'; -import Phase2Gear from './gear_sets/phase_2.gear.json'; -import Phase3Gear from './gear_sets/phase_3.gear.json'; -import Phase4Gear from './gear_sets/phase_4.gear.json'; -import Phase5Gear from './gear_sets/phase_5.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -42,21 +38,11 @@ import Phase5Gear from './gear_sets/phase_5.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearPhase1 = PresetUtils.makePresetGear('Phase 1', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); -export const GearPhase2 = PresetUtils.makePresetGear('Phase 2', Phase2Gear, { customCondition: player => player.getLevel() === 40 }); -export const GearPhase3 = PresetUtils.makePresetGear('Phase 3', Phase3Gear, { customCondition: player => player.getLevel() === 50 }); -export const GearPhase4 = PresetUtils.makePresetGear('Phase 4', Phase4Gear, { customCondition: player => player.getLevel() === 60 }); -export const GearPhase5 = PresetUtils.makePresetGear('Phase 5', Phase5Gear, { customCondition: player => player.getLevel() === 60 }); - -export const GearPresets = { - [Phase.Phase1]: [GearPhase1], - [Phase.Phase2]: [GearPhase2], - [Phase.Phase3]: [GearPhase3], - [Phase.Phase4]: [GearPhase4], - [Phase.Phase5]: [GearPhase5], -}; +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); + +export const GearPresets = {}; -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/feral_druid/sim.ts b/ui/feral_druid/sim.ts index 1323f299d..b3554d6e2 100644 --- a/ui/feral_druid/sim.ts +++ b/ui/feral_druid/sim.ts @@ -149,11 +149,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralDruid, { ], // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], }, @@ -205,10 +201,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralDruid, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, }, }, diff --git a/ui/healing_priest/presets.ts b/ui/healing_priest/presets.ts index b2a2af3d5..7a91ef93d 100644 --- a/ui/healing_priest/presets.ts +++ b/ui/healing_priest/presets.ts @@ -21,8 +21,7 @@ import BlankGear from './gear_sets/blank.gear.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. -export const DiscDefaultGear = PresetUtils.makePresetGear('Blank', BlankGear, { talentTree: 0 }); -export const HolyDefaultGear = PresetUtils.makePresetGear('Blank', BlankGear, { talentTree: 1 }); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); export const ROTATION_PRESET_DISC = PresetUtils.makePresetAPLRotation('Disc', DiscApl); export const ROTATION_PRESET_HOLY = PresetUtils.makePresetAPLRotation('Holy', HolyApl); diff --git a/ui/healing_priest/sim.ts b/ui/healing_priest/sim.ts index 0cf3ec279..dad46821e 100644 --- a/ui/healing_priest/sim.ts +++ b/ui/healing_priest/sim.ts @@ -51,7 +51,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHealingPriest, { defaults: { // Default equipped gear. - gear: Presets.DiscDefaultGear.gear, + gear: Presets.GearBlank.gear, // Default EP weights for sorting gear in the gear picker. epWeights: Stats.fromMap({ [Stat.StatIntellect]: 2.73, @@ -107,8 +107,8 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHealingPriest, { ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.DiscDefaultGear, - Presets.HolyDefaultGear, + Presets.GearBlank, + Presets.GearBlank, ], }, @@ -139,10 +139,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHealingPriest, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.DiscDefaultGear.gear, + 1: Presets.GearBlank.gear, }, [Faction.Horde]: { - 1: Presets.DiscDefaultGear.gear, + 1: Presets.GearBlank.gear, }, }, }, @@ -163,10 +163,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHealingPriest, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.HolyDefaultGear.gear, + 1: Presets.GearBlank.gear, }, [Faction.Horde]: { - 1: Presets.HolyDefaultGear.gear, + 1: Presets.GearBlank.gear, }, }, }, diff --git a/ui/hunter/gear_sets/blank.gear.json b/ui/hunter/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/hunter/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p2_melee.gear.json b/ui/hunter/gear_sets/p2_melee.gear.json deleted file mode 100644 index c9bc506a1..000000000 --- a/ui/hunter/gear_sets/p2_melee.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":215166}, - {"id":19540}, - {"id":213304}, - {"id":213308,"enchant":247}, - {"id":213314,"enchant":866,"rune":415370}, - {"id":213317}, - {"id":213278,"enchant":904,"rune":425711}, - {"id":213325,"rune":415352}, - {"id":213333,"rune":415320}, - {"id":6423,"enchant":849,"rune":409687}, - {"id":2951}, - {"id":9533}, - {"id":213348}, - {"id":211449}, - {"id":213409,"enchant":7210}, - {"id":213442,"enchant":7210}, - {"id":216516} -]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p2_ranged_bm.gear.json b/ui/hunter/gear_sets/p2_ranged_bm.gear.json deleted file mode 100644 index 526da87ae..000000000 --- a/ui/hunter/gear_sets/p2_ranged_bm.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166}, - {"id":213344}, - {"id":213304}, - {"id":213308,"enchant":849}, - {"id":11193,"enchant":866,"rune":409580}, - {"id":19590,"enchant":247}, - {"id":211423,"enchant":904,"rune":409433}, - {"id":213325,"rune":409504}, - {"id":216676,"rune":415399}, - {"id":9926,"randomSuffix":212,"enchant":911,"rune":409541}, - {"id":2951}, - {"id":12012,"randomSuffix":171}, - {"id":211449}, - {"id":213348}, - {"id":10823,"enchant":7210}, - {"id":19548,"enchant":7210}, - {"id":213356,"enchant":664} - ] -} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p2_ranged_mm.gear.json b/ui/hunter/gear_sets/p2_ranged_mm.gear.json deleted file mode 100644 index 3566a4653..000000000 --- a/ui/hunter/gear_sets/p2_ranged_mm.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166}, - {"id":213344}, - {"id":213304}, - {"id":213308,"enchant":849}, - {"id":11193,"enchant":866,"rune":409580}, - {"id":19590,"enchant":247}, - {"id":211423,"enchant":904,"rune":409433}, - {"id":213325,"rune":409504}, - {"id":216676,"rune":415399}, - {"id":9926,"randomSuffix":212,"enchant":911,"rune":409541}, - {"id":12012,"randomSuffix":171}, - {"id":12012,"randomSuffix":171}, - {"id":211449}, - {"id":213348}, - {"id":10823,"enchant":7210}, - {"id":19544,"enchant":7210}, - {"id":213356,"enchant":664} - ] -} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p3_melee_bm.gear.json b/ui/hunter/gear_sets/p3_melee_bm.gear.json deleted file mode 100644 index 349f82c59..000000000 --- a/ui/hunter/gear_sets/p3_melee_bm.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166,"enchant":1508,"rune":415428}, - {"id":220624}, - {"id":220742,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220666,"enchant":928,"rune":409580}, - {"id":19589,"enchant":1885,"rune":415358}, - {"id":21319,"enchant":1887,"rune":409368}, - {"id":11686,"rune":415352}, - {"id":220667,"enchant":1508,"rune":415320}, - {"id":220668,"enchant":1887,"rune":409687}, - {"id":17713}, - {"id":220626}, - {"id":221307}, - {"id":223195}, - {"id":220588,"enchant":2564}, - {"id":224409,"enchant":2564}, - {"id":221450,"enchant":664} - ] -} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p3_ranged_mm.gear.json b/ui/hunter/gear_sets/p3_ranged_mm.gear.json deleted file mode 100644 index a76cf31ce..000000000 --- a/ui/hunter/gear_sets/p3_ranged_mm.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166,"enchant":1508,"rune":415413}, - {"id":220624}, - {"id":220742,"enchant":7325}, - {"id":12552,"enchant":849}, - {"id":220666,"enchant":928,"rune":409580}, - {"id":19589,"enchant":247,"rune":428726}, - {"id":220545,"enchant":1887,"rune":409433}, - {"id":17778,"rune":409504}, - {"id":220667,"enchant":1508,"rune":415399}, - {"id":220668,"enchant":1887,"rune":409541}, - {"id":220627}, - {"id":9533}, - {"id":223195}, - {"id":221307}, - {"id":12527,"randomSuffix":172,"enchant":2564}, - {"id":19543,"enchant":2564}, - {"id":220573,"enchant":664} - ] -} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p4_ranged.gear.json b/ui/hunter/gear_sets/p4_ranged.gear.json deleted file mode 100644 index 704e704b8..000000000 --- a/ui/hunter/gear_sets/p4_ranged.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":227067,"enchant":1508,"rune":415413}, - {"id":228685}, - {"id":227069,"enchant":7328}, - {"id":228290,"enchant":849,"rune":440529}, - {"id":226534,"enchant":928,"rune":415370}, - {"id":226530,"enchant":247,"rune":428717}, - {"id":226528,"enchant":1887,"rune":409433}, - {"id":226529,"rune":409504}, - {"id":226532,"enchant":1508,"rune":415399}, - {"id":226531,"enchant":1887,"rune":409541}, - {"id":227284,"rune":442892}, - {"id":228261,"rune":442891}, - {"id":221307}, - {"id":13965}, - {"id":227833,"enchant":2646}, - {}, - {"id":228334,"enchant":664} - ] -} diff --git a/ui/hunter/gear_sets/p4_weave.gear.json b/ui/hunter/gear_sets/p4_weave.gear.json deleted file mode 100644 index 7ce67a8e0..000000000 --- a/ui/hunter/gear_sets/p4_weave.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226536,"enchant":1508,"rune":415413}, - {"id":228685}, - {"id":226527,"enchant":7328}, - {"id":228290,"enchant":849,"rune":440529}, - {"id":226535,"enchant":928,"rune":415370}, - {"id":226530,"enchant":1885,"rune":428717}, - {"id":226528,"enchant":1887,"rune":409433}, - {"id":226529,"rune":409504}, - {"id":226537,"enchant":1508,"rune":409593}, - {"id":226538,"enchant":1887,"rune":458479}, - {"id":228286,"rune":442892}, - {"id":228261,"rune":442891}, - {"id":221307}, - {"id":221309}, - {"id":228272,"enchant":2646}, - {}, - {"id":228334,"enchant":664} - ] -} diff --git a/ui/hunter/gear_sets/p5_melee_bm.gear.json b/ui/hunter/gear_sets/p5_melee_bm.gear.json deleted file mode 100644 index 106404ebd..000000000 --- a/ui/hunter/gear_sets/p5_melee_bm.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232115,"enchant":7617,"rune":415405}, - {"id":231320}, - {"id":231066,"enchant":2606}, - {"id":230842,"enchant":849,"rune":440529}, - {"id":232118,"enchant":1891,"rune":409368}, - {"id":232111,"enchant":1885,"rune":415358}, - {"id":232116,"enchant":1887,"rune":458393}, - {"id":231065,"rune":415352}, - {"id":231067,"enchant":7617,"rune":415320}, - {"id":231070,"enchant":1887,"rune":409687}, - {"id":228286,"rune":442894}, - {"id":230734,"rune":442813}, - {"id":228722}, - {"id":230282}, - {"id":231754,"enchant":1900}, - {"id":231755,"enchant":1900}, - {"id":221450,"enchant":664} - ] -} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p5_melee_sv.gear.json b/ui/hunter/gear_sets/p5_melee_sv.gear.json deleted file mode 100644 index b840db136..000000000 --- a/ui/hunter/gear_sets/p5_melee_sv.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232115,"enchant":7635,"rune":415405}, - {"id":231320}, - {"id":231066,"enchant":2606}, - {"id":230842,"enchant":849,"rune":440529}, - {"id":231071,"enchant":1891,"rune":409368}, - {"id":231063,"enchant":1885,"rune":415358}, - {"id":232116,"enchant":1887,"rune":458393}, - {"id":231065,"rune":409504}, - {"id":231067,"enchant":7635,"rune":415320}, - {"id":231070,"enchant":1887,"rune":458479}, - {"id":228261,"rune":442894}, - {"id":230734,"rune":442813}, - {"id":231288}, - {"id":230282}, - {"id":230818,"enchant":2646}, - {}, - {"id":221450,"enchant":664} - ] -} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p5_ranged_sv.gear.json b/ui/hunter/gear_sets/p5_ranged_sv.gear.json deleted file mode 100644 index c71311248..000000000 --- a/ui/hunter/gear_sets/p5_ranged_sv.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231059,"enchant":7617,"rune":415413}, - {"id":231803}, - {"id":231057,"enchant":2606}, - {"id":228290,"enchant":849,"rune":440529}, - {"id":231062,"enchant":1891,"rune":415370}, - {"id":231055,"enchant":247,"rune":428717}, - {"id":230859,"enchant":1887,"rune":409433}, - {"id":231056,"rune":409504}, - {"id":231058,"enchant":7617,"rune":415399}, - {"id":231061,"enchant":1887,"rune":409541}, - {"id":230921,"rune":442894}, - {"id":230734,"rune":442891}, - {"id":227990}, - {"id":13965}, - {"id":231823,"enchant":2646}, - {}, - {"id":230801,"enchant":664} - ] -} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p5_weave.gear.json b/ui/hunter/gear_sets/p5_weave.gear.json deleted file mode 100644 index 5d48d0cf9..000000000 --- a/ui/hunter/gear_sets/p5_weave.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232123,"enchant":7635,"rune":415428}, - {"id":231803}, - {"id":231066,"enchant":2606}, - {"id":228290,"enchant":849,"rune":440533}, - {"id":232126,"enchant":1891,"rune":415370}, - {"id":231063,"enchant":1885,"rune":415358}, - {"id":231069,"enchant":1887,"rune":409433}, - {"id":232120,"rune":409504}, - {"id":231067,"enchant":7635,"rune":409593}, - {"id":232125,"enchant":1887,"rune":458479}, - {"id":230921,"rune":442892}, - {"id":230734,"rune":442891}, - {"id":13965}, - {"id":230282}, - {"id":228272,"enchant":2646}, - {}, - {"id":230801,"enchant":664} - ] -} \ No newline at end of file diff --git a/ui/hunter/gear_sets/phase1.gear.json b/ui/hunter/gear_sets/phase1.gear.json deleted file mode 100644 index 64a99b40f..000000000 --- a/ui/hunter/gear_sets/phase1.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":211510}, - {"id":20444}, - {"id":2264}, - {"id":5193}, - {"id":211512,"rune":409580}, - {"id":6198}, - {"id":211423,"rune":409368}, - {"id":209421}, - {"id":13114,"rune":415320}, - {"id":211511}, - {"id":211467}, - {"id":1491}, - {"id":211449}, - {"id":4381}, - {"id":209562}, - {}, - {"id":209534} -]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/placeholder.gear.json b/ui/hunter/gear_sets/placeholder.gear.json new file mode 100644 index 000000000..97627a58b --- /dev/null +++ b/ui/hunter/gear_sets/placeholder.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":18421}, + {"id":19540}, + {"id":14817}, + {"id":15138,"enchant":247}, + {"id":14811,"enchant":866}, + {"id":18458}, + {"id":15063,"enchant":904}, + {"id":18393,"rune":415352}, + {"id":8309,"rune":415320}, + {"id":6423,"enchant":849}, + {"id":2951}, + {"id":9533}, + {"id":13515}, + {"id":18473}, + {"id":22317,"enchant":7210}, + {"id":22317,"enchant":7210}, + {"id":16996} +]} \ No newline at end of file diff --git a/ui/hunter/presets.ts b/ui/hunter/presets.ts index abe280913..191e10ed9 100644 --- a/ui/hunter/presets.ts +++ b/ui/hunter/presets.ts @@ -44,18 +44,7 @@ import Phase5AplMeleeBm from './apls/p5_melee_bm.apl.json'; import Phase5AplMeleeSv from './apls/p5_melee_sv.apl.json'; import Phase5AplRanged from './apls/p5_ranged.apl.json'; import Phase5AplWeave from './apls/p5_weave.apl.json'; -import Phase2GearMelee from './gear_sets/p2_melee.gear.json'; -import Phase2GearRangedBm from './gear_sets/p2_ranged_bm.gear.json'; -import Phase2GearRangedMm from './gear_sets/p2_ranged_mm.gear.json'; -import Phase3GearMeleeBm from './gear_sets/p3_melee_bm.gear.json'; -import Phase3GearRangedMm from './gear_sets/p3_ranged_mm.gear.json'; -import Phase4GearRanged from './gear_sets/p4_ranged.gear.json'; -import Phase4GearWeave from './gear_sets/p4_weave.gear.json'; -import Phase5GearMeleeBm from './gear_sets/p5_melee_bm.gear.json'; -import Phase5GearMeleeSv from './gear_sets/p5_melee_sv.gear.json'; -import Phase5GearRangedSv from './gear_sets/p5_ranged_sv.gear.json'; -import Phase5GearWeave from './gear_sets/p5_weave.gear.json'; -import Phase1Gear from './gear_sets/phase1.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -64,41 +53,11 @@ import Phase1Gear from './gear_sets/phase1.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearBeastMasteryPhase1 = PresetUtils.makePresetGear('P1 Beast Mastery', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); -export const GearMarksmanPhase1 = PresetUtils.makePresetGear('P1 Marksmanship', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); -export const GearSurvivalPhase1 = PresetUtils.makePresetGear('P1 Survival', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const GearRangedBmPhase2 = PresetUtils.makePresetGear('P2 Ranged BM', Phase2GearRangedBm, { customCondition: player => player.getLevel() === 40 }); -export const GearRangedMmPhase2 = PresetUtils.makePresetGear('P2 Ranged MM', Phase2GearRangedMm, { customCondition: player => player.getLevel() === 40 }); -export const GearMeleePhase2 = PresetUtils.makePresetGear('P2 Melee', Phase2GearMelee, { customCondition: player => player.getLevel() === 40 }); +export const GearPresets = {}; -export const GearMeleeBmPhase3 = PresetUtils.makePresetGear('P3 Melee BM', Phase3GearMeleeBm, { customCondition: player => player.getLevel() === 50 }); -export const GearRangedMmPhase3 = PresetUtils.makePresetGear('P3 Ranged MM', Phase3GearRangedMm, { customCondition: player => player.getLevel() === 50 }); - -export const GearWeavePhase4 = PresetUtils.makePresetGear('P4 Weave', Phase4GearWeave, { customCondition: player => player.getLevel() === 60 }); -export const GearRangedSVPhase4 = PresetUtils.makePresetGear('P4 Ranged', Phase4GearRanged, { customCondition: player => player.getLevel() === 60 }); - -export const GearWeavePhase5 = PresetUtils.makePresetGear('P5 Weave', Phase5GearWeave, { customCondition: player => player.getLevel() === 60 }); -export const GearRangedMMPhase5 = PresetUtils.makePresetGear('P5 Ranged MM', Phase5GearRangedSv, { customCondition: player => player.getLevel() === 60 }); -export const GearRangedSVPhase5 = PresetUtils.makePresetGear('P5 Ranged SV', Phase5GearRangedSv, { customCondition: player => player.getLevel() === 60 }); -export const GearMeleeBMPhase5 = PresetUtils.makePresetGear('P5 Melee BM', Phase5GearMeleeBm, { customCondition: player => player.getLevel() === 60 }); -export const GearMeleeSVPhase5 = PresetUtils.makePresetGear('P5 Melee SV', Phase5GearMeleeSv, { customCondition: player => player.getLevel() === 60 }); - -export const GearPresets = { - [Phase.Phase1]: [GearBeastMasteryPhase1, GearMarksmanPhase1, GearSurvivalPhase1], - [Phase.Phase2]: [GearRangedBmPhase2, GearRangedMmPhase2, GearMeleePhase2], - [Phase.Phase3]: [GearRangedMmPhase3, GearMeleeBmPhase3], - [Phase.Phase4]: [], //[GearWeavePhase4, GearRangedSVPhase4], - [Phase.Phase5]: [GearWeavePhase5, GearRangedMMPhase5, GearRangedSVPhase5, GearMeleeBMPhase5, GearMeleeSVPhase5], -}; - -export const DefaultGearWeave = GearPresets[Phase.Phase5][0]; -export const DefaultGearRangedMM = GearPresets[Phase.Phase5][1]; -export const DefaultGearRangedSV = GearPresets[Phase.Phase5][2]; -export const DefaultGearMeleeBM = GearPresets[Phase.Phase5][3]; -export const DefaultGearMeleeSV = GearPresets[Phase.Phase5][4]; - -export const DefaultGear = DefaultGearRangedSV; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets @@ -216,27 +175,27 @@ export const DefaultTalentsMeleeSV = TalentPresets[Phase.Phase5][4]; export const DefaultTalents = DefaultTalentsWeave; export const PresetBuildWeave = PresetUtils.makePresetBuild('Weave', { - gear: DefaultGearWeave, + gear: DefaultGear, talents: DefaultTalentsWeave, rotation: DefaultAPLWeave, }); export const PresetBuildRangedMM = PresetUtils.makePresetBuild('Ranged MM', { - gear: DefaultGearRangedMM, + gear: DefaultGear, talents: DefaultTalentsRangedMM, rotation: DefaultAPLRanged, }); export const PresetBuildRangedSV = PresetUtils.makePresetBuild('Ranged SV', { - gear: DefaultGearRangedSV, + gear: DefaultGear, talents: DefaultTalentsRangedSV, rotation: DefaultAPLRanged, }); export const PresetBuildMeleeBM = PresetUtils.makePresetBuild('Melee BM', { - gear: DefaultGearMeleeBM, + gear: DefaultGear, talents: DefaultTalentsMeleeBM, rotation: DefaultAPLMeleeBM, }); export const PresetBuildMeleeSV = PresetUtils.makePresetBuild('Melee SV', { - gear: DefaultGearMeleeSV, + gear: DefaultGear, talents: DefaultTalentsMeleeSV, rotation: DefaultAPLMeleeSV, }); diff --git a/ui/hunter/sim.ts b/ui/hunter/sim.ts index b0fbe3d9a..fc127cede 100644 --- a/ui/hunter/sim.ts +++ b/ui/hunter/sim.ts @@ -159,11 +159,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHunter, { ], // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], builds: [Presets.PresetBuildRangedMM, Presets.PresetBuildRangedSV, Presets.PresetBuildMeleeBM, Presets.PresetBuildMeleeSV, Presets.PresetBuildWeave], }, diff --git a/ui/mage/gear_sets/blank.gear.json b/ui/mage/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/mage/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/mage/gear_sets/p1_fire.gear.json b/ui/mage/gear_sets/p1_fire.gear.json deleted file mode 100644 index 94287fd70..000000000 --- a/ui/mage/gear_sets/p1_fire.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":211842}, - {"id":209686}, - {"id":215365}, - {"id":9822,"randomSuffix":1880}, - {"id":209671,"enchant":847,"rune":412286}, - {"id":210781,"enchant":723}, - {"id":14191,"randomSuffix":1882,"rune":400613}, - {"id":6611,"randomSuffix":1882}, - {"id":209684,"rune":401556}, - {"id":209669}, - {"id":20426}, - {"id":209668}, - {"id":21566}, - {"id":211450}, - {"id":209561,"enchant":723}, - {}, - {"id":209674} -]} diff --git a/ui/mage/gear_sets/p1_generic.gear.json b/ui/mage/gear_sets/p1_generic.gear.json deleted file mode 100644 index 2d8be5b96..000000000 --- a/ui/mage/gear_sets/p1_generic.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":211842}, - {"id":209686}, - {"id":215365}, - {"id":9822,"randomSuffix":1804}, - {"id":209671,"enchant":843,"rune":412286}, - {"id":1974,"enchant":723}, - {"id":14191,"randomSuffix":1882,"rune":400574}, - {"id":215366}, - {"id":209684,"rune":401556}, - {"id":209669}, - {"id":20426}, - {"id":209668}, - {"id":21566}, - {"id":211450}, - {"id":209561,"enchant":723}, - {}, - {"id":209674} -]} diff --git a/ui/mage/gear_sets/p2_arcane.gear.json b/ui/mage/gear_sets/p2_arcane.gear.json deleted file mode 100644 index 472fad08d..000000000 --- a/ui/mage/gear_sets/p2_arcane.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215111}, - {"id":213345}, - {"id":213301}, - {"id":216620}, - {"id":215377,"enchant":866,"rune":412286}, - {"id":19597,"enchant":905}, - {"id":10019,"rune":400574}, - {"id":213321,"rune":400588}, - {"id":215379,"rune":425124}, - {"id":215378,"enchant":255,"rune":412322}, - {"id":213283}, - {"id":216510}, - {"id":213347}, - {"id":211450}, - {"id":213410,"enchant":7210}, - {"id":213542}, - {"id":213559} - ] -} diff --git a/ui/mage/gear_sets/p2_fire.gear.json b/ui/mage/gear_sets/p2_fire.gear.json deleted file mode 100644 index fe125af39..000000000 --- a/ui/mage/gear_sets/p2_fire.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215111}, - {"id":213345}, - {"id":213301}, - {"id":216620}, - {"id":215377,"enchant":866,"rune":412286}, - {"id":19597,"enchant":905}, - {"id":10019,"rune":400613}, - {"id":213321,"rune":400624}, - {"id":215379,"rune":401556}, - {"id":215378,"enchant":255,"rune":412322}, - {"id":213283}, - {"id":216511}, - {"id":213347}, - {"id":211450}, - {"id":213410,"enchant":7210}, - {"id":213542}, - {"id":213559} - ] -} diff --git a/ui/mage/gear_sets/p2_frost.gear.json b/ui/mage/gear_sets/p2_frost.gear.json deleted file mode 100644 index 4373b6eb1..000000000 --- a/ui/mage/gear_sets/p2_frost.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - { "id": 215111 }, - { "id": 213345 }, - { "id": 213301 }, - { "id": 216620 }, - { "id": 215377, "enchant": 866, "rune": 412286 }, - { "id": 19597, "enchant": 905 }, - { "id": 10019, "rune": 400613 }, - { "id": 213321, "rune": 401502 }, - { "id": 215379, "rune": 425121 }, - { "id": 215378, "enchant": 255, "rune": 412322 }, - { "id": 213283 }, - { "id": 216511 }, - { "id": 213347 }, - { "id": 211450 }, - { "id": 213410, "enchant": 7210 }, - { "id": 213542 }, - { "id": 213559 } - ] -} diff --git a/ui/mage/gear_sets/p3_fire.gear.json b/ui/mage/gear_sets/p3_fire.gear.json deleted file mode 100644 index fc0a1ab54..000000000 --- a/ui/mage/gear_sets/p3_fire.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":3075,"rune":400624}, - {"id":20037}, - {"id":11624,"enchant":7325}, - {"id":220611}, - {"id":220680,"enchant":928,"rune":412286}, - {"id":19596,"enchant":1883,"rune":428741}, - {"id":10787,"rune":400613}, - {"id":14304,"randomSuffix":1892,"rune":401502}, - {"id":220679,"rune":425121}, - {"id":220681,"enchant":911,"rune":412322}, - {"id":221440}, - {"id":220628}, - {"id":220634}, - {"id":213347}, - {"id":220586,"enchant":2443}, - {"id":220599}, - {"id":11748} - ] -} diff --git a/ui/mage/gear_sets/p3_frost_ffb.gear.json b/ui/mage/gear_sets/p3_frost_ffb.gear.json deleted file mode 100644 index eebbdbfcd..000000000 --- a/ui/mage/gear_sets/p3_frost_ffb.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":3075,"rune":428739}, - {"id":20037}, - {"id":11624,"enchant":7325}, - {"id":220611}, - {"id":220680,"enchant":928,"rune":400647}, - {"id":19596,"enchant":1883,"rune":428741}, - {"id":10787,"rune":400613}, - {"id":14304,"randomSuffix":1892,"rune":401502}, - {"id":220679,"rune":425121}, - {"id":220681,"enchant":911,"rune":412322}, - {"id":221440}, - {"id":220628}, - {"id":220634}, - {"id":213347}, - {"id":220586,"enchant":2443}, - {"id":220599}, - {"id":220604} - ] -} diff --git a/ui/mage/gear_sets/p4_arcane.gear.json b/ui/mage/gear_sets/p4_arcane.gear.json deleted file mode 100644 index 3940bb970..000000000 --- a/ui/mage/gear_sets/p4_arcane.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226562,"enchant":2544,"rune":428885}, - {"id":228289}, - {"id":226560,"enchant":7325}, - {"id":228100,"enchant":2463,"rune":400615}, - {"id":226559,"enchant":1891,"rune":412286}, - {"id":226558,"enchant":1883,"rune":428878}, - {"id":226556,"rune":400574}, - {"id":226934,"rune":400588}, - {"id":226561,"enchant":2544,"rune":425121}, - {"id":226931,"enchant":911,"rune":412322}, - {"id":228243,"rune":442894}, - {"id":228287,"rune":442893}, - {"id":228255}, - {"id":12930}, - {"id":228269,"enchant":2504}, - {"id":19308}, - {"id":18338} - ] -} diff --git a/ui/mage/gear_sets/p4_fire.gear.json b/ui/mage/gear_sets/p4_fire.gear.json deleted file mode 100644 index e7611a4db..000000000 --- a/ui/mage/gear_sets/p4_fire.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226935,"enchant":2544,"rune":400624}, - {"id":228289}, - {"id":226560,"enchant":7325}, - {"id":227869,"enchant":2463,"rune":400615}, - {"id":226559,"enchant":1891,"rune":412286}, - {"id":226558,"enchant":1883,"rune":428878}, - {"id":226556,"rune":400613}, - {"id":228190,"rune":401502}, - {"id":226561,"enchant":2544,"rune":425121}, - {"id":226931,"enchant":911,"rune":412322}, - {"id":228243,"rune":442894}, - {"id":228287,"rune":442895}, - {"id":228255}, - {"id":12930}, - {"id":228269,"enchant":2504}, - {"id":19311}, - {"id":11748} - ] -} diff --git a/ui/mage/gear_sets/p4_frost.gear.json b/ui/mage/gear_sets/p4_frost.gear.json deleted file mode 100644 index 288f37ae5..000000000 --- a/ui/mage/gear_sets/p4_frost.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226562,"enchant":2544,"rune":428739}, - {"id":228289}, - {"id":226560,"enchant":7325}, - {"id":228100,"enchant":2463,"rune":400615}, - {"id":226559,"enchant":1891,"rune":400647}, - {"id":226558,"enchant":1883,"rune":428878}, - {"id":226556,"rune":400613}, - {"id":226934,"rune":401502}, - {"id":226561,"enchant":2544,"rune":425121}, - {"id":226931,"enchant":911,"rune":412322}, - {"id":228243,"rune":442894}, - {"id":228287,"rune":442895}, - {"id":228255}, - {"id":13968}, - {"id":228269,"enchant":2504}, - {"id":228548}, - {"id":228381} - ] -} diff --git a/ui/mage/gear_sets/p5_arcane.gear.json b/ui/mage/gear_sets/p5_arcane.gear.json deleted file mode 100644 index ce1639de5..000000000 --- a/ui/mage/gear_sets/p5_arcane.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":230812,"enchant":7634,"rune":428739}, - {"id":231324}, - {"id":231325,"enchant":2605}, - {"id":230804,"enchant":2463,"rune":440802}, - {"id":231327,"enchant":1891,"rune":400647}, - {"id":231326,"enchant":1883,"rune":428741}, - {"id":232132,"rune":400613}, - {"id":232128,"rune":412532}, - {"id":232130,"enchant":7634,"rune":425121}, - {"id":232133,"enchant":911,"rune":412322}, - {"id":228287,"rune":442894}, - {"id":228243,"rune":442895}, - {"id":230243}, - {"id":231282}, - {"id":230794,"enchant":2504}, - {"id":220597}, - {"id":228381} - ] -} diff --git a/ui/mage/gear_sets/p5_fire.gear.json b/ui/mage/gear_sets/p5_fire.gear.json deleted file mode 100644 index 75c1858b3..000000000 --- a/ui/mage/gear_sets/p5_fire.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":230812,"enchant":7634,"rune":400624}, - {"id":228289}, - {"id":231106,"enchant":2605}, - {"id":230804,"enchant":2463,"rune":400615}, - {"id":231105,"enchant":1891,"rune":412324}, - {"id":231107,"enchant":1883,"rune":428878}, - {"id":231102,"rune":400613}, - {"id":228256,"rune":401502}, - {"id":231104,"enchant":7634,"rune":425121}, - {"id":231101,"enchant":911,"rune":412322}, - {"id":228287,"rune":442894}, - {"id":228687,"rune":442895}, - {"id":230243}, - {"id":230810}, - {"id":229971,"enchant":2504}, - {}, - {"id":231857} - ] -} diff --git a/ui/mage/gear_sets/p5_frost.gear.json b/ui/mage/gear_sets/p5_frost.gear.json deleted file mode 100644 index f59118129..000000000 --- a/ui/mage/gear_sets/p5_frost.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":230812,"enchant":7634,"rune":428739}, - {"id":231324}, - {"id":231325,"enchant":2605}, - {"id":230804,"enchant":2463,"rune":440802}, - {"id":231327,"enchant":1891,"rune":400647}, - {"id":231326,"enchant":1883,"rune":428741}, - {"id":232132,"rune":400613}, - {"id":232128,"rune":412532}, - {"id":232130,"enchant":7634,"rune":425121}, - {"id":232133,"enchant":911,"rune":412322}, - {"id":228687,"rune":442894}, - {"id":228287,"rune":442895}, - {"id":230243}, - {"id":231282}, - {"id":229972,"enchant":2504}, - {}, - {"id":228381} - ] -} diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts index 296717ad8..7bf39c31f 100644 --- a/ui/mage/presets.ts +++ b/ui/mage/presets.ts @@ -35,87 +35,17 @@ import Phase4APLFire from './apls/p4_fire.apl.json'; import Phase4APLFrost from './apls/p4_frost.apl.json'; import Phase5APLFire from './apls/p5_fire.apl.json'; import Phase5APLSpellFrost from './apls/p5_spellfrost.apl.json'; -import Phase1GearFire from './gear_sets/p1_fire.gear.json'; -import Phase1Gear from './gear_sets/p1_generic.gear.json'; -import Phase2GearArcane from './gear_sets/p2_arcane.gear.json'; -import Phase2GearFire from './gear_sets/p2_fire.gear.json'; -import Phase2GearFrost from './gear_sets/p2_frost.gear.json'; -import Phase3GearFire from './gear_sets/p3_fire.gear.json'; -import Phase3GearFrostFFB from './gear_sets/p3_frost_ffb.gear.json'; -import Phase4GearArcane from './gear_sets/p4_arcane.gear.json'; -import Phase4GearFire from './gear_sets/p4_fire.gear.json'; -import Phase4GearFrost from './gear_sets/p4_frost.gear.json'; -import Phase5GearArcane from './gear_sets/p5_arcane.gear.json'; -import Phase5GearFire from './gear_sets/p5_fire.gear.json'; -import Phase5GearFrost from './gear_sets/p5_frost.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; /////////////////////////////////////////////////////////////////////////// // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearArcanePhase1 = PresetUtils.makePresetGear('P1 Arcane', Phase1Gear, { - customCondition: player => player.getLevel() === 25, -}); -export const GearFirePhase1 = PresetUtils.makePresetGear('P1 Fire', Phase1GearFire, { - customCondition: player => player.getLevel() === 25, -}); -export const GearFrostPhase1 = PresetUtils.makePresetGear('P1 Frost', Phase1Gear, { - customCondition: player => player.getLevel() === 25, -}); - -export const GearArcanePhase2 = PresetUtils.makePresetGear('P2 Arcane', Phase2GearArcane, { - customCondition: player => player.getLevel() === 40, -}); -export const GearFirePhase2 = PresetUtils.makePresetGear('P2 Fire', Phase2GearFire, { - customCondition: player => player.getLevel() === 40, -}); -export const GearFrostPhase2 = PresetUtils.makePresetGear('P2 Frost', Phase2GearFrost, { - customCondition: player => player.getLevel() === 40, -}); - -// No new Phase 3 Arcane presets at the moment -export const GearArcanePhase3 = GearArcanePhase2; -export const GearFirePhase3 = PresetUtils.makePresetGear('P3 Fire', Phase3GearFire, { - customCondition: player => player.getLevel() === 50, -}); -export const GearFrostPhase3 = PresetUtils.makePresetGear('P3 Frost', Phase3GearFrostFFB, { - customCondition: player => player.getLevel() === 50, -}); - -// No new Phase 4 Arcane presets at the moment -export const GearArcanePhase4 = PresetUtils.makePresetGear('P4 Arcane', Phase4GearArcane, { - customCondition: player => player.getLevel() === 60, -}); -export const GearFirePhase4 = PresetUtils.makePresetGear('P4 Fire', Phase4GearFire, { - customCondition: player => player.getLevel() === 60, -}); -export const GearFrostPhase4 = PresetUtils.makePresetGear('P4 Frost', Phase4GearFrost, { - customCondition: player => player.getLevel() === 60, -}); - -export const GearArcanePhase5 = PresetUtils.makePresetGear('P5 Arcane', Phase5GearArcane, { - customCondition: player => player.getLevel() === 60, -}); -export const GearFirePhase5 = PresetUtils.makePresetGear('P5 Fire', Phase5GearFire, { - customCondition: player => player.getLevel() === 60, -}); -export const GearFrostPhase5 = PresetUtils.makePresetGear('P5 Frost', Phase5GearFrost, { - customCondition: player => player.getLevel() === 60, -}); - -export const GearPresets = { - [Phase.Phase1]: [GearArcanePhase1, GearFirePhase1, GearFrostPhase1], - [Phase.Phase2]: [GearArcanePhase2, GearFirePhase2, GearFrostPhase2], - [Phase.Phase3]: [GearArcanePhase3, GearFirePhase3, GearFrostPhase3], - [Phase.Phase4]: [GearArcanePhase4, GearFirePhase4, GearFrostPhase4], - [Phase.Phase5]: [GearArcanePhase5, GearFirePhase5, GearFrostPhase5], -}; +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const DefaultGearArcane = GearPresets[Phase.Phase5][0]; -export const DefaultGearFire = GearPresets[Phase.Phase5][1]; -export const DefaultGearFrost = GearPresets[Phase.Phase5][2]; +export const GearPresets = {}; -export const DefaultGear = DefaultGearFire; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets @@ -258,12 +188,12 @@ export const DefaultTalentsFrost = TalentPresets[Phase.Phase5][2]; export const DefaultTalents = DefaultTalentsFire; export const PresetBuildArcane = PresetUtils.makePresetBuild('Arcane', { - gear: DefaultGearArcane, + gear: DefaultGear, talents: DefaultTalentsArcane, rotation: DefaultAPLs[60][0], }); -export const PresetBuildFire = PresetUtils.makePresetBuild('Fire', { gear: DefaultGearFire, talents: DefaultTalentsFire, rotation: DefaultAPLs[60][1] }); -export const PresetBuildFrost = PresetUtils.makePresetBuild('Frost', { gear: DefaultGearFrost, talents: DefaultTalentsFrost, rotation: DefaultAPLs[60][2] }); +export const PresetBuildFire = PresetUtils.makePresetBuild('Fire', { gear: DefaultGear, talents: DefaultTalentsFire, rotation: DefaultAPLs[60][1] }); +export const PresetBuildFrost = PresetUtils.makePresetBuild('Frost', { gear: DefaultGear, talents: DefaultTalentsFrost, rotation: DefaultAPLs[60][2] }); /////////////////////////////////////////////////////////////////////////// // Options diff --git a/ui/mage/sim.ts b/ui/mage/sim.ts index 897b73b23..a8b0ca889 100644 --- a/ui/mage/sim.ts +++ b/ui/mage/sim.ts @@ -128,11 +128,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, { ...Presets.TalentPresets[Phase.Phase1], ], gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], builds: [Presets.PresetBuildArcane, Presets.PresetBuildFire, Presets.PresetBuildFrost], }, @@ -163,10 +159,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, }, }, @@ -188,10 +184,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][1].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][1].gear, + 1: Presets.DefaultGear.gear, }, }, }, @@ -213,10 +209,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][2].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][2].gear, + 1: Presets.DefaultGear.gear, }, }, }, diff --git a/ui/protection_paladin/gear_sets/p4prot.gear.json b/ui/protection_paladin/gear_sets/p4prot.gear.json deleted file mode 100644 index 7fabc86ac..000000000 --- a/ui/protection_paladin/gear_sets/p4prot.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - { "id": 226607, "enchant": 1505, "rune": 429133 }, - { "id": 228354 }, - { "id": 226605, "enchant": 7563 }, - { "id": 227854, "enchant": 7564, "rune": 440658 }, - { "id": 226595, "enchant": 1891, "rune": 425589 }, - { "id": 226603, "enchant": 1885, "rune": 407632 }, - { "id": 226608, "enchant": 1887, "rune": 407631 }, - { "id": 226604, "rune": 458318 }, - { "id": 226606, "enchant": 1505, "rune": 407669 }, - { "id": 226609, "enchant": 1887, "rune": 426157 }, - { "id": 228242, "rune": 442898 }, - { "id": 22331, "rune": 459312 }, - { "id": 228686 }, - { "id": 228163 }, - { "id": 227840, "enchant": 1900 }, - { "id": 228702, "enchant": 7603 }, - { "id": 228174 } - ] -} diff --git a/ui/protection_paladin/gear_sets/p5prot.gear.json b/ui/protection_paladin/gear_sets/p5prot.gear.json deleted file mode 100644 index 3e52be19b..000000000 --- a/ui/protection_paladin/gear_sets/p5prot.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - { "id": 231186, "enchant": 7618, "rune": 429133 }, - { "id": 230840 }, - { "id": 231184, "enchant": 2606 }, - { "id": 231012, "enchant": 849, "rune": 440658 }, - { "id": 231181, "enchant": 1891, "rune": 425589 }, - { "id": 231182, "enchant": 1885, "rune": 407632 }, - { "id": 231188, "enchant": 1887, "rune": 407631 }, - { "id": 231183, "rune": 458318 }, - { "id": 231177, "enchant": 7618, "rune": 407669 }, - { "id": 231189, "enchant": 1887, "rune": 426157 }, - { "id": 230943, "rune": 442898 }, - { "id": 230999, "rune": 459312 }, - { "id": 228722 }, - { "id": 230736 }, - { "id": 230224, "enchant": 1900 }, - { "id": 231289, "enchant": 7603 }, - { "id": 232421 } - ] -} diff --git a/ui/protection_paladin/presets.ts b/ui/protection_paladin/presets.ts index 4fa986220..7ac4eca11 100644 --- a/ui/protection_paladin/presets.ts +++ b/ui/protection_paladin/presets.ts @@ -25,12 +25,11 @@ import { WeaponImbue, ZanzaBuff, } from '../core/proto/common.js'; -import { PaladinAura, PaladinSeal, Blessings, PaladinOptions as ProtectionPaladinOptions } from '../core/proto/paladin.js'; +import { Blessings, PaladinAura, PaladinOptions as ProtectionPaladinOptions,PaladinSeal } from '../core/proto/paladin.js'; import { SavedTalents } from '../core/proto/ui.js'; -import APLP5ProtJson from './apls/p5prot.apl.json'; import APLP4ProtJson from './apls/p4prot.apl.json'; -import Phase4ProtGearJson from './gear_sets/p4prot.gear.json'; -import Phase5ProtGearJson from './gear_sets/p5prot.gear.json'; +import APLP5ProtJson from './apls/p5prot.apl.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -40,18 +39,11 @@ import Phase5ProtGearJson from './gear_sets/p5prot.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const Phase4ProtGear = PresetUtils.makePresetGear('P4 Prot', Phase4ProtGearJson); -export const Phase5ProtGear = PresetUtils.makePresetGear('P5 Prot', Phase5ProtGearJson); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const GearPresets = { - [Phase.Phase1]: [], - [Phase.Phase2]: [], - [Phase.Phase3]: [], - [Phase.Phase4]: [Phase4ProtGear, Phase5ProtGear], - [Phase.Phase5]: [Phase4ProtGear, Phase5ProtGear], -}; +export const GearPresets = {}; -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/protection_paladin/sim.ts b/ui/protection_paladin/sim.ts index 14fe21eb8..9252c8eca 100644 --- a/ui/protection_paladin/sim.ts +++ b/ui/protection_paladin/sim.ts @@ -193,7 +193,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecProtectionPaladin, { // Preset talents that the user can quickly select. talents: [...Presets.TalentPresets[Phase.Phase5], ...Presets.TalentPresets[Phase.Phase4]], // Preset gear configurations that the user can quickly select. - gear: [...Presets.GearPresets[Phase.Phase4], ...Presets.GearPresets[Phase.Phase5]], + gear: [Presets.DefaultGear], }, autoRotation: player => { @@ -218,7 +218,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecProtectionPaladin, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase5][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: {}, }, diff --git a/ui/retribution_paladin/gear_sets/blank.gear.json b/ui/retribution_paladin/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/retribution_paladin/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/retribution_paladin/gear_sets/p1ret.gear.json b/ui/retribution_paladin/gear_sets/p1ret.gear.json deleted file mode 100644 index 861040f5b..000000000 --- a/ui/retribution_paladin/gear_sets/p1ret.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211505}, - {"id":209422}, - {"id":2264}, - {"id":213088,"enchant":247}, - {"id":211504,"enchant":847,"rune":407778}, - {"id":4438,"enchant":823}, - {"id":209568,"enchant":856,"rune":407676}, - {"id":6460}, - {"id":209566,"rune":415076}, - {"id":211506,"enchant":247}, - {"id":13097}, - {"id":6321}, - {"id":211449}, - {"id":21568}, - {"id":209562,"enchant":943}, - {}, - {"id":209574} - ] - } \ No newline at end of file diff --git a/ui/retribution_paladin/gear_sets/p2retsoc.gear.json b/ui/retribution_paladin/gear_sets/p2retsoc.gear.json deleted file mode 100644 index 7296bf5b6..000000000 --- a/ui/retribution_paladin/gear_sets/p2retsoc.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161}, - {"id":213344}, - {"id":213304}, - {"id":213307,"enchant":849}, - {"id":213313,"enchant":866,"rune":407778}, - {"id":19581,"enchant":856}, - {"id":213319,"enchant":856,"rune":407676}, - {"id":215380,"rune":426158}, - {"id":213332,"rune":415076}, - {"id":9637,"enchant":849,"rune":426157}, - {"id":213284}, - {"id":19515}, - {"id":211449}, - {"id":213348}, - {"id":213416,"enchant":34}, - {}, - {"id":215435} - ] -} \ No newline at end of file diff --git a/ui/retribution_paladin/gear_sets/p2retsom.gear.json b/ui/retribution_paladin/gear_sets/p2retsom.gear.json deleted file mode 100644 index 32bad13d4..000000000 --- a/ui/retribution_paladin/gear_sets/p2retsom.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161}, - {"id":213344}, - {"id":213304}, - {"id":213307,"enchant":849}, - {"id":213313,"enchant":866,"rune":407798}, - {"id":19581,"enchant":856}, - {"id":213319,"enchant":856,"rune":407676}, - {"id":215380,"rune":426158}, - {"id":213332,"rune":415076}, - {"id":9637,"enchant":849,"rune":426157}, - {"id":213284}, - {"id":19515}, - {"id":211449}, - {"id":213348}, - {"id":210741,"enchant":34}, - {}, - {"id":215435} - ] -} \ No newline at end of file diff --git a/ui/retribution_paladin/gear_sets/p3retsom.gear.json b/ui/retribution_paladin/gear_sets/p3retsom.gear.json deleted file mode 100644 index c43f8e40e..000000000 --- a/ui/retribution_paladin/gear_sets/p3retsom.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161,"enchant":1506,"rune":429139}, - {"id":220624}, - {"id":220738,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220653,"enchant":928,"rune":407798}, - {"id":19580,"enchant":1885,"rune":429152}, - {"id":220541,"enchant":856,"rune":407676}, - {"id":220554,"rune":426158}, - {"id":220654,"enchant":1506,"rune":415076}, - {"id":220656,"enchant":1887,"rune":426157}, - {"id":220626}, - {"id":223194}, - {"id":221307}, - {"id":221309}, - {"id":223526,"enchant":34}, - {}, - {"id":221457} - ] -} diff --git a/ui/retribution_paladin/gear_sets/p4ret-exodin-6pcT1.gear.json b/ui/retribution_paladin/gear_sets/p4ret-exodin-6pcT1.gear.json deleted file mode 100644 index 7044b0201..000000000 --- a/ui/retribution_paladin/gear_sets/p4ret-exodin-6pcT1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226599,"enchant":2543,"rune":429139}, - {"id":228759}, - {"id":221783,"enchant":7328}, - {"id":228102,"enchant":849,"rune":440672}, - {"id":226602,"enchant":1891,"rune":407778}, - {"id":228127,"enchant":1885,"rune":429144}, - {"id":228260,"enchant":931,"rune":407676}, - {"id":226597,"rune":426158}, - {"id":226598,"enchant":2543,"rune":407624}, - {"id":226601,"enchant":1887,"rune":426157}, - {"id":228261,"rune":442898}, - {"id":228080,"rune":442876}, - {"id":228078}, - {"id":228722}, - {"id":228347,"enchant":1900}, - {}, - {"id":228173} - ] -} diff --git a/ui/retribution_paladin/gear_sets/p4ret-exodin.gear.json b/ui/retribution_paladin/gear_sets/p4ret-exodin.gear.json deleted file mode 100644 index 1fa5b9956..000000000 --- a/ui/retribution_paladin/gear_sets/p4ret-exodin.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226976,"enchant":2543,"rune":429139}, - {"id":228759}, - {"id":226969,"enchant":7328}, - {"id":228102,"enchant":849,"rune":440672}, - {"id":220653,"enchant":1891,"rune":407778}, - {"id":228127,"enchant":1885,"rune":429144}, - {"id":228260,"enchant":931,"rune":407676}, - {"id":228295,"rune":426158}, - {"id":220654,"enchant":2543,"rune":407624}, - {"id":220656,"enchant":1887,"rune":426157}, - {"id":228261,"rune":442898}, - {"id":228080,"rune":442813}, - {"id":228078}, - {"id":228722}, - {"id":228347,"enchant":1900}, - {}, - {"id":228173} - ] -} diff --git a/ui/retribution_paladin/gear_sets/p4ret-twisting-6pcT1.gear.json b/ui/retribution_paladin/gear_sets/p4ret-twisting-6pcT1.gear.json deleted file mode 100644 index 3c3261a84..000000000 --- a/ui/retribution_paladin/gear_sets/p4ret-twisting-6pcT1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226599,"enchant":1506,"rune":429139}, - {"id":228759}, - {"id":221783,"enchant":7328}, - {"id":228360,"enchant":849,"rune":440672}, - {"id":226602,"enchant":1891,"rune":407778}, - {"id":226596,"enchant":1885,"rune":429152}, - {"id":228260,"enchant":931,"rune":407676}, - {"id":228295,"rune":426158}, - {"id":226598,"enchant":2543,"rune":407624}, - {"id":226601,"enchant":1887,"rune":426157}, - {"id":228261,"rune":442898}, - {"id":228080,"rune":442876}, - {"id":228078}, - {"id":228722}, - {"id":227683,"enchant":1900}, - {}, - {"id":228173} - ] -} diff --git a/ui/retribution_paladin/gear_sets/p4rettwist.gear.json b/ui/retribution_paladin/gear_sets/p4rettwist.gear.json deleted file mode 100644 index 18cb0605f..000000000 --- a/ui/retribution_paladin/gear_sets/p4rettwist.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226976,"enchant":2543,"rune":429139}, - {"id":228759}, - {"id":226969,"enchant":7328}, - {"id":228102,"enchant":849,"rune":440672}, - {"id":220653,"enchant":1891,"rune":407778}, - {"id":228127,"enchant":1885,"rune":429152}, - {"id":228260,"enchant":931,"rune":407676}, - {"id":228295,"rune":426158}, - {"id":220654,"enchant":2543,"rune":407624}, - {"id":220656,"enchant":1887,"rune":426157}, - {"id":228261,"rune":442898}, - {"id":228080,"rune":442876}, - {"id":228078}, - {"id":228722}, - {"id":227683,"enchant":1900}, - {}, - {"id":228173} - ] -} diff --git a/ui/retribution_paladin/gear_sets/p5exodin.gear.json b/ui/retribution_paladin/gear_sets/p5exodin.gear.json deleted file mode 100644 index 323217acb..000000000 --- a/ui/retribution_paladin/gear_sets/p5exodin.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232147,"enchant":7619,"rune":429139}, - {"id":231902}, - {"id":232145,"enchant":7328}, - {"id":230842,"enchant":849,"rune":440672}, - {"id":232150,"enchant":1891,"rune":407778}, - {"id":231174,"enchant":1885,"rune":429144}, - {"id":231179,"enchant":931,"rune":407676}, - {"id":232144,"rune":426158}, - {"id":232146,"enchant":2543,"rune":407624}, - {"id":232149,"enchant":1887,"rune":426157}, - {"id":228261,"rune":442898}, - {"id":230734,"rune":442876}, - {"id":231779}, - {"id":228722}, - {"id":229749,"enchant":1900}, - {}, - {"id":232389} - ] -} \ No newline at end of file diff --git a/ui/retribution_paladin/gear_sets/p5shockadin.gear.json b/ui/retribution_paladin/gear_sets/p5shockadin.gear.json deleted file mode 100644 index 0b4807e47..000000000 --- a/ui/retribution_paladin/gear_sets/p5shockadin.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231178,"enchant":7621,"rune":429139}, - {"id":231328}, - {"id":231176,"enchant":2605}, - {"id":230804,"enchant":7564,"rune":462834}, - {"id":231329,"enchant":1891,"rune":458287}, - {"id":231331,"enchant":1883,"rune":429144}, - {"id":231179,"enchant":1887,"rune":407613}, - {"id":231330,"rune":426065}, - {"id":231177,"enchant":7621,"rune":407669}, - {"id":231180,"enchant":929,"rune":426157}, - {"id":228287,"rune":442813}, - {"id":230867,"rune":442898}, - {"id":228255}, - {"id":231285}, - {"id":229806,"enchant":2568}, - {"id":230248,"enchant":7603}, - {"id":232420} - ] -} diff --git a/ui/retribution_paladin/gear_sets/p5twisting.gear.json b/ui/retribution_paladin/gear_sets/p5twisting.gear.json deleted file mode 100644 index e823c98d1..000000000 --- a/ui/retribution_paladin/gear_sets/p5twisting.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231178,"enchant":7619,"rune":429139}, - {"id":231902}, - {"id":231176,"enchant":2606}, - {"id":230842,"enchant":849,"rune":440672}, - {"id":231181,"enchant":1891,"rune":407778}, - {"id":231174,"enchant":1885,"rune":429152}, - {"id":230861,"enchant":927,"rune":407676}, - {"id":231175,"rune":426158}, - {"id":231177,"enchant":7619,"rune":407624}, - {"id":230741,"enchant":1887,"rune":426157}, - {"id":228261,"rune":442898}, - {"id":230734,"rune":442876}, - {"id":231779}, - {"id":228722}, - {"id":230242,"enchant":1900}, - {}, - {"id":232389} - ] -} \ No newline at end of file diff --git a/ui/retribution_paladin/presets.ts b/ui/retribution_paladin/presets.ts index f9dc5a804..7acac886c 100644 --- a/ui/retribution_paladin/presets.ts +++ b/ui/retribution_paladin/presets.ts @@ -35,17 +35,7 @@ import APLPP5ExodinJson from './apls/p5ret-exodin-6CF2DR.apl.json'; import APLPP5TwistingSlowJson from './apls/p5ret-twist-4DR-3.5-3.6.apl.json'; import APLPP5TwistingSlowerJson from './apls/p5ret-twist-4DR-3.7-4.0.apl.json'; import APLPP5ShockadinJson from './apls/p5Shockadin.apl.json'; -import Phase1RetGearJson from './gear_sets/p1ret.gear.json'; -import Phase2RetSoCGearJson from './gear_sets/p2retsoc.gear.json'; -import Phase2RetSoMGearJson from './gear_sets/p2retsom.gear.json'; -import Phase3RetSoMGearJson from './gear_sets/p3retsom.gear.json'; -import Phase4RetExodinGearJson from './gear_sets/p4ret-exodin.gear.json'; -import Phase4RetExodin6PcT1GearJson from './gear_sets/p4ret-exodin-6pcT1.gear.json'; -import Phase4RetTwisting6PcT1GearJson from './gear_sets/p4ret-twisting-6pcT1.gear.json'; -import Phase4RetGearJson from './gear_sets/p4rettwist.gear.json'; -import Phase5ExodinGearJson from './gear_sets/p5exodin.gear.json'; -import Phase5ShockadinGearJson from './gear_sets/p5shockadin.gear.json'; -import Phase5TwistingGearJson from './gear_sets/p5twisting.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -55,49 +45,11 @@ import Phase5TwistingGearJson from './gear_sets/p5twisting.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const Phase1RetGear = PresetUtils.makePresetGear('P1', Phase1RetGearJson, { - customCondition: player => player.getLevel() == 25, -}); -export const Phase2RetSoCGear = PresetUtils.makePresetGear('P2 SoC/DS', Phase2RetSoCGearJson, { - customCondition: player => player.getLevel() == 40, -}); -export const Phase2RetSoMGear = PresetUtils.makePresetGear('P2 SoM', Phase2RetSoMGearJson, { - customCondition: player => player.getLevel() == 40, -}); -export const Phase3RetSoMGear = PresetUtils.makePresetGear('P3 SoM', Phase3RetSoMGearJson, { - customCondition: player => player.getLevel() == 50, -}); -export const Phase4RetTwistGear = PresetUtils.makePresetGear('P4 Twist', Phase4RetGearJson, { - customCondition: player => player.getLevel() == 60, -}); -export const Phase4RetTwist6pT1Gear = PresetUtils.makePresetGear('P4 Ret Twist 6pT1', Phase4RetTwisting6PcT1GearJson, { - customCondition: player => player.getLevel() == 60, -}); -export const Phase4RetExodinGear = PresetUtils.makePresetGear('P4 Ret Exodin', Phase4RetExodinGearJson, { - customCondition: player => player.getLevel() == 60, -}); -export const Phase4RetExodin6pT1Gear = PresetUtils.makePresetGear('P4 Ret Exodin 6pT1', Phase4RetExodin6PcT1GearJson, { - customCondition: player => player.getLevel() == 60, -}); -export const Phase5TwistingGear = PresetUtils.makePresetGear('P5 Twisting', Phase5TwistingGearJson, { - customCondition: player => player.getLevel() == 60, -}); -export const Phase5ExodinGear = PresetUtils.makePresetGear('P5 Exodin', Phase5ExodinGearJson, { - customCondition: player => player.getLevel() == 60, -}); -export const Phase5ShockadinGear = PresetUtils.makePresetGear('P5 Shockadin', Phase5ShockadinGearJson, { - customCondition: player => player.getLevel() == 60, -}); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const GearPresets = { - [Phase.Phase1]: [Phase1RetGear], - [Phase.Phase2]: [Phase2RetSoCGear, Phase2RetSoMGear], - [Phase.Phase3]: [Phase3RetSoMGear], - [Phase.Phase4]: [Phase4RetTwistGear, Phase4RetTwist6pT1Gear, Phase4RetExodinGear, Phase4RetExodin6pT1Gear], - [Phase.Phase5]: [Phase5TwistingGear, Phase5ExodinGear, Phase5ShockadinGear], -}; +export const GearPresets = {}; -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/retribution_paladin/sim.ts b/ui/retribution_paladin/sim.ts index 589b1ada4..8fbd73580 100644 --- a/ui/retribution_paladin/sim.ts +++ b/ui/retribution_paladin/sim.ts @@ -155,11 +155,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, { ], // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], }, @@ -185,8 +181,8 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, - 2: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, + 2: Presets.DefaultGear.gear, }, [Faction.Horde]: {}, }, diff --git a/ui/rogue/gear_sets/p1_combat.gear.json b/ui/rogue/gear_sets/p1_combat.gear.json deleted file mode 100644 index d75fe28f1..000000000 --- a/ui/rogue/gear_sets/p1_combat.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211510}, - {"id":209422}, - {"id":209692}, - {"id":209680}, - {"id":211512,"rune":399965}, - {"id":3202}, - {"id":7359,"rune":424785}, - {"id":209421}, - {"id":10410,"rune":399963}, - {"id":211511}, - {"id":20439}, - {"id":2933}, - {"id":211449}, - {}, - {"id":209525}, - {"id":209691}, - {"id":209688} - ] -} \ No newline at end of file diff --git a/ui/rogue/gear_sets/p1_daggers.gear.json b/ui/rogue/gear_sets/p1_daggers.gear.json deleted file mode 100644 index f463eeb9c..000000000 --- a/ui/rogue/gear_sets/p1_daggers.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211510}, - {"id":209422}, - {"id":209692}, - {"id":209680}, - {"id":211512,"rune":399965}, - {"id":3202}, - {"id":7359,"rune":399956}, - {"id":209421}, - {"id":10410,"rune":399963}, - {"id":211511}, - {"id":20439}, - {"id":2933}, - {"id":211449}, - {}, - {"id":209436}, - {"id":209436}, - {"id":209688} - ] -} \ No newline at end of file diff --git a/ui/rogue/gear_sets/p2_daggers.gear.json b/ui/rogue/gear_sets/p2_daggers.gear.json deleted file mode 100644 index 05519048a..000000000 --- a/ui/rogue/gear_sets/p2_daggers.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166}, - {"id":213344}, - {"id":9647}, - {"id":5257,"enchant":849}, - {"id":213313,"enchant":866,"rune":399965}, - {"id":19590,"enchant":856}, - {"id":213319,"enchant":904,"rune":399956}, - {"id":215115,"rune":400029}, - {"id":213332,"rune":399963}, - {"id":213341,"enchant":247,"rune":425096}, - {"id":19512}, - {"id":213284}, - {"id":211449}, - {"id":213348}, - {"id":213291,"enchant":7210}, - {"id":3187,"randomSuffix":1554,"enchant":7210}, - {"id":213355} - ] -} \ No newline at end of file diff --git a/ui/rogue/gear_sets/p3_muti.gear.json b/ui/rogue/gear_sets/p3_muti.gear.json deleted file mode 100644 index 89b11fe21..000000000 --- a/ui/rogue/gear_sets/p3_muti.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166,"enchant":1508,"rune":432256}, - {"id":220624}, - {"id":220747,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220676,"enchant":928,"rune":399965}, - {"id":19589,"enchant":1885,"rune":432271}, - {"id":21319,"enchant":1887,"rune":399956}, - {"id":11686,"rune":400029}, - {"id":220678,"enchant":1508,"rune":399963}, - {"id":220677,"enchant":911,"rune":425096}, - {"id":220626}, - {"id":223194}, - {"id":223195}, - {"id":213348}, - {"id":220585,"enchant":2564}, - {"id":6660,"enchant":2564}, - {"id":2100} - ] -} \ No newline at end of file diff --git a/ui/rogue/gear_sets/p3_muti_hat.gear.json b/ui/rogue/gear_sets/p3_muti_hat.gear.json deleted file mode 100644 index 9e4bbc921..000000000 --- a/ui/rogue/gear_sets/p3_muti_hat.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166,"enchant":1508,"rune":432264}, - {"id":220624}, - {"id":220747,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220676,"enchant":928,"rune":399965}, - {"id":19589,"enchant":1885,"rune":432276}, - {"id":21319,"enchant":1887,"rune":399956}, - {"id":11686,"rune":400029}, - {"id":220678,"enchant":1508,"rune":399963}, - {"id":220677,"enchant":911,"rune":425096}, - {"id":220626}, - {"id":223194}, - {"id":223195}, - {"id":213348}, - {"id":220585,"enchant":2564}, - {"id":220585,"enchant":2564}, - {"id":2100} - ] -} \ No newline at end of file diff --git a/ui/rogue/gear_sets/p3_saber.gear.json b/ui/rogue/gear_sets/p3_saber.gear.json deleted file mode 100644 index 6548e8d1f..000000000 --- a/ui/rogue/gear_sets/p3_saber.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166,"enchant":1508,"rune":432264}, - {"id":220624}, - {"id":220747,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220676,"enchant":928,"rune":399965}, - {"id":19589,"enchant":1885,"rune":432276}, - {"id":21319,"enchant":1887,"rune":424785}, - {"id":11686,"rune":400029}, - {"id":220678,"enchant":1508,"rune":399963}, - {"id":220677,"enchant":911,"rune":425096}, - {"id":220626}, - {"id":223194}, - {"id":223195}, - {"id":213348}, - {"id":220588,"enchant":2564}, - {"id":220589,"enchant":2564}, - {"id":2100} - ] -} \ No newline at end of file diff --git a/ui/rogue/gear_sets/p4_muti.gear.json b/ui/rogue/gear_sets/p4_muti.gear.json deleted file mode 100644 index 15abe1ce8..000000000 --- a/ui/rogue/gear_sets/p4_muti.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226446,"enchant":1508,"rune":432259}, - {"id":228685}, - {"id":226444,"enchant":7328}, - {"id":228383,"enchant":849}, - {"id":226447,"enchant":1891,"rune":399965}, - {"id":226442,"enchant":1885,"rune":432271}, - {"id":228257,"enchant":1887,"rune":399956}, - {"id":226440,"rune":425012}, - {"id":226445,"enchant":1508,"rune":399963}, - {"id":226443,"enchant":911,"rune":425096}, - {"id":228286,"rune":442887}, - {"id":227280,"rune":442896}, - {"id":228078}, - {"id":228722}, - {"id":228511,"enchant":1900}, - {"id":228701,"enchant":1900}, - {"id":228252} - ] -} diff --git a/ui/rogue/gear_sets/p4_saber.gear.json b/ui/rogue/gear_sets/p4_saber.gear.json deleted file mode 100644 index 7133e410a..000000000 --- a/ui/rogue/gear_sets/p4_saber.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226829,"enchant":1508,"rune":432264}, - {"id":228354}, - {"id":226444,"enchant":7328}, - {"id":228383,"enchant":849}, - {"id":226825,"enchant":1891,"rune":399965}, - {"id":226442,"enchant":1885,"rune":432276}, - {"id":226441,"enchant":1887,"rune":424785}, - {"id":226440,"rune":425012}, - {"id":226445,"enchant":1508,"rune":399963}, - {"id":226443,"enchant":911,"rune":425096}, - {"id":228286,"rune":442896}, - {"id":227280,"rune":442813}, - {"id":228078}, - {"id":228722}, - {"id":228265,"enchant":1900}, - {"id":228143,"enchant":1900}, - {"id":228252} - ] -} diff --git a/ui/rogue/gear_sets/p5_backstab.gear.json b/ui/rogue/gear_sets/p5_backstab.gear.json deleted file mode 100644 index 4d6e17c13..000000000 --- a/ui/rogue/gear_sets/p5_backstab.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231043,"enchant":7625,"rune":432256}, - {"id":231336}, - {"id":231338,"enchant":2606}, - {"id":230842,"enchant":849,"rune":412096}, - {"id":231337,"enchant":1891,"rune":424925}, - {"id":231339,"enchant":1885,"rune":432276}, - {"id":231042,"enchant":1887,"rune":462708}, - {"id":231045,"rune":425012}, - {"id":231044,"enchant":7625,"rune":399963}, - {"id":231041,"enchant":1887,"rune":425096}, - {"id":228286,"rune":442887}, - {"id":227280,"rune":442896}, - {"id":231287}, - {"id":230282}, - {"id":228296,"enchant":1900}, - {"id":224122,"enchant":1900}, - {"id":228252} - ] -} diff --git a/ui/rogue/gear_sets/p5_mutilate.gear.json b/ui/rogue/gear_sets/p5_mutilate.gear.json deleted file mode 100644 index 736493614..000000000 --- a/ui/rogue/gear_sets/p5_mutilate.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166,"enchant":7625,"rune":432264}, - {"id":231336}, - {"id":231338,"enchant":2606}, - {"id":228383,"enchant":849}, - {"id":232190,"enchant":1891,"rune":399965}, - {"id":232183,"enchant":1885,"rune":432271}, - {"id":232188,"enchant":1887,"rune":399956}, - {"id":232184,"rune":425012}, - {"id":232186,"enchant":7625,"rune":399963}, - {"id":232189,"enchant":1887,"rune":425096}, - {"id":227280,"rune":442887}, - {"id":228286,"rune":442896}, - {"id":230250}, - {"id":231287}, - {"id":224122,"enchant":1900}, - {"id":228277,"enchant":1900}, - {"id":228252} - ] -} diff --git a/ui/rogue/gear_sets/p5_saber.gear.json b/ui/rogue/gear_sets/p5_saber.gear.json deleted file mode 100644 index ca218d842..000000000 --- a/ui/rogue/gear_sets/p5_saber.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232187,"enchant":7625,"rune":432264}, - {"id":231803}, - {"id":232185,"enchant":2606}, - {"id":230842,"enchant":849}, - {"id":232190,"enchant":1891,"rune":399965}, - {"id":232183,"enchant":1885,"rune":432276}, - {"id":231042,"enchant":1887,"rune":424785}, - {"id":231045,"rune":425012}, - {"id":231044,"enchant":7625,"rune":399963}, - {"id":231041,"enchant":1887,"rune":425096}, - {"id":228286,"rune":442887}, - {"id":227280,"rune":442813}, - {"id":230250}, - {"id":230282}, - {"id":230224,"enchant":1900}, - {"id":224122,"enchant":1900}, - {"id":228252} - ] -} diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts index f825b1577..4ae4cbfaa 100644 --- a/ui/rogue/presets.ts +++ b/ui/rogue/presets.ts @@ -38,17 +38,6 @@ import SaberDPSAPL60 from './apls/Saber_DPS_60.apl.json'; import SaberIEAApl50 from './apls/Saber_IEA_50.apl.json'; import SlaughterCutthroatDPSAPL60 from './apls/Slaughter_Cutthroat_60.apl.json'; import BlankGear from './gear_sets/blank.gear.json'; -import P1CombatGear from './gear_sets/p1_combat.gear.json'; -import P1Daggers from './gear_sets/p1_daggers.gear.json'; -import P2DaggersGear from './gear_sets/p2_daggers.gear.json'; -import P3MutiGear from './gear_sets/p3_muti.gear.json'; -import P3MutiHatGear from './gear_sets/p3_muti_hat.gear.json'; -import P3SaberGear from './gear_sets/p3_saber.gear.json'; -import P4MutiGear from './gear_sets/p4_muti.gear.json'; -import P4SaberGear from './gear_sets/p4_saber.gear.json'; -import P5BackstabGear from './gear_sets/p5_backstab.gear.json'; -import P5MutilateGear from './gear_sets/p5_mutilate.gear.json'; -import P5SaberGear from './gear_sets/p5_saber.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -59,30 +48,10 @@ import P5SaberGear from './gear_sets/p5_saber.gear.json'; /////////////////////////////////////////////////////////////////////////// export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const P1GearDaggers = PresetUtils.makePresetGear('P1 Daggers', P1Daggers, { customCondition: player => player.getLevel() === 25 }); -export const P1GearSaber = PresetUtils.makePresetGear('P1 Saber', P1CombatGear, { customCondition: player => player.getLevel() === 25 }); -export const P2GearDaggers = PresetUtils.makePresetGear('P2 Daggers', P2DaggersGear, { customCondition: player => player.getLevel() === 40 }); -export const P3GearMuti = PresetUtils.makePresetGear('P3 Mutilate', P3MutiGear, { customCondition: player => player.getLevel() === 50 }); -export const P3GearMutiHat = PresetUtils.makePresetGear('P3 Mutilate (HaT)', P3MutiHatGear, { customCondition: player => player.getLevel() === 50 }); -export const P3GearSaber = PresetUtils.makePresetGear('P3 Saber', P3SaberGear, { customCondition: player => player.getLevel() === 50 }); -export const P4GearMuti = PresetUtils.makePresetGear('P4 Mutilate', P4MutiGear, { customCondition: player => player.getLevel() === 60 }); -export const P4GearSaber = PresetUtils.makePresetGear('P4 Saber', P4SaberGear, { customCondition: player => player.getLevel() === 60 }); -export const P5GearBackstab = PresetUtils.makePresetGear('P5 Backstab', P5BackstabGear, { customCondition: player => player.getLevel() === 60 }); -export const P5GearMutilate = PresetUtils.makePresetGear('P5 Mutilate', P5MutilateGear, { customCondition: player => player.getLevel() === 60 }); -export const P5GearSaber = PresetUtils.makePresetGear('P5 Saber', P5SaberGear, { customCondition: player => player.getLevel() === 60 }); - -export const GearPresets = { - [Phase.Phase1]: [P1GearDaggers, P1GearSaber], - [Phase.Phase2]: [P2GearDaggers], - [Phase.Phase3]: [P3GearMuti, P3GearMutiHat, P3GearSaber], - [Phase.Phase4]: [P4GearMuti, P4GearSaber], - [Phase.Phase5]: [P5GearBackstab, P5GearMutilate, P5GearSaber], -}; -export const DefaultGear = GearPresets[Phase.Phase5][0]; -export const DefaultGearBackstab = GearPresets[Phase.Phase5][0]; -export const DefaultGearMutilate = GearPresets[Phase.Phase5][1]; -export const DefaultGearSaber = GearPresets[Phase.Phase5][2]; +export const GearPresets = {}; + +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets[] @@ -293,7 +262,7 @@ export const DefaultTalents = DefaultTalentsAssassin; // Encounters /////////////////////////////////////////////////////////////////////////// export const PresetBuildBackstab = PresetUtils.makePresetBuild('Backstab', { - gear: DefaultGearBackstab, + gear: DefaultGear, talents: P5TalentBackstabAssassination, rotation: DefaultAPLBackstab, encounter: PresetUtils.makePresetEncounter( @@ -303,7 +272,7 @@ export const PresetBuildBackstab = PresetUtils.makePresetBuild('Backstab', { }); export const PresetBuildBackstabIEA = PresetUtils.makePresetBuild('Backstab IEA', { - gear: DefaultGearBackstab, + gear: DefaultGear, talents: P5TalentBackstabAssassinationIEA, rotation: DefaultAPLBackstab, encounter: PresetUtils.makePresetEncounter( @@ -313,7 +282,7 @@ export const PresetBuildBackstabIEA = PresetUtils.makePresetBuild('Backstab IEA' }); export const PresetBuildMutilate = PresetUtils.makePresetBuild('Mutilate', { - gear: DefaultGearMutilate, + gear: DefaultGear, talents: DefaultTalentsMutilate, rotation: DefaultAPLMutilate, encounter: PresetUtils.makePresetEncounter( @@ -323,7 +292,7 @@ export const PresetBuildMutilate = PresetUtils.makePresetBuild('Mutilate', { }); export const PresetBuildMutilateIEA = PresetUtils.makePresetBuild('Mutilate IEA', { - gear: DefaultGearMutilate, + gear: DefaultGear, talents: P5TalentMutilateSaberslashCTTCIEA, rotation: ROTATION_PRESET_MUTILATE_IEA_P5, encounter: PresetUtils.makePresetEncounter( @@ -333,7 +302,7 @@ export const PresetBuildMutilateIEA = PresetUtils.makePresetBuild('Mutilate IEA' }); export const PresetBuildSaberSlash = PresetUtils.makePresetBuild('Saber Slash', { - gear: DefaultGearSaber, + gear: DefaultGear, talents: DefaultTalentsSaber, rotation: DefaultAPLSaber, encounter: PresetUtils.makePresetEncounter( @@ -343,7 +312,7 @@ export const PresetBuildSaberSlash = PresetUtils.makePresetBuild('Saber Slash', }); export const PresetBuildSaberSlashIEA = PresetUtils.makePresetBuild('Saber Slash IEA', { - gear: DefaultGearSaber, + gear: DefaultGear, talents: P5TalentMutilateSaberslashCTTCIEA, rotation: ROTATION_PRESET_SABER_IEA_P5, encounter: PresetUtils.makePresetEncounter( diff --git a/ui/rogue/sim.ts b/ui/rogue/sim.ts index 72c84488e..6642bf51f 100644 --- a/ui/rogue/sim.ts +++ b/ui/rogue/sim.ts @@ -169,11 +169,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRogue, { ], // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], builds: [ Presets.PresetBuildBackstab, @@ -213,10 +209,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRogue, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, }, }, @@ -237,10 +233,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRogue, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, }, }, diff --git a/ui/shadow_priest/gear_sets/blank.gear.json b/ui/shadow_priest/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/shadow_priest/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/shadow_priest/gear_sets/phase_1.gear.json b/ui/shadow_priest/gear_sets/phase_1.gear.json deleted file mode 100644 index 57c848e9d..000000000 --- a/ui/shadow_priest/gear_sets/phase_1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":209683}, - {"id":209686}, - {"id":215365}, - {"id":6614}, - {"id":209671,"enchant":847,"rune":425204}, - {"id":6613,"enchant":66}, - {"id":209672,"rune":401955}, - {"id":215366}, - {"id":209684,"rune":402799}, - {"id":210795,"enchant":66}, - {"id":209668}, - {"id":20426}, - {"id":211450}, - {"id":21566}, - {"id":209561}, - {}, - {"id":211461} - ] -} \ No newline at end of file diff --git a/ui/shadow_priest/gear_sets/phase_2.gear.json b/ui/shadow_priest/gear_sets/phase_2.gear.json deleted file mode 100644 index 0eee311f4..000000000 --- a/ui/shadow_priest/gear_sets/phase_2.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215111}, - {"id":213345}, - {"id":9912,"randomSuffix":1850}, - {"id":14270,"randomSuffix":1846,"enchant":903}, - {"id":213311,"enchant":866,"rune":425204}, - {"id":19597,"enchant":905}, - {"id":10019,"rune":401955}, - {"id":213321,"rune":431655}, - {"id":213329,"rune":402799}, - {"id":213336,"enchant":852,"rune":425294}, - {"id":216519}, - {"id":213283}, - {"id":211450}, - {"id":213347}, - {"id":213410,"enchant":7210}, - {"id":213542}, - {"id":5216,"randomSuffix":1842} - ] -} diff --git a/ui/shadow_priest/gear_sets/phase_3.gear.json b/ui/shadow_priest/gear_sets/phase_3.gear.json deleted file mode 100644 index 76c7ab42b..000000000 --- a/ui/shadow_priest/gear_sets/phase_3.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":220523,"rune":413251}, - {"id":220623}, - {"id":10172,"randomSuffix":1854,"enchant":7325}, - {"id":14321,"randomSuffix":1850,"enchant":903}, - {"id":220535,"enchant":928,"rune":425204}, - {"id":19596,"enchant":1883,"rune":431670}, - {"id":220548,"rune":401955}, - {"id":223192,"rune":431655}, - {"id":220556,"rune":402799}, - {"id":10179,"randomSuffix":1853,"enchant":911,"rune":425294}, - {"id":220628}, - {"id":221458}, - {"id":221307}, - {"id":220634}, - {"id":220586}, - {"id":220598}, - {"id":220604} - ] -} diff --git a/ui/shadow_priest/gear_sets/phase_4.gear.json b/ui/shadow_priest/gear_sets/phase_4.gear.json deleted file mode 100644 index e08cc1af7..000000000 --- a/ui/shadow_priest/gear_sets/phase_4.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226584,"enchant":1505,"rune":413251}, - {"id":228289}, - {"id":226581,"enchant":7325}, - {"id":228100,"enchant":7564,"rune":402668}, - {"id":226582,"enchant":1891,"rune":425198}, - {"id":226579,"enchant":1883,"rune":431670}, - {"id":226585,"enchant":931,"rune":401955}, - {"id":226580,"rune":431655}, - {"id":228352,"rune":402799}, - {"id":226586,"enchant":929,"rune":425204}, - {"id":227454,"rune":442897}, - {"id":228687,"rune":442898}, - {"id":228255}, - {"id":12930}, - {"id":228336,"enchant":2504}, - {}, - {"id":228262} - ] -} diff --git a/ui/shadow_priest/gear_sets/phase_5_t1.gear.json b/ui/shadow_priest/gear_sets/phase_5_t1.gear.json deleted file mode 100644 index 76a1dca07..000000000 --- a/ui/shadow_priest/gear_sets/phase_5_t1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232171,"enchant":7623,"rune":413251}, - {"id":228289}, - {"id":232169,"enchant":2605}, - {"id":230804,"enchant":2463,"rune":402668}, - {"id":232174,"enchant":1891,"rune":425198}, - {"id":232167,"enchant":1883,"rune":431670}, - {"id":232172,"rune":401955}, - {"id":231171,"rune":431655}, - {"id":232170,"enchant":7623,"rune":402799}, - {"id":231165,"enchant":929,"rune":425204}, - {"id":228243,"rune":442897}, - {"id":228687,"rune":442898}, - {"id":228255}, - {"id":231785}, - {"id":230794,"enchant":2504}, - {"id":220598}, - {"id":231857} - ] -} diff --git a/ui/shadow_priest/gear_sets/phase_5_t2.gear.json b/ui/shadow_priest/gear_sets/phase_5_t2.gear.json deleted file mode 100644 index bc6fb9e6f..000000000 --- a/ui/shadow_priest/gear_sets/phase_5_t2.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231167,"enchant":7623,"rune":413251}, - {"id":228289}, - {"id":231170,"enchant":2605}, - {"id":230804,"enchant":2463,"rune":402668}, - {"id":231169,"enchant":1891,"rune":425198}, - {"id":231172,"enchant":1883,"rune":431670}, - {"id":230723,"rune":401955}, - {"id":231171,"rune":431655}, - {"id":231168,"enchant":7623,"rune":402799}, - {"id":231165,"enchant":929,"rune":425204}, - {"id":228243,"rune":442897}, - {"id":228687,"rune":442898}, - {"id":228255}, - {"id":231785}, - {"id":230794,"enchant":2504}, - {"id":220598}, - {"id":231857} - ] -} diff --git a/ui/shadow_priest/presets.ts b/ui/shadow_priest/presets.ts index 43e870557..05718eae2 100644 --- a/ui/shadow_priest/presets.ts +++ b/ui/shadow_priest/presets.ts @@ -26,12 +26,7 @@ import Phase2APL from './apls/phase_2.apl.json'; import Phase3APL from './apls/phase_3.apl.json'; import Phase4APL from './apls/phase_4.apl.json'; import Phase5APL from './apls/phase_5.apl.json'; -import Phase1Gear from './gear_sets/phase_1.gear.json'; -import Phase2Gear from './gear_sets/phase_2.gear.json'; -import Phase3Gear from './gear_sets/phase_3.gear.json'; -import Phase4Gear from './gear_sets/phase_4.gear.json'; -import Phase5CoreForgedGear from './gear_sets/phase_5_t1.gear.json'; -import Phase5DraconicGear from './gear_sets/phase_5_t2.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -41,25 +36,11 @@ import Phase5DraconicGear from './gear_sets/phase_5_t2.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearPhase1 = PresetUtils.makePresetGear('Phase 1', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); -export const GearPhase2 = PresetUtils.makePresetGear('Phase 2', Phase2Gear, { customCondition: player => player.getLevel() === 40 }); -export const GearPhase3 = PresetUtils.makePresetGear('Phase 3', Phase3Gear, { customCondition: player => player.getLevel() === 50 }); -export const GearPhase4 = PresetUtils.makePresetGear('Phase 4', Phase4Gear, { customCondition: player => player.getLevel() === 60 }); -export const GearPhase5Draconic = PresetUtils.makePresetGear('P5 Draconic', Phase5DraconicGear, { customCondition: player => player.getLevel() === 60 }); -export const GearPhase5CoreForged = PresetUtils.makePresetGear('P5 Core Forged', Phase5CoreForgedGear, { - customCondition: player => player.getLevel() === 60, -}); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const GearPresets = { - [Phase.Phase1]: [GearPhase1], - [Phase.Phase2]: [GearPhase2], - [Phase.Phase3]: [GearPhase3], - [Phase.Phase4]: [GearPhase4], - [Phase.Phase5]: [GearPhase5Draconic, GearPhase5CoreForged], -}; +export const GearPresets = {}; -// TODO: Add Phase 3 preset and pull from map -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/shadow_priest/sim.ts b/ui/shadow_priest/sim.ts index 88f86ffbc..7b4b323aa 100644 --- a/ui/shadow_priest/sim.ts +++ b/ui/shadow_priest/sim.ts @@ -129,11 +129,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecShadowPriest, { ...Presets.APLPresets[Phase.Phase1], ], gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], }, @@ -159,10 +155,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecShadowPriest, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, }, }, diff --git a/ui/tank_rogue/gear_sets/p1_combat.gear.json b/ui/tank_rogue/gear_sets/p1_combat.gear.json deleted file mode 100644 index d75fe28f1..000000000 --- a/ui/tank_rogue/gear_sets/p1_combat.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211510}, - {"id":209422}, - {"id":209692}, - {"id":209680}, - {"id":211512,"rune":399965}, - {"id":3202}, - {"id":7359,"rune":424785}, - {"id":209421}, - {"id":10410,"rune":399963}, - {"id":211511}, - {"id":20439}, - {"id":2933}, - {"id":211449}, - {}, - {"id":209525}, - {"id":209691}, - {"id":209688} - ] -} \ No newline at end of file diff --git a/ui/tank_rogue/gear_sets/p1_daggers.gear.json b/ui/tank_rogue/gear_sets/p1_daggers.gear.json deleted file mode 100644 index f463eeb9c..000000000 --- a/ui/tank_rogue/gear_sets/p1_daggers.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211510}, - {"id":209422}, - {"id":209692}, - {"id":209680}, - {"id":211512,"rune":399965}, - {"id":3202}, - {"id":7359,"rune":399956}, - {"id":209421}, - {"id":10410,"rune":399963}, - {"id":211511}, - {"id":20439}, - {"id":2933}, - {"id":211449}, - {}, - {"id":209436}, - {"id":209436}, - {"id":209688} - ] -} \ No newline at end of file diff --git a/ui/tank_rogue/gear_sets/p2_daggers.gear.json b/ui/tank_rogue/gear_sets/p2_daggers.gear.json deleted file mode 100644 index 05519048a..000000000 --- a/ui/tank_rogue/gear_sets/p2_daggers.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166}, - {"id":213344}, - {"id":9647}, - {"id":5257,"enchant":849}, - {"id":213313,"enchant":866,"rune":399965}, - {"id":19590,"enchant":856}, - {"id":213319,"enchant":904,"rune":399956}, - {"id":215115,"rune":400029}, - {"id":213332,"rune":399963}, - {"id":213341,"enchant":247,"rune":425096}, - {"id":19512}, - {"id":213284}, - {"id":211449}, - {"id":213348}, - {"id":213291,"enchant":7210}, - {"id":3187,"randomSuffix":1554,"enchant":7210}, - {"id":213355} - ] -} \ No newline at end of file diff --git a/ui/tank_rogue/gear_sets/p3_daggers.gear.json b/ui/tank_rogue/gear_sets/p3_daggers.gear.json deleted file mode 100644 index fe9501510..000000000 --- a/ui/tank_rogue/gear_sets/p3_daggers.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":223963,"rune":432259}, - {"id":213344}, - {"id":221411}, - {"id":11626,"enchant":849}, - {"id":213313,"enchant":866,"rune":400014}, - {"id":19590,"enchant":856,"rune":432271}, - {"id":15708,"enchant":904,"rune":399956}, - {"id":11686,"rune":400029}, - {"id":213332,"rune":400012}, - {"id":213341,"enchant":247,"rune":400016}, - {"id":19511}, - {"id":220626}, - {"id":211449}, - {"id":223195}, - {"id":221460,"enchant":2564}, - {"id":220585,"enchant":2564}, - {"id":220572} - ] -} \ No newline at end of file diff --git a/ui/tank_rogue/gear_sets/p3_saber.gear.json b/ui/tank_rogue/gear_sets/p3_saber.gear.json deleted file mode 100644 index 6275283ce..000000000 --- a/ui/tank_rogue/gear_sets/p3_saber.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":223963,"rune":432259}, - {"id":213344}, - {"id":221411}, - {"id":11626,"enchant":849}, - {"id":213313,"enchant":866,"rune":400014}, - {"id":19590,"enchant":856,"rune":432271}, - {"id":15708,"enchant":904,"rune":424785}, - {"id":11686,"rune":400029}, - {"id":213332,"rune":400012}, - {"id":213341,"enchant":247,"rune":400016}, - {"id":19511}, - {"id":220626}, - {"id":211449}, - {"id":223195}, - {"id":220588,"enchant":2564}, - {"id":220589,"enchant":2564}, - {"id":220572} - ] -} \ No newline at end of file diff --git a/ui/tank_rogue/gear_sets/p4_saber.gear.json b/ui/tank_rogue/gear_sets/p4_saber.gear.json deleted file mode 100644 index b67a68cbc..000000000 --- a/ui/tank_rogue/gear_sets/p4_saber.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226446,"enchant":1505,"rune":432264}, - {"id":228354}, - {"id":226478,"enchant":7328}, - {"id":228290,"enchant":7564,"rune":436564}, - {"id":226447,"enchant":1891,"rune":400014}, - {"id":226442,"enchant":923,"rune":432273}, - {"id":226475,"enchant":1887,"rune":424785}, - {"id":226440,"rune":425012}, - {"id":226445,"enchant":1505,"rune":400012}, - {"id":226443,"enchant":911,"rune":400016}, - {"id":227280,"rune":442813}, - {"id":228286,"rune":459312}, - {"id":228686}, - {"id":228722}, - {"id":17075,"enchant":1900}, - {"id":228143,"enchant":2564}, - {"id":228252,"enchant":2523} - ] -} \ No newline at end of file diff --git a/ui/tank_rogue/gear_sets/p5_saber.gear.json b/ui/tank_rogue/gear_sets/p5_saber.gear.json deleted file mode 100644 index 3ffa256f0..000000000 --- a/ui/tank_rogue/gear_sets/p5_saber.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231043,"enchant":7624,"rune":432264}, - {"id":231803}, - {"id":232193,"enchant":2606}, - {"id":227854,"enchant":849,"rune":436564}, - {"id":231040,"enchant":1891,"rune":400014}, - {"id":231046,"enchant":923,"rune":432273}, - {"id":232196,"enchant":1887,"rune":424785}, - {"id":232192,"rune":425012}, - {"id":231044,"enchant":7624,"rune":400012}, - {"id":232197,"enchant":1887,"rune":400016}, - {"id":228286,"rune":442813}, - {"id":230734,"rune":459312}, - {"id":228686}, - {"id":230282}, - {"id":230224,"enchant":1900}, - {"id":224122,"enchant":2564}, - {"id":228252} - ] -} \ No newline at end of file diff --git a/ui/tank_rogue/presets.ts b/ui/tank_rogue/presets.ts index 9f07f7fad..0390f884d 100644 --- a/ui/tank_rogue/presets.ts +++ b/ui/tank_rogue/presets.ts @@ -32,13 +32,6 @@ import P3SaberApl from './apls/Saber_DPS_50.apl.json'; import P3SaberIEAApl from './apls/Saber_IEA_50.apl.json'; import P4SaberWeaveApl from './apls/Saber_Weave_60.apl.json'; import BlankGear from './gear_sets/blank.gear.json'; -import P1CombatGear from './gear_sets/p1_combat.gear.json'; -import P1DaggersGear from './gear_sets/p1_daggers.gear.json'; -import P2DaggersGear from './gear_sets/p2_daggers.gear.json'; -import P3DaggersGear from './gear_sets/p3_daggers.gear.json'; -import P3SaberGear from './gear_sets/p3_saber.gear.json'; -import P4SaberGear from './gear_sets/p4_saber.gear.json'; -import P5SaberGear from './gear_sets/p5_saber.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -50,23 +43,10 @@ import P5SaberGear from './gear_sets/p5_saber.gear.json'; // TODO: Add gear sets export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const GearDaggersP1 = PresetUtils.makePresetGear('P1 Daggers', P1DaggersGear, { customCondition: player => player.getLevel() == 25 }); -export const GearDaggersP2 = PresetUtils.makePresetGear('P2 Daggers', P2DaggersGear, { customCondition: player => player.getLevel() == 40 }); -export const GearCombatP1 = PresetUtils.makePresetGear('P1 Combat', P1CombatGear, { customCondition: player => player.getLevel() == 25 }); -export const GearDaggersP3 = PresetUtils.makePresetGear('P3 Daggers', P3DaggersGear, { customCondition: player => player.getLevel() == 50 }); -export const GearSaberP3 = PresetUtils.makePresetGear('P3 Saber', P3SaberGear, { customCondition: player => player.getLevel() == 50 }); -export const GearSaberP4 = PresetUtils.makePresetGear('P4 Saber', P4SaberGear, { customCondition: player => player.getLevel() == 60 }); -export const GearSaberP5 = PresetUtils.makePresetGear('P5 Saber', P5SaberGear, { customCondition: player => player.getLevel() == 60 }); - -export const GearPresets = { - [Phase.Phase1]: [GearDaggersP1, GearCombatP1], - [Phase.Phase2]: [GearDaggersP2], - [Phase.Phase3]: [GearDaggersP3, GearSaberP3], - [Phase.Phase4]: [GearSaberP4], - [Phase.Phase5]: [GearSaberP5], -}; -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const GearPresets = {}; + +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/tank_rogue/sim.ts b/ui/tank_rogue/sim.ts index 88ba70dd6..1f392a2e5 100644 --- a/ui/tank_rogue/sim.ts +++ b/ui/tank_rogue/sim.ts @@ -156,11 +156,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankRogue, { ], // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], builds: [Presets.PresetBuildEncounterDefault, Presets.PresetBuildEncounterVael], }, @@ -187,10 +183,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankRogue, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, + 1: Presets.DefaultGear.gear, }, }, }, diff --git a/ui/tank_warlock/gear_sets/blank.gear.json b/ui/tank_warlock/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/tank_warlock/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/tank_warlock/gear_sets/p1.affi.tank.gear.json b/ui/tank_warlock/gear_sets/p1.affi.tank.gear.json deleted file mode 100644 index de827ee7c..000000000 --- a/ui/tank_warlock/gear_sets/p1.affi.tank.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":209683}, - {"id":209686}, - {"id":215365}, - {"id":9822,"randomSuffix":1880}, - {"id":209671,"enchant":847,"rune":403668}, - {"id":210781,"enchant":723}, - {"id":209672,"rune":403789}, - {"id":215366}, - {"id":209684,"rune":412758}, - {"id":210795}, - {"id":20431}, - {"id":209668}, - {"id":21566}, - {"id":211450}, - {"id":209561,"enchant":723}, - {}, - {"id":209674} -]} \ No newline at end of file diff --git a/ui/tank_warlock/gear_sets/p1.destro.tank.gear.json b/ui/tank_warlock/gear_sets/p1.destro.tank.gear.json deleted file mode 100644 index 535c5317f..000000000 --- a/ui/tank_warlock/gear_sets/p1.destro.tank.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":209683}, - {"id":209686}, - {"id":215365}, - {"id":9822,"randomSuffix":1880}, - {"id":209671,"enchant":847,"rune":403666}, - {"id":210781,"enchant":723}, - {"id":209672,"rune":403789}, - {"id":215366}, - {"id":209684,"rune":412758}, - {"id":210795}, - {"id":20431}, - {"id":209668}, - {"id":21566}, - {"id":211450}, - {"id":209561,"enchant":723}, - {}, - {"id":209674} -]} \ No newline at end of file diff --git a/ui/tank_warlock/gear_sets/p2.demo.tank.gear.json b/ui/tank_warlock/gear_sets/p2.demo.tank.gear.json deleted file mode 100644 index 308fab6bf..000000000 --- a/ui/tank_warlock/gear_sets/p2.demo.tank.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":215111}, - {"id":213345}, - {"id":213301}, - {"id":216620,"enchant":884}, - {"id":213311,"enchant":7223,"rune":403668}, - {"id":19597,"enchant":852}, - {"id":213300,"enchant":904,"rune":403789}, - {"id":213321,"rune":426301}, - {"id":213329,"enchant":18,"rune":412758}, - {"id":213336,"enchant":911,"rune":412732}, - {"id":216508}, - {"id":213283}, - {"id":211450}, - {"id":213347}, - {"id":213410,"enchant":7210}, - {}, - {"id":213559} -]} diff --git a/ui/tank_warlock/gear_sets/p2.destro.tank.gear.json b/ui/tank_warlock/gear_sets/p2.destro.tank.gear.json deleted file mode 100644 index 645376741..000000000 --- a/ui/tank_warlock/gear_sets/p2.destro.tank.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":215111}, - {"id":213345}, - {"id":213301}, - {"id":216620,"enchant":884}, - {"id":213311,"enchant":7223,"rune":403666}, - {"id":19597,"enchant":852}, - {"id":213300,"enchant":904,"rune":403789}, - {"id":213321,"rune":426301}, - {"id":213329,"enchant":18,"rune":412758}, - {"id":213336,"enchant":911,"rune":412732}, - {"id":19524}, - {"id":213283}, - {"id":216509}, - {"id":213347}, - {"id":213410,"enchant":7210}, - {"id":15107}, - {"id":213559} -]} diff --git a/ui/tank_warlock/gear_sets/p3.destro.tank.gear.json b/ui/tank_warlock/gear_sets/p3.destro.tank.gear.json deleted file mode 100644 index 16acac5a4..000000000 --- a/ui/tank_warlock/gear_sets/p3.destro.tank.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":220523,"enchant":1507,"rune":427712}, - {"id":220623}, - {"id":220751,"enchant":7325}, - {"id":11623,"enchant":1889}, - {"id":220783,"enchant":928,"rune":403668}, - {"id":220538,"enchant":1886,"rune":427726}, - {"id":220548,"enchant":931,"rune":403789}, - {"id":223192,"rune":426301}, - {"id":220781,"enchant":1507,"rune":425464}, - {"id":220784,"enchant":911,"rune":412732}, - {"id":220628}, - {"id":223985}, - {"id":216509}, - {"id":221307}, - {"id":223964}, - {"id":220599}, - {"id":220604} - ] -} diff --git a/ui/tank_warlock/gear_sets/p4_demo_tank.gear.json b/ui/tank_warlock/gear_sets/p4_demo_tank.gear.json deleted file mode 100644 index 5ec32c334..000000000 --- a/ui/tank_warlock/gear_sets/p4_demo_tank.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226917,"enchant":2544,"rune":427712}, - {"id":228289}, - {"id":216925,"enchant":7325}, - {"id":228100,"enchant":1889,"rune":403511}, - {"id":226920,"enchant":2503,"rune":403668}, - {"id":216920,"enchant":1886,"rune":427733}, - {"id":216921,"enchant":2503,"rune":403789}, - {"id":216919,"rune":426316}, - {"id":216923,"enchant":2544,"rune":425463}, - {"id":216918,"enchant":911,"rune":412798}, - {"id":228287,"rune":442894}, - {"id":228683,"rune":459312}, - {"id":228686}, - {"id":228293}, - {"id":228382,"enchant":2504}, - {"id":228548}, - {"id":228262} - ] -} diff --git a/ui/tank_warlock/gear_sets/p4_destro_aff_tank.gear.json b/ui/tank_warlock/gear_sets/p4_destro_aff_tank.gear.json deleted file mode 100644 index c08c31e3d..000000000 --- a/ui/tank_warlock/gear_sets/p4_destro_aff_tank.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226917,"enchant":2544,"rune":427712}, - {"id":228289}, - {"id":216925,"enchant":7325}, - {"id":228100,"enchant":1889,"rune":403511}, - {"id":226920,"enchant":2503,"rune":403668}, - {"id":216920,"enchant":1886,"rune":427726}, - {"id":216921,"enchant":2503,"rune":403789}, - {"id":216919,"rune":426316}, - {"id":216923,"enchant":2544,"rune":425463}, - {"id":216918,"enchant":911,"rune":412798}, - {"id":228287,"rune":442894}, - {"id":228683,"rune":459312}, - {"id":228686}, - {"id":228293}, - {"id":228382,"enchant":2504}, - {"id":228548}, - {"id":228262} - ] -} diff --git a/ui/tank_warlock/presets.ts b/ui/tank_warlock/presets.ts index 9e9cfe069..0af1b8225 100644 --- a/ui/tank_warlock/presets.ts +++ b/ui/tank_warlock/presets.ts @@ -40,52 +40,17 @@ import Phase2DestroTankAPL from './apls/p2.destro.tank.apl.json'; import Phase3TankAPL from './apls/p3.destro.tank.apl.json'; import Phase4DemoTankAPL from './apls/p4_demo_tank.apl.json'; import Phase4DestroAffTankAPL from './apls/p4_destro_aff_tank.apl.json'; -import AfflictionGearPhase1 from './gear_sets/p1.affi.tank.gear.json'; -import DestructionGearPhase1 from './gear_sets/p1.destro.tank.gear.json'; -import DemonologyGearPhase2 from './gear_sets/p2.demo.tank.gear.json'; -import DestructionGearPhase2 from './gear_sets/p2.destro.tank.gear.json'; -import TankGearPhase3 from './gear_sets/p3.destro.tank.gear.json'; -import DemoTankGearPhase4 from './gear_sets/p4_demo_tank.gear.json'; -import DestroAffTankGearPhase4 from './gear_sets/p4_destro_aff_tank.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; /////////////////////////////////////////////////////////////////////////// // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearAfflictionTankPhase1 = PresetUtils.makePresetGear('P1 Aff', AfflictionGearPhase1, { - customCondition: player => player.getLevel() === 25, -}); -export const GearDestructionTankPhase1 = PresetUtils.makePresetGear('P1 Destro', DestructionGearPhase1, { - customCondition: player => player.getLevel() === 25, -}); - -export const GearDemonologyTankPhase2 = PresetUtils.makePresetGear('P2 Demo', DemonologyGearPhase2, { - customCondition: player => player.getLevel() === 40, -}); -export const GearDestructionTankPhase2 = PresetUtils.makePresetGear('P2 Destro', DestructionGearPhase2, { - customCondition: player => player.getLevel() === 40, -}); - -export const GearTankPhase3 = PresetUtils.makePresetGear('P3 Destro', TankGearPhase3, { customCondition: player => player.getLevel() === 50 }); - -export const GearDemoTankPhase4 = PresetUtils.makePresetGear('P4 Demo', DemoTankGearPhase4, { customCondition: player => player.getLevel() === 60 }); -export const GearDestroAffTankPhase4 = PresetUtils.makePresetGear('P4 Destro/Aff', DestroAffTankGearPhase4, { - customCondition: player => player.getLevel() === 60, -}); - -export const GearPresets = { - [Phase.Phase1]: [GearAfflictionTankPhase1, GearDestructionTankPhase1], - [Phase.Phase2]: [GearDemonologyTankPhase2, GearDestructionTankPhase2], - [Phase.Phase3]: [GearTankPhase3], - [Phase.Phase4]: [GearDemoTankPhase4, GearDestroAffTankPhase4], - [Phase.Phase5]: [], -}; +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const DefaultGearAff = GearPresets[Phase.Phase4][1]; -export const DefaultGearDemo = GearPresets[Phase.Phase4][0]; -export const DefaultGearDestro = GearPresets[Phase.Phase4][1]; +export const GearPresets = {}; -export const DefaultGear = DefaultGearDestro; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets @@ -196,10 +161,10 @@ export const DefaultTalentsDestro = TalentPresets[Phase.Phase4][2]; export const DefaultTalents = DefaultTalentsDestro; -export const PresetBuildAff = PresetUtils.makePresetBuild('Aff', { gear: DefaultGearAff, talents: DefaultTalentsAff, rotation: DefaultAPLs[60][0] }); -export const PresetBuildDemo = PresetUtils.makePresetBuild('Demo', { gear: DefaultGearDemo, talents: DefaultTalentsDemo, rotation: DefaultAPLs[60][1] }); +export const PresetBuildAff = PresetUtils.makePresetBuild('Aff', { gear: DefaultGear, talents: DefaultTalentsAff, rotation: DefaultAPLs[60][0] }); +export const PresetBuildDemo = PresetUtils.makePresetBuild('Demo', { gear: DefaultGear, talents: DefaultTalentsDemo, rotation: DefaultAPLs[60][1] }); export const PresetBuildDestro = PresetUtils.makePresetBuild('Destro', { - gear: DefaultGearDestro, + gear: DefaultGear, talents: DefaultTalentsDestro, rotation: DefaultAPLs[60][2], }); diff --git a/ui/tank_warlock/sim.ts b/ui/tank_warlock/sim.ts index d4b9f5700..517213022 100644 --- a/ui/tank_warlock/sim.ts +++ b/ui/tank_warlock/sim.ts @@ -169,11 +169,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankWarlock, { // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], builds: [Presets.PresetBuildAff, Presets.PresetBuildDemo, Presets.PresetBuildDestro], }, @@ -210,10 +206,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankWarlock, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearDemonologyTankPhase2.gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearDemonologyTankPhase2.gear, + 1: Presets.DefaultGear.gear, }, }, otherDefaults: Presets.OtherDefaults, @@ -235,10 +231,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankWarlock, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearDestructionTankPhase2.gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearDestructionTankPhase2.gear, + 1: Presets.DefaultGear.gear, }, }, otherDefaults: Presets.OtherDefaults, diff --git a/ui/tank_warrior/gear_sets/blank.gear.json b/ui/tank_warrior/gear_sets/blank.gear.json new file mode 100644 index 000000000..2feb21015 --- /dev/null +++ b/ui/tank_warrior/gear_sets/blank.gear.json @@ -0,0 +1,3 @@ +{ + "items": [] +} diff --git a/ui/tank_warrior/gear_sets/phase_4_damage.gear.json b/ui/tank_warrior/gear_sets/phase_4_damage.gear.json deleted file mode 100644 index b7873e37c..000000000 --- a/ui/tank_warrior/gear_sets/phase_4_damage.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226488,"enchant":1505,"rune":403218}, - {"id":228685}, - {"id":226491,"enchant":7563}, - {"id":228102,"enchant":7564,"rune":440484}, - {"id":226489,"enchant":1891,"rune":412507}, - {"id":226484,"enchant":1885,"rune":426940}, - {"id":226486,"enchant":1887,"rune":413404}, - {"id":228295,"rune":413380}, - {"id":226490,"enchant":1505,"rune":403219}, - {"id":228924,"enchant":911,"rune":426490}, - {"id":19325,"rune":442887}, - {"id":228261,"rune":442881}, - {"id":228722}, - {"id":227915}, - {"id":228397,"enchant":1900}, - {"id":228757,"enchant":1900}, - {"id":228165} - ] -} diff --git a/ui/tank_warrior/gear_sets/phase_4_tanky.gear.json b/ui/tank_warrior/gear_sets/phase_4_tanky.gear.json deleted file mode 100644 index e5a3e5d16..000000000 --- a/ui/tank_warrior/gear_sets/phase_4_tanky.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226488,"enchant":1505,"rune":426980}, - {"id":228249}, - {"id":226491,"enchant":7563}, - {"id":228292,"enchant":7564,"rune":440488}, - {"id":226489,"enchant":1891,"rune":425421}, - {"id":226484,"enchant":1885,"rune":426978}, - {"id":226486,"enchant":2503,"rune":403195}, - {"id":226485,"rune":29787}, - {"id":226490,"enchant":1505,"rune":403219}, - {"id":226487,"enchant":911,"rune":412513}, - {"id":19325,"rune":459312}, - {"id":228242,"rune":442881}, - {"id":227915}, - {"id":228686}, - {"id":227991,"enchant":1900}, - {"id":12602,"enchant":929}, - {"id":228165} - ] -} diff --git a/ui/tank_warrior/gear_sets/placeholder.gear.json b/ui/tank_warrior/gear_sets/placeholder.gear.json new file mode 100644 index 000000000..361dc6dac --- /dev/null +++ b/ui/tank_warrior/gear_sets/placeholder.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":18421}, + {"id":19540}, + {"id":14817}, + {"id":15138,"enchant":247}, + {"id":14811,"enchant":866}, + {"id":18458}, + {"id":15063,"enchant":904}, + {"id":18393,"rune":415352}, + {"id":8309,"rune":415320}, + {"id":6423,"enchant":849}, + {"id":2951}, + {"id":9533}, + {"id":13515}, + {"id":18473}, + {"id":22317,"enchant":7210}, + {"id":14812}, + {"id":16996} +]} \ No newline at end of file diff --git a/ui/tank_warrior/presets.ts b/ui/tank_warrior/presets.ts index 7bbe9fb77..67ee324b7 100644 --- a/ui/tank_warrior/presets.ts +++ b/ui/tank_warrior/presets.ts @@ -25,28 +25,17 @@ import { import { SavedTalents } from '../core/proto/ui.js'; import { TankWarrior_Options as TankWarriorOptions, WarriorShout, WarriorStance } from '../core/proto/warrior.js'; import Phase4APL from './apls/phase_4.apl.json'; -import Phase4DamageGear from './gear_sets/phase_4_damage.gear.json'; -import Phase4TankyGear from './gear_sets/phase_4_tanky.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; /////////////////////////////////////////////////////////////////////////// // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearTankyPhase4 = PresetUtils.makePresetGear('P4 Tanky', Phase4TankyGear, { customCondition: player => player.getLevel() === 60 }); -export const GearMaxDPSPhase4 = PresetUtils.makePresetGear('P4 Max DPS', Phase4DamageGear, { customCondition: player => player.getLevel() === 60 }); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const GearPresets = { - [Phase.Phase1]: [], - [Phase.Phase2]: [], - [Phase.Phase3]: [], - [Phase.Phase4]: [GearTankyPhase4, GearMaxDPSPhase4], - [Phase.Phase5]: [], -}; - -export const DefaultGearTanky = GearPresets[Phase.Phase4][0]; -export const DefaultGearDamage = GearPresets[Phase.Phase4][1]; +export const GearPresets = {}; -export const DefaultGear = DefaultGearTanky; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets @@ -94,8 +83,8 @@ export const TalentPresets = { export const DefaultTalents = TalentPresets[Phase.Phase4][0]; -export const PresetBuildTanky = PresetUtils.makePresetBuild('Tanky', { gear: DefaultGearTanky, talents: TalentsPhase4Prot, rotation: DefaultAPLs[60] }); -export const PresetBuildDamage = PresetUtils.makePresetBuild('Damage', { gear: DefaultGearDamage, talents: TalentsPhase4Fury, rotation: DefaultAPLs[60] }); +export const PresetBuildTanky = PresetUtils.makePresetBuild('Tanky', { gear: DefaultGear, talents: TalentsPhase4Prot, rotation: DefaultAPLs[60] }); +export const PresetBuildDamage = PresetUtils.makePresetBuild('Damage', { gear: DefaultGear, talents: TalentsPhase4Fury, rotation: DefaultAPLs[60] }); /////////////////////////////////////////////////////////////////////////// // Options Presets diff --git a/ui/tank_warrior/sim.ts b/ui/tank_warrior/sim.ts index a17b5be9b..70105d6f5 100644 --- a/ui/tank_warrior/sim.ts +++ b/ui/tank_warrior/sim.ts @@ -150,11 +150,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankWarrior, { ], // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], // Preset builds that the user can quickly select. builds: [Presets.PresetBuildTanky, Presets.PresetBuildDamage], diff --git a/ui/warden_shaman/gear_sets/blank.gear.json b/ui/warden_shaman/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/warden_shaman/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/warden_shaman/gear_sets/phase_4_ele_tank.gear.json b/ui/warden_shaman/gear_sets/phase_4_ele_tank.gear.json deleted file mode 100644 index 4170d4273..000000000 --- a/ui/warden_shaman/gear_sets/phase_4_ele_tank.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":227162,"enchant":1505,"rune":415231}, - {"id":228289}, - {"id":227160,"enchant":7325}, - {"id":228100,"enchant":7564,"rune":440569}, - {"id":226627,"enchant":1891,"rune":408524}, - {"id":226626,"enchant":1886,"rune":432140}, - {"id":226621,"enchant":2503,"rune":408490}, - {"id":226633,"rune":415100}, - {"id":226631,"enchant":1505,"rune":408531}, - {"id":226628,"enchant":911,"rune":408696}, - {"id":228287,"rune":442894}, - {"id":227282,"rune":442896}, - {"id":228686}, - {"id":228293}, - {"id":227886,"enchant":2504}, - {"id":228142,"enchant":7603}, - {"id":228178} - ] -} diff --git a/ui/warden_shaman/gear_sets/phase_4_enh_tank.gear.json b/ui/warden_shaman/gear_sets/phase_4_enh_tank.gear.json deleted file mode 100644 index ce53ebb75..000000000 --- a/ui/warden_shaman/gear_sets/phase_4_enh_tank.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226638,"enchant":1505,"rune":415140}, - {"id":228759}, - {"id":226632,"enchant":7328}, - {"id":228383,"enchant":7564,"rune":440580}, - {"id":226635,"enchant":1891,"rune":408524}, - {"id":226634,"enchant":1886,"rune":432140}, - {"id":226637,"enchant":927,"rune":425339}, - {"id":226633,"rune":408498}, - {"id":226639,"enchant":1505,"rune":408531}, - {"id":226628,"enchant":911,"rune":408696}, - {"id":227455,"rune":442896}, - {"id":228287,"rune":442876}, - {"id":228293}, - {"id":228686}, - {"id":17068,"enchant":1900}, - {"id":228142,"enchant":7603}, - {"id":228177} - ] -} diff --git a/ui/warden_shaman/presets.ts b/ui/warden_shaman/presets.ts index 521afa51d..9eadab5d8 100644 --- a/ui/warden_shaman/presets.ts +++ b/ui/warden_shaman/presets.ts @@ -28,8 +28,7 @@ import { EnhancementShaman_Options as EnhancementShamanOptions, ShamanSyncType } import { SavedTalents } from '../core/proto/ui.js'; import Phase4EleTankAPLJSON from './apls/phase_4_ele_tank.apl.json'; import Phase4EnhTankAPLJSON from './apls/phase_4_enh_tank.apl.json'; -import Phase4EleTankGearJSON from './gear_sets/phase_4_ele_tank.gear.json'; -import Phase4EnhTankGearJSON from './gear_sets/phase_4_enh_tank.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -39,18 +38,11 @@ import Phase4EnhTankGearJSON from './gear_sets/phase_4_enh_tank.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearEnhTankPhase4 = PresetUtils.makePresetGear('P4 Enh', Phase4EnhTankGearJSON); -export const GearEleTankPhase4 = PresetUtils.makePresetGear('P4 Ele', Phase4EleTankGearJSON); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const GearPresets = { - [Phase.Phase1]: [], - [Phase.Phase2]: [], - [Phase.Phase3]: [], - [Phase.Phase4]: [GearEnhTankPhase4, GearEleTankPhase4], - [Phase.Phase5]: [], -}; +export const GearPresets = {}; -export const DefaultGear = GearPresets[Phase.Phase4][0]; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets diff --git a/ui/warden_shaman/sim.ts b/ui/warden_shaman/sim.ts index 8328459f0..8be5dc58f 100644 --- a/ui/warden_shaman/sim.ts +++ b/ui/warden_shaman/sim.ts @@ -182,11 +182,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWardenShaman, { ...Presets.APLPresets[Phase.Phase1], ], gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], }, diff --git a/ui/warlock/gear_sets/blank.gear.json b/ui/warlock/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/warlock/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p1/destruction.gear.json b/ui/warlock/gear_sets/p1/destruction.gear.json deleted file mode 100644 index 6b79a6b81..000000000 --- a/ui/warlock/gear_sets/p1/destruction.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":211842}, - {"id":209686}, - {"id":215365}, - {"id":9822,"randomSuffix":1880}, - {"id":209671,"enchant":847,"rune":403666}, - {"id":210781,"enchant":723}, - {"id":14191,"randomSuffix":1882,"rune":403629}, - {"id":6611,"randomSuffix":1882}, - {"id":209684,"rune":412758}, - {"id":209669}, - {"id":20431}, - {"id":209668}, - {"id":21566}, - {"id":211450}, - {"id":209561,"enchant":723}, - {}, - {"id":209674} -]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p2/fire.imp.gear.json b/ui/warlock/gear_sets/p2/fire.imp.gear.json deleted file mode 100644 index 60850a41e..000000000 --- a/ui/warlock/gear_sets/p2/fire.imp.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":215111}, - {"id":213345}, - {"id":213301}, - {"id":216620}, - {"id":215377,"enchant":866,"rune":403666}, - {"id":19597,"enchant":905}, - {"id":10019,"rune":403629}, - {"id":213321,"rune":426301}, - {"id":215379,"rune":412758}, - {"id":215378,"enchant":911,"rune":412732}, - {"id":213283}, - {"id":19524}, - {"id":213347}, - {"id":216509}, - {"id":213410,"enchant":7210}, - {"id":15107}, - {"id":213559} -]} diff --git a/ui/warlock/gear_sets/p2/fire.succubus.gear.json b/ui/warlock/gear_sets/p2/fire.succubus.gear.json deleted file mode 100644 index 5f1231b5b..000000000 --- a/ui/warlock/gear_sets/p2/fire.succubus.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":215111}, - {"id":213345}, - {"id":213301}, - {"id":216620}, - {"id":215377,"enchant":866,"rune":412727}, - {"id":19597,"enchant":905}, - {"id":10019,"rune":403629}, - {"id":213321,"rune":426301}, - {"id":215379,"rune":412758}, - {"id":215378,"enchant":911,"rune":412732}, - {"id":213283}, - {"id":216508}, - {"id":213347}, - {"id":211450}, - {"id":213410,"enchant":7210}, - {"id":15107}, - {"id":213559} -]} diff --git a/ui/warlock/gear_sets/p2/shadow.gear.json b/ui/warlock/gear_sets/p2/shadow.gear.json deleted file mode 100644 index c65cd7d9b..000000000 --- a/ui/warlock/gear_sets/p2/shadow.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":215111}, - {"id":213345}, - {"id":213301}, - {"id":216620}, - {"id":215377,"enchant":866,"rune":403668}, - {"id":19597,"enchant":905}, - {"id":10019,"rune":403501}, - {"id":20098,"rune":426301}, - {"id":215379,"rune":412689}, - {"id":215378,"enchant":911,"rune":412732}, - {"id":213283}, - {"id":216507}, - {"id":213347}, - {"id":211450}, - {"id":213410,"enchant":7210}, - {"id":15108}, - {"id":213559} -]} diff --git a/ui/warlock/gear_sets/p3/backdraft.gear.json b/ui/warlock/gear_sets/p3/backdraft.gear.json deleted file mode 100644 index 686df9aca..000000000 --- a/ui/warlock/gear_sets/p3/backdraft.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":220523,"enchant":1509,"rune":427713}, - {"id":220623}, - {"id":220750,"enchant":7325}, - {"id":220611}, - {"id":220680,"enchant":928,"rune":412727}, - {"id":220538,"enchant":1883,"rune":427726}, - {"id":220548,"rune":403629}, - {"id":223192,"rune":426301}, - {"id":220679,"enchant":1509,"rune":412758}, - {"id":220681,"enchant":911,"rune":412732}, - {"id":220628}, - {"id":223985}, - {"id":216509}, - {"id":223195}, - {"id":220586}, - {"id":220599}, - {"id":220604} - ] -} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p3/nf.ruin.gear.json b/ui/warlock/gear_sets/p3/nf.ruin.gear.json deleted file mode 100644 index a53681920..000000000 --- a/ui/warlock/gear_sets/p3/nf.ruin.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":220523,"enchant":1509,"rune":427712}, - {"id":220623}, - {"id":220750,"enchant":7325}, - {"id":220611}, - {"id":220535,"enchant":928,"rune":403668}, - {"id":19596,"enchant":1883,"rune":427726}, - {"id":220548,"rune":403501}, - {"id":223192,"rune":426301}, - {"id":220679,"enchant":1509,"rune":425464}, - {"id":220681,"enchant":911,"rune":412732}, - {"id":220628}, - {"id":223985}, - {"id":220634}, - {"id":216509}, - {"id":220586}, - {"id":220598}, - {"id":220604} - ] -} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p4/affliction.gear.json b/ui/warlock/gear_sets/p4/affliction.gear.json deleted file mode 100644 index c433bbc12..000000000 --- a/ui/warlock/gear_sets/p4/affliction.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226549,"enchant":2544,"rune":427712}, - {"id":228289}, - {"id":226550,"enchant":7325}, - {"id":227869,"enchant":2463,"rune":403511}, - {"id":226548,"enchant":1891,"rune":403668}, - {"id":226553,"enchant":1884,"rune":427717}, - {"id":226552,"rune":403501}, - {"id":226905,"rune":426316}, - {"id":226547,"enchant":2544,"rune":412689}, - {"id":226908,"enchant":911,"rune":426320}, - {"id":228287,"rune":442897}, - {"id":228687,"rune":442894}, - {"id":228255}, - {"id":223214}, - {"id":228269,"enchant":2504}, - {"id":220598}, - {"id":13396} - ] -} diff --git a/ui/warlock/gear_sets/p4/destruction.gear.json b/ui/warlock/gear_sets/p4/destruction.gear.json deleted file mode 100644 index ef139bdf8..000000000 --- a/ui/warlock/gear_sets/p4/destruction.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226909,"enchant":2544,"rune":427713}, - {"id":228289}, - {"id":227808,"enchant":7325}, - {"id":22330,"enchant":2463,"rune":440870}, - {"id":226548,"enchant":1891,"rune":412727}, - {"id":226553,"enchant":1884,"rune":412758}, - {"id":226552,"rune":403629}, - {"id":228190,"rune":426316}, - {"id":226547,"enchant":2544,"rune":425464}, - {"id":226908,"enchant":911,"rune":440892}, - {"id":228287,"rune":442897}, - {"id":228683,"rune":442894}, - {"id":223195}, - {"id":228255}, - {"id":228269,"enchant":2504}, - {"id":19311}, - {"id":220604} - ] -} diff --git a/ui/warlock/gear_sets/p5/affliction.gear.json b/ui/warlock/gear_sets/p5/affliction.gear.json deleted file mode 100644 index cd9ef6c89..000000000 --- a/ui/warlock/gear_sets/p5/affliction.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":230812,"enchant":7630,"rune":427712}, - {"id":228289}, - {"id":231077,"enchant":2605}, - {"id":231300,"rune":403511}, - {"id":231076,"enchant":1891,"rune":403668}, - {"id":231079,"enchant":1884,"rune":427717}, - {"id":231073,"rune":403501}, - {"id":231078,"rune":426316}, - {"id":231075,"enchant":7630,"rune":425464}, - {"id":231072,"enchant":911,"rune":426320}, - {"id":230257,"rune":442897}, - {"id":228287,"rune":442894}, - {"id":230238}, - {"id":230810}, - {"id":229910,"enchant":2504}, - {}, - {"id":231308} - ] -} diff --git a/ui/warlock/gear_sets/p5/demonology.gear.json b/ui/warlock/gear_sets/p5/demonology.gear.json deleted file mode 100644 index bdf0a5210..000000000 --- a/ui/warlock/gear_sets/p5/demonology.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":230812,"enchant":7630,"rune":427712}, - {"id":231346}, - {"id":231077,"enchant":2605}, - {"id":231300,"enchant":7564,"rune":403511}, - {"id":231076,"enchant":1891,"rune":412727}, - {"id":231347,"enchant":1884,"rune":427733}, - {"id":231073,"rune":403501}, - {"id":231078,"rune":426301}, - {"id":231075,"enchant":7630,"rune":425464}, - {"id":231072,"enchant":911,"rune":426320}, - {"id":230867,"rune":442897}, - {"id":231001,"rune":442894}, - {"id":230238}, - {"id":231284}, - {"id":230813,"enchant":2504}, - {}, - {"id":231308} - ] -} diff --git a/ui/warlock/gear_sets/p5/demonology_hybrid.gear.json b/ui/warlock/gear_sets/p5/demonology_hybrid.gear.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui/warlock/gear_sets/p5/destruction.gear.json b/ui/warlock/gear_sets/p5/destruction.gear.json deleted file mode 100644 index d4ed932dc..000000000 --- a/ui/warlock/gear_sets/p5/destruction.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232235,"enchant":7630,"rune":427713}, - {"id":228289}, - {"id":232233,"enchant":2605}, - {"id":230804,"rune":440882}, - {"id":232238,"enchant":1891,"rune":412727}, - {"id":232231,"enchant":1884,"rune":412758}, - {"id":232236,"rune":403629}, - {"id":232232,"rune":426316}, - {"id":231075,"enchant":7630,"rune":425464}, - {"id":231072,"enchant":911,"rune":440870}, - {"id":230257,"rune":442897}, - {"id":228287,"rune":442894}, - {"id":230238}, - {"id":230810}, - {"id":229910,"enchant":2504}, - {}, - {"id":231308} - ] -} diff --git a/ui/warlock/gear_sets/placeholder.gear.json b/ui/warlock/gear_sets/placeholder.gear.json new file mode 100644 index 000000000..0024e0280 --- /dev/null +++ b/ui/warlock/gear_sets/placeholder.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":22267}, + {"id":22403}, + {"id":14112}, + {"id":13386,"enchant":247}, + {"id":14153,"enchant":866}, + {"id":13107}, + {"id":18407,"enchant":904}, + {"id":11662}, + {"id":19165}, + {"id":18735,"enchant":849}, + {"id":22339}, + {"id":22433}, + {"id":12930}, + {"id":22268}, + {"id":18372,"enchant":7210}, + {"id":22329}, + {"id":13396} +]} \ No newline at end of file diff --git a/ui/warlock/presets.ts b/ui/warlock/presets.ts index 82f27151d..efa6330f4 100644 --- a/ui/warlock/presets.ts +++ b/ui/warlock/presets.ts @@ -40,50 +40,17 @@ import NFRuinAPLP3 from './apls/p3/nf.ruin.apl.json'; import AffAPLP4 from './apls/p4/affliction.apl.json'; import DestroAPLP4 from './apls/p4/destruction.apl.json'; // gear -import DestructionGear from './gear_sets/p1/destruction.gear.json'; -import FireImpGear from './gear_sets/p2/fire.imp.gear.json'; -import FireSuccubusGear from './gear_sets/p2/fire.succubus.gear.json'; -import ShadowGear from './gear_sets/p2/shadow.gear.json'; -import BackdraftGearP3 from './gear_sets/p3/backdraft.gear.json'; -import NFRuinGearP3 from './gear_sets/p3/nf.ruin.gear.json'; -import AffGearP4 from './gear_sets/p4/affliction.gear.json'; -import DestroGearP4 from './gear_sets/p4/destruction.gear.json'; -import AffGearP5 from './gear_sets/p5/affliction.gear.json'; -import DemoGearP5 from './gear_sets/p5/demonology.gear.json'; -import DestroGearP5 from './gear_sets/p5/destruction.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; /////////////////////////////////////////////////////////////////////////// // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearDestructionPhase1 = PresetUtils.makePresetGear('Destruction', DestructionGear, { customCondition: player => player.getLevel() === 25 }); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const FireImpGearPhase2 = PresetUtils.makePresetGear('P2 Fire Imp', FireImpGear, { customCondition: player => player.getLevel() === 40 }); -export const FireSuccubusGearPhase2 = PresetUtils.makePresetGear('P2 Fire Succubus', FireSuccubusGear, { customCondition: player => player.getLevel() === 40 }); -export const ShadowGearPhase2 = PresetUtils.makePresetGear('P2 Shadow', ShadowGear, { customCondition: player => player.getLevel() === 40 }); +export const GearPresets = {}; -export const BackdraftGearPhase3 = PresetUtils.makePresetGear('P3 Backdraft', BackdraftGearP3, { customCondition: player => player.getLevel() === 50 }); -export const NFRuinGearPhase3 = PresetUtils.makePresetGear('P3 NF/Ruin', NFRuinGearP3, { customCondition: player => player.getLevel() === 50 }); - -export const AffGearPhase4 = PresetUtils.makePresetGear('P4 Aff', AffGearP4, { customCondition: player => player.getLevel() === 60 }); -export const DestroGearPhase4 = PresetUtils.makePresetGear('P4 Destro', DestroGearP4, { customCondition: player => player.getLevel() === 60 }); - -export const AffGearPhase5 = PresetUtils.makePresetGear('P5 Aff', AffGearP5, { customCondition: player => player.getLevel() === 60 }); -export const DemoGearPhase5 = PresetUtils.makePresetGear('P5 Demo', AffGearP5, { customCondition: player => player.getLevel() === 60 }); -export const DestroGearPhase5 = PresetUtils.makePresetGear('P5 Destro', DestroGearP5, { customCondition: player => player.getLevel() === 60 }); - -export const GearPresets = { - [Phase.Phase1]: [GearDestructionPhase1], - [Phase.Phase2]: [FireImpGearPhase2, FireSuccubusGearPhase2, ShadowGearPhase2], - [Phase.Phase3]: [NFRuinGearPhase3, BackdraftGearPhase3], - [Phase.Phase4]: [AffGearPhase4, DestroGearPhase4], - [Phase.Phase5]: [], -}; - -export const DefaultGearAff = AffGearPhase4; -export const DefaultGearDestro = DestroGearPhase4; - -export const DefaultGear = DefaultGearDestro; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets @@ -220,9 +187,9 @@ export const DefaultTalentsDestro = TalentPresets[Phase.Phase4][1]; export const DefaultTalents = DefaultTalentsDestro; -export const PresetBuildAff = PresetUtils.makePresetBuild('Aff', { gear: DefaultGearAff, talents: DefaultTalentsAff, rotation: DefaultAPLs[60][0] }); +export const PresetBuildAff = PresetUtils.makePresetBuild('Aff', { gear: DefaultGear, talents: DefaultTalentsAff, rotation: DefaultAPLs[60][0] }); export const PresetBuildDestro = PresetUtils.makePresetBuild('Destro', { - gear: DefaultGearDestro, + gear: DefaultGear, talents: DefaultTalentsDestro, rotation: DefaultAPLs[60][2], }); diff --git a/ui/warlock/sim.ts b/ui/warlock/sim.ts index c2db7d3a3..923390c2a 100644 --- a/ui/warlock/sim.ts +++ b/ui/warlock/sim.ts @@ -210,11 +210,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWarlock, { // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], // Preset builds (gear, talents, APL) that the user can quickly select. builds: [Presets.PresetBuildAff, Presets.PresetBuildDestro], @@ -249,10 +245,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWarlock, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.FireImpGearPhase2.gear, + 1: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.FireImpGearPhase2.gear, + 1: Presets.DefaultGear.gear, }, }, otherDefaults: Presets.OtherDefaults, diff --git a/ui/warrior/gear_sets/blank.gear.json b/ui/warrior/gear_sets/blank.gear.json new file mode 100644 index 000000000..4bcab0861 --- /dev/null +++ b/ui/warrior/gear_sets/blank.gear.json @@ -0,0 +1 @@ +{"items": []} \ No newline at end of file diff --git a/ui/warrior/gear_sets/phase_1.gear.json b/ui/warrior/gear_sets/phase_1.gear.json deleted file mode 100644 index d96c17109..000000000 --- a/ui/warrior/gear_sets/phase_1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211505}, - {"id":209422}, - {"id":9817,"randomSuffix":680}, - {"id":213088,"enchant":247}, - {"id":211504,"enchant":847,"rune":402911}, - {"id":209524,"enchant":823}, - {"id":209568,"rune":429765}, - {"id":6460}, - {"id":209566,"rune":425418}, - {"id":211506,"enchant":247}, - {"id":20429}, - {"id":211467}, - {"id":211449}, - {"id":21568}, - {"id":209562}, - {}, - {"id":209563} - ] -} \ No newline at end of file diff --git a/ui/warrior/gear_sets/phase_1_dw.gear.json b/ui/warrior/gear_sets/phase_1_dw.gear.json deleted file mode 100644 index 84d67c4b5..000000000 --- a/ui/warrior/gear_sets/phase_1_dw.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":211505}, - {"id":209422}, - {"id":9817,"randomSuffix":680}, - {"id":213088,"enchant":247}, - {"id":211504,"enchant":847,"rune":402911}, - {"id":209524,"enchant":823}, - {"id":209568,"rune":413404}, - {"id":6460}, - {"id":209566,"rune":425418}, - {"id":211506,"enchant":247}, - {"id":20429}, - {"id":211467}, - {"id":211449}, - {"id":21568}, - {"id":209525}, - {"id":209694}, - {"id":209563} - ] -} \ No newline at end of file diff --git a/ui/warrior/gear_sets/phase_2_2h.gear.json b/ui/warrior/gear_sets/phase_2_2h.gear.json deleted file mode 100644 index 1e721ab7f..000000000 --- a/ui/warrior/gear_sets/phase_2_2h.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166}, - {"id":213344}, - {"id":213304}, - {"id":213307,"enchant":247}, - {"id":213313,"enchant":866,"rune":402877}, - {"id":19581,"enchant":856}, - {"id":213319,"enchant":856,"rune":403218}, - {"id":213327,"rune":402922}, - {"id":213332,"rune":425412}, - {"id":9637,"enchant":849,"rune":403338}, - {"id":19512}, - {"id":213284}, - {"id":211449}, - {"id":213348}, - {"id":213416,"enchant":34}, - {}, - {"id":9426} - ] -} diff --git a/ui/warrior/gear_sets/phase_2_dw.gear.json b/ui/warrior/gear_sets/phase_2_dw.gear.json deleted file mode 100644 index 51c95734a..000000000 --- a/ui/warrior/gear_sets/phase_2_dw.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215166}, - {"id":213344}, - {"id":213304}, - {"id":213307,"enchant":247}, - {"id":213313,"enchant":866,"rune":402877}, - {"id":19581,"enchant":856}, - {"id":213319,"enchant":856,"rune":413404}, - {"id":213327,"rune":402922}, - {"id":213332,"rune":425418}, - {"id":9637,"enchant":849,"rune":403338}, - {"id":19512}, - {"id":213284}, - {"id":211449}, - {"id":213348}, - {"id":10823,"enchant":7210}, - {"id":6802,"enchant":7210}, - {"id":9426} - ] -} \ No newline at end of file diff --git a/ui/warrior/gear_sets/phase_3_2h.gear.json b/ui/warrior/gear_sets/phase_3_2h.gear.json deleted file mode 100644 index d30ed8ed6..000000000 --- a/ui/warrior/gear_sets/phase_3_2h.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161,"enchant":1506,"rune":426953}, - {"id":213344}, - {"id":221381,"enchant":7328}, - {"id":213307,"enchant":849}, - {"id":213313,"enchant":928,"rune":402877}, - {"id":19589,"enchant":1885,"rune":427065}, - {"id":213288,"enchant":1887,"rune":403218}, - {"id":215115,"rune":402922}, - {"id":213332,"rune":425412}, - {"id":223196,"enchant":1887,"rune":426490}, - {"id":17713}, - {"id":19516}, - {"id":223195}, - {"id":223195}, - {"id":220173,"enchant":803}, - {}, - {"id":213293} - ] -} \ No newline at end of file diff --git a/ui/warrior/gear_sets/phase_3_dw.gear.json b/ui/warrior/gear_sets/phase_3_dw.gear.json deleted file mode 100644 index 958cac879..000000000 --- a/ui/warrior/gear_sets/phase_3_dw.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161,"enchant":1506,"rune":426972}, - {"id":220624}, - {"id":220738,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220653,"enchant":928,"rune":402877}, - {"id":19580,"enchant":1885,"rune":427065}, - {"id":220541,"enchant":1887,"rune":413404}, - {"id":215115,"rune":413380}, - {"id":220654,"rune":425418}, - {"id":220656,"enchant":1887,"rune":403338}, - {"id":19511}, - {"id":220626}, - {"id":20130}, - {"id":223195}, - {"id":220588,"enchant":2563}, - {"id":220589,"enchant":2563}, - {"id":220571} - ] -} \ No newline at end of file diff --git a/ui/warrior/gear_sets/phase_3_glad.gear.json b/ui/warrior/gear_sets/phase_3_glad.gear.json deleted file mode 100644 index 9a5ffa847..000000000 --- a/ui/warrior/gear_sets/phase_3_glad.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161,"enchant":1506,"rune":426980}, - {"id":220624}, - {"id":220738,"enchant":7328}, - {"id":220615,"enchant":849}, - {"id":220653,"enchant":928,"rune":402877}, - {"id":19580,"enchant":1885,"rune":427065}, - {"id":220541,"enchant":1887,"rune":403195}, - {"id":215115,"rune":29787}, - {"id":220654,"rune":425418}, - {"id":220656,"enchant":1887,"rune":412513}, - {"id":19511}, - {"id":220626}, - {"id":20130}, - {"id":223195}, - {"id":220588,"enchant":2563}, - {"id":1979,"enchant":929}, - {"id":220571} - ] - } \ No newline at end of file diff --git a/ui/warrior/gear_sets/phase_4_2h.gear.json b/ui/warrior/gear_sets/phase_4_2h.gear.json deleted file mode 100644 index 7c4512604..000000000 --- a/ui/warrior/gear_sets/phase_4_2h.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161,"enchant":2543,"rune":426953}, - {"id":228685}, - {"id":226492,"enchant":7328}, - {"id":228102,"enchant":849,"rune":440113}, - {"id":226494,"enchant":1891,"rune":412507}, - {"id":226499,"enchant":1885,"rune":427065}, - {"id":226497,"enchant":931,"rune":429765}, - {"id":228295,"rune":402922}, - {"id":226493,"enchant":2543,"rune":425412}, - {"id":226496,"enchant":1887,"rune":426490}, - {"id":19325,"rune":442813}, - {"id":228261,"rune":442890}, - {"id":20130}, - {"id":228722}, - {"id":228229,"enchant":1900}, - {}, - {"id":228519} - ] -} diff --git a/ui/warrior/gear_sets/phase_4_dw.gear.json b/ui/warrior/gear_sets/phase_4_dw.gear.json deleted file mode 100644 index b1e08f204..000000000 --- a/ui/warrior/gear_sets/phase_4_dw.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161,"enchant":1505,"rune":403218}, - {"id":228685}, - {"id":226492,"enchant":7563}, - {"id":228102,"enchant":7564,"rune":440484}, - {"id":226494,"enchant":1891,"rune":402911}, - {"id":226499,"enchant":1885,"rune":426940}, - {"id":226497,"enchant":931,"rune":413404}, - {"id":228295,"rune":413380}, - {"id":226493,"enchant":1505,"rune":425418}, - {"id":226496,"enchant":1887,"rune":412513}, - {"id":228080,"rune":442813}, - {"id":228261,"rune":442890}, - {"id":20130}, - {"id":228722}, - {"id":228350,"enchant":1900}, - {"id":228265,"enchant":1900}, - {"id":228165} - ] -} diff --git a/ui/warrior/gear_sets/phase_4_glad.gear.json b/ui/warrior/gear_sets/phase_4_glad.gear.json deleted file mode 100644 index 763f7cc39..000000000 --- a/ui/warrior/gear_sets/phase_4_glad.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":215161,"enchant":1505,"rune":426980}, - {"id":228685}, - {"id":226492,"enchant":7563}, - {"id":228102,"enchant":7564,"rune":440484}, - {"id":226494,"enchant":1891,"rune":412507}, - {"id":226499,"enchant":1885,"rune":426940}, - {"id":226497,"enchant":931,"rune":403195}, - {"id":228295,"rune":29787}, - {"id":226493,"enchant":1505,"rune":425418}, - {"id":226496,"enchant":1887,"rune":412513}, - {"id":19325,"rune":442813}, - {"id":228261,"rune":442881}, - {"id":20130}, - {"id":228722}, - {"id":228350,"enchant":1900}, - {"id":18756}, - {"id":228252} - ] -} diff --git a/ui/warrior/gear_sets/phase_5_2h_t1.gear.json b/ui/warrior/gear_sets/phase_5_2h_t1.gear.json deleted file mode 100644 index 1d2d39bdb..000000000 --- a/ui/warrior/gear_sets/phase_5_2h_t1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232251,"enchant":7632,"rune":426953}, - {"id":231803}, - {"id":232249,"enchant":2606}, - {"id":230842,"enchant":849,"rune":440484}, - {"id":232254,"enchant":1891,"rune":412507}, - {"id":232247,"enchant":1885,"rune":426940}, - {"id":231036,"enchant":927,"rune":429765}, - {"id":231032,"rune":413380}, - {"id":226493,"enchant":7632,"rune":425412}, - {"id":232253,"enchant":911,"rune":412513}, - {"id":230734,"rune":442813}, - {"id":228261,"rune":442876}, - {"id":20130}, - {"id":228722}, - {"id":230818,"enchant":1900}, - {}, - {"id":228165} - ] -} diff --git a/ui/warrior/gear_sets/phase_5_2h_t2.gear.json b/ui/warrior/gear_sets/phase_5_2h_t2.gear.json deleted file mode 100644 index 2a6be45ba..000000000 --- a/ui/warrior/gear_sets/phase_5_2h_t2.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":231035,"enchant":7632,"rune":426953}, - {"id":231803}, - {"id":232249,"enchant":2606}, - {"id":230842,"enchant":849,"rune":440484}, - {"id":231038,"enchant":1891,"rune":412507}, - {"id":231031,"enchant":1885,"rune":426940}, - {"id":231036,"enchant":927,"rune":429765}, - {"id":231032,"rune":413380}, - {"id":231034,"enchant":7632,"rune":425412}, - {"id":232253,"enchant":911,"rune":412513}, - {"id":230839,"rune":442876}, - {"id":228261,"rune":442881}, - {"id":20130}, - {"id":228722}, - {"id":230818,"enchant":1900}, - {}, - {"id":228165} - ] -} diff --git a/ui/warrior/gear_sets/phase_5_dw_t1.gear.json b/ui/warrior/gear_sets/phase_5_dw_t1.gear.json deleted file mode 100644 index 940ea4c58..000000000 --- a/ui/warrior/gear_sets/phase_5_dw_t1.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":232251,"enchant":7632,"rune":403218}, - {"id":231307}, - {"id":232249,"enchant":2606}, - {"id":230842,"enchant":849,"rune":440484}, - {"id":232254,"enchant":1891,"rune":402911}, - {"id":232247,"enchant":1885,"rune":426940}, - {"id":232252,"enchant":931,"rune":413404}, - {"id":228295,"rune":413380}, - {"id":226493,"enchant":7632,"rune":425418}, - {"id":230741,"enchant":911,"rune":412513}, - {"id":230734,"rune":442876}, - {"id":228261,"rune":442813}, - {"id":20130}, - {"id":228722}, - {"id":230837,"enchant":1900}, - {"id":230747,"enchant":1900}, - {"id":228165} - ] -} diff --git a/ui/warrior/gear_sets/phase_5_dw_t2.gear.json b/ui/warrior/gear_sets/phase_5_dw_t2.gear.json deleted file mode 100644 index 483508a8c..000000000 --- a/ui/warrior/gear_sets/phase_5_dw_t2.gear.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "items": [ - {"id":226495,"enchant":7632,"rune":403218}, - {"id":231307}, - {"id":231033,"enchant":2606}, - {"id":230842,"enchant":849,"rune":440484}, - {"id":231038,"enchant":1891,"rune":402911}, - {"id":231031,"enchant":1885,"rune":426940}, - {"id":231036,"enchant":931,"rune":413404}, - {"id":231032,"rune":413380}, - {"id":226493,"enchant":7632,"rune":425418}, - {"id":231037,"enchant":911,"rune":412513}, - {"id":230734,"rune":442876}, - {"id":228261,"rune":442813}, - {"id":20130}, - {"id":228722}, - {"id":230837,"enchant":1900}, - {"id":230747,"enchant":1900}, - {"id":228165} - ] -} diff --git a/ui/warrior/presets.ts b/ui/warrior/presets.ts index dd283ba5f..0bad87ad9 100644 --- a/ui/warrior/presets.ts +++ b/ui/warrior/presets.ts @@ -34,20 +34,7 @@ import Phase4APLFury from './apls/phase_4_fury.apl.json'; import Phase4APLGlad from './apls/phase_4_glad.apl.json'; import Phase5APL2H from './apls/phase_5_2h.apl.json'; import Phase5APLDW from './apls/phase_5_dw.apl.json'; -import Phase1Gear from './gear_sets/phase_1.gear.json'; -import Phase1DWGear from './gear_sets/phase_1_dw.gear.json'; -import Phase22HGear from './gear_sets/phase_2_2h.gear.json'; -import Phase2DWGear from './gear_sets/phase_2_dw.gear.json'; -import Phase32HGear from './gear_sets/phase_3_2h.gear.json'; -import Phase3DWGear from './gear_sets/phase_3_dw.gear.json'; -import Phase3GladGear from './gear_sets/phase_3_glad.gear.json'; -import Phase42HGear from './gear_sets/phase_4_2h.gear.json'; -import Phase4DWGear from './gear_sets/phase_4_dw.gear.json'; -import Phase4GladGear from './gear_sets/phase_4_glad.gear.json'; -import Phase52HCoreForgedGear from './gear_sets/phase_5_2h_t1.gear.json'; -import Phase52HDraconicGear from './gear_sets/phase_5_2h_t2.gear.json'; -import Phase5DWCoreForgedGear from './gear_sets/phase_5_dw_t1.gear.json'; -import Phase5DWDraconicGear from './gear_sets/phase_5_dw_t2.gear.json'; +import BlankGear from './gear_sets/blank.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -57,47 +44,11 @@ import Phase5DWDraconicGear from './gear_sets/phase_5_dw_t2.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearArmsPhase1 = PresetUtils.makePresetGear('P1 Arms 2H', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); -export const GearArmsDWPhase1 = PresetUtils.makePresetGear('P1 Arms DW', Phase1DWGear, { customCondition: player => player.getLevel() === 25 }); -export const GearFuryPhase1 = PresetUtils.makePresetGear('P1 DW Fury', Phase1Gear, { customCondition: player => player.getLevel() === 25 }); +export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); -export const GearArmsPhase2 = PresetUtils.makePresetGear('P2 2H', Phase22HGear, { customCondition: player => player.getLevel() === 40 }); -export const GearFuryPhase2 = PresetUtils.makePresetGear('P2 DW', Phase2DWGear, { customCondition: player => player.getLevel() === 40 }); +export const GearPresets = {}; -export const GearArmsPhase3 = PresetUtils.makePresetGear('P3 2H', Phase32HGear, { customCondition: player => player.getLevel() === 50 }); -export const GearFuryPhase3 = PresetUtils.makePresetGear('P3 DW', Phase3DWGear, { customCondition: player => player.getLevel() === 50 }); -export const GearGladPhase3 = PresetUtils.makePresetGear('P3 Glad', Phase3GladGear, { customCondition: player => player.getLevel() === 50 }); - -export const Gear2HPhase4 = PresetUtils.makePresetGear('P4 2H', Phase42HGear, { customCondition: player => player.getLevel() === 60 }); -export const GearDWPhase4 = PresetUtils.makePresetGear('P4 DW', Phase4DWGear, { customCondition: player => player.getLevel() === 60 }); -export const GearGladPhase4 = PresetUtils.makePresetGear('P4 Glad', Phase4GladGear, { customCondition: player => player.getLevel() === 60 }); - -export const Gear2HCoreForgedPhase5 = PresetUtils.makePresetGear('P5 2H Core Forged', Phase52HCoreForgedGear, { - customCondition: player => player.getLevel() === 60, -}); -export const GearDWCoreForgedPhase5 = PresetUtils.makePresetGear('P5 DW Core Forged', Phase5DWCoreForgedGear, { - customCondition: player => player.getLevel() === 60, -}); -export const Gear2HDraconicPhase5 = PresetUtils.makePresetGear('P5 2H Draconic', Phase52HDraconicGear, { - customCondition: player => player.getLevel() === 60, -}); -export const GearDWDraconicPhase5 = PresetUtils.makePresetGear('P5 DW Draconic', Phase5DWDraconicGear, { - customCondition: player => player.getLevel() === 60, -}); - -export const GearPresets = { - [Phase.Phase1]: [GearArmsPhase1, GearFuryPhase1, GearArmsDWPhase1], - [Phase.Phase2]: [GearArmsPhase2, GearFuryPhase2], - [Phase.Phase3]: [GearArmsPhase3, GearFuryPhase3, GearGladPhase3], - [Phase.Phase4]: [Gear2HPhase4, GearDWPhase4, GearGladPhase4], - [Phase.Phase5]: [Gear2HCoreForgedPhase5, GearDWCoreForgedPhase5, Gear2HDraconicPhase5, GearDWDraconicPhase5], -}; - -export const DefaultGear2H = GearPresets[Phase.Phase5][0]; -export const DefaultGearDW = GearPresets[Phase.Phase5][1]; -// export const DefaultGearGlad = GearPresets[Phase.Phase4][2]; - -export const DefaultGear = DefaultGear2H; +export const DefaultGear = GearBlank; /////////////////////////////////////////////////////////////////////////// // APL Presets @@ -206,8 +157,8 @@ export const DefaultTalentsDW = TalentPresets[Phase.Phase5][1]; export const DefaultTalents = DefaultTalents2H; -export const PresetBuild2H = PresetUtils.makePresetBuild('Two-Handed', { gear: DefaultGear2H, talents: DefaultTalents2H, rotation: DefaultAPLs[60][0] }); -export const PresetBuildDW = PresetUtils.makePresetBuild('Dual-Wield', { gear: DefaultGearDW, talents: DefaultTalentsDW, rotation: DefaultAPLs[60][1] }); +export const PresetBuild2H = PresetUtils.makePresetBuild('Two-Handed', { gear: DefaultGear, talents: DefaultTalents2H, rotation: DefaultAPLs[60][0] }); +export const PresetBuildDW = PresetUtils.makePresetBuild('Dual-Wield', { gear: DefaultGear, talents: DefaultTalentsDW, rotation: DefaultAPLs[60][1] }); // export const PresetBuildGlad = PresetUtils.makePresetBuild('Glad', { gear: DefaultGearGlad, talents: DefaultTalentsGlad, rotation: DefaultAPLs[60][3] }); /////////////////////////////////////////////////////////////////////////// diff --git a/ui/warrior/sim.ts b/ui/warrior/sim.ts index 2985d4d89..116160046 100644 --- a/ui/warrior/sim.ts +++ b/ui/warrior/sim.ts @@ -127,11 +127,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWarrior, { ], // Preset gear configurations that the user can quickly select. gear: [ - ...Presets.GearPresets[Phase.Phase5], - ...Presets.GearPresets[Phase.Phase4], - ...Presets.GearPresets[Phase.Phase3], - ...Presets.GearPresets[Phase.Phase2], - ...Presets.GearPresets[Phase.Phase1], + Presets.DefaultGear, ], // Preset builds that the user can quickly select. builds: [Presets.PresetBuild2H, Presets.PresetBuildDW], @@ -170,14 +166,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWarrior, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, - 2: Presets.GearPresets[Phase.Phase2][0].gear, - 3: Presets.GearPresets[Phase.Phase3][0].gear, + 1: Presets.DefaultGear.gear, + 2: Presets.DefaultGear.gear, + 3: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][0].gear, - 2: Presets.GearPresets[Phase.Phase2][0].gear, - 3: Presets.GearPresets[Phase.Phase3][0].gear, + 1: Presets.DefaultGear.gear, + 2: Presets.DefaultGear.gear, + 3: Presets.DefaultGear.gear, }, }, }, @@ -198,14 +194,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWarrior, { defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: Presets.GearPresets[Phase.Phase1][1].gear, - 2: Presets.GearPresets[Phase.Phase2][1].gear, - 3: Presets.GearPresets[Phase.Phase3][1].gear, + 1: Presets.DefaultGear.gear, + 2: Presets.DefaultGear.gear, + 3: Presets.DefaultGear.gear, }, [Faction.Horde]: { - 1: Presets.GearPresets[Phase.Phase1][1].gear, - 2: Presets.GearPresets[Phase.Phase2][1].gear, - 3: Presets.GearPresets[Phase.Phase3][1].gear, + 1: Presets.DefaultGear.gear, + 2: Presets.DefaultGear.gear, + 3: Presets.DefaultGear.gear, }, }, },