github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix "you control you control" in rules text

Browse source 
GainAbilityControlledEffect + FilterControlledCreaturePermanent is redundant
This commit is contained in:
Neil Gentleman 2016-07-17 11:26:32 -07:00
parent 0c37163052
commit 46a8ee438a
18 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/battleforzendikar/ChasmGuide.java
View file

@ -36,7 +36,7 @@ import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
/** /**
* *
@ -55,7 +55,7 @@ public class ChasmGuide extends CardImpl {
// <i>Rally</i> — Whenever Chasm Guide or another Ally enters the battlefield under your control, creatures you control gain haste until end of turn. // <i>Rally</i> — Whenever Chasm Guide or another Ally enters the battlefield under your control, creatures you control gain haste until end of turn.
this.addAbility(new AllyEntersBattlefieldTriggeredAbility( this.addAbility(new AllyEntersBattlefieldTriggeredAbility(
new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control")), false)); new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent("creatures")), false));
} }
public ChasmGuide(final ChasmGuide card) { public ChasmGuide(final ChasmGuide card) {

4
Mage.Sets/src/mage/sets/battleforzendikar/FiremantleMage.java
View file

@ -36,7 +36,7 @@ import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
/** /**
* *
@ -55,7 +55,7 @@ public class FiremantleMage extends CardImpl {
// <i>Rally</i> — Whenver Firemantle Mage or another Ally enters the battlefield under your control, creatures you control gain menace until end of turn. // <i>Rally</i> — Whenver Firemantle Mage or another Ally enters the battlefield under your control, creatures you control gain menace until end of turn.
this.addAbility(new AllyEntersBattlefieldTriggeredAbility( this.addAbility(new AllyEntersBattlefieldTriggeredAbility(
new GainAbilityControlledEffect(new MenaceAbility(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control")), false)); new GainAbilityControlledEffect(new MenaceAbility(), Duration.EndOfTurn, new FilterCreaturePermanent("creatures")), false));
} }
public FiremantleMage(final FiremantleMage card) { public FiremantleMage(final FiremantleMage card) {

4
Mage.Sets/src/mage/sets/battleforzendikar/KorBladewhirl.java
View file

@ -36,7 +36,7 @@ import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
/** /**
* *
@ -55,7 +55,7 @@ public class KorBladewhirl extends CardImpl {
// <i>Rally</i> — Whenever Kor Bladewhirl or another Ally enters the battlefield under your control, creatures you control gain first strike until end of turn. // <i>Rally</i> — Whenever Kor Bladewhirl or another Ally enters the battlefield under your control, creatures you control gain first strike until end of turn.
this.addAbility(new AllyEntersBattlefieldTriggeredAbility( this.addAbility(new AllyEntersBattlefieldTriggeredAbility(
new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control")), false)); new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent("creatures")), false));
} }
public KorBladewhirl(final KorBladewhirl card) { public KorBladewhirl(final KorBladewhirl card) {

4
Mage.Sets/src/mage/sets/battleforzendikar/OnduChampion.java
View file

@ -36,7 +36,7 @@ import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
/** /**
* *
@ -55,7 +55,7 @@ public class OnduChampion extends CardImpl {
// <i>Rally</i> — Whenever Ondu Champion or another Ally enters the battlefield under your control, creatures you control gain trample until end of turn. // <i>Rally</i> — Whenever Ondu Champion or another Ally enters the battlefield under your control, creatures you control gain trample until end of turn.
this.addAbility(new AllyEntersBattlefieldTriggeredAbility( this.addAbility(new AllyEntersBattlefieldTriggeredAbility(
new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control")), false)); new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent("creatures")), false));
} }
public OnduChampion(final OnduChampion card) { public OnduChampion(final OnduChampion card) {

2
Mage.Sets/src/mage/sets/battleforzendikar/RuinationGuide.java
View file

@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.ColorlessPredicate;
*/ */
public class RuinationGuide extends CardImpl { public class RuinationGuide extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other colorless creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creatures");
static { static {
filter.add(new ColorlessPredicate()); filter.add(new ColorlessPredicate());

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java
View file

@ -73,7 +73,7 @@ public class KiraGreatGlassSpinner extends CardImpl {
// Creatures you control have "Whenever this creature becomes the target of a spell or ability for the first time in a turn, counter that spell or ability." // Creatures you control have "Whenever this creature becomes the target of a spell or ability for the first time in a turn, counter that spell or ability."
Effect effect = new CounterTargetEffect(); Effect effect = new CounterTargetEffect();
effect.setText("counter that spell or ability"); effect.setText("counter that spell or ability");
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new KiraGreatGlassSpinnerAbility(effect), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures you control"))), this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new KiraGreatGlassSpinnerAbility(effect), Duration.WhileOnBattlefield, new FilterCreaturePermanent("creatures"))),
new CreatureWasTargetedThisTurnWatcher()); new CreatureWasTargetedThisTurnWatcher());
} }

8
Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java
View file

@ -46,8 +46,6 @@ import mage.filter.common.FilterCreaturePermanent;
*/ */
public class DanceOfShadows extends CardImpl { public class DanceOfShadows extends CardImpl {
static private FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control");
public DanceOfShadows (UUID ownerId) { public DanceOfShadows (UUID ownerId) {
super(ownerId, 108, "Dance of Shadows", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); super(ownerId, 108, "Dance of Shadows", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}");
this.expansionSetCode = "CHK"; this.expansionSetCode = "CHK";
@ -55,12 +53,12 @@ public class DanceOfShadows extends CardImpl {
// Creatures you control get +1/+0 and gain fear until end of turn. (They can't be blocked except by artifact creatures and/or black creatures.) // Creatures you control get +1/+0 and gain fear until end of turn. (They can't be blocked except by artifact creatures and/or black creatures.)
Effect effect = new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter); Effect effect = new BoostControlledEffect(1, 0, Duration.EndOfTurn, new FilterCreaturePermanent());
effect.setText("Creatures you control get +1/+0"); effect.setText("Creatures you control get +1/+0");
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(effect);
effect = new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter); effect = new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent());
effect.setText("and gain fear until end of turn"); effect.setText("and gain fear until end of turn");
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.EndOfTurn, filter)); this.getSpellAbility().addEffect(effect);
} }
public DanceOfShadows (final DanceOfShadows card) { public DanceOfShadows (final DanceOfShadows card) {

4
Mage.Sets/src/mage/sets/dragonsoftarkir/DragonlordKolaghan.java
View file

@ -42,7 +42,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.stack.Spell; import mage.game.stack.Spell;
@ -72,7 +72,7 @@ public class DragonlordKolaghan extends CardImpl {
// Other creatures you control have haste. // Other creatures you control have haste.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent(), true))); new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true)));
// Whenever an opponent casts a creature or planeswalker spell with the same name as a card in their graveyard, that player loses 10 life. // Whenever an opponent casts a creature or planeswalker spell with the same name as a card in their graveyard, that player loses 10 life.
Effect effect = new LoseLifeTargetEffect(10); Effect effect = new LoseLifeTargetEffect(10);

2
Mage.Sets/src/mage/sets/fatereforged/KolaghanTheStormsFury.java
View file

@ -69,7 +69,7 @@ public class KolaghanTheStormsFury extends CardImpl {
// Whenever a Dragon you control attacks, creatures you control get +1/+0 until end of turn. // Whenever a Dragon you control attacks, creatures you control get +1/+0 until end of turn.
this.addAbility(new AttacksAllTriggeredAbility( this.addAbility(new AttacksAllTriggeredAbility(
new BoostControlledEffect(1, 0, Duration.EndOfTurn, new FilterCreaturePermanent("creatures you control"), false), new BoostControlledEffect(1, 0, Duration.EndOfTurn, new FilterCreaturePermanent("creatures"), false),
false, filter, SetTargetPointer.NONE, false)); false, filter, SetTargetPointer.NONE, false));
// Dash {3}{B}{R} // Dash {3}{B}{R}

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

@ -44,7 +44,6 @@ import mage.constants.Zone;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInLibrary;
/** /**
@ -53,11 +52,10 @@ import mage.target.common.TargetCardInLibrary;
*/ */
public class SterlingGrove extends CardImpl { public class SterlingGrove extends CardImpl {
private static final FilterControlledPermanent filterPermanent = new FilterControlledPermanent("Other enchantments you control"); private static final FilterControlledPermanent filterPermanent = new FilterControlledPermanent("enchantments");
private static final FilterCard filterCard = new FilterCard("enchantment card"); private static final FilterCard filterCard = new FilterCard("enchantment card");
static { static {
filterPermanent.add(new CardTypePredicate(CardType.ENCHANTMENT)); filterPermanent.add(new CardTypePredicate(CardType.ENCHANTMENT));
filterPermanent.add(new AnotherPredicate());
filterCard.add(new CardTypePredicate(CardType.ENCHANTMENT)); filterCard.add(new CardTypePredicate(CardType.ENCHANTMENT));
} }

2
Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheEdge.java
View file

@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
*/ */
public class ChiefOfTheEdge extends CardImpl { public class ChiefOfTheEdge extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Warrior creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Warrior creatures");
static { static {
filter.add(new SubtypePredicate("Warrior")); filter.add(new SubtypePredicate("Warrior"));

2
Mage.Sets/src/mage/sets/khansoftarkir/ChiefOfTheScale.java
View file

@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
*/ */
public class ChiefOfTheScale extends CardImpl { public class ChiefOfTheScale extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Warrior creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Warrior creatures");
static { static {
filter.add(new SubtypePredicate("Warrior")); filter.add(new SubtypePredicate("Warrior"));

2
Mage.Sets/src/mage/sets/khansoftarkir/SecretPlans.java
View file

@ -47,7 +47,7 @@ import mage.filter.predicate.other.FaceDownPredicate;
*/ */
public class SecretPlans extends CardImpl { public class SecretPlans extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Face-down creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Face-down creatures");
static { static {
filter.add(new FaceDownPredicate()); filter.add(new FaceDownPredicate());

2
Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java
View file

@ -53,7 +53,7 @@ import mage.target.common.TargetCreaturePermanent;
public class MadAuntie extends CardImpl { public class MadAuntie extends CardImpl {
private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("another Goblin"); private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("another Goblin");
private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Goblins you control"); private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Goblin creatures");
static { static {
filter1.add(new SubtypePredicate("Goblin")); filter1.add(new SubtypePredicate("Goblin"));

4
Mage.Sets/src/mage/sets/portalthreekingdoms/SunQuanLordOfWu.java
View file

@ -37,7 +37,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
/** /**
* *
@ -57,7 +57,7 @@ public class SunQuanLordOfWu extends CardImpl {
// Creatures you control have horsemanship. // Creatures you control have horsemanship.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HorsemanshipAbility.getInstance(), this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HorsemanshipAbility.getInstance(),
Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures you control")))); Duration.WhileOnBattlefield, new FilterCreaturePermanent("creatures"))));
} }
public SunQuanLordOfWu(final SunQuanLordOfWu card) { public SunQuanLordOfWu(final SunQuanLordOfWu card) {

4
Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java
View file

@ -41,7 +41,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -55,7 +55,7 @@ public class Asceticism extends CardImpl {
// Creatures you control have hexproof. // Creatures you control have hexproof.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent()))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent("creatures"))));
// {1}{G}: Regenerate target creature. // {1}{G}: Regenerate target creature.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}"));
ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetCreaturePermanent());

7
Mage.Sets/src/mage/sets/shadowsoverinnistrad/BehindTheScenes.java
View file

@ -39,7 +39,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
/** /**
@ -52,13 +51,13 @@ public class BehindTheScenes extends CardImpl {
super(ownerId, 100, "Behind the Scenes", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); super(ownerId, 100, "Behind the Scenes", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}");
this.expansionSetCode = "SOI"; this.expansionSetCode = "SOI";
// Creature you control have skulk. // Creatures you control have skulk.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityControlledEffect(new SkulkAbility(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent()))); new GainAbilityControlledEffect(new SkulkAbility(), Duration.WhileOnBattlefield, new FilterCreaturePermanent("creatures"))));
// {4}{W}: Creatures you control get +1/+1 until end of turn. // {4}{W}: Creatures you control get +1/+1 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent("Creatures you control")), new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent("creatures")),
new ManaCostsImpl("{4}{W}"))); new ManaCostsImpl("{4}{W}")));
} }

4
Mage.Sets/src/mage/sets/shadowsoverinnistrad/NephaliaMoondrakes.java
View file

@ -51,8 +51,6 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class NephaliaMoondrakes extends CardImpl { public class NephaliaMoondrakes extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control");
public NephaliaMoondrakes(UUID ownerId) { public NephaliaMoondrakes(UUID ownerId) {
super(ownerId, 75, "Nephalia Moondrakes", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{U}{U}"); super(ownerId, 75, "Nephalia Moondrakes", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{U}{U}");
this.expansionSetCode = "SOI"; this.expansionSetCode = "SOI";
@ -69,7 +67,7 @@ public class NephaliaMoondrakes extends CardImpl {
this.addAbility(ability); this.addAbility(ability);
// {4}{U}{U}, Exile Nephalia Moondrakes from your graveyard: Creatures you control gain flying until end of turn. // {4}{U}{U}, Exile Nephalia Moondrakes from your graveyard: Creatures you control gain flying until end of turn.
ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, filter), new ManaCostsImpl("{4}{U}{U}")); ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent("creatures")), new ManaCostsImpl("{4}{U}{U}"));
ability.addCost(new ExileSourceFromGraveCost()); ability.addCost(new ExileSourceFromGraveCost());
this.addAbility(ability); this.addAbility(ability);
} }