From a0e725c355e3fd955436e5fa0f0bf061ae8d67d6 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 19:11:05 +0000
Subject: [PATCH] -convert Flight of Fancy to triggers -retire the keyword
 "When CARDNAME enters the battlefield, draw two cards."

---
 res/cardsfolder/flight_of_fancy.txt |  3 ++-
 res/cardsfolder/mulldrifter.txt     |  2 +-
 src/forge/CardFactory.java          | 22 ++++++----------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/res/cardsfolder/flight_of_fancy.txt b/res/cardsfolder/flight_of_fancy.txt
index e5e40c8d05b..01a87b21778 100644
--- a/res/cardsfolder/flight_of_fancy.txt
+++ b/res/cardsfolder/flight_of_fancy.txt
@@ -4,7 +4,8 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:Flying
-K:When CARDNAME enters the battlefield, draw two cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flight_of_fancy.jpg
 SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/49.jpg
diff --git a/res/cardsfolder/mulldrifter.txt b/res/cardsfolder/mulldrifter.txt
index 46906dd03ad..34efc2de9cf 100644
--- a/res/cardsfolder/mulldrifter.txt
+++ b/res/cardsfolder/mulldrifter.txt
@@ -6,7 +6,7 @@ PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards.
 K:Evoke:2 U
-SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 2
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+evoked | Execute$ TrigSac | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it by it's evoke cost, sacrifice it.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0
 SVar:Rarity:Common
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 42884c3a7a5..676c55d11c8 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -4522,20 +4522,13 @@ public class CardFactory implements NewConstants {
         
         ////////////////////////////////////////////////////////////////
         
-        if (card.getKeyword().contains("When CARDNAME enters the battlefield, draw a card.") || 
-        		card.getKeyword().contains("When CARDNAME enters the battlefield, draw two cards.")) {
+        if (card.getKeyword().contains("When CARDNAME enters the battlefield, draw a card.")) {
             
             final SpellAbility ability = new Ability(card, "0") {
-                @Override
-                public void resolve() {
-                	int drawCardsNum = 1;
-                	if (card.getKeyword().contains("When CARDNAME enters the battlefield, draw two cards.")) {
-                		drawCardsNum = 2;
-                	}
-                	for (int i = 0; i < drawCardsNum; i++) {
-                        card.getController().drawCard();
-                	}//for loop
-                }//resolve()
+            	@Override
+            	public void resolve() {
+            		card.getController().drawCard();
+            	}//resolve()
             };//SpellAbility
             Command intoPlay = new Command() {
                 
@@ -4546,10 +4539,7 @@ public class CardFactory implements NewConstants {
                     sb.append(card.getName());
                     sb.append(" - ");
                     sb.append(card.getController());
-                    sb.append(" draws ");
-                    if (card.getKeyword().contains("When CARDNAME enters the battlefield, draw a card.")) {
-                    	sb.append("a card.");
-                    } else sb.append("two cards.");
+                    sb.append(" draws a card.");
                 	
                     ability.setStackDescription(sb.toString());
                     AllZone.Stack.add(ability);