From f5d40469039f8e4ddf66fa602e78749435ef3793 Mon Sep 17 00:00:00 2001
From: John Gray <john.m.gray@wmich.edu>
Date: Sun, 21 Jul 2019 11:51:16 -0400
Subject: [PATCH] added unit test for Repeated Reverberation + add fix for
 loyalty counter (issue #5882)

---
 .../mage/cards/r/RepeatedReverberation.java   |  5 +-
 .../single/RepeatedReverberationTest.java     | 88 +++++++++++++++++++
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/single/RepeatedReverberationTest.java

diff --git a/Mage.Sets/src/mage/cards/r/RepeatedReverberation.java b/Mage.Sets/src/mage/cards/r/RepeatedReverberation.java
index 3a9b5a4ec5a..a587f68add3 100644
--- a/Mage.Sets/src/mage/cards/r/RepeatedReverberation.java
+++ b/Mage.Sets/src/mage/cards/r/RepeatedReverberation.java
@@ -60,7 +60,8 @@ class RepeatedReverberationTriggeredAbility extends DelayedTriggeredAbility {
 
     @Override
     public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.SPELL_CAST;
+        return event.getType() == GameEvent.EventType.SPELL_CAST
+                || event.getType() == GameEvent.EventType.ACTIVATED_ABILITY;
     }
 
     @Override
@@ -117,7 +118,7 @@ class RepeatedReverberationEffect extends OneShotEffect {
             return false;
         }
         Player controller = game.getPlayer(source.getControllerId());
-        Permanent sourcePermanent = game.getPermanent(source.getSourceId());
+        Permanent sourcePermanent = game.getPermanent(stackAbility.getStackAbility().getSourceId());
         if (controller == null || sourcePermanent == null) {
             return false;
         }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/RepeatedReverberationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/RepeatedReverberationTest.java
new file mode 100644
index 00000000000..1d350858d16
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/RepeatedReverberationTest.java
@@ -0,0 +1,88 @@
+
+package org.mage.test.cards.single;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author Jgray1206
+ */
+public class RepeatedReverberationTest extends CardTestPlayerBase {
+
+    /**
+     * https://github.com/magefree/mage/issues/5882
+     * Repeated Reverberation was not working with loyalty counter abilities.
+     */
+    @Test
+    public void testRepeatedReverberationWorksWithLoyaltyAbilities() {
+        // +1: You gain 2 life.
+        // -1: Put a +1/+1 counter on each creature you control. Those creatures gain vigilance until end of turn.
+        // -6: Put a white Avatar creature token onto the battlefield. It has "This creature's power and toughness are each equal to your life total."
+        addCard(Zone.HAND, playerA, "Ajani Goldmane"); // {2}{W}{W} starts with 4 Loyality counters
+        addCard(Zone.HAND, playerA, "Repeated Reverberation");
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 4);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ajani Goldmane");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Repeated Reverberation");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: You gain 2 life");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Ajani Goldmane", 1);
+        assertGraveyardCount(playerA, "Repeated Reverberation", 1);
+        assertCounterCount("Ajani Goldmane", CounterType.LOYALTY, 5);  // 4 + 1 = 5
+
+        assertLife(playerA, 26);
+    }
+
+    @Test
+    public void testRepeatedReverberationWorksWithInstants() {
+        addCard(Zone.HAND, playerA, "Soothing Balm"); // {1}{W} Target player gains 5 life
+        addCard(Zone.HAND, playerA, "Repeated Reverberation");
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 4);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Repeated Reverberation");
+        waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Soothing Balm");
+        addTarget(playerA, playerA);
+        addTarget(playerA, playerB); //Should be able to choose new targets for each copy
+        addTarget(playerA, playerA);
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, "Soothing Balm", 1);
+        assertGraveyardCount(playerA, "Repeated Reverberation", 1);
+
+        assertLife(playerA, 30);
+        assertLife(playerB, 25);
+    }
+
+    @Test
+    public void testRepeatedReverberationWorksWithSorceries() {
+        addCard(Zone.HAND, playerA, "Soul Feast"); // {3}{B}{B} Target player loses 4 life. You gain 4 life.
+        addCard(Zone.HAND, playerA, "Repeated Reverberation");
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Repeated Reverberation");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Soul Feast");
+        addTarget(playerA, playerB);
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, "Soul Feast", 1);
+        assertGraveyardCount(playerA, "Repeated Reverberation", 1);
+
+        assertLife(playerA, 32);
+        assertLife(playerB, 8);
+    }
+}