From 7b184a76fac942db93b96b9d2f5c7d0857cb4571 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Sun, 14 Nov 2021 11:10:23 -0500
Subject: [PATCH] a few more exile from graveyard fixes
---
Mage.Sets/src/mage/cards/a/AuthorOfShadows.java | 2 +-
Mage.Sets/src/mage/cards/b/BurnAway.java | 2 +-
Mage.Sets/src/mage/cards/g/GoBlank.java | 2 +-
Mage.Sets/src/mage/cards/h/HedonistsTrove.java | 2 +-
Mage.Sets/src/mage/cards/k/KayasGuile.java | 2 +-
.../src/mage/cards/m/MnemonicBetrayal.java | 2 +-
Mage.Sets/src/mage/cards/n/NihilSpellbomb.java | 17 ++++++++++-------
Mage.Sets/src/mage/cards/s/SzatsWill.java | 2 +-
Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java | 2 +-
.../common/ExileGraveyardAllPlayersEffect.java | 3 +--
.../effects/common/GetEmblemEffect.java | 2 +-
11 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java b/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java
index 272b6acf96..312f79a7e8 100644
--- a/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java
+++ b/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java
@@ -48,7 +48,7 @@ class AuthorOfShadowsEffect extends OneShotEffect {
AuthorOfShadowsEffect() {
super(Outcome.Benefit);
- staticText = "exile all cards from all opponents' graveyards. Choose a nonland card exiled this way. " +
+ staticText = "exile all opponents' graveyards. Choose a nonland card exiled this way. " +
"You may cast that card for as long as it remains exiled, and you may spend mana " +
"as though it were mana of any color to cast that spell";
}
diff --git a/Mage.Sets/src/mage/cards/b/BurnAway.java b/Mage.Sets/src/mage/cards/b/BurnAway.java
index b29f7a9279..09c29d803c 100644
--- a/Mage.Sets/src/mage/cards/b/BurnAway.java
+++ b/Mage.Sets/src/mage/cards/b/BurnAway.java
@@ -78,6 +78,6 @@ class BurnAwayDelayedTriggeredAbility extends DelayedTriggeredAbility {
@Override
public String getRule() {
- return "When that creature dies this turn, exile all cards from its controller's graveyard.";
+ return "When that creature dies this turn, exile its controller's graveyard.";
}
}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/cards/g/GoBlank.java b/Mage.Sets/src/mage/cards/g/GoBlank.java
index f62dcc7ece..e1dc8ccddc 100644
--- a/Mage.Sets/src/mage/cards/g/GoBlank.java
+++ b/Mage.Sets/src/mage/cards/g/GoBlank.java
@@ -20,7 +20,7 @@ public final class GoBlank extends CardImpl {
// Target player discards two cards. Then exile all cards from that player's graveyard.
this.getSpellAbility().addEffect(new DiscardTargetEffect(2));
this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()
- .setText("Then exile all cards from that player's graveyard"));
+ .setText("Then exile that player's graveyard"));
this.getSpellAbility().addTarget(new TargetPlayer());
}
diff --git a/Mage.Sets/src/mage/cards/h/HedonistsTrove.java b/Mage.Sets/src/mage/cards/h/HedonistsTrove.java
index 7dbca52684..9cb9bd9acb 100644
--- a/Mage.Sets/src/mage/cards/h/HedonistsTrove.java
+++ b/Mage.Sets/src/mage/cards/h/HedonistsTrove.java
@@ -56,7 +56,7 @@ class HedonistsTroveExileEffect extends OneShotEffect {
HedonistsTroveExileEffect() {
super(Outcome.Exile);
- staticText = "exile all cards from target opponent's graveyard";
+ staticText = "exile target opponent's graveyard";
}
private HedonistsTroveExileEffect(final HedonistsTroveExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KayasGuile.java b/Mage.Sets/src/mage/cards/k/KayasGuile.java
index 8526d2fdec..413d02acfc 100644
--- a/Mage.Sets/src/mage/cards/k/KayasGuile.java
+++ b/Mage.Sets/src/mage/cards/k/KayasGuile.java
@@ -36,7 +36,7 @@ public final class KayasGuile extends CardImpl {
// • Exile all cards from each opponent's graveyard.
this.getSpellAbility().addMode(new Mode(new ExileGraveyardAllPlayersEffect(
StaticFilters.FILTER_CARD_CARDS, TargetController.OPPONENT
- ).setText("exile all cards from each opponent's graveyard")));
+ )));
// • Create a 1/1 white and black Spirit creature token with flying.
this.getSpellAbility().addMode(new Mode(new CreateTokenEffect(new WhiteBlackSpiritToken())));
diff --git a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java
index fa7f94a7c3..dbad20c9a2 100644
--- a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java
+++ b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java
@@ -53,7 +53,7 @@ class MnemonicBetrayalExileEffect extends OneShotEffect {
public MnemonicBetrayalExileEffect() {
super(Outcome.Benefit);
- this.staticText = "exile all cards from all opponents' graveyards. " +
+ this.staticText = "exile all opponents' graveyards. " +
"You may cast spells from among those cards this turn, " +
"and you may spend mana as though it were mana of any type to cast those spells. " +
"At the beginning of the next end step, if any of those cards remain exiled, " +
diff --git a/Mage.Sets/src/mage/cards/n/NihilSpellbomb.java b/Mage.Sets/src/mage/cards/n/NihilSpellbomb.java
index eb1849d20e..17d84c5f54 100644
--- a/Mage.Sets/src/mage/cards/n/NihilSpellbomb.java
+++ b/Mage.Sets/src/mage/cards/n/NihilSpellbomb.java
@@ -1,7 +1,5 @@
-
package mage.cards.n;
-import java.util.UUID;
import mage.abilities.common.DiesSourceTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
@@ -13,25 +11,30 @@ import mage.abilities.effects.common.ExileGraveyardAllTargetPlayerEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
-import mage.constants.Zone;
import mage.target.TargetPlayer;
+import java.util.UUID;
+
/**
- *
* @author North
*/
public final class NihilSpellbomb extends CardImpl {
public NihilSpellbomb(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
+ super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}");
// {T}, Sacrifice Nihil Spellbomb: Exile all cards from target player's graveyard.
- SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllTargetPlayerEffect(), new TapSourceCost());
+ SimpleActivatedAbility ability = new SimpleActivatedAbility(
+ new ExileGraveyardAllTargetPlayerEffect(), new TapSourceCost()
+ );
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetPlayer());
this.addAbility(ability);
+
// When Nihil Spellbomb is put into a graveyard from the battlefield, you may pay {B}. If you do, draw a card.
- this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{B}")), false));
+ this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(
+ new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}")
+ ), false).setTriggerPhrase("When {this} is put into a graveyard from the battlefield, "));
}
private NihilSpellbomb(final NihilSpellbomb card) {
diff --git a/Mage.Sets/src/mage/cards/s/SzatsWill.java b/Mage.Sets/src/mage/cards/s/SzatsWill.java
index b4941126f7..5e07b91a2a 100644
--- a/Mage.Sets/src/mage/cards/s/SzatsWill.java
+++ b/Mage.Sets/src/mage/cards/s/SzatsWill.java
@@ -68,7 +68,7 @@ class SzatsWillEffect extends OneShotEffect {
SzatsWillEffect() {
super(Outcome.Benefit);
- staticText = "exile all cards from all opponents' graveyards, "
+ staticText = "exile all opponents' graveyards, "
+ "then create X 0/1 black Thrull creature tokens, "
+ "where X is the greatest power among creature cards exiled this way";
}
diff --git a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java
index 6cd0b20739..3769775caa 100644
--- a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java
+++ b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java
@@ -335,7 +335,7 @@ class ExileAllCardsFromAllGraveyards extends OneShotEffect {
public ExileAllCardsFromAllGraveyards() {
super(Outcome.Benefit);
- this.staticText = "Exile all cards from all graveyards. Add {R}{R}{R}";
+ this.staticText = "Exile all graveyards. Add {R}{R}{R}";
}
public ExileAllCardsFromAllGraveyards(final ExileAllCardsFromAllGraveyards effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java
index 4f517249dd..58d185cbff 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java
@@ -24,7 +24,6 @@ public class ExileGraveyardAllPlayersEffect extends OneShotEffect {
public ExileGraveyardAllPlayersEffect() {
this(StaticFilters.FILTER_CARD_CARDS);
- this.staticText = "exile all graveyards";
}
public ExileGraveyardAllPlayersEffect(FilterCard filter) {
@@ -35,7 +34,7 @@ public class ExileGraveyardAllPlayersEffect extends OneShotEffect {
super(Outcome.Exile);
this.filter = filter;
this.targetController = targetController;
- staticText = "exile all " + filter.getMessage() + " from all "
+ staticText = "exile all " + (filter.getMessage().equals("cards") ? "" : filter.getMessage() + " from all ")
+ (targetController.equals(TargetController.OPPONENT) ? "opponents' " : "")
+ "graveyards";
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java
index 527a1f1c90..907dfdf70a 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java
@@ -45,7 +45,7 @@ public class GetEmblemEffect extends OneShotEffect {
public String getText() {
StringBuilder sb = new StringBuilder();
- sb.append("You get an emblem with \"");
+ sb.append("you get an emblem with \"");
List<String> rules = emblem.getAbilities().getRules(null);
if (rules.size() == 1) {
for (String s : rules) {