Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed cards with tooltip text containing "Other Other" and "you control you control" text parts.

Browse source
This commit is contained in:
LevelX2 2013-08-27 16:33:25 +02:00
parent fcd7595223
commit 51d4dff35b
22 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java
View file

@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.abilities.keyword.HasteAbility;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
/**
*
@ -56,7 +56,7 @@ public class MadrushCyclops extends CardImpl<MadrushCyclops> {
this.color.setGreen(true);
this.power = new MageInt(3);
this.toughness = new MageInt(4);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent())));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent())));
}
public MadrushCyclops (final MadrushCyclops card) {

2
Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java
View file

@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent;
*/
public class MelokuTheCloudedMirror extends CardImpl<MelokuTheCloudedMirror> {
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent();
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("land");
public MelokuTheCloudedMirror(UUID ownerId) {
super(ownerId, 74, "Meloku the Clouded Mirror", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}");

2
Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java
View file

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

3
Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java
View file

@ -36,6 +36,7 @@ import mage.target.TargetSpell;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
import mage.filter.common.FilterControlledCreaturePermanent;
/**
*
@ -47,7 +48,7 @@ public class FamiliarsRuse extends CardImpl<FamiliarsRuse> {
super(ownerId, 64, "Familiar's Ruse", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{U}");
this.expansionSetCode = "LRW";
this.color.setBlue(true);
this.getSpellAbility().addCost(new ReturnToHandTargetCost(new TargetControlledCreaturePermanent()));
this.getSpellAbility().addCost(new ReturnToHandTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("creature"),false)));
this.getSpellAbility().addEffect(new CounterTargetEffect());
this.getSpellAbility().addTarget(new TargetSpell());
}

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

@ -35,7 +35,7 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.abilities.keyword.HasteAbility;
import mage.cards.CardImpl;
import mage.constants.Duration;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
/**
*
@ -47,7 +47,7 @@ public class BurstOfSpeed extends CardImpl<BurstOfSpeed> {
super(ownerId, 129, "Burst of Speed", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}");
this.expansionSetCode = "M10";
this.color.setRed(true);
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false));
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(), false));
}
public BurstOfSpeed(final BurstOfSpeed card) {

4
Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java
View file

@ -64,8 +64,8 @@ public class AkromasMemorial extends CardImpl<AkromasMemorial> {
@Override
public void build() {
// Creatures you control have flying, first strike, vigilance, trample, haste, and protection from black and from red.
CompoundAbility abilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance(), new ProtectionAbility(filterBlack), new ProtectionAbility(filterRed));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(abilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures you control"))));
CompoundAbility compoundAbilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance(), new ProtectionAbility(filterBlack), new ProtectionAbility(filterRed));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures"))));
}
public AkromasMemorial(final AkromasMemorial card) {

4
Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java
View file

@ -34,7 +34,7 @@ import mage.constants.Rarity;
import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
/**
*
@ -49,7 +49,7 @@ public class CleaverRiot extends CardImpl<CleaverRiot> {
this.color.setRed(true);
// Creatures you control gain double strike until end of turn.
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false));
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(), false));
}
public CleaverRiot(final CleaverRiot card) {

2
Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java
View file

@ -56,7 +56,7 @@ public class SteelformSliver extends CardImpl<SteelformSliver> {
// Sliver creatures you control get +0/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield,
new FilterCreaturePermanent("Sliver", "Sliver creatures you control"), false)));
new FilterCreaturePermanent("Sliver", "Sliver creatures"), false)));
}
public SteelformSliver(final SteelformSliver card) {

9
Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java
View file

@ -38,7 +38,8 @@ import mage.abilities.keyword.HexproofAbility;
import mage.cards.CardImpl;
import mage.constants.Duration;
import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterArtifactPermanent;
import mage.filter.predicate.mageobject.CardTypePredicate;
/**
@ -46,11 +47,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
*/
public class LeoninAbunas extends CardImpl<LeoninAbunas> {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("Artifacts you control");
static {
filter.add(new CardTypePredicate(CardType.ARTIFACT));
}
private static final FilterPermanent filter = new FilterArtifactPermanent();
public LeoninAbunas(UUID ownerId) {
super(ownerId, 8, "Leonin Abunas", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}");

8
Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
View file

@ -33,10 +33,10 @@ import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.Game;
@ -50,8 +50,6 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class ArmWithAEther extends CardImpl<ArmWithAEther> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control");
public ArmWithAEther(UUID ownerId) {
super(ownerId, 28, "Arm with AEther", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}");
this.expansionSetCode = "NPH";
@ -59,7 +57,9 @@ public class ArmWithAEther extends CardImpl<ArmWithAEther> {
this.color.setBlue(true);
// Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand."
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(new ArmWithAEtherTriggeredAbility(), Duration.EndOfTurn, filter));
Effect effect = new GainAbilityControlledEffect(new ArmWithAEtherTriggeredAbility(), Duration.EndOfTurn, new FilterCreaturePermanent());
effect.setText("Until end of turn, creatures you control gain \"Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand.\"");
this.getSpellAbility().addEffect(effect);
}
public ArmWithAEther(final ArmWithAEther card) {

2
Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java
View file

@ -74,7 +74,7 @@ public class VelaTheNightClad extends CardImpl<VelaTheNightClad> {
this.addAbility(new SimpleStaticAbility(
Zone.BATTLEFIELD,
new GainAbilityControlledEffect(IntimidateAbility.getInstance(),
Duration.WhileOnBattlefield, new FilterCreaturePermanent("Other creatures you control"), true )));
Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true )));
// Whenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life.
Ability ability = new ZoneChangeAllTriggeredAbility(
Zone.BATTLEFIELD,

4
Mage.Sets/src/mage/sets/ravnika/TolsimirWolfblood.java
View file

@ -52,8 +52,8 @@ import mage.game.permanent.token.Token;
*/
public class TolsimirWolfblood extends CardImpl<TolsimirWolfblood> {
private static final FilterCreaturePermanent filterGreen = new FilterCreaturePermanent("Other green creatures you control");
private static final FilterCreaturePermanent filterWhite = new FilterCreaturePermanent("Other white creatures you control");
private static final FilterCreaturePermanent filterGreen = new FilterCreaturePermanent("green creatures you control");
private static final FilterCreaturePermanent filterWhite = new FilterCreaturePermanent("white creatures you control");
static {
filterGreen.add(new ColorPredicate(ObjectColor.GREEN));
filterGreen.add(new ControllerPredicate(TargetController.YOU));

2
Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java
View file

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

2
Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java
View file

@ -45,7 +45,7 @@ import mage.target.common.TargetControlledPermanent;
*/
public class Deprive extends CardImpl<Deprive> {
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent();
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("land");
public Deprive(UUID ownerId) {
super(ownerId, 59, "Deprive", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}");

2
Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java
View file

@ -57,7 +57,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
*/
public class JoragaTreespeaker extends LevelerCard<JoragaTreespeaker> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elves you control");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elves");
static {
filter.add(new SubtypePredicate("Elf"));

2
Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java
View file

@ -64,7 +64,7 @@ public class MoonbowIllusionist extends CardImpl<MoonbowIllusionist> {
this.addAbility(FlyingAbility.getInstance());
// {2}, Return a land you control to its owner's hand: Target land becomes the basic land type of your choice until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new GenericManaCost(2));
ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent())));
ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("land"))));
ability.addTarget(new TargetLandPermanent());
this.addAbility(ability);

2
Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java
View file

@ -50,7 +50,7 @@ import mage.target.common.TargetLandPermanent;
*/
public class OboroBreezecaller extends CardImpl<OboroBreezecaller> {
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent();
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("land");
public OboroBreezecaller(UUID ownerId) {
super(ownerId, 48, "Oboro Breezecaller", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}");

2
Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java
View file

@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
public class DeathBaron extends CardImpl<DeathBaron> {
private static final FilterCreaturePermanent filterSkeletons = new FilterCreaturePermanent("Skeleton creatures");
private static final FilterCreaturePermanent filterZombie = new FilterCreaturePermanent("other Zombie creatures");
private static final FilterCreaturePermanent filterZombie = new FilterCreaturePermanent("Zombie creatures");
static {
filterSkeletons.add(new SubtypePredicate("Skeleton"));

4
Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java
View file

@ -1,4 +1,4 @@
/*
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
@ -48,7 +48,7 @@ import mage.filter.predicate.permanent.ControllerPredicate;
public class MasterOfEtherium extends CardImpl<MasterOfEtherium> {
private static final FilterControlledPermanent filterCounted = new FilterControlledPermanent("artifacts you control");
private static final FilterCreaturePermanent filterBoosted = new FilterCreaturePermanent("artifact creatures you control");
private static final FilterCreaturePermanent filterBoosted = new FilterCreaturePermanent("artifact creatures");
static {
filterCounted.add(new CardTypePredicate(CardType.ARTIFACT));

5
Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java
View file

@ -35,6 +35,7 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.abilities.keyword.ShroudAbility;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
/**
*
@ -42,8 +43,6 @@ import mage.filter.common.FilterControlledCreaturePermanent;
*/
public class TortoiseFormation extends CardImpl<TortoiseFormation> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control");
public TortoiseFormation(UUID ownerId) {
super(ownerId, 61, "Tortoise Formation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}");
this.expansionSetCode = "ALA";
@ -51,7 +50,7 @@ public class TortoiseFormation extends CardImpl<TortoiseFormation> {
this.color.setBlue(true);
// Creatures you control gain shroud until end of turn.
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, filter));
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent()));
}
public TortoiseFormation(final TortoiseFormation card) {

5
Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java
View file

@ -53,7 +53,7 @@ public class JoragaWarcaller extends CardImpl<JoragaWarcaller> {
private static final String rule = "Other Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller";
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other elf creatures you control");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("elf creatures you control");
static {
filter.add(new ControllerPredicate(TargetController.YOU));
@ -81,7 +81,8 @@ public class JoragaWarcaller extends CardImpl<JoragaWarcaller> {
// Other Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new CountersCount(CounterType.P1P1), new CountersCount(CounterType.P1P1), Duration.WhileOnBattlefield, filter, true, rule)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new BoostAllEffect( new CountersCount(CounterType.P1P1), new CountersCount(CounterType.P1P1), Duration.WhileOnBattlefield, filter, true, rule)));
}

2
Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java
View file

@ -73,7 +73,7 @@ public class BoostAllEffect extends ContinuousEffectImpl<BoostAllEffect> {
}
public BoostAllEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterCreaturePermanent filter, boolean excludeSource, String rule) {
this(power, toughness, duration, filter, excludeSource, null, false);
this(power, toughness, duration, filter, excludeSource, rule, false);
}
public BoostAllEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterCreaturePermanent filter, boolean excludeSource, String rule, boolean lockedInPT) {