diff --git a/sim/common/mop/trinkets_phase_1_50.go b/sim/common/mop/trinkets_phase_1_50.go index 4810138eef..3933f105b3 100644 --- a/sim/common/mop/trinkets_phase_1_50.go +++ b/sim/common/mop/trinkets_phase_1_50.go @@ -13,7 +13,7 @@ func init() { character := agent.GetCharacter() duration := time.Second * 15 - statValue := core.GetItemEffectScaling(75274, 2.66700005531, state) + statValue := core.GetItemEffectScalingStatValue(75274, 2.66700005531, state) statTypeOptions := []stats.Stat{stats.Strength, stats.Agility, stats.Intellect} auras := make(map[stats.Stat]*core.StatBuffAura, 3) @@ -62,7 +62,7 @@ func init() { actionID := core.ActionID{SpellID: 126467} manaMetrics := character.NewManaMetrics(actionID) - mana := core.GetItemEffectScaling(81266, 2.97199988365, state) + mana := core.GetItemEffectScalingStatValue(81266, 2.97199988365, state) triggerAura := character.MakeProcTriggerAura(core.ProcTrigger{ Name: "Price of Progress (Heroic)", diff --git a/sim/common/mop/trinkets_phase_3_52.go b/sim/common/mop/trinkets_phase_3_52.go index c6294fe3e1..dd81347d1a 100644 --- a/sim/common/mop/trinkets_phase_3_52.go +++ b/sim/common/mop/trinkets_phase_3_52.go @@ -27,7 +27,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.44999998808, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.44999998808, state) statBuffAura, aura := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ AuraLabel: fmt.Sprintf("Blades of Renataki (%s)", versionLabel), @@ -74,7 +74,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - manaValue := core.GetItemEffectScaling(itemID, 0.55900001526, state) + manaValue := core.GetItemEffectScalingStatValue(itemID, 0.55900001526, state) manaMetrics := character.NewManaMetrics(core.ActionID{SpellID: 138856}) stackingAura := character.RegisterAura(core.Aura{ @@ -141,7 +141,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.44999998808, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.44999998808, state) statBuffAura, aura := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ AuraLabel: fmt.Sprintf("Wushoolay's Lightning (%s)", versionLabel), @@ -189,7 +189,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.44999998808, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.44999998808, state) statBuffAura, aura := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ AuraLabel: fmt.Sprintf("Feathers of Fury (%s)", versionLabel), @@ -235,7 +235,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 2.97000002861, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 2.97000002861, state) aura, _ := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ Duration: time.Second * 20, @@ -276,7 +276,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.5189999938, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.5189999938, state) aura, _ := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ Duration: time.Second * 10, @@ -320,7 +320,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - shieldValue := core.GetItemEffectScaling(itemID, 9.45600032806, state) + shieldValue := core.GetItemEffectScalingStatValue(itemID, 9.45600032806, state) // TODO: For now self-shield as there is no healing Sim shield := character.NewDamageAbsorptionAura(core.AbsorptionAuraConfig{ @@ -365,7 +365,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - healValue := core.GetItemEffectScaling(itemID, 13.61499977112, state) + healValue := core.GetItemEffectScalingStatValue(itemID, 13.61499977112, state) spell := character.RegisterSpell(core.SpellConfig{ ActionID: core.ActionID{SpellID: 138973}, @@ -416,7 +416,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.5189999938, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.5189999938, state) aura, _ := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ Duration: time.Second * 10, @@ -460,7 +460,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.96799999475, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.96799999475, state) aura, _ := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ Duration: time.Second * 20, @@ -677,7 +677,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() actionId := core.ActionID{SpellID: 138979, ItemID: itemID} - absorbPerHitValue := core.GetItemEffectScaling(itemID, 3.78200006485, state) + absorbPerHitValue := core.GetItemEffectScalingStatValue(itemID, 3.78200006485, state) damageAbsorptionAura := character.NewDamageAbsorptionAura(core.AbsorptionAuraConfig{ Aura: core.Aura{ @@ -744,7 +744,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - strengthValue := core.GetItemEffectScaling(itemID, 2.47499990463, state) + strengthValue := core.GetItemEffectScalingStatValue(itemID, 2.47499990463, state) buffAura := character.NewTemporaryStatsAura( fmt.Sprintf("Zandalari Warrior (%s)", versionLabel), @@ -793,7 +793,7 @@ func init() { character := agent.GetCharacter() actionId := core.ActionID{SpellID: 138724, ItemID: 94509} - manaValue := core.GetItemEffectScaling(94509, 10.05900001526, state) + manaValue := core.GetItemEffectScalingStatValue(94509, 10.05900001526, state) manaMetrics := character.NewManaMetrics(actionId) spell := character.RegisterSpell(core.SpellConfig{ diff --git a/sim/common/mop/trinkets_phase_4_54.go b/sim/common/mop/trinkets_phase_4_54.go index c9e0780098..d9c9a96fbd 100644 --- a/sim/common/mop/trinkets_phase_4_54.go +++ b/sim/common/mop/trinkets_phase_4_54.go @@ -54,7 +54,7 @@ func init() { auraID, exists := config.cdrAuraIDs[character.Spec] var cdrAura *core.Aura if exists { - cdr := 1.0 / (1.0 + core.GetItemEffectScaling(itemID, 0.00989999995, state)/100) + cdr := 1.0 / (1.0 + core.GetItemEffectScalingStatValue(itemID, 0.00989999995, state)/100) cdrAura = core.MakePermanent(character.RegisterAura(core.Aura{ Label: fmt.Sprintf("Readiness (%s)", versionLabel), ActionID: core.ActionID{SpellID: auraID}, @@ -66,7 +66,7 @@ func init() { } stats := stats.Stats{} - stats[config.buffedStat] = core.GetItemEffectScaling(itemID, 2.97300004959, state) + stats[config.buffedStat] = core.GetItemEffectScalingStatValue(itemID, 2.97300004959, state) aura := character.NewTemporaryStatsAura( fmt.Sprintf("%s (%s)", config.buffAuraLabel, versionLabel), @@ -263,7 +263,7 @@ func init() { multistrikeTriggerAura := character.MakeProcTriggerAura(core.ProcTrigger{ Name: fmt.Sprintf("%s (%s) - Multistrike Trigger", config.baseTrinketLabel, versionLabel), - ProcChance: core.GetItemEffectScaling(itemID, 0.03539999947, state) / 1000, + ProcChance: core.GetItemEffectScalingStatValue(itemID, 0.03539999947, state) / 1000, Outcome: core.OutcomeLanded, Callback: core.CallbackOnSpellHitDealt | core.CallbackOnPeriodicDamageDealt, RequireDamageDealt: true, @@ -287,7 +287,7 @@ func init() { }) stats := stats.Stats{} - stats[config.buffedStat] = core.GetItemEffectScaling(itemID, 2.97300004959, state) + stats[config.buffedStat] = core.GetItemEffectScalingStatValue(itemID, 2.97300004959, state) statBuffAura := character.NewTemporaryStatsAura( fmt.Sprintf("%s (%s)", config.buffAuraLabel, versionLabel), @@ -382,7 +382,7 @@ func init() { AttachMultiplicativePseudoStatBuff(&character.PseudoStats.CritDamageMultiplier, critDamageValue) stats := stats.Stats{} - stats[config.buffedStat] = core.GetItemEffectScaling(itemID, 2.97300004959, state) + stats[config.buffedStat] = core.GetItemEffectScalingStatValue(itemID, 2.97300004959, state) aura := character.NewTemporaryStatsAura( fmt.Sprintf("%s (%s)", config.buffAuraLabel, versionLabel), @@ -466,7 +466,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.27030000091, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.27030000091, state) statBuffAura, aura := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ AuraLabel: fmt.Sprintf("Item - Proc Agility (%s)", versionLabel), ActionID: core.ActionID{SpellID: 146311}, @@ -579,7 +579,7 @@ func init() { cleaveTriggerAura := character.MakeProcTriggerAura(core.ProcTrigger{ Name: fmt.Sprintf("%s (%s) - Cleave Trigger", config.baseTrinketLabel, versionLabel), - ProcChance: core.GetItemEffectScaling(itemID, 0.07859999686, state) / 10000, + ProcChance: core.GetItemEffectScalingStatValue(itemID, 0.07859999686, state) / 10000, Outcome: core.OutcomeLanded, Callback: core.CallbackOnSpellHitDealt | core.CallbackOnPeriodicDamageDealt, RequireDamageDealt: true, @@ -602,7 +602,7 @@ func init() { }) stats := stats.Stats{} - stats[config.buffedStat] = core.GetItemEffectScaling(itemID, 2.97300004959, state) + stats[config.buffedStat] = core.GetItemEffectScalingStatValue(itemID, 2.97300004959, state) statBuffAura := character.NewTemporaryStatsAura( fmt.Sprintf("%s (%s)", config.buffAuraLabel, versionLabel), @@ -703,7 +703,7 @@ func init() { aura := character.NewTemporaryStatsAura( "Winds of Time", core.ActionID{SpellID: 148447}, - stats.Stats{stats.HasteRating: core.GetItemEffectScaling(103678, 1.56799995899, state)}, + stats.Stats{stats.HasteRating: core.GetItemEffectScalingStatValue(103678, 1.56799995899, state)}, time.Second*20, ) @@ -744,7 +744,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.29699999094, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.29699999094, state) statBuffAura, aura := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ AuraLabel: fmt.Sprintf("Item - Proc Critical Strike (%s)", versionLabel), ActionID: core.ActionID{SpellID: 146286}, @@ -797,7 +797,7 @@ func init() { core.NewItemEffect(itemID, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(itemID, 0.59399998188, state) + statValue := core.GetItemEffectScalingStatValue(itemID, 0.59399998188, state) statBuffAura, aura := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ AuraLabel: fmt.Sprintf("Item - Proc Intellect (%s)", versionLabel), ActionID: core.ActionID{SpellID: 146183}, diff --git a/sim/common/mop/weapons.go b/sim/common/mop/weapons.go index 4e813f0c8b..0478bf6f06 100644 --- a/sim/common/mop/weapons.go +++ b/sim/common/mop/weapons.go @@ -14,7 +14,7 @@ func init() { core.NewItemEffect(86518, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(86518, 0.58200001717, state) + statValue := core.GetItemEffectScalingStatValue(86518, 0.58200001717, state) dot := character.RegisterSpell(core.SpellConfig{ ActionID: core.ActionID{SpellID: 126211}, @@ -66,7 +66,7 @@ func init() { core.NewItemEffect(88149, func(agent core.Agent, state proto.ItemLevelState) { character := agent.GetCharacter() - statValue := core.GetItemEffectScaling(88149, 0.19400000572, state) + statValue := core.GetItemEffectScalingStatValue(88149, 0.19400000572, state) aura, _ := character.NewTemporaryStatBuffWithStacks(core.TemporaryStatBuffWithStacksConfig{ AuraLabel: "The Deepest Night", diff --git a/sim/core/utils.go b/sim/core/utils.go index 7fb0e84fbe..247f6ce626 100644 --- a/sim/core/utils.go +++ b/sim/core/utils.go @@ -277,9 +277,16 @@ func ApplyVarianceMinMax(avgEffect float64, variance float64) (float64, float64) return min, max } +// Used to get stat values for item effects which are rounded +func GetItemEffectScalingStatValue(itemID int32, coeff float64, state proto.ItemLevelState) float64 { + return math.Round(GetItemEffectScaling(itemID, coeff, state)) +} + +// Used to get non-rounded stat values for item effects such as the amplify trinkets func GetItemEffectScaling(itemID int32, coeff float64, state proto.ItemLevelState) float64 { - return math.Round(GetItemEffectRandomPropPointsForItem(itemID, state) * coeff) + return GetItemEffectRandomPropPointsForItem(itemID, state) * coeff } + func GetItemEffectRandomPropPointsForItem(itemID int32, state proto.ItemLevelState) float64 { return float64(GetItemByID(itemID).GetItemEffectRandomPropPoints(state)) } diff --git a/sim/death_knight/blood/TestBlood.results b/sim/death_knight/blood/TestBlood.results index 128ef9e74f..bef79ec4c1 100644 --- a/sim/death_knight/blood/TestBlood.results +++ b/sim/death_knight/blood/TestBlood.results @@ -2175,10 +2175,10 @@ dps_results: { dps_results: { key: "TestBlood-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 221038.23925 - tps: 1.12998075584e+06 - dtps: 65350.88916 - hps: 75774.17892 + dps: 222522.07303 + tps: 1.13700032401e+06 + dtps: 65501.94312 + hps: 77051.43884 } } dps_results: { @@ -2778,10 +2778,10 @@ dps_results: { dps_results: { key: "TestBlood-AllItems-Thok'sTailTip-105609" value: { - dps: 235162.10111 - tps: 1.17836885814e+06 - dtps: 61829.69343 - hps: 74675.65419 + dps: 234442.55094 + tps: 1.16684998645e+06 + dtps: 61978.86325 + hps: 73970.5914 } } dps_results: { diff --git a/sim/death_knight/frost/TestFrostMasterfrost.results b/sim/death_knight/frost/TestFrostMasterfrost.results index fbc61e2aee..97c0ed4928 100644 --- a/sim/death_knight/frost/TestFrostMasterfrost.results +++ b/sim/death_knight/frost/TestFrostMasterfrost.results @@ -1937,9 +1937,9 @@ dps_results: { dps_results: { key: "TestFrostMasterfrost-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 234412.98661 - tps: 214004.69927 - hps: 2116.65143 + dps: 233612.54513 + tps: 213549.54703 + hps: 2124.6119 } } dps_results: { @@ -2465,9 +2465,9 @@ dps_results: { dps_results: { key: "TestFrostMasterfrost-AllItems-Thok'sTailTip-105609" value: { - dps: 257692.42948 - tps: 232208.58857 - hps: 2127.9856 + dps: 256317.34127 + tps: 231164.20664 + hps: 2119.20265 } } dps_results: { diff --git a/sim/death_knight/frost/TestFrostTwoHand.results b/sim/death_knight/frost/TestFrostTwoHand.results index f8c63c6337..e3ac497cee 100644 --- a/sim/death_knight/frost/TestFrostTwoHand.results +++ b/sim/death_knight/frost/TestFrostTwoHand.results @@ -1937,9 +1937,9 @@ dps_results: { dps_results: { key: "TestFrostTwoHand-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 231878.42616 - tps: 207103.0317 - hps: 3517.82943 + dps: 232276.34849 + tps: 207290.01726 + hps: 3499.50485 } } dps_results: { @@ -2473,9 +2473,9 @@ dps_results: { dps_results: { key: "TestFrostTwoHand-AllItems-Thok'sTailTip-105609" value: { - dps: 251613.47133 - tps: 221092.1543 - hps: 3517.82943 + dps: 251818.94755 + tps: 221019.39547 + hps: 3499.50485 } } dps_results: { diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results index f4db147f78..2f0071827d 100644 --- a/sim/death_knight/unholy/TestUnholy.results +++ b/sim/death_knight/unholy/TestUnholy.results @@ -1929,9 +1929,9 @@ dps_results: { dps_results: { key: "TestUnholy-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 225715.95142 - tps: 159412.01859 - hps: 2614.42257 + dps: 225580.43504 + tps: 159245.02815 + hps: 2642.48736 } } dps_results: { @@ -2465,9 +2465,9 @@ dps_results: { dps_results: { key: "TestUnholy-AllItems-Thok'sTailTip-105609" value: { - dps: 253481.52708 - tps: 175046.05169 - hps: 2612.06585 + dps: 252511.72443 + tps: 174076.39906 + hps: 2619.82608 } } dps_results: { diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 4c256aed9b..3521ffab21 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -393,9 +393,9 @@ dps_results: { dps_results: { key: "TestBalance-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 276197.33173 - tps: 275733.20113 - hps: 29382.34781 + dps: 276221.03817 + tps: 275755.77442 + hps: 29838.94537 } } dps_results: { @@ -545,9 +545,9 @@ dps_results: { dps_results: { key: "TestBalance-AllItems-Thok'sTailTip-105609" value: { - dps: 246259.23078 - tps: 246648.84658 - hps: 28679.03862 + dps: 245758.28812 + tps: 246165.53635 + hps: 28536.86164 } } dps_results: { diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 089037238a..026943eb9e 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -1937,9 +1937,9 @@ dps_results: { dps_results: { key: "TestFeral-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 234204.32138 - tps: 355503.18813 - hps: 15955.52995 + dps: 235536.37542 + tps: 350281.30189 + hps: 16433.98301 } } dps_results: { @@ -2417,9 +2417,9 @@ dps_results: { dps_results: { key: "TestFeral-AllItems-Thok'sTailTip-105609" value: { - dps: 246992.2408 - tps: 367337.36845 - hps: 14695.70853 + dps: 246718.09762 + tps: 360143.26964 + hps: 15091.28461 } } dps_results: { diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results index 67c6615aa5..4391bb74bf 100644 --- a/sim/druid/guardian/TestGuardian.results +++ b/sim/druid/guardian/TestGuardian.results @@ -2175,10 +2175,10 @@ dps_results: { dps_results: { key: "TestGuardian-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 316310.03066 - tps: 1.91003501535e+06 - dtps: 46676.1074 - hps: 31431.67548 + dps: 317218.54729 + tps: 1.91416706867e+06 + dtps: 46338.96663 + hps: 31665.71208 } } dps_results: { @@ -2715,10 +2715,10 @@ dps_results: { dps_results: { key: "TestGuardian-AllItems-Thok'sTailTip-105609" value: { - dps: 321573.77592 - tps: 1.94307006131e+06 - dtps: 46335.7281 - hps: 30599.88822 + dps: 322525.93065 + tps: 1.94645329019e+06 + dtps: 46346.80235 + hps: 30771.63874 } } dps_results: { diff --git a/sim/hunter/beast_mastery/TestBeastMastery.results b/sim/hunter/beast_mastery/TestBeastMastery.results index 43fe629ef6..a53bb8540b 100644 --- a/sim/hunter/beast_mastery/TestBeastMastery.results +++ b/sim/hunter/beast_mastery/TestBeastMastery.results @@ -1685,8 +1685,8 @@ dps_results: { dps_results: { key: "TestBeastMastery-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 218417.32926 - tps: 102554.60594 + dps: 218425.32085 + tps: 102560.69183 } } dps_results: { @@ -2091,8 +2091,8 @@ dps_results: { dps_results: { key: "TestBeastMastery-AllItems-Thok'sTailTip-105609" value: { - dps: 218417.32926 - tps: 102554.60594 + dps: 218425.32085 + tps: 102560.69183 } } dps_results: { diff --git a/sim/hunter/marksmanship/TestMarksmanship.results b/sim/hunter/marksmanship/TestMarksmanship.results index fefd1d41a3..ae0084d1df 100644 --- a/sim/hunter/marksmanship/TestMarksmanship.results +++ b/sim/hunter/marksmanship/TestMarksmanship.results @@ -1921,9 +1921,9 @@ dps_results: { dps_results: { key: "TestMarksmanship-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 228206.14553 - tps: 174859.0766 - hps: 18.27721 + dps: 227276.52558 + tps: 173940.26526 + hps: 18.28943 } } dps_results: { @@ -2393,9 +2393,9 @@ dps_results: { dps_results: { key: "TestMarksmanship-AllItems-Thok'sTailTip-105609" value: { - dps: 228206.14553 - tps: 174859.0766 - hps: 18.27721 + dps: 227276.52558 + tps: 173940.26526 + hps: 18.28943 } } dps_results: { diff --git a/sim/hunter/survival/TestSurvival.results b/sim/hunter/survival/TestSurvival.results index 008e70c147..9c3757c645 100644 --- a/sim/hunter/survival/TestSurvival.results +++ b/sim/hunter/survival/TestSurvival.results @@ -1678,8 +1678,8 @@ dps_results: { dps_results: { key: "TestSurvival-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 225101.1038 - tps: 171789.57854 + dps: 224838.83233 + tps: 171644.02981 } } dps_results: { @@ -2084,8 +2084,8 @@ dps_results: { dps_results: { key: "TestSurvival-AllItems-Thok'sTailTip-105609" value: { - dps: 225101.1038 - tps: 171789.57854 + dps: 224838.83233 + tps: 171644.02981 } } dps_results: { diff --git a/sim/mage/arcane/TestArcane.results b/sim/mage/arcane/TestArcane.results index 94ad7c6713..584a9ce08e 100644 --- a/sim/mage/arcane/TestArcane.results +++ b/sim/mage/arcane/TestArcane.results @@ -334,8 +334,8 @@ dps_results: { dps_results: { key: "TestArcane-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 269216.16226 - tps: 258431.0084 + dps: 269737.06847 + tps: 258842.7462 } } dps_results: { @@ -460,8 +460,8 @@ dps_results: { dps_results: { key: "TestArcane-AllItems-Thok'sTailTip-105609" value: { - dps: 239224.03976 - tps: 230685.90615 + dps: 240996.58833 + tps: 232313.87681 } } dps_results: { diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results index 9289142b75..d6ded83d76 100644 --- a/sim/mage/fire/TestFire.results +++ b/sim/mage/fire/TestFire.results @@ -1657,8 +1657,8 @@ dps_results: { dps_results: { key: "TestFire-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 160114.02618 - tps: 156122.30754 + dps: 159943.77388 + tps: 155986.43564 } } dps_results: { @@ -2084,8 +2084,8 @@ dps_results: { dps_results: { key: "TestFire-AllItems-Thok'sTailTip-105609" value: { - dps: 137866.84285 - tps: 134437.57984 + dps: 138943.92107 + tps: 135505.22794 } } dps_results: { diff --git a/sim/mage/frost/TestFrost.results b/sim/mage/frost/TestFrost.results index 8a91875ece..330e29bc95 100644 --- a/sim/mage/frost/TestFrost.results +++ b/sim/mage/frost/TestFrost.results @@ -334,8 +334,8 @@ dps_results: { dps_results: { key: "TestFrost-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 173993.54983 - tps: 127165.32183 + dps: 173957.27862 + tps: 127108.15489 } } dps_results: { @@ -460,8 +460,8 @@ dps_results: { dps_results: { key: "TestFrost-AllItems-Thok'sTailTip-105609" value: { - dps: 151373.39423 - tps: 110242.19464 + dps: 151565.47197 + tps: 110330.69036 } } dps_results: { diff --git a/sim/monk/brewmaster/TestBrewmaster.results b/sim/monk/brewmaster/TestBrewmaster.results index cdc02c9530..cd93da8303 100644 --- a/sim/monk/brewmaster/TestBrewmaster.results +++ b/sim/monk/brewmaster/TestBrewmaster.results @@ -2175,10 +2175,10 @@ dps_results: { dps_results: { key: "TestBrewmaster-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 265416.04328 - tps: 1.14594430119e+06 - dtps: 16907.49969 - hps: 30533.23891 + dps: 265606.37767 + tps: 1.14711764701e+06 + dtps: 16938.29725 + hps: 30546.91772 } } dps_results: { @@ -2697,10 +2697,10 @@ dps_results: { dps_results: { key: "TestBrewmaster-AllItems-Thok'sTailTip-105609" value: { - dps: 274129.77714 - tps: 1.17067264412e+06 - dtps: 16907.49969 - hps: 31203.994 + dps: 274326.26225 + tps: 1.17187787385e+06 + dtps: 16938.29725 + hps: 31218.24697 } } dps_results: { diff --git a/sim/monk/windwalker/TestWindwalker.results b/sim/monk/windwalker/TestWindwalker.results index 60fae68584..4988408a3d 100644 --- a/sim/monk/windwalker/TestWindwalker.results +++ b/sim/monk/windwalker/TestWindwalker.results @@ -1945,9 +1945,9 @@ dps_results: { dps_results: { key: "TestWindwalker-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 235510.40985 - tps: 224981.75575 - hps: 7879.36834 + dps: 237477.77624 + tps: 226950.05456 + hps: 7841.61783 } } dps_results: { @@ -2417,9 +2417,9 @@ dps_results: { dps_results: { key: "TestWindwalker-AllItems-Thok'sTailTip-105609" value: { - dps: 241853.54145 - tps: 230564.86967 - hps: 8225.08932 + dps: 243619.64826 + tps: 232338.08711 + hps: 8203.42859 } } dps_results: { diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 02ef0d992e..f78d1c0098 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -2148,10 +2148,10 @@ dps_results: { dps_results: { key: "TestProtection-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 229785.00353 - tps: 1.42973082187e+06 - dtps: 34848.329 - hps: 38230.12471 + dps: 229725.38076 + tps: 1.42980517e+06 + dtps: 34765.65816 + hps: 38358.52274 } } dps_results: { @@ -2679,10 +2679,10 @@ dps_results: { dps_results: { key: "TestProtection-AllItems-Thok'sTailTip-105609" value: { - dps: 234750.68073 - tps: 1.45581786422e+06 - dtps: 32201.29154 - hps: 39633.37593 + dps: 234943.43118 + tps: 1.45666902023e+06 + dtps: 32699.64772 + hps: 39797.84771 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index d3a0025319..8d2596c941 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -1905,9 +1905,9 @@ dps_results: { dps_results: { key: "TestRetribution-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 244578.81573 - tps: 233286.15786 - hps: 23.91795 + dps: 245707.39811 + tps: 234465.73796 + hps: 23.93818 } } dps_results: { @@ -2377,9 +2377,9 @@ dps_results: { dps_results: { key: "TestRetribution-AllItems-Thok'sTailTip-105609" value: { - dps: 271873.74577 - tps: 257208.04778 - hps: 22.36278 + dps: 273129.26557 + tps: 258526.73008 + hps: 22.37818 } } dps_results: { diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index e77f5fc5b2..310ecbf3af 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -1881,9 +1881,9 @@ dps_results: { dps_results: { key: "TestShadow-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 100395.36005 - tps: 93795.63677 - hps: 1632.42802 + dps: 100493.74162 + tps: 93879.03507 + hps: 1631.51702 } } dps_results: { @@ -2377,9 +2377,9 @@ dps_results: { dps_results: { key: "TestShadow-AllItems-Thok'sTailTip-105609" value: { - dps: 86082.24336 - tps: 81002.37018 - hps: 1629.5762 + dps: 86286.11756 + tps: 81163.61202 + hps: 1631.27937 } } dps_results: { diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results index 8850857dce..93acfdd53c 100644 --- a/sim/rogue/assassination/TestAssassination.results +++ b/sim/rogue/assassination/TestAssassination.results @@ -394,8 +394,8 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 101277.29352 - tps: 71264.12916 + dps: 101283.72886 + tps: 71268.50143 } } dps_results: { @@ -506,8 +506,8 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-Thok'sTailTip-105609" value: { - dps: 109317.22754 - tps: 76778.59043 + dps: 109353.09535 + tps: 76803.79892 } } dps_results: { diff --git a/sim/rogue/combat/TestCombat.results b/sim/rogue/combat/TestCombat.results index 87833f7d56..6ecc4dfb87 100644 --- a/sim/rogue/combat/TestCombat.results +++ b/sim/rogue/combat/TestCombat.results @@ -362,8 +362,8 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 99499.38878 - tps: 70128.68642 + dps: 99000.57613 + tps: 69777.32104 } } dps_results: { @@ -474,8 +474,8 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-Thok'sTailTip-105609" value: { - dps: 105398.07574 - tps: 74153.35669 + dps: 104965.42533 + tps: 73849.86138 } } dps_results: { diff --git a/sim/rogue/subtlety/TestSubtlety.results b/sim/rogue/subtlety/TestSubtlety.results index f08f4dd3d8..347feed041 100644 --- a/sim/rogue/subtlety/TestSubtlety.results +++ b/sim/rogue/subtlety/TestSubtlety.results @@ -362,8 +362,8 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 103159.7394 - tps: 72690.77583 + dps: 104143.82708 + tps: 73394.46044 } } dps_results: { @@ -474,8 +474,8 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-Thok'sTailTip-105609" value: { - dps: 108200.98907 - tps: 76145.38343 + dps: 109169.14608 + tps: 76838.59363 } } dps_results: { diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index c506f1518d..7cd4d58ab1 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1685,8 +1685,8 @@ dps_results: { dps_results: { key: "TestElemental-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 160025.76688 - tps: 114740.74717 + dps: 160223.30241 + tps: 114649.5341 } } dps_results: { @@ -2112,8 +2112,8 @@ dps_results: { dps_results: { key: "TestElemental-AllItems-Thok'sTailTip-105609" value: { - dps: 141121.59721 - tps: 101968.17506 + dps: 141415.74572 + tps: 102066.8663 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index d2f5b5ad45..2c31ff8e64 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1692,8 +1692,8 @@ dps_results: { dps_results: { key: "TestEnhancement-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 144971.29782 - tps: 124089.19202 + dps: 145235.40819 + tps: 124089.75776 } } dps_results: { @@ -2112,8 +2112,8 @@ dps_results: { dps_results: { key: "TestEnhancement-AllItems-Thok'sTailTip-105609" value: { - dps: 152440.98842 - tps: 129157.19082 + dps: 152744.51369 + tps: 129247.6241 } } dps_results: { diff --git a/sim/warlock/affliction/TestAffliction.results b/sim/warlock/affliction/TestAffliction.results index 659dcd4901..6b6b44945e 100644 --- a/sim/warlock/affliction/TestAffliction.results +++ b/sim/warlock/affliction/TestAffliction.results @@ -1897,9 +1897,9 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 253977.97179 - tps: 175573.88123 - hps: 2901.74192 + dps: 257060.061 + tps: 178112.33031 + hps: 2918.95141 } } dps_results: { @@ -2401,9 +2401,9 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-Thok'sTailTip-105609" value: { - dps: 225949.37018 - tps: 156919.64571 - hps: 2981.12763 + dps: 228262.08231 + tps: 158417.41417 + hps: 2977.79676 } } dps_results: { diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results index 24b0591d2a..ed49fcef66 100644 --- a/sim/warlock/demonology/TestDemonology.results +++ b/sim/warlock/demonology/TestDemonology.results @@ -1664,8 +1664,8 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 232865.01554 - tps: 146258.04703 + dps: 229787.2954 + tps: 144859.85488 } } dps_results: { @@ -2105,8 +2105,8 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-Thok'sTailTip-105609" value: { - dps: 208680.27266 - tps: 132007.84469 + dps: 207100.77529 + tps: 131438.43266 } } dps_results: { diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results index 5da22130eb..2ceacf597f 100644 --- a/sim/warlock/destruction/TestDestruction.results +++ b/sim/warlock/destruction/TestDestruction.results @@ -1881,9 +1881,9 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 240318.70279 - tps: 185666.55839 - hps: 1394.37779 + dps: 241904.55079 + tps: 186971.65924 + hps: 1404.3813 } } dps_results: { @@ -2385,9 +2385,9 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-Thok'sTailTip-105609" value: { - dps: 212462.71767 - tps: 163353.31015 - hps: 1400.49105 + dps: 214359.64522 + tps: 165152.6198 + hps: 1401.0468 } } dps_results: { diff --git a/sim/warrior/arms/TestArms.results b/sim/warrior/arms/TestArms.results index 9bff720c7d..66629619b8 100644 --- a/sim/warrior/arms/TestArms.results +++ b/sim/warrior/arms/TestArms.results @@ -355,8 +355,8 @@ dps_results: { dps_results: { key: "TestArms-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 232571.48261 - tps: 159716.09923 + dps: 231746.41703 + tps: 159024.48529 } } dps_results: { @@ -460,8 +460,8 @@ dps_results: { dps_results: { key: "TestArms-AllItems-Thok'sTailTip-105609" value: { - dps: 252332.21278 - tps: 171442.17268 + dps: 251482.61726 + tps: 170777.6613 } } dps_results: { diff --git a/sim/warrior/fury/TestFury.results b/sim/warrior/fury/TestFury.results index 80a9662f6f..bb26786d4c 100644 --- a/sim/warrior/fury/TestFury.results +++ b/sim/warrior/fury/TestFury.results @@ -355,8 +355,8 @@ dps_results: { dps_results: { key: "TestFury-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 249884.9906 - tps: 157752.34332 + dps: 251667.16291 + tps: 159103.42497 } } dps_results: { @@ -467,8 +467,8 @@ dps_results: { dps_results: { key: "TestFury-AllItems-Thok'sTailTip-105609" value: { - dps: 265714.70492 - tps: 167225.20627 + dps: 267534.46546 + tps: 168668.28729 } } dps_results: { diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results index 2fdd050940..3404a1189d 100644 --- a/sim/warrior/protection/TestProtectionWarrior.results +++ b/sim/warrior/protection/TestProtectionWarrior.results @@ -1938,8 +1938,8 @@ dps_results: { dps_results: { key: "TestProtectionWarrior-AllItems-PurifiedBindingsofImmerseus-105422" value: { - dps: 251484.5971 - tps: 1.46201264337e+06 + dps: 251713.51184 + tps: 1.46327111483e+06 dtps: 43867.17469 } } @@ -2410,8 +2410,8 @@ dps_results: { dps_results: { key: "TestProtectionWarrior-AllItems-Thok'sTailTip-105609" value: { - dps: 269872.11398 - tps: 1.56038644942e+06 + dps: 270124.03024 + tps: 1.56176340022e+06 dtps: 41893.97196 } }