github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 03:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed CantCounter to CantBeCountered.

Browse source
This commit is contained in:
LevelX2 2015-01-22 21:29:38 +01:00
parent f77c930299
commit 8ea8e77b88
30 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java
View file

@ -35,8 +35,8 @@ import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantCounterControlledEffect;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredControlledEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.cards.CardImpl;
import mage.filter.Filter;
import mage.filter.FilterSpell;
@ -66,8 +66,8 @@ public class SpellbreakerBehemoth extends CardImpl {
this.power = new MageInt(5);
this.toughness = new MageInt(5);
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCounterControlledEffect(filter, Duration.WhileOnBattlefield)));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filter, Duration.WhileOnBattlefield)));
}
public SpellbreakerBehemoth(final SpellbreakerBehemoth card) {

4
Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java
View file

@ -33,7 +33,7 @@ import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.RegenerateTargetEffect;
@ -67,7 +67,7 @@ public class IsaoEnlightenedBushi extends CardImpl {
this.toughness = new MageInt(1);
// Isao, Enlightened Bushi can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
this.addAbility(new BushidoAbility(2));
// {2}: Regenerate target Samurai.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2));

4
Mage.Sets/src/mage/sets/commander/AkromaAngelOfFury.java
View file

@ -30,7 +30,7 @@ package mage.sets.commander;
import java.util.UUID;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continious.BoostSourceEffect;
@ -70,7 +70,7 @@ public class AkromaAngelOfFury extends CardImpl {
this.toughness = new MageInt(6);
// Akroma, Angel of Fury can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// Flying
this.addAbility(FlyingAbility.getInstance());
// Trample

4
Mage.Sets/src/mage/sets/conflux/VolcanicFallout.java
View file

@ -30,7 +30,7 @@ package mage.sets.conflux;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.effects.common.DamageEverythingEffect;
import mage.cards.CardImpl;
@ -47,7 +47,7 @@ public class VolcanicFallout extends CardImpl {
this.color.setRed(true);
// Volcanic Fallout can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// Volcanic Fallout deals 2 damage to each creature and each player.
this.getSpellAbility().addEffect(new DamageEverythingEffect(2));
}

4
Mage.Sets/src/mage/sets/darksteel/LastWord.java
View file

@ -31,7 +31,7 @@ package mage.sets.darksteel;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.effects.common.CounterTargetEffect;
import mage.cards.CardImpl;
import mage.target.TargetSpell;
@ -46,7 +46,7 @@ public class LastWord extends CardImpl {
super(ownerId, 23, "Last Word", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{U}{U}");
this.expansionSetCode = "DST";
this.color.setBlue(true);
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
this.getSpellAbility().addEffect(new CounterTargetEffect());
this.getSpellAbility().addTarget(new TargetSpell());
}

4
Mage.Sets/src/mage/sets/dragonsmaze/Skylasher.java
View file

@ -33,7 +33,7 @@ import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.keyword.FlashAbility;
import mage.abilities.keyword.ProtectionAbility;
import mage.abilities.keyword.ReachAbility;
@ -65,7 +65,7 @@ public class Skylasher extends CardImpl {
// Flash
this.addAbility(FlashAbility.getInstance());
// Skylasher can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// Reach, protection from blue
this.addAbility(ReachAbility.getInstance());
this.addAbility(new ProtectionAbility(filter));

4
Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java
View file

@ -30,7 +30,7 @@ package mage.sets.guildpact;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
import mage.filter.FilterPermanent;
@ -57,7 +57,7 @@ public class WreakHavoc extends CardImpl {
this.expansionSetCode = "GPT";
this.color.setRed(true);
this.color.setGreen(true);
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
this.getSpellAbility().addEffect(new DestroyTargetEffect());
this.getSpellAbility().addTarget(new TargetPermanent(filter));
}

4
Mage.Sets/src/mage/sets/invasion/BlurredMongoose.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.keyword.ShroudAbility;
import mage.cards.CardImpl;
@ -51,7 +51,7 @@ public class BlurredMongoose extends CardImpl {
this.toughness = new MageInt(1);
// Blurred Mongoose can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
this.addAbility(ShroudAbility.getInstance());
}

4
Mage.Sets/src/mage/sets/invasion/Obliterate.java
View file

@ -30,7 +30,7 @@ package mage.sets.invasion;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl;
import mage.filter.FilterPermanent;
@ -59,7 +59,7 @@ public class Obliterate extends CardImpl {
this.color.setRed(true);
// Obliterate can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// Destroy all artifacts, creatures, and lands. They can't be regenerated.
this.getSpellAbility().addEffect(new DestroyAllEffect(filter));
}

4
Mage.Sets/src/mage/sets/khansoftarkir/PearlLakeAncient.java
View file

@ -29,7 +29,7 @@ package mage.sets.khansoftarkir;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.ReturnToHandTargetCost;
import mage.abilities.effects.common.ReturnToHandSourceEffect;
@ -61,7 +61,7 @@ public class PearlLakeAncient extends CardImpl {
this.addAbility(FlashAbility.getInstance());
// Pearl Lake Ancient can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// Prowess
this.addAbility(new ProwessAbility());

8
Mage.Sets/src/mage/sets/khansoftarkir/SurrakDragonclaw.java
View file

@ -29,9 +29,9 @@ package mage.sets.khansoftarkir;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantCounterControlledEffect;
import mage.abilities.effects.common.CantBeCounteredControlledEffect;
import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.abilities.keyword.FlashAbility;
import mage.abilities.keyword.TrampleAbility;
@ -74,10 +74,10 @@ public class SurrakDragonclaw extends CardImpl {
this.addAbility(FlashAbility.getInstance());
// Surrak Dragonclaw can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// Creature spells you control can't be countered.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCounterControlledEffect(filterTarget, null, Duration.WhileOnBattlefield)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield)));
// Other creatures you control have trample.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,

8
Mage.Sets/src/mage/sets/legions/RootSliver.java
View file

@ -31,8 +31,8 @@ import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantCounterControlledEffect;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredControlledEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
@ -65,9 +65,9 @@ public class RootSliver extends CardImpl {
this.toughness = new MageInt(2);
// Root Sliver can't be countered.
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect()));
// Sliver spells can't be countered by spells or abilities.
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterControlledEffect(filter, new FilterStackObject(), Duration.WhileOnBattlefield)));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredControlledEffect(filter, new FilterStackObject(), Duration.WhileOnBattlefield)));
}

4
Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java
View file

@ -35,7 +35,7 @@ import mage.constants.Zone;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.FilterCard;
@ -64,7 +64,7 @@ public class GreatSableStag extends CardImpl {
this.addAbility(new ProtectionAbility(filter1));
this.addAbility(new ProtectionAbility(filter2));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect()));
}
public GreatSableStag(final GreatSableStag card) {

4
Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java
View file

@ -33,7 +33,7 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.ObjectColor;
import mage.abilities.effects.common.CantCounterControlledEffect;
import mage.abilities.effects.common.CantBeCounteredControlledEffect;
import mage.abilities.effects.common.CantBeTargetedAllEffect;
import mage.cards.CardImpl;
import mage.filter.FilterSpell;
@ -62,7 +62,7 @@ public class AutumnsVeil extends CardImpl {
this.expansionSetCode = "M11";
this.color.setGreen(true);
// Spells you control can't be countered by blue or black spells this turn
this.getSpellAbility().addEffect(new CantCounterControlledEffect(filterTarget1, filterSource, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new CantBeCounteredControlledEffect(filterTarget1, filterSource, Duration.EndOfTurn));
// and creatures you control can't be the targets of blue or black spells this turn.
this.getSpellAbility().addEffect(new CantBeTargetedAllEffect(filterTarget2, filterSource, Duration.EndOfTurn));
}

4
Mage.Sets/src/mage/sets/magic2011/Combust.java
View file

@ -34,7 +34,7 @@ import mage.constants.Rarity;
import mage.constants.Zone;
import mage.ObjectColor;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterCreaturePermanent;
@ -62,7 +62,7 @@ public class Combust extends CardImpl {
this.color.setRed(true);
this.getSpellAbility().addEffect(new DamageTargetEffect(5, false));
this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect()));
}
public Combust(final Combust card) {

4
Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java
View file

@ -36,7 +36,7 @@ import mage.constants.Zone;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.CantBeTargetedSourceEffect;
import mage.abilities.keyword.HasteAbility;
import mage.cards.CardImpl;
@ -64,7 +64,7 @@ public class GaeasRevenge extends CardImpl {
this.power = new MageInt(8);
this.toughness = new MageInt(5);
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect()));
this.addAbility(HasteAbility.getInstance());
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filter, Duration.WhileOnBattlefield)));

4
Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java
View file

@ -35,7 +35,7 @@ import java.util.Set;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.effects.AsThoughEffectImpl;
import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl;
import mage.abilities.effects.ReplacementEffectImpl;
@ -67,7 +67,7 @@ public class SavageSummoning extends CardImpl {
this.color.setGreen(true);
// Savage Summoning can't be countered.
Ability ability = new CantCounterAbility();
Ability ability = new CantBeCounteredAbility();
ability.setRuleAtTheTop(true);
this.addAbility(ability);

4
Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll.java
View file

@ -36,7 +36,7 @@ import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.RegenerateSourceEffect;
import mage.abilities.keyword.HexproofAbility;
import mage.cards.CardImpl;
@ -58,7 +58,7 @@ public class ThrunTheLastTroll extends CardImpl {
this.power = new MageInt(4);
this.toughness = new MageInt(4);
this.addAbility(new SimpleStaticAbility(Zone.ALL, new CantCounterSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.ALL, new CantBeCounteredSourceEffect()));
this.addAbility(HexproofAbility.getInstance());
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}")));
}

4
Mage.Sets/src/mage/sets/returntoravnica/AbruptDecay.java
View file

@ -35,7 +35,7 @@ import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
import mage.filter.Filter;
@ -62,7 +62,7 @@ public class AbruptDecay extends CardImpl {
this.color.setBlack(true);
// Abrupt Decay can't be countered by spells or abilities.
Effect effect = new CantCounterSourceEffect();
Effect effect = new CantBeCounteredSourceEffect();
effect.setText("{this} can't be countered by spells or abilities");
Ability ability = new SimpleStaticAbility(Zone.STACK,effect);
ability.setRuleAtTheTop(true);

4
Mage.Sets/src/mage/sets/returntoravnica/Counterflux.java
View file

@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.CounterTargetEffect;
import mage.abilities.keyword.OverloadAbility;
import mage.cards.CardImpl;
@ -73,7 +73,7 @@ public class Counterflux extends CardImpl {
this.color.setRed(true);
// Counterflux can't be countered by spells or abilities.
Effect effect = new CantCounterSourceEffect();
Effect effect = new CantBeCounteredSourceEffect();
effect.setText("{this} can't be countered by spells or abilities");
Ability ability = new SimpleStaticAbility(Zone.STACK,effect);
ability.setRuleAtTheTop(true);

4
Mage.Sets/src/mage/sets/returntoravnica/LoxodonSmiter.java
View file

@ -30,7 +30,7 @@ package mage.sets.returntoravnica;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.cards.Card;
@ -64,7 +64,7 @@ public class LoxodonSmiter extends CardImpl {
this.toughness = new MageInt(4);
// Loxodon Smiter can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// If a spell or ability an opponent controls causes you to discard Loxodon Smiter, put it onto the battlefield instead of putting it into your graveyard.
this.addAbility(new SimpleStaticAbility(Zone.HAND, new LoxodonSmiterEffect()));

4
Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java
View file

@ -36,7 +36,7 @@ import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.effects.common.search.SearchTargetGraveyardHandLibraryForCardNameAndExileEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
@ -62,7 +62,7 @@ public class SlaughterGames extends CardImpl {
this.color.setRed(true);
// Slaughter Games can't be countered by spells or abilities.
Effect effect = new CantCounterSourceEffect();
Effect effect = new CantBeCounteredSourceEffect();
effect.setText("{this} can't be countered by spells or abilities");
Ability ability = new SimpleStaticAbility(Zone.STACK,effect);
ability.setRuleAtTheTop(true);

4
Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java
View file

@ -36,7 +36,7 @@ import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.common.PutIntoGraveFromAnywhereSourceTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.AnnihilatorAbility;
@ -73,7 +73,7 @@ public class EmrakulTheAeonsTorn extends CardImpl {
this.toughness = new MageInt(15);
// Emrakul, the Aeons Torn can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// When you cast Emrakul, take an extra turn after this one.
this.addAbility(new EmrakulTheAeonsTornOnCastAbility());
// Flying, protection from colored spells, annihilator 6

4
Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl;
@ -64,7 +64,7 @@ public class VexingShusher extends CardImpl {
this.toughness = new MageInt(2);
// Vexing Shusher can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// {R/G}: Target spell can't be countered by spells or abilities.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VexingShusherCantCounterTargetEffect(), new ManaCostsImpl("{R/G}"));
ability.addTarget(new TargetSpell());

4
Mage.Sets/src/mage/sets/tempest/Scragnoth.java
View file

@ -30,7 +30,7 @@ package mage.sets.tempest;
import java.util.UUID;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
@ -59,7 +59,7 @@ public class Scragnoth extends CardImpl {
this.toughness = new MageInt(4);
// Scragnoth can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// Protection from blue
this.addAbility(new ProtectionAbility(filter));
}

4
Mage.Sets/src/mage/sets/theros/MistcutterHydra.java
View file

@ -32,7 +32,7 @@ import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.common.CantCounterAbility;
import mage.abilities.common.CantBeCounteredAbility;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.HasteAbility;
@ -68,7 +68,7 @@ public class MistcutterHydra extends CardImpl {
this.toughness = new MageInt(0);
// Mistcutter Hydra can't be countered.
this.addAbility(new CantCounterAbility());
this.addAbility(new CantBeCounteredAbility());
// Haste
this.addAbility(HasteAbility.getInstance());
// protection from blue

4
Mage.Sets/src/mage/sets/zendikar/TerraStomper.java
View file

@ -33,7 +33,7 @@ import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl;
@ -52,7 +52,7 @@ public class TerraStomper extends CardImpl {
this.power = new MageInt(8);
this.toughness = new MageInt(8);
this.addAbility(new SimpleStaticAbility(Zone.ALL, new CantCounterSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.ALL, new CantBeCounteredSourceEffect()));
this.addAbility(TrampleAbility.getInstance());
}

14
Mage/src/mage/abilities/common/CantCounterAbility.java → Mage/src/mage/abilities/common/CantBeCounteredAbility.java
View file

@ -29,20 +29,20 @@
package mage.abilities.common;
import mage.abilities.StaticAbility;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.constants.Zone;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class CantCounterAbility extends StaticAbility {
public class CantBeCounteredAbility extends StaticAbility {
public CantCounterAbility() {
super(Zone.STACK, new CantCounterSourceEffect());
public CantBeCounteredAbility() {
super(Zone.STACK, new CantBeCounteredSourceEffect());
}
public CantCounterAbility(CantCounterAbility ability) {
public CantBeCounteredAbility(CantBeCounteredAbility ability) {
super(ability);
}
@ -52,7 +52,7 @@ public class CantCounterAbility extends StaticAbility {
}
@Override
public CantCounterAbility copy() {
return new CantCounterAbility(this);
public CantBeCounteredAbility copy() {
return new CantBeCounteredAbility(this);
}
}

12
Mage/src/mage/abilities/effects/common/CantCounterControlledEffect.java → Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java
View file

@ -44,23 +44,23 @@ import mage.game.stack.Spell;
*
* @author BetaSteward_at_googlemail.com
*/
public class CantCounterControlledEffect extends ContinuousRuleModifiyingEffectImpl {
public class CantBeCounteredControlledEffect extends ContinuousRuleModifiyingEffectImpl {
private FilterSpell filterTarget;
private FilterObject filterSource;
public CantCounterControlledEffect(FilterSpell filterTarget, FilterObject filterSource, Duration duration) {
public CantBeCounteredControlledEffect(FilterSpell filterTarget, FilterObject filterSource, Duration duration) {
super(duration, Outcome.Benefit);
this.filterTarget = filterTarget;
this.filterSource = filterSource;
setText();
}
public CantCounterControlledEffect(FilterSpell filterTarget, Duration duration) {
public CantBeCounteredControlledEffect(FilterSpell filterTarget, Duration duration) {
this(filterTarget, null, duration);
}
public CantCounterControlledEffect(final CantCounterControlledEffect effect) {
public CantBeCounteredControlledEffect(final CantBeCounteredControlledEffect effect) {
super(effect);
if (effect.filterTarget != null) {
this.filterTarget = effect.filterTarget.copy();
@ -71,8 +71,8 @@ public class CantCounterControlledEffect extends ContinuousRuleModifiyingEffectI
}
@Override
public CantCounterControlledEffect copy() {
return new CantCounterControlledEffect(this);
public CantBeCounteredControlledEffect copy() {
return new CantBeCounteredControlledEffect(this);
}
@Override

10
Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java → Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java
View file

@ -43,20 +43,20 @@ import mage.game.stack.StackObject;
*
* @author BetaSteward_at_googlemail.com
*/
public class CantCounterSourceEffect extends ContinuousRuleModifiyingEffectImpl {
public class CantBeCounteredSourceEffect extends ContinuousRuleModifiyingEffectImpl {
public CantCounterSourceEffect() {
public CantBeCounteredSourceEffect() {
super(Duration.WhileOnStack, Outcome.Benefit, false, true);
staticText = "{this} can't be countered";
}
public CantCounterSourceEffect(final CantCounterSourceEffect effect) {
public CantBeCounteredSourceEffect(final CantBeCounteredSourceEffect effect) {
super(effect);
}
@Override
public CantCounterSourceEffect copy() {
return new CantCounterSourceEffect(this);
public CantBeCounteredSourceEffect copy() {
return new CantBeCounteredSourceEffect(this);
}
@Override