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

* Fixed some minor bugs of the split cards Supply // Demand and Pure // Simple.

Browse source
This commit is contained in:
LevelX2 2015-10-03 08:56:56 +02:00
parent 435eb49b58
commit a1fb65858c
2 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Mage.Sets/src/mage/sets/dissension/PureSimple.java
View file

@ -25,18 +25,18 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.sets.dissension; package mage.sets.dissension;
import java.util.UUID; import java.util.UUID;
import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.DestroyAllEffect;
import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.SplitCard;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.cards.SplitCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
/** /**
@ -45,13 +45,11 @@ import mage.target.TargetPermanent;
*/ */
public class PureSimple extends SplitCard { public class PureSimple extends SplitCard {
private static final FilterPermanent filterAura = new FilterPermanent("aura"); private static final FilterPermanent filterDestroy = new FilterPermanent("Auras and Equipment");
private static final FilterPermanent filterEquipment = new FilterPermanent("equipment");
private static final FilterPermanent filterMulticolor = new FilterPermanent("multicolor permanent"); private static final FilterPermanent filterMulticolor = new FilterPermanent("multicolor permanent");
static { static {
filterAura.add(new SubtypePredicate("Aura")); filterDestroy.add(Predicates.or(new SubtypePredicate("Aura"), new SubtypePredicate("Equipment")));
filterEquipment.add(new SubtypePredicate("Equipment"));
filterMulticolor.add(new MulticoloredPredicate()); filterMulticolor.add(new MulticoloredPredicate());
} }
@ -60,15 +58,13 @@ public class PureSimple extends SplitCard {
this.expansionSetCode = "DIS"; this.expansionSetCode = "DIS";
// Pure // Pure
// Destroy all Auras // Destroy target multicolored permanent.
getLeftHalfCard().getSpellAbility().addEffect(new DestroyAllEffect(filterAura)); getLeftHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect());
// and Equipment. getLeftHalfCard().getSpellAbility().addTarget(new TargetPermanent(filterMulticolor));
getLeftHalfCard().getSpellAbility().addEffect(new DestroyAllEffect(filterEquipment));
// Simple // Simple
// Destroy target multicolored permanent. // Destroy all Auras and Equipment.
getRightHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect()); getRightHalfCard().getSpellAbility().addEffect(new DestroyAllEffect(filterDestroy));
getRightHalfCard().getSpellAbility().addTarget(new TargetPermanent(filterMulticolor));
} }
public PureSimple(final PureSimple card) { public PureSimple(final PureSimple card) {

13
Mage.Sets/src/mage/sets/dissension/SupplyDemand.java
View file

@ -39,7 +39,6 @@ import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.game.permanent.token.SaprolingToken; import mage.game.permanent.token.SaprolingToken;
import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInLibrary;
/** /**
* *
* @author LevelX2 * @author LevelX2
@ -53,16 +52,16 @@ public class SupplyDemand extends SplitCard {
} }
public SupplyDemand(UUID ownerId) { public SupplyDemand(UUID ownerId) {
super(ownerId, 157, "Supply", "Demand", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{W}{U}", "{X}{G}{W}", false); super(ownerId, 157, "Supply", "Demand", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{G}{W}", "{1}{W}{U}", false);
this.expansionSetCode = "DIS"; this.expansionSetCode = "DIS";
// Demand
// Search your library for a multicolored card, reveal it, and put it into your hand. Then shuffle your library.
getLeftHalfCard().getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, filter), true));
// Supply // Supply
// Put X 1/1 green Saproling creature tokens onto the battlefield. // Put X 1/1 green Saproling creature tokens onto the battlefield.
getRightHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new ManacostVariableValue())); getLeftHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new ManacostVariableValue()));
// Demand
// Search your library for a multicolored card, reveal it, and put it into your hand. Then shuffle your library.
getRightHalfCard().getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, filter), true));
} }