mirror of
https://github.com/correl/mage.git
synced 2024-11-15 03:00:16 +00:00
* Disrupting Shoal - fixed that it counter spells by CMC from any payed split card's parts instead combined CMC only;
This commit is contained in:
Oleg Agafonov
parent
8ac78b4b9e
commit
70514124a6
2 changed files with 71 additions and 72 deletions
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
package mage.cards.d;
|
||||
|
||||
import mage.ObjectColor;
|
||||
|
|
@ -11,7 +10,6 @@ import mage.abilities.effects.OneShotEffect;
|
|||
import mage.cards.Card;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.cards.CardSetInfo;
|
||||
import mage.cards.SplitCard;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.SubType;
|
||||
|
|
@ -27,13 +25,12 @@ import mage.target.common.TargetCardInHand;
|
|||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author LevelX2
|
||||
*/
|
||||
public final class DisruptingShoal extends CardImpl {
|
||||
|
||||
public DisruptingShoal(UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{U}{U}");
|
||||
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{U}{U}");
|
||||
this.subtype.add(SubType.ARCANE);
|
||||
|
||||
// You may exile a blue card with converted mana cost X from your hand rather than pay Disrupting Shoal's mana cost.
|
||||
|
|
@ -86,16 +83,7 @@ class DisruptingShoalCounterTargetEffect extends OneShotEffect {
|
|||
for (Cost cost : sourceAbility.getCosts()) {
|
||||
if (cost.isPaid() && cost instanceof ExileFromHandCost) {
|
||||
for (Card card : ((ExileFromHandCost) cost).getCards()) {
|
||||
if (card instanceof SplitCard) {
|
||||
if (((SplitCard) card).getLeftHalfCard().getConvertedManaCost() == amount) {
|
||||
return true;
|
||||
}
|
||||
if (((SplitCard) card).getRightHalfCard().getConvertedManaCost() == amount) {
|
||||
return true;
|
||||
}
|
||||
} else if (card.getConvertedManaCost() == amount) {
|
||||
return true;
|
||||
}
|
||||
return card.getConvertedManaCost() == amount;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
package org.mage.test.cards.abilities.oneshot.counterspell;
|
||||
|
||||
import mage.constants.PhaseStep;
|
||||
|
|
@ -7,11 +6,20 @@ import org.junit.Test;
|
|||
import org.mage.test.serverside.base.CardTestPlayerBase;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author LevelX2
|
||||
*/
|
||||
public class DisruptingShoalTest extends CardTestPlayerBase {
|
||||
|
||||
// https://www.mtgsalvation.com/forums/magic-fundamentals/magic-rulings/762504-disrupting-shoal-and-fuse-split-cards
|
||||
// For the purpose of Disrupting Shoal, a split card in your hand has a converted mana cost equal to the sum of
|
||||
// the converted mana costs of its two halves, because "[t]he mana cost of a split card is the combined mana
|
||||
// costs of its two halves" while it's in your hand (C.R. 708.4, 708.4b, 202.3). For example, Beck & Call
|
||||
// has converted mana cost 8 while it's in your hand. You can exile a split card with Disrupting Shoal
|
||||
// only if that card has converted mana cost X. Whether the card has fuse or not doesn't matter.
|
||||
// Nevertheless, Disrupting Shoal can still target a spell even if X doesn't match that spell's converted
|
||||
// mana cost, because Disrupting Shoal requires only a "spell" as a target (C.R. 114.1a, 601.2c); it's just
|
||||
// that it will do nothing if X doesn't match the targeted spell's converted mana cost when it resolves.
|
||||
|
||||
@Test
|
||||
public void testWithManaPaymentEqual() {
|
||||
addCard(Zone.HAND, playerA, "Silvercoat Lion");
|
||||
|
|
@ -23,11 +31,13 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
|
|||
addCard(Zone.BATTLEFIELD, playerB, "Island", 4); // {X}{U}{U}
|
||||
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion");
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Silvercoat Lion");
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Silvercoat Lion", "Silvercoat Lion");
|
||||
setChoice(playerB, "X=2");
|
||||
|
||||
setStopAt(1, PhaseStep.BEGIN_COMBAT);
|
||||
setStrictChooseMode(true);
|
||||
setStopAt(1, PhaseStep.END_TURN);
|
||||
execute();
|
||||
assertAllCommandsUsed();
|
||||
|
||||
assertGraveyardCount(playerB, "Disrupting Shoal", 1);
|
||||
assertGraveyardCount(playerA, "Silvercoat Lion", 1);
|
||||
|
|
@ -44,11 +54,13 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
|
|||
addCard(Zone.BATTLEFIELD, playerB, "Island", 3); // {X}{U}{U}
|
||||
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion");
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Silvercoat Lion");
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Silvercoat Lion", "Silvercoat Lion");
|
||||
setChoice(playerB, "X=1");
|
||||
|
||||
setStopAt(1, PhaseStep.BEGIN_COMBAT);
|
||||
setStrictChooseMode(true);
|
||||
setStopAt(1, PhaseStep.END_TURN);
|
||||
execute();
|
||||
assertAllCommandsUsed();
|
||||
|
||||
assertGraveyardCount(playerB, "Disrupting Shoal", 1);
|
||||
assertPermanentCount(playerA, "Silvercoat Lion", 1);
|
||||
|
|
@ -57,11 +69,12 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
|
|||
/**
|
||||
* Test that Disrupting Shoal can be played with alternate casting costs And
|
||||
* the X Value is equal to the CMC of the exiled blue card
|
||||
*
|
||||
*/
|
||||
@Test
|
||||
public void testWithBlueCardsInHand() {
|
||||
addCard(Zone.HAND, playerA, "Pillarfield Ox");
|
||||
|
||||
// Counter target spell with converted mana cost 2.
|
||||
addCard(Zone.HAND, playerA, "Spell Snare");
|
||||
addCard(Zone.BATTLEFIELD, playerA, "Plains", 3);
|
||||
addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
|
||||
|
|
@ -72,39 +85,42 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
|
|||
addCard(Zone.HAND, playerB, "Mistfire Adept", 2); // blue cards with 4 CMC to pay Disrupting Shoal
|
||||
addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
|
||||
|
||||
// cast spell with cmc = 4
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pillarfield Ox");
|
||||
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Pillarfield Ox", "Pillarfield Ox");
|
||||
playerB.addChoice("Yes"); // use alternate costs = Mistfire Adept = CMC = 4
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spell Snare", "Disrupting Shoal", "Disrupting Shoal");
|
||||
setChoice(playerB, "Yes"); // use alternate costs
|
||||
setChoice(playerB, "Mistfire Adept"); // pay to cast Mistfire Adept (CMC = 4)
|
||||
|
||||
setStopAt(1, PhaseStep.CLEANUP);
|
||||
// rules: 202.3e When calculating the converted mana cost of an object with an {X} in its mana cost,
|
||||
// X is treated as 0 while the object is not on the stack, and X is treated as the number chosen for
|
||||
// it while the object is on the stack.
|
||||
//
|
||||
// SO Spell Snare can't be played here (it need cmc 2, but Disrupting Shoal got cmc = 4 + 2)
|
||||
checkPlayableAbility("can't cast Spell Snare", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Spell Snare", false);
|
||||
//castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spell Snare", "Disrupting Shoal", "Disrupting Shoal");
|
||||
|
||||
setStrictChooseMode(true);
|
||||
setStopAt(1, PhaseStep.END_TURN);
|
||||
execute();
|
||||
assertAllCommandsUsed();
|
||||
|
||||
assertLife(playerA, 20);
|
||||
assertLife(playerB, 20);
|
||||
|
||||
assertGraveyardCount(playerB, "Disrupting Shoal", 1);
|
||||
assertExileCount(playerB, 1); // Mistfire Adept
|
||||
assertHandCount(playerB, "Mistfire Adept", 1); // One Left
|
||||
assertExileCount(playerB, 1); // Mistfire Adept
|
||||
assertHandCount(playerB, "Mistfire Adept", 1); // One Left
|
||||
|
||||
assertHandCount(playerA, "Spell Snare", 1); // Can't be cast -> no valid target
|
||||
assertHandCount(playerA, "Spell Snare", 1); // Can't be cast -> no valid target
|
||||
|
||||
assertGraveyardCount(playerA, "Pillarfield Ox", 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that Disrupting Shoal can be played with alternate casting costs And
|
||||
* the X Value can be equal to either half of a fuse card.
|
||||
*
|
||||
* Reported bug: "Casting Disrupting Shoal pitching Far // Away does not
|
||||
* counter spells with converted mana cost 2 or 3, which it should. Instead
|
||||
* it does counter spells with converted mana cost 5, which it shouldn't".
|
||||
*/
|
||||
@Test
|
||||
public void testWithFuseCardCounterCMCTwo() {
|
||||
public void testWithFuseCardCounterCMC_LeftIgnore() {
|
||||
|
||||
// CMC 2 and CMC 3
|
||||
// cmc 2
|
||||
addCard(Zone.HAND, playerA, "Grizzly Bears"); // 2/2 {1}{G}
|
||||
|
||||
addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
|
||||
|
|
@ -117,33 +133,29 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
|
|||
* {2}{B} Instant Target player sacrifices a creature. Fuse (You may
|
||||
* cast one or both halves of this card from your hand.)
|
||||
*/
|
||||
addCard(Zone.HAND, playerB, "Far // Away", 1);
|
||||
addCard(Zone.HAND, playerB, "Far // Away", 1); // cmc 2 + 3
|
||||
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grizzly Bears");
|
||||
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Grizzly Bears");
|
||||
playerB.addChoice("Yes"); // use alternate costs = 2 CMC = Far
|
||||
// try to pay by split card, but can't counter -- X <> bear's cmc
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Grizzly Bears", "Grizzly Bears");
|
||||
setChoice(playerB, "Yes"); // use alternative cost
|
||||
setChoice(playerB, "Far // Away"); // pay by card (cmc = 5, so X = 5 too)
|
||||
|
||||
setStopAt(1, PhaseStep.BEGIN_COMBAT);
|
||||
setStrictChooseMode(true);
|
||||
setStopAt(1, PhaseStep.END_TURN);
|
||||
execute();
|
||||
assertAllCommandsUsed();
|
||||
|
||||
assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost
|
||||
assertGraveyardCount(playerB, "Disrupting Shoal", 1);
|
||||
assertPermanentCount(playerA, "Grizzly Bears", 0); // should have been countered by Shoal
|
||||
assertGraveyardCount(playerA, "Grizzly Bears", 1);
|
||||
assertPermanentCount(playerA, "Grizzly Bears", 1); // can't counter (cmc 2 <> x = 5)
|
||||
assertGraveyardCount(playerA, "Grizzly Bears", 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that Disrupting Shoal can be played with alternate casting costs And
|
||||
* the X Value can be equal to either half of a fuse card.
|
||||
*
|
||||
* Reported bug: "Casting Disrupting Shoal pitching Far // Away does not
|
||||
* counter spells with converted mana cost 2 or 3, which it should. Instead
|
||||
* it does counter spells with converted mana cost 5, which it shouldn't".
|
||||
*/
|
||||
@Test
|
||||
public void testWithFuseCardCounterCMCThree() {
|
||||
|
||||
public void testWithFuseCardCounterCMC_RightIgnore() {
|
||||
// cmc 3
|
||||
addCard(Zone.HAND, playerA, "Centaur Courser"); // 3/3 {2}{G}
|
||||
addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
|
||||
|
||||
|
|
@ -157,30 +169,25 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
|
|||
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Centaur Courser");
|
||||
|
||||
// try to pay by split card, but can't counter -- X <> centaur's cmc
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Centaur Courser", "Centaur Courser");
|
||||
playerB.addChoice("Yes"); // use alternate costs = 3 CMC = Away
|
||||
setChoice(playerB, "Yes"); // use alternative cost
|
||||
setChoice(playerB, "Far // Away"); // pay by card (cmc = 5, so X = 5 too)
|
||||
|
||||
setStopAt(1, PhaseStep.CLEANUP);
|
||||
setStrictChooseMode(true);
|
||||
setStopAt(1, PhaseStep.END_TURN);
|
||||
execute();
|
||||
assertAllCommandsUsed();
|
||||
|
||||
assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost
|
||||
assertGraveyardCount(playerB, "Disrupting Shoal", 1);
|
||||
assertPermanentCount(playerA, "Centaur Courser", 0); // should have been countered by Shoal
|
||||
assertGraveyardCount(playerA, "Centaur Courser", 1);
|
||||
assertPermanentCount(playerA, "Centaur Courser", 1); // can't counter (cmc 3 <> x = 5)
|
||||
assertGraveyardCount(playerA, "Centaur Courser", 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that Disrupting Shoal can be played with alternate casting costs And
|
||||
* the X Value can be equal to either half of a fuse card. Not the combined
|
||||
* cost of both.
|
||||
*
|
||||
* Reported bug: "Casting Disrupting Shoal pitching Far // Away does not
|
||||
* counter spells with converted mana cost 2 or 3, which it should. Instead
|
||||
* it does counter spells with converted mana cost 5, which it shouldn't".
|
||||
*/
|
||||
@Test
|
||||
public void testWithFuseCardShouldNotCounterCMCFive() {
|
||||
|
||||
public void testWithFuseCardShouldNotCounterCMC_BothUses() {
|
||||
// cmc 5
|
||||
addCard(Zone.HAND, playerA, "Air Elemental"); // 4/4 Flying {3}{U}{U}
|
||||
addCard(Zone.BATTLEFIELD, playerA, "Island", 5);
|
||||
|
||||
|
|
@ -194,15 +201,19 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
|
|||
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Air Elemental");
|
||||
|
||||
// try to pay by split card and it works
|
||||
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Disrupting Shoal", "Air Elemental", "Air Elemental");
|
||||
playerB.addChoice("Yes"); // use alternate costs = 2 or 3 CMC = Far // Away, not the combined cost!
|
||||
setChoice(playerB, "Yes"); // use alternative cost
|
||||
setChoice(playerB, "Far // Away"); // pay by card (cmc = 5, so X = 5 too)
|
||||
|
||||
setStopAt(1, PhaseStep.CLEANUP);
|
||||
setStrictChooseMode(true);
|
||||
setStopAt(1, PhaseStep.END_TURN);
|
||||
execute();
|
||||
assertAllCommandsUsed();
|
||||
|
||||
assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost
|
||||
assertGraveyardCount(playerB, "Disrupting Shoal", 1);
|
||||
assertPermanentCount(playerA, "Air Elemental", 1); // should NOT have been countered by Shoal
|
||||
assertGraveyardCount(playerA, "Air Elemental", 0);
|
||||
assertPermanentCount(playerA, "Air Elemental", 0); // will counter cause (cmc 5 == x = 5)
|
||||
assertGraveyardCount(playerA, "Air Elemental", 1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue