From a1fb65858c88e1ad097f78fa76373a6df1350e65 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 3 Oct 2015 08:56:56 +0200
Subject: [PATCH] * Fixed some minor bugs of the split cards Supply // Demand
 and Pure // Simple.

---
 .../src/mage/sets/dissension/PureSimple.java  | 28 ++++++++-----------
 .../mage/sets/dissension/SupplyDemand.java    | 13 ++++-----
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/dissension/PureSimple.java b/Mage.Sets/src/mage/sets/dissension/PureSimple.java
index 9a2b77b35f2..ec456b064da 100644
--- a/Mage.Sets/src/mage/sets/dissension/PureSimple.java
+++ b/Mage.Sets/src/mage/sets/dissension/PureSimple.java
@@ -25,18 +25,18 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.sets.dissension;
 
 import java.util.UUID;
 import mage.abilities.effects.common.DestroyAllEffect;
 import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.SplitCard;
 import mage.constants.CardType;
 import mage.constants.Rarity;
-import mage.cards.SplitCard;
 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.SubtypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -45,30 +45,26 @@ import mage.target.TargetPermanent;
  */
 public class PureSimple extends SplitCard {
 
-    private static final FilterPermanent filterAura = new FilterPermanent("aura");
-    private static final FilterPermanent filterEquipment = new FilterPermanent("equipment");
+    private static final FilterPermanent filterDestroy = new FilterPermanent("Auras and Equipment");
     private static final FilterPermanent filterMulticolor = new FilterPermanent("multicolor permanent");
-    
+
     static {
-        filterAura.add(new SubtypePredicate("Aura"));
-        filterEquipment.add(new SubtypePredicate("Equipment"));
+        filterDestroy.add(Predicates.or(new SubtypePredicate("Aura"), new SubtypePredicate("Equipment")));
         filterMulticolor.add(new MulticoloredPredicate());
     }
-    
+
     public PureSimple(UUID ownerId) {
         super(ownerId, 154, "Pure", "Simple", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}{G}", "{1}{G}{W}", true);
         this.expansionSetCode = "DIS";
 
         // Pure
-        // Destroy all Auras
-        getLeftHalfCard().getSpellAbility().addEffect(new DestroyAllEffect(filterAura));
-        // and Equipment.
-        getLeftHalfCard().getSpellAbility().addEffect(new DestroyAllEffect(filterEquipment));
+        // Destroy target multicolored permanent.
+        getLeftHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect());
+        getLeftHalfCard().getSpellAbility().addTarget(new TargetPermanent(filterMulticolor));
 
         // Simple
-        // Destroy target multicolored permanent.
-        getRightHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect());
-        getRightHalfCard().getSpellAbility().addTarget(new TargetPermanent(filterMulticolor));
+        // Destroy all Auras and Equipment.
+        getRightHalfCard().getSpellAbility().addEffect(new DestroyAllEffect(filterDestroy));
     }
 
     public PureSimple(final PureSimple card) {
diff --git a/Mage.Sets/src/mage/sets/dissension/SupplyDemand.java b/Mage.Sets/src/mage/sets/dissension/SupplyDemand.java
index 8eae6bf7da0..9f57c434cba 100644
--- a/Mage.Sets/src/mage/sets/dissension/SupplyDemand.java
+++ b/Mage.Sets/src/mage/sets/dissension/SupplyDemand.java
@@ -39,7 +39,6 @@ import mage.filter.predicate.mageobject.MulticoloredPredicate;
 import mage.game.permanent.token.SaprolingToken;
 import mage.target.common.TargetCardInLibrary;
 
-
 /**
  *
  * @author LevelX2
@@ -53,16 +52,16 @@ public class SupplyDemand extends SplitCard {
     }
 
     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";
 
-        // 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
         // 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));
 
     }