github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 09:16:26 -09:00
Code Issues Projects Releases Packages Wiki Activity

Standardise use of CantBeCounteredSourceAbility for remaining cards not yet using it

Browse source
This commit is contained in:
PurpleCrowbar 2022-11-03 02:10:26 +00:00
parent a4b4965779
commit fc560d4853
6 changed files with 17 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/cards/a/AbruptDecay.java
View file

@ -2,16 +2,12 @@
package mage.cards.a; package mage.cards.a;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredSourceAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.ComparisonType; import mage.constants.ComparisonType;
import mage.constants.Zone;
import mage.filter.common.FilterNonlandPermanent; import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.ManaValuePredicate;
import mage.target.common.TargetNonlandPermanent; import mage.target.common.TargetNonlandPermanent;
@ -31,12 +27,8 @@ public final class AbruptDecay extends CardImpl {
public AbruptDecay(UUID ownerId, CardSetInfo setInfo) { public AbruptDecay(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{B}{G}"); super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{B}{G}");
// Abrupt Decay can't be countered. // This spell can't be countered.
Effect effect = new CantBeCounteredSourceEffect(); this.addAbility(new CantBeCounteredSourceAbility());
effect.setText("this spell can't be countered");
Ability ability = new SimpleStaticAbility(Zone.STACK, effect);
ability.setRuleAtTheTop(true);
this.addAbility(ability);
// Destroy target nonland permanent with converted mana cost 3 or less. // Destroy target nonland permanent with converted mana cost 3 or less.
this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new DestroyTargetEffect());

14
Mage.Sets/src/mage/cards/o/OverwhelmingDenial.java
View file

@ -2,16 +2,12 @@
package mage.cards.o; package mage.cards.o;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredSourceAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.CounterTargetEffect;
import mage.abilities.keyword.SurgeAbility; import mage.abilities.keyword.SurgeAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Zone;
import mage.target.TargetSpell; import mage.target.TargetSpell;
/** /**
@ -23,12 +19,8 @@ public final class OverwhelmingDenial extends CardImpl {
public OverwhelmingDenial(UUID ownerId, CardSetInfo setInfo) { public OverwhelmingDenial(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}"); super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}");
// Overwhelming Denial can't be countered by spell or abilities. // This spell can't be countered.
Effect effect = new CantBeCounteredSourceEffect(); this.addAbility(new CantBeCounteredSourceAbility());
effect.setText("this spell can't be countered");
Ability ability = new SimpleStaticAbility(Zone.STACK, effect);
ability.setRuleAtTheTop(true);
this.addAbility(ability);
// Counter target spell. // Counter target spell.
this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addTarget(new TargetSpell());

11
Mage.Sets/src/mage/cards/r/RazeToTheGround.java
View file

@ -1,15 +1,12 @@
package mage.cards.r; package mage.cards.r;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.CantBeCounteredSourceAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
@ -26,11 +23,7 @@ public final class RazeToTheGround extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
// This spell can't be countered. // This spell can't be countered.
Effect effect = new CantBeCounteredSourceEffect(); this.addAbility(new CantBeCounteredSourceAbility());
effect.setText("this spell can't be countered");
Ability ability = new SimpleStaticAbility(Zone.STACK, effect);
ability.setRuleAtTheTop(true);
this.addAbility(ability);
// Destroy target artifact. If its mana value was 1 or less, draw a card. // Destroy target artifact. If its mana value was 1 or less, draw a card.
this.getSpellAbility().addEffect(new RazeToTheGroundEffect()); this.getSpellAbility().addEffect(new RazeToTheGroundEffect());

13
Mage.Sets/src/mage/cards/s/SlaughterGames.java
View file

@ -1,15 +1,12 @@
package mage.cards.s; package mage.cards.s;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.CantBeCounteredSourceAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.ChooseACardNameEffect; import mage.abilities.effects.common.ChooseACardNameEffect;
import mage.abilities.effects.common.search.SearchTargetGraveyardHandLibraryForCardNameAndExileEffect; import mage.abilities.effects.common.search.SearchTargetGraveyardHandLibraryForCardNameAndExileEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.target.common.TargetOpponent; import mage.target.common.TargetOpponent;
@ -23,12 +20,8 @@ public final class SlaughterGames extends CardImpl {
public SlaughterGames(UUID ownerId, CardSetInfo setInfo) { public SlaughterGames(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}{R}");
// Slaughter Games can't be countered. // This spell can't be countered.
Effect effect = new CantBeCounteredSourceEffect(); this.addAbility(new CantBeCounteredSourceAbility());
effect.setText("this spell can't be countered");
Ability ability = new SimpleStaticAbility(Zone.STACK, effect);
ability.setRuleAtTheTop(true);
this.addAbility(ability);
// Name a nonland card. Search target opponent's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles their library. // Name a nonland card. Search target opponent's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles their library.
this.getSpellAbility().addEffect(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME)); this.getSpellAbility().addEffect(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME));

14
Mage.Sets/src/mage/cards/t/TearsOfValakut.java
View file

@ -2,16 +2,12 @@
package mage.cards.t; package mage.cards.t;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredSourceAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.AbilityPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -31,12 +27,8 @@ public final class TearsOfValakut extends CardImpl {
public TearsOfValakut(UUID ownerId, CardSetInfo setInfo) { public TearsOfValakut(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}");
// Tears of Valakut can't be countered. // This spell can't be countered.
Effect effect = new CantBeCounteredSourceEffect(); this.addAbility(new CantBeCounteredSourceAbility());
effect.setText("this spell can't be countered");
Ability ability = new SimpleStaticAbility(Zone.STACK, effect);
ability.setRuleAtTheTop(true);
this.addAbility(ability);
// Tears of Valakut deals 5 damage to target creature with flying. // Tears of Valakut deals 5 damage to target creature with flying.
this.getSpellAbility().addEffect(new DamageTargetEffect(5)); this.getSpellAbility().addEffect(new DamageTargetEffect(5));

14
Mage.Sets/src/mage/cards/u/UrzasRage.java
View file

@ -1,17 +1,13 @@
package mage.cards.u; package mage.cards.u;
import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredSourceAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.KickedCondition; import mage.abilities.condition.common.KickedCondition;
import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.decorator.ConditionalOneShotEffect;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.keyword.KickerAbility; import mage.abilities.keyword.KickerAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Zone;
import mage.target.common.TargetAnyTarget; import mage.target.common.TargetAnyTarget;
import java.util.UUID; import java.util.UUID;
@ -27,12 +23,8 @@ public final class UrzasRage extends CardImpl {
// Kicker {8}{R} // Kicker {8}{R}
this.addAbility(new KickerAbility("{8}{R}")); this.addAbility(new KickerAbility("{8}{R}"));
// Urza's Rage can't be countered. // This spell can't be countered.
Effect effect = new CantBeCounteredSourceEffect(); this.addAbility(new CantBeCounteredSourceAbility());
effect.setText("this spell can't be countered");
Ability ability = new SimpleStaticAbility(Zone.STACK, effect);
ability.setRuleAtTheTop(true);
this.addAbility(ability);
// Urza's Rage deals 3 damage to any target. If Urza's Rage was kicked, instead it deals 10 damage to that creature or player and the damage can't be prevented. // Urza's Rage deals 3 damage to any target. If Urza's Rage was kicked, instead it deals 10 damage to that creature or player and the damage can't be prevented.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect( this.getSpellAbility().addEffect(new ConditionalOneShotEffect(