Paladin reorganise metrics display

sim/paladin/consecration.go

@@ -45,9 +45,11 @@ func (paladin *Paladin) registerConsecrationSpell() {
  })
 
  paladin.Consecration = paladin.RegisterSpell(core.SpellConfig{
- ActionID: actionID,
- SpellSchool: core.SpellSchoolHoly,
- ProcMask: core.ProcMaskEmpty,
+ ActionID: actionID,
+ SpellSchool: core.SpellSchoolHoly,
+ ProcMask: core.ProcMaskEmpty,
+ Flags: core.SpellFlagMeleeMetrics,
+
  ResourceType: stats.Mana,
  BaseCost: baseCost,
 

sim/paladin/exorcism.go

@@ -13,9 +13,11 @@ func (paladin *Paladin) registerExorcismSpell() {
  baseCost := paladin.BaseMana * 0.08 * (1 - 0.02*float64(paladin.Talents.Benediction))
 
  paladin.Exorcism = paladin.RegisterSpell(core.SpellConfig{
- ActionID: core.ActionID{SpellID: 48801},
- SpellSchool: core.SpellSchoolHoly,
- ProcMask: core.ProcMaskSpellDamage,
+ ActionID: core.ActionID{SpellID: 48801},
+ SpellSchool: core.SpellSchoolHoly,
+ ProcMask: core.ProcMaskSpellDamage,
+ Flags: core.SpellFlagMeleeMetrics,
+
  ResourceType: stats.Mana,
  BaseCost: baseCost,
 

sim/paladin/holy_wrath.go

@@ -14,9 +14,11 @@ func (paladin *Paladin) registerHolyWrathSpell() {
  results := make([]*core.SpellResult, len(paladin.Env.Encounter.Targets))
 
  paladin.HolyWrath = paladin.RegisterSpell(core.SpellConfig{
- ActionID: core.ActionID{SpellID: 48817},
- SpellSchool: core.SpellSchoolHoly,
- ProcMask: core.ProcMaskSpellDamage,
+ ActionID: core.ActionID{SpellID: 48817},
+ SpellSchool: core.SpellSchoolHoly,
+ ProcMask: core.ProcMaskSpellDamage,
+ Flags: core.SpellFlagMeleeMetrics,
+
  ResourceType: stats.Mana,
  BaseCost: baseCost,
 

sim/paladin/sov.go

@@ -45,7 +45,6 @@ func (paladin *Paladin) registerSealOfVengeanceSpellAndAura() {
  ActionID: core.ActionID{SpellID: 31803, Tag: 1}, // Holy Vengeance.
  SpellSchool: core.SpellSchoolHoly,
  ProcMask: core.ProcMaskEmpty, // Might need to be changed later if SOV secondary rolls can proc other things.
- Flags: core.SpellFlagMeleeMetrics,
 
  ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
  // Does no damage, just applies dot and rolls.
@@ -203,6 +202,7 @@ func (paladin *Paladin) createSealOfVengeanceDot(target *core.Unit) *core.Dot {
  ActionID: dotActionID,
  SpellSchool: core.SpellSchoolHoly,
  ProcMask: core.ProcMaskSpellDamage,
+ Flags: core.SpellFlagMeleeMetrics,
 
  DamageMultiplier: 1 *
  (1 + paladin.getItemSetLightswornBattlegearBonus4() + paladin.getItemSetAegisPlateBonus2() + paladin.getTalentSealsOfThePureBonus()),

sim/paladin/talents.go

@@ -489,46 +489,51 @@ func (paladin *Paladin) applyRighteousVengeance() {
  dotActionID := core.ActionID{SpellID: 61840} // Righteous Vengeance
 
  rvDots := make([]*core.Dot, paladin.Env.GetNumTargets())
- rvSpell := paladin.RegisterSpell(core.SpellConfig{
- ActionID: dotActionID,
+ rvProc := paladin.RegisterSpell(core.SpellConfig{
+ ActionID: dotActionID.WithTag(1),
  SpellSchool: core.SpellSchoolHoly,
  ProcMask: core.ProcMaskEmpty,
- Flags: core.SpellFlagNoOnCastComplete | core.SpellFlagMeleeMetrics | core.SpellFlagIgnoreModifiers,
-
- DamageMultiplier: 1,
- CritMultiplier: paladin.MeleeCritMultiplier(),
- ThreatMultiplier: 1,
+ Flags: core.SpellFlagNoOnCastComplete | core.SpellFlagIgnoreModifiers,
 
  ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
  rvDots[target.Index].ApplyOrReset(sim)
  spell.CalcAndDealOutcome(sim, target, spell.OutcomeAlwaysHit)
  },
  })
 
- onTick := func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
- dot.CalcAndDealPeriodicSnapshotDamage(sim, target, dot.OutcomeTick)
- }
- if paladin.HasTuralyonsOrLiadrinsBattlegear2Pc {
- onTick = func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
- dot.CalcAndDealPeriodicSnapshotDamage(sim, target, dot.OutcomeTickPhysicalCrit)
- }
- }
+ rvSpell := paladin.RegisterSpell(core.SpellConfig{
+ ActionID: dotActionID.WithTag(2),
+ SpellSchool: core.SpellSchoolHoly,
+ ProcMask: core.ProcMaskEmpty,
+ Flags: core.SpellFlagNoOnCastComplete | core.SpellFlagMeleeMetrics | core.SpellFlagIgnoreModifiers,
+
+ DamageMultiplier: 1,
+ CritMultiplier: paladin.MeleeCritMultiplier(),
+ ThreatMultiplier: 1,
+ })
 
  for i := range rvDots {
  target := paladin.Env.GetTargetUnit(int32(i))
  rvDots[i] = core.NewDot(core.Dot{
  Spell: rvSpell,
  Aura: target.RegisterAura(core.Aura{
- Label: "Righteous Vengeance (DoT) - " + strconv.Itoa(int(paladin.Index)) + " - " + strconv.Itoa(int(target.Index)),
+ Label: "Righteous Vengeance (DoT) - " + strconv.Itoa(int(paladin.Index)),
  ActionID: rvSpell.ActionID,
  }),
  NumberOfTicks: 4,
  TickLength: time.Second * 2,
 
  SnapshotAttackerMultiplier: 1,
 
- OnTick: onTick,
+ OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
+ if paladin.HasTuralyonsOrLiadrinsBattlegear2Pc {
+ dot.CalcAndDealPeriodicSnapshotDamage(sim, target, dot.Spell.OutcomeMeleeSpecialCritOnly)
+ } else {
+ dot.CalcAndDealPeriodicSnapshotDamage(sim, target, dot.Spell.OutcomeAlwaysHit)
+ }
+ },
  })
+
  }
 
  paladin.RegisterAura(core.Aura{
@@ -555,7 +560,7 @@ func (paladin *Paladin) applyRighteousVengeance() {
  newDamage := result.Damage * (0.10 * float64(paladin.Talents.RighteousVengeance))
 
  dot.SnapshotBaseDamage = (outstandingDamage + newDamage) / float64(dot.NumberOfTicks)
- rvSpell.Cast(sim, result.Target)
+ rvProc.Cast(sim, result.Target)
  },
  })
 }

ui/core/proto_utils/action_id.ts

@@ -257,6 +257,13 @@ export class ActionId {
  name += ' (DoT)'
  }
  break;
+ case 'Righteous Vengeance':
+ if (this.tag == 1) {
+ name += ' (Application)'
+ } else if (this.tag == 2) {
+ name += ' (DoT)'
+ }
+ break;
  case 'Holy Shield':
  if (this.tag == 1) {
  name += ' (Proc)';