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..78315cfb42a --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/RepeatedReverberationTest.java @@ -0,0 +1,120 @@ + +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 { + + /* Repeated Reverberation {2}{R}{R} + * When you next cast an instant spell, cast a sorcery spell, or activate a loyalty ability this turn, copy that spell or ability twice. + * You may choose new targets for the copies. + */ + String repeatedReverb = "Repeated Reverberation"; + + /** + * https://github.com/magefree/mage/issues/5882 + * Repeated Reverberation was not working with loyalty counter abilities. + */ + @Test + public void testRepeatedReverberationWorksWithLoyaltyAbilities() { + /* Ajani Goldmane: {2}{W}{W} starts with 4 Loyality counters + * +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." + */ + String ajani = "Ajani Goldmane"; + + addCard(Zone.HAND, playerA, ajani); + addCard(Zone.HAND, playerA, repeatedReverb); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, ajani); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, repeatedReverb); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: You gain 2 life"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + setStrictChooseMode(true); + execute(); + + assertPermanentCount(playerA, ajani, 1); + assertGraveyardCount(playerA, repeatedReverb, 1); + assertCounterCount(ajani, CounterType.LOYALTY, 5); // 4 + 1 = 5 + + assertLife(playerA, 26); + assertAllCommandsUsed(); + } + + @Test + public void testRepeatedReverberationWorksWithInstants() { + /* Soothing Balm - Instant {1}{W} + * Target player gains 5 life + * Just an arbitrary instant to test reverb with. + */ + String soothingBalm = "Soothing Balm"; + + addCard(Zone.HAND, playerA, soothingBalm); + addCard(Zone.HAND, playerA, repeatedReverb); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, repeatedReverb); + waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, soothingBalm); + addTarget(playerA, playerA); + setChoice(playerA, "Yes"); //Choose new targets? + addTarget(playerA, playerB); + setChoice(playerA, "Yes"); //Choose new targets? + addTarget(playerA, playerA); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + setStrictChooseMode(true); + execute(); + + assertGraveyardCount(playerA, soothingBalm, 1); + assertGraveyardCount(playerA, repeatedReverb, 1); + + assertLife(playerA, 30); + assertLife(playerB, 25); + assertAllCommandsUsed(); + } + + @Test + public void testRepeatedReverberationWorksWithSorceries() { + /* Soul Feast - Sorcery {3}{B}{B} + * Target player loses 4 life. You gain 4 life. + * Just an arbitrary sorcery to test reverb with. + */ + String soulFeast = "Soul Feast"; + + addCard(Zone.HAND, playerA, soulFeast); + addCard(Zone.HAND, playerA, repeatedReverb); + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, repeatedReverb); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, soulFeast); + addTarget(playerA, playerB); + setChoice(playerA, "No"); //Choose new targets? + setChoice(playerA, "No"); //Choose new targets? + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + setStrictChooseMode(true); + execute(); + + assertGraveyardCount(playerA, soulFeast, 1); + assertGraveyardCount(playerA, repeatedReverb, 1); + + assertLife(playerA, 32); + assertLife(playerB, 8); + assertAllCommandsUsed(); + } +}