Merge pull request #986 from hillerstorm/ret-pala

[Ret] Combine Glyph of Exorcism within Exorcism in damage breakdown
wowsims · Aug 28, 2024 · 8921534 · 8921534
2 parents 6dcace6 + 4647f36
commit 8921534
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/sim/paladin/glyphs.go b/sim/paladin/glyphs.go
@@ -88,10 +88,11 @@ func registerGlyphOfExorcism(paladin *Paladin) {
 		core.CalcScalingSpellAverageEffect(proto.Class_ClassPaladin, 2.663)
 
 	glyphOfExorcismDot := paladin.RegisterSpell(core.SpellConfig{
-		ActionID:       core.ActionID{SpellID: 54934},
+		ActionID:       core.ActionID{SpellID: 879}.WithTag(3), // actual 54934
 		SpellSchool:    core.SpellSchoolHoly,
 		ProcMask:       core.ProcMaskSpellDamage,
 		ClassSpellMask: SpellMaskGlyphOfExorcism,
+		Flags:          core.SpellFlagPassiveSpell,
 
 		DamageMultiplier: 1,
 		CritMultiplier:   paladin.DefaultSpellCritMultiplier(),

diff --git a/ui/core/proto_utils/action_id.ts b/ui/core/proto_utils/action_id.ts
@@ -412,12 +412,15 @@ export class ActionId {
 				}
 				break;
 			case 'Censure':
-				if (this.tag == 1) {
-					name += ' (Application)';
-				} else if (this.tag == 2) {
+				if (this.tag == 2) {
 					name += ' (DoT)';
 				}
 				break;
+			case 'Exorcism':
+				if (this.tag === 3) {
+					name = 'Glyph of Exorcism (DoT)';
+				}
+				break;
 			// For targetted buffs, tag is the source player's raid index or -1 if none.
 			case 'Bloodlust':
 			case 'Ferocious Inspiration':
@@ -773,6 +776,7 @@ const spellIdTooltipOverrides: Map<string, ActionIdOverride> = new Map([
 	[JSON.stringify({ spellId: 56641, tag: 3 }), { spellId: 99058 }], // Hunter - T12 2P Flaming Arrow - Steady shot
 	[JSON.stringify({ spellId: 35395, tag: 3 }), { spellId: 99092 }], // Paladin - T12 2P Flames of the Faithful
 	[JSON.stringify({ spellId: 53600, tag: 3 }), { spellId: 99075 }], // Paladin - T12 2P Righteous Flames
+	[JSON.stringify({ spellId: 879, tag: 3 }), { spellId: 54934 }], // Paladin - Glyph of Exorcism
 ]);
 
 export const defaultTargetIcon = 'https://wow.zamimg.com/images/wow/icons/large/spell_shadow_metamorphosis.jpg';