Merge pull request #1107 from hillerstorm/ret_stuff

wowsims · Oct 18, 2024 · 24e8ea0 · 24e8ea0
2 parents e25effa + d124338
commit 24e8ea0
Show file tree

Hide file tree

Showing 16 changed files with 905 additions and 771 deletions.
diff --git a/sim/paladin/exorcism.go b/sim/paladin/exorcism.go
@@ -42,7 +42,7 @@ func (paladin *Paladin) registerExorcism() {
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := sim.Roll(exorcismMinDamage, exorcismMaxDamage) +
+			baseDamage := sim.RollWithLabel(exorcismMinDamage, exorcismMaxDamage, "Exorcism") +
 				0.344*max(spell.SpellPower(), spell.MeleeAttackPower())
 
 			bonusCritPercent := core.TernaryFloat64(

diff --git a/sim/paladin/guardian_of_ancient_kings.go b/sim/paladin/guardian_of_ancient_kings.go
@@ -170,7 +170,7 @@ func (paladin *Paladin) registerRetributionGuardian(duration time.Duration, snap
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := sim.Roll(ancientFuryMinDamage, ancientFuryMaxDamage) +
+			baseDamage := sim.RollWithLabel(ancientFuryMinDamage, ancientFuryMaxDamage, "Ancient Fury") +
 				0.061*spell.SpellPower()
 
 			// Deals X Holy damage per application of Ancient Power,

diff --git a/sim/paladin/hammer_of_wrath.go b/sim/paladin/hammer_of_wrath.go
@@ -44,7 +44,7 @@ func (paladin *Paladin) registerHammerOfWrathSpell() {
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := sim.Roll(howMinDamage, howMaxDamage) +
+			baseDamage := sim.RollWithLabel(howMinDamage, howMaxDamage, "Hammer of Wrath") +
 				0.117*spell.SpellPower() +
 				0.39*spell.MeleeAttackPower()
 

diff --git a/sim/paladin/judgement.go b/sim/paladin/judgement.go
@@ -7,8 +7,7 @@ import (
 )
 
 func (paladin *Paladin) registerJudgement() {
-	actionId := core.ActionID{SpellID: 20271}
-	hpMetrics := paladin.NewHolyPowerMetrics(actionId)
+	hpMetrics := paladin.NewHolyPowerMetrics(core.ActionID{SpellID: 105767})
 	hasT132pc := paladin.HasSetBonus(ItemSetBattleplateOfRadiantGlory, 2)
 
 	paladin.RegisterSpell(core.SpellConfig{
@@ -41,7 +40,16 @@ func (paladin *Paladin) registerJudgement() {
 			if result.Landed() {
 				paladin.CurrentJudgement.Cast(sim, target)
 				if hasT132pc {
-					paladin.GainHolyPower(sim, 1, hpMetrics)
+					// TODO: Measure the aura update delay distribution on PTR.
+					waitTime := time.Millisecond * time.Duration(sim.RollWithLabel(150, 750, "T13 2pc"))
+					core.StartDelayedAction(sim, core.DelayedActionOptions{
+						DoAt:     sim.CurrentTime + waitTime,
+						Priority: core.ActionPriorityRegen,
+
+						OnAction: func(_ *core.Simulation) {
+							paladin.GainHolyPower(sim, 1, hpMetrics)
+						},
+					})
 				}
 			}
 		},

diff --git a/sim/paladin/protection/avengers_shield.go b/sim/paladin/protection/avengers_shield.go
@@ -48,7 +48,7 @@ func (prot *ProtectionPaladin) registerAvengersShieldSpell() {
 			constBaseDamage := 0.21*spell.SpellPower() + 0.419*spell.MeleeAttackPower()
 
 			for idx := int32(0); idx < numTargets; idx++ {
-				baseDamage := constBaseDamage + sim.Roll(asMinDamage, asMaxDamage)
+				baseDamage := constBaseDamage + sim.RollWithLabel(asMinDamage, asMaxDamage, "Avengers Shield")
 
 				currentTarget := sim.Environment.GetTargetUnit(idx)
 				results[idx] = spell.CalcDamage(sim, currentTarget, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit)