From 0cbbfe1f07a86d1be36fe9086d3234777f8ffcae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= Date: Tue, 24 Sep 2024 11:27:45 +0200 Subject: [PATCH] Simplify Scales of Life to always be usable for real this time --- sim/common/cata/other_effects.go | 22 ------------------- sim/death_knight/frost/TestFrost.results | 4 ++-- sim/death_knight/unholy/TestUnholy.results | 4 ++-- sim/druid/balance/TestBalance.results | 10 +++++---- sim/druid/feral/TestFeral.results | 10 +++++---- sim/druid/guardian/TestGuardian.results | 2 ++ sim/hunter/beast_mastery/TestBM.results | 2 ++ sim/hunter/marksmanship/TestMM.results | 2 ++ sim/hunter/survival/TestSV.results | 2 ++ sim/mage/arcane/TestArcane.results | 10 +++++---- sim/mage/fire/TestFire.results | 10 +++++---- .../retribution/TestRetribution.results | 2 ++ sim/priest/shadow/TestShadow.results | 10 +++++---- .../assassination/TestAssassination.results | 2 ++ sim/rogue/combat/TestCombat.results | 2 ++ sim/rogue/subtlety/TestSubtlety.results | 2 ++ sim/shaman/elemental/TestElemental.results | 10 +++++---- .../enhancement/TestEnhancement.results | 2 ++ sim/warlock/affliction/TestAffliction.results | 10 +++++---- sim/warlock/demonology/TestDemonology.results | 10 +++++---- .../destruction/TestDestruction.results | 10 +++++---- sim/warrior/arms/TestArms.results | 2 ++ sim/warrior/fury/TestFury.results | 2 ++ 23 files changed, 80 insertions(+), 62 deletions(-) diff --git a/sim/common/cata/other_effects.go b/sim/common/cata/other_effects.go index c86c29fd9c..d89bffccaa 100644 --- a/sim/common/cata/other_effects.go +++ b/sim/common/cata/other_effects.go @@ -790,23 +790,6 @@ func init() { core.NewItemEffect(scalesOfLifeItemID, func(agent core.Agent) { character := agent.GetCharacter() - weightOfAFeather := character.RegisterAura(core.Aura{ - Label: "Weight of a Feather", - ActionID: core.ActionID{SpellID: core.TernaryInt32(heroic, 97117, 96879)}, - Duration: time.Second * 20, - }) - - core.MakePermanent(character.GetOrRegisterAura(core.Aura{ - Label: "Scales of Life Trigger", - OnHealTaken: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if result.Damage <= 0 { - return - } - - weightOfAFeather.Activate(sim) - }, - })) - // Assuming full stack since sim doesn't track overhealing maxHeal := core.TernaryFloat64(heroic, 19283, 17095) trinketSpell := character.RegisterSpell(core.SpellConfig{ @@ -830,13 +813,8 @@ func init() { CritMultiplier: character.DefaultSpellCritMultiplier(), ThreatMultiplier: 1, - ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool { - return weightOfAFeather.IsActive() - }, - ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { spell.CalcAndDealHealing(sim, spell.Unit, maxHeal, spell.OutcomeHealingCrit) - weightOfAFeather.Deactivate(sim) }, }) diff --git a/sim/death_knight/frost/TestFrost.results b/sim/death_knight/frost/TestFrost.results index 17437406b3..9b1f093c2d 100644 --- a/sim/death_knight/frost/TestFrost.results +++ b/sim/death_knight/frost/TestFrost.results @@ -1168,7 +1168,7 @@ dps_results: { value: { dps: 20745.1798 tps: 18901.58265 - hps: 531.88082 + hps: 562.31529 } } dps_results: { @@ -1176,7 +1176,7 @@ dps_results: { value: { dps: 20745.1798 tps: 18901.58265 - hps: 568.96024 + hps: 603.64838 } } dps_results: { diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results index 98aeb21974..eab5f9ff23 100644 --- a/sim/death_knight/unholy/TestUnholy.results +++ b/sim/death_knight/unholy/TestUnholy.results @@ -1168,7 +1168,7 @@ dps_results: { value: { dps: 30574.59353 tps: 22630.58823 - hps: 879.08437 + hps: 881.49104 } } dps_results: { @@ -1176,7 +1176,7 @@ dps_results: { value: { dps: 30574.59353 tps: 22630.58823 - hps: 921.60089 + hps: 924.58725 } } dps_results: { diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 41428a1899..0cca579d4d 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -1033,15 +1033,17 @@ dps_results: { dps_results: { key: "TestBalance-AllItems-ScalesofLife-68915" value: { - dps: 26258.64645 - tps: 26265.2223 + dps: 26257.45085 + tps: 26264.04343 + hps: 301.94329 } } dps_results: { key: "TestBalance-AllItems-ScalesofLife-69109" value: { - dps: 26258.64645 - tps: 26265.2223 + dps: 26257.45085 + tps: 26264.04343 + hps: 340.5892 } } dps_results: { diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index e0ae613866..068b5b40eb 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -1026,15 +1026,17 @@ dps_results: { dps_results: { key: "TestFeral-AllItems-ScalesofLife-68915" value: { - dps: 25439.58027 - tps: 36362.5747 + dps: 25486.94855 + tps: 36344.22563 + hps: 309.23259 } } dps_results: { key: "TestFeral-AllItems-ScalesofLife-69109" value: { - dps: 25439.58027 - tps: 36362.5747 + dps: 25486.94855 + tps: 36344.22563 + hps: 348.81147 } } dps_results: { diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results index 620a8ae73f..4e43ef38ae 100644 --- a/sim/druid/guardian/TestGuardian.results +++ b/sim/druid/guardian/TestGuardian.results @@ -1028,6 +1028,7 @@ dps_results: { value: { dps: 7800.93141 tps: 39067.10435 + hps: 315.5737 } } dps_results: { @@ -1035,6 +1036,7 @@ dps_results: { value: { dps: 7800.93141 tps: 39067.10435 + hps: 355.96418 } } dps_results: { diff --git a/sim/hunter/beast_mastery/TestBM.results b/sim/hunter/beast_mastery/TestBM.results index 99b3b4b56f..0958cc13a8 100644 --- a/sim/hunter/beast_mastery/TestBM.results +++ b/sim/hunter/beast_mastery/TestBM.results @@ -1056,6 +1056,7 @@ dps_results: { value: { dps: 20882.39663 tps: 17632.35153 + hps: 344.15369 } } dps_results: { @@ -1063,6 +1064,7 @@ dps_results: { value: { dps: 20882.39663 tps: 17632.35153 + hps: 388.20214 } } dps_results: { diff --git a/sim/hunter/marksmanship/TestMM.results b/sim/hunter/marksmanship/TestMM.results index b216ee0c46..d9ce3e79ff 100644 --- a/sim/hunter/marksmanship/TestMM.results +++ b/sim/hunter/marksmanship/TestMM.results @@ -1056,6 +1056,7 @@ dps_results: { value: { dps: 20804.36191 tps: 18630.89211 + hps: 312.86699 } } dps_results: { @@ -1063,6 +1064,7 @@ dps_results: { value: { dps: 20804.36191 tps: 18630.89211 + hps: 352.91104 } } dps_results: { diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results index 4c7f105d9c..0ea928f4ed 100644 --- a/sim/hunter/survival/TestSV.results +++ b/sim/hunter/survival/TestSV.results @@ -1056,6 +1056,7 @@ dps_results: { value: { dps: 24461.81628 tps: 22098.30071 + hps: 312.86699 } } dps_results: { @@ -1063,6 +1064,7 @@ dps_results: { value: { dps: 24461.81628 tps: 22098.30071 + hps: 352.91104 } } dps_results: { diff --git a/sim/mage/arcane/TestArcane.results b/sim/mage/arcane/TestArcane.results index c9619c3f42..ee199d2526 100644 --- a/sim/mage/arcane/TestArcane.results +++ b/sim/mage/arcane/TestArcane.results @@ -1012,15 +1012,17 @@ dps_results: { dps_results: { key: "TestArcane-AllItems-ScalesofLife-68915" value: { - dps: 27584.0859 - tps: 27718.80004 + dps: 27496.01335 + tps: 27642.23324 + hps: 444.96343 } } dps_results: { key: "TestArcane-AllItems-ScalesofLife-69109" value: { - dps: 27584.0859 - tps: 27718.80004 + dps: 27496.01335 + tps: 27642.23324 + hps: 501.91458 } } dps_results: { diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results index 6bc687832a..75270d4014 100644 --- a/sim/mage/fire/TestFire.results +++ b/sim/mage/fire/TestFire.results @@ -1012,15 +1012,17 @@ dps_results: { dps_results: { key: "TestFire-AllItems-ScalesofLife-68915" value: { - dps: 27980.06567 - tps: 27497.51044 + dps: 27984.37289 + tps: 27502.25287 + hps: 360.05275 } } dps_results: { key: "TestFire-AllItems-ScalesofLife-69109" value: { - dps: 27980.06567 - tps: 27497.51044 + dps: 27984.37289 + tps: 27502.25287 + hps: 406.13614 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index c6458caf3e..796a7cde07 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -1035,6 +1035,7 @@ dps_results: { value: { dps: 29056.27505 tps: 29071.6183 + hps: 246.45862 } } dps_results: { @@ -1042,6 +1043,7 @@ dps_results: { value: { dps: 29056.27505 tps: 29071.6183 + hps: 278.00301 } } dps_results: { diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index 0acbff96e0..3e7cf2e89c 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -1040,15 +1040,17 @@ dps_results: { dps_results: { key: "TestShadow-AllItems-ScalesofLife-68915" value: { - dps: 27699.74157 - tps: 25794.72689 + dps: 27699.19405 + tps: 25794.00843 + hps: 363.36847 } } dps_results: { key: "TestShadow-AllItems-ScalesofLife-69109" value: { - dps: 27699.74157 - tps: 25794.72689 + dps: 27699.19405 + tps: 25794.00843 + hps: 409.87623 } } dps_results: { diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results index c5ae542ec1..e661830d90 100644 --- a/sim/rogue/assassination/TestAssassination.results +++ b/sim/rogue/assassination/TestAssassination.results @@ -1037,6 +1037,7 @@ dps_results: { value: { dps: 27198.10171 tps: 19310.65222 + hps: 291.12785 } } dps_results: { @@ -1044,6 +1045,7 @@ dps_results: { value: { dps: 27198.10171 tps: 19310.65222 + hps: 328.38949 } } dps_results: { diff --git a/sim/rogue/combat/TestCombat.results b/sim/rogue/combat/TestCombat.results index 41a8b42009..81f63c6f63 100644 --- a/sim/rogue/combat/TestCombat.results +++ b/sim/rogue/combat/TestCombat.results @@ -1028,6 +1028,7 @@ dps_results: { value: { dps: 27844.47743 tps: 19769.57898 + hps: 291.12785 } } dps_results: { @@ -1035,6 +1036,7 @@ dps_results: { value: { dps: 27844.47743 tps: 19769.57898 + hps: 328.38949 } } dps_results: { diff --git a/sim/rogue/subtlety/TestSubtlety.results b/sim/rogue/subtlety/TestSubtlety.results index ebbd36d059..c4258a4e48 100644 --- a/sim/rogue/subtlety/TestSubtlety.results +++ b/sim/rogue/subtlety/TestSubtlety.results @@ -1000,6 +1000,7 @@ dps_results: { value: { dps: 22185.24075 tps: 15751.52093 + hps: 309.7614 } } dps_results: { @@ -1007,6 +1008,7 @@ dps_results: { value: { dps: 22185.24075 tps: 15751.52093 + hps: 349.40796 } } dps_results: { diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index 5118695c26..8b9f38d05d 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1033,15 +1033,17 @@ dps_results: { dps_results: { key: "TestElemental-AllItems-ScalesofLife-68915" value: { - dps: 30105.59576 - tps: 581.33731 + dps: 30116.72618 + tps: 580.80155 + hps: 320.63097 } } dps_results: { key: "TestElemental-AllItems-ScalesofLife-69109" value: { - dps: 30105.59576 - tps: 581.33731 + dps: 30116.72618 + tps: 580.80155 + hps: 361.66873 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 4c12aaeb02..a46a148133 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1035,6 +1035,7 @@ dps_results: { value: { dps: 27910.67917 tps: 18567.02518 + hps: 315.97258 } } dps_results: { @@ -1042,6 +1043,7 @@ dps_results: { value: { dps: 27910.67917 tps: 18567.02518 + hps: 356.41412 } } dps_results: { diff --git a/sim/warlock/affliction/TestAffliction.results b/sim/warlock/affliction/TestAffliction.results index 789e31708d..a1f6574f0f 100644 --- a/sim/warlock/affliction/TestAffliction.results +++ b/sim/warlock/affliction/TestAffliction.results @@ -998,15 +998,17 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-ScalesofLife-68915" value: { - dps: 26625.26751 - tps: 19448.52951 + dps: 26641.68512 + tps: 19521.80503 + hps: 354.04187 } } dps_results: { key: "TestAffliction-AllItems-ScalesofLife-69109" value: { - dps: 26639.05967 - tps: 19476.99847 + dps: 26640.35472 + tps: 19530.31362 + hps: 399.35591 } } dps_results: { diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results index 65140f31c2..eaa7eb50ed 100644 --- a/sim/warlock/demonology/TestDemonology.results +++ b/sim/warlock/demonology/TestDemonology.results @@ -998,15 +998,17 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-ScalesofLife-68915" value: { - dps: 27925.65786 - tps: 14230.85394 + dps: 27924.88434 + tps: 14239.28694 + hps: 351.03642 } } dps_results: { key: "TestDemonology-AllItems-ScalesofLife-69109" value: { - dps: 27925.93816 - tps: 14231.32287 + dps: 27925.16463 + tps: 14239.75588 + hps: 395.9658 } } dps_results: { diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results index 361405402b..2823fe3dfd 100644 --- a/sim/warlock/destruction/TestDestruction.results +++ b/sim/warlock/destruction/TestDestruction.results @@ -998,15 +998,17 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-ScalesofLife-68915" value: { - dps: 27353.05069 - tps: 17742.37066 + dps: 27402.1002 + tps: 17790.10306 + hps: 351.03642 } } dps_results: { key: "TestDestruction-AllItems-ScalesofLife-69109" value: { - dps: 27353.05069 - tps: 17742.58565 + dps: 27402.1002 + tps: 17790.35112 + hps: 395.9658 } } dps_results: { diff --git a/sim/warrior/arms/TestArms.results b/sim/warrior/arms/TestArms.results index 97fa0517c2..f881f2afac 100644 --- a/sim/warrior/arms/TestArms.results +++ b/sim/warrior/arms/TestArms.results @@ -1049,6 +1049,7 @@ dps_results: { value: { dps: 31488.55325 tps: 20471.84565 + hps: 315.97258 } } dps_results: { @@ -1056,6 +1057,7 @@ dps_results: { value: { dps: 31488.55325 tps: 20471.84565 + hps: 356.41412 } } dps_results: { diff --git a/sim/warrior/fury/TestFury.results b/sim/warrior/fury/TestFury.results index 6f6ae4f192..89096d5a58 100644 --- a/sim/warrior/fury/TestFury.results +++ b/sim/warrior/fury/TestFury.results @@ -1070,6 +1070,7 @@ dps_results: { value: { dps: 28663.09175 tps: 23757.76147 + hps: 319.07818 } } dps_results: { @@ -1077,6 +1078,7 @@ dps_results: { value: { dps: 28663.09175 tps: 23757.76147 + hps: 359.9172 } } dps_results: {