Merge pull request #1053 from hillerstorm/fix_scales_of_life

Simplify Scales of Life to always be usable for real this time
wowsims · Sep 24, 2024 · cc6ad23 · cc6ad23
2 parents d5ead78 + 0cbbfe1
commit cc6ad23
Show file tree

Hide file tree

Showing 23 changed files with 80 additions and 62 deletions.
diff --git 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
@@ -1168,15 +1168,15 @@ dps_results: {
  value: {
   dps: 20745.1798
   tps: 18901.58265
-  hps: 531.88082
+  hps: 562.31529
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ScalesofLife-69109"
  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
@@ -1168,15 +1168,15 @@ dps_results: {
  value: {
   dps: 30574.59353
   tps: 22630.58823
-  hps: 879.08437
+  hps: 881.49104
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ScalesofLife-69109"
  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
@@ -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
@@ -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
@@ -1028,13 +1028,15 @@ dps_results: {
  value: {
   dps: 7800.93141
   tps: 39067.10435
+  hps: 315.5737
  }
 }
 dps_results: {
  key: "TestGuardian-AllItems-ScalesofLife-69109"
  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
@@ -1056,13 +1056,15 @@ dps_results: {
  value: {
   dps: 20882.39663
   tps: 17632.35153
+  hps: 344.15369
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ScalesofLife-69109"
  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
@@ -1056,13 +1056,15 @@ dps_results: {
  value: {
   dps: 20804.36191
   tps: 18630.89211
+  hps: 312.86699
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ScalesofLife-69109"
  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
@@ -1056,13 +1056,15 @@ dps_results: {
  value: {
   dps: 24461.81628
   tps: 22098.30071
+  hps: 312.86699
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ScalesofLife-69109"
  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
@@ -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
@@ -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
@@ -1035,13 +1035,15 @@ dps_results: {
  value: {
   dps: 29056.27505
   tps: 29071.6183
+  hps: 246.45862
  }
 }
 dps_results: {
  key: "TestRetribution-AllItems-ScalesofLife-69109"
  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
@@ -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
@@ -1037,13 +1037,15 @@ dps_results: {
  value: {
   dps: 27198.10171
   tps: 19310.65222
+  hps: 291.12785
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ScalesofLife-69109"
  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
@@ -1028,13 +1028,15 @@ dps_results: {
  value: {
   dps: 27844.47743
   tps: 19769.57898
+  hps: 291.12785
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ScalesofLife-69109"
  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
@@ -1000,13 +1000,15 @@ dps_results: {
  value: {
   dps: 22185.24075
   tps: 15751.52093
+  hps: 309.7614
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ScalesofLife-69109"
  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
@@ -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
@@ -1035,13 +1035,15 @@ dps_results: {
  value: {
   dps: 27910.67917
   tps: 18567.02518
+  hps: 315.97258
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-ScalesofLife-69109"
  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
@@ -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
@@ -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: {