From 22dac1a1ff0197007d3748c564ddad20df088e98 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 10:34:21 +0000
Subject: [PATCH] - Converting Search for Tomorrow to AF_Fetch (since it didn't
 seem to work before) - Moving Suspend down to postFactoryKeywords() so Spells
 with Ability_Factory don't clear out Suspend ability when trying to clear
 default "Spell" ability.

---
 res/cardsfolder/search_for_tomorrow.txt |  4 ++--
 src/forge/CardFactory.java              | 30 ++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/res/cardsfolder/search_for_tomorrow.txt b/res/cardsfolder/search_for_tomorrow.txt
index 311d62addc9..246147de21a 100644
--- a/res/cardsfolder/search_for_tomorrow.txt
+++ b/res/cardsfolder/search_for_tomorrow.txt
@@ -1,9 +1,9 @@
 Name:Search for Tomorrow
 ManaCost:2 G
 Types:Sorcery
-Text:Search your library for a basic land card and put it onto the battlefield. Then shuffle your library.
-K:spTutor:Land.Basic:Battlefield
+Text:no text
 K:Suspend:2:G
+A:SP$Fetch|Cost$2 G|Destination$Battlefield|FetchType$Land.Basic|FetchNum$1|SpellDescription$Search your library for a basic land card and put them onto the battlefield. Then shuffle your library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/search_for_tomorrow.jpg
 End
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index c2feadc640e..863c2c128af 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -5439,21 +5439,6 @@ public class CardFactory implements NewConstants {
                 card.setMadnessCost(k[1]);
             }
         }//madness
-        
-        if(hasKeyword(card, "Suspend") != -1) {
-        	// Suspend:<TimeCounters>:<Cost>
-            int n = hasKeyword(card, "Suspend");
-            if(n != -1) {
-                String parse = card.getKeyword().get(n).toString();
-                card.removeIntrinsicKeyword(parse);
-                card.setSuspend(true);
-                String k[] = parse.split(":");
-
-                final int timeCounters = Integer.parseInt(k[1]);
-                final String cost = k[2];
-                card.addSpellAbility(CardFactoryUtil.ability_suspend(card, cost, timeCounters));
-            }
-        }//madness
 
         if(hasKeyword(card, "Devour") != -1) {
             int n = hasKeyword(card, "Devour");
@@ -12253,6 +12238,21 @@ public class CardFactory implements NewConstants {
             card.addChangeControllerCommand(controllerChanges);
          } //HandSize
         
+        if(hasKeyword(card, "Suspend") != -1) {
+        	// Suspend:<TimeCounters>:<Cost>
+            int n = hasKeyword(card, "Suspend");
+            if(n != -1) {
+                String parse = card.getKeyword().get(n).toString();
+                card.removeIntrinsicKeyword(parse);
+                card.setSuspend(true);
+                String k[] = parse.split(":");
+
+                final int timeCounters = Integer.parseInt(k[1]);
+                final String cost = k[2];
+                card.addSpellAbility(CardFactoryUtil.ability_suspend(card, cost, timeCounters));
+            }
+        }//Suspend
+        
         if (card.getManaCost().contains("X"))
         {
         	SpellAbility sa = card.getSpellAbility()[0];