Skip to content

Commit 6ab1d46

Browse files
committed
mercy for shaman now 2 stack instead of 4
1 parent 2e8fa22 commit 6ab1d46

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

sim/common/sod/item_effects/phase_8.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ func init() {
620620

621621
// https://www.wowhead.com/classic-ptr/item=240854/mercy
622622
// Hunter - Equip: Chance on hit to cause your next 2 instances of damage from your pet's special abilities to be increased by 20%. Lasts 12 sec.
623-
// Shaman - Equip: Chance on hit to cause your next 4 instances of Fire damage are increased by 20%. Lasts 12 sec. (100ms cooldown)
623+
// Shaman - Equip: Chance on hit to cause your next 2 instances of Fire damage are increased by 20%. Lasts 12 sec. (100ms cooldown)
624624
// Warrior - Equip: Chance on hit to cause your next 2 instances of Whirlwind damage to be increased by 20%. Lasts 12 sec.
625625
core.NewItemEffect(Mercy, func(agent core.Agent) {
626626
character := agent.GetCharacter()

sim/shaman/items.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ func init() {
625625

626626
const MercyDamageBonus = 1.20
627627

628-
// Equip: Chance on hit to cause your next 4 instances of Fire damage are increased by 20%. Lasts 12 sec. (100ms cooldown)
628+
// Equip: Chance on hit to cause your next 2 instances of Fire damage are increased by 20%. Lasts 12 sec. (100ms cooldown)
629629
// Confirmed PPM 1.0
630630
// Note: Not listed but confirmed by Zirene, does not proc from or benefit Flametongue Weapon procs
631631
func (shaman *Shaman) ApplyMercyShamanEffect(aura *core.Aura) {
@@ -640,7 +640,7 @@ func (shaman *Shaman) ApplyMercyShamanEffect(aura *core.Aura) {
640640
ActionID: core.ActionID{SpellID: 1231498},
641641
Label: "Mercy by Fire",
642642
Duration: time.Second * 12,
643-
MaxStacks: 4,
643+
MaxStacks: 2,
644644
OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
645645
if !spell.Matches(ClassSpellMask_ShamanFlametongueProc) && spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolFire) && result.Landed() && icd.IsReady(sim) {
646646
icd.Use(sim)

0 commit comments

Comments
 (0)