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

* Patron of the Orochi, Everbark Shaman, Boil and Llanowar Druid - Fixed that land selection was wrongly done with name instead of land subtype.

Browse source
This commit is contained in:
LevelX2 2014-07-03 12:18:08 +02:00
parent 6de0233f9a
commit 12182e0a37
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
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;
@ -87,7 +87,7 @@ class PatronOfTheOrochiEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent(); private static final FilterPermanent filter = new FilterPermanent();
static { static {
filter.add(Predicates.or( new NamePredicate("Forest"), filter.add(Predicates.or( new SubtypePredicate("Forest"),
Predicates.and(new CardTypePredicate(CardType.CREATURE), Predicates.and(new CardTypePredicate(CardType.CREATURE),
new ColorPredicate(ObjectColor.GREEN)) new ColorPredicate(ObjectColor.GREEN))
)); ));

2
Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java
View file

@ -56,7 +56,7 @@ public class EverbarkShaman extends CardImpl {
private static final FilterCard filterTreefolk = new FilterCard("Treefolk from your graveyard"); private static final FilterCard filterTreefolk = new FilterCard("Treefolk from your graveyard");
static { static {
filterForest.add(new NamePredicate("Forest")); filterForest.add(new SubtypePredicate("Forest"));
filterTreefolk.add(new SubtypePredicate("Treefolk")); filterTreefolk.add(new SubtypePredicate("Treefolk"));
} }

6
Mage.Sets/src/mage/sets/tempest/Boil.java
View file

@ -33,7 +33,7 @@ import mage.constants.Rarity;
import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
/** /**
* *
@ -44,13 +44,15 @@ public class Boil extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("islands"); private static final FilterPermanent filter = new FilterPermanent("islands");
static { static {
filter.add(new NamePredicate("Island")); filter.add(new SubtypePredicate("Island"));
} }
public Boil(UUID ownerId) { public Boil(UUID ownerId) {
super(ownerId, 165, "Boil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); super(ownerId, 165, "Boil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}");
this.expansionSetCode = "TMP"; this.expansionSetCode = "TMP";
this.color.setRed(true); this.color.setRed(true);
// Destroy all Islands.
this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); this.getSpellAbility().addEffect(new DestroyAllEffect(filter));
} }

4
Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java
View file

@ -40,7 +40,7 @@ import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
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;
@ -84,7 +84,7 @@ class LlanowarDruidEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent(); private static final FilterPermanent filter = new FilterPermanent();
static { static {
filter.add(new NamePredicate("Forest")); filter.add(new SubtypePredicate("Forest"));
} }
public LlanowarDruidEffect() { public LlanowarDruidEffect() {