From 61161b3142a4da86a988767bcf5ff97c2bc8f885 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 09:22:21 +0000
Subject: [PATCH] - Converted Elephant Ambush to keyword. - Added rarity and LQ
 pic url to Combust.

---
 res/cardsfolder/combust.txt         |  2 ++
 res/cardsfolder/elephant_ambush.txt |  4 +++-
 src/forge/CardFactory_Instants.java | 27 +--------------------------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/res/cardsfolder/combust.txt b/res/cardsfolder/combust.txt
index b74aee482a8..fc5861ae69f 100644
--- a/res/cardsfolder/combust.txt
+++ b/res/cardsfolder/combust.txt
@@ -4,4 +4,6 @@ Types:Instant
 Text:no text
 K:CARDNAME can't be countered.
 A:SP$DealDamage|Cost$1 R|ValidTgts$Creature.White,Creature.Blue|NumDmg$5|TgtPrompt$Select target white or blue creature.|SpellDescription$CARDNAME deals 5 damage to target white or blue creature.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/combust.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/elephant_ambush.txt b/res/cardsfolder/elephant_ambush.txt
index 12eae0ffeb7..207e14c9d71 100644
--- a/res/cardsfolder/elephant_ambush.txt
+++ b/res/cardsfolder/elephant_ambush.txt
@@ -1,7 +1,9 @@
 Name:Elephant Ambush
 ManaCost:2 G G
 Types:Instant
-Text:no text
+Text:Put a 3/3 green Elephant creature token onto the battlefield.
+K:spMakeToken<>1<>Elephant<>G 3 3 Elephant<>Controller<>G<>Creature;Elephant<>3<>3<>None
+SVar:Flashback:6 G G/0
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elephant_ambush.jpg
 End
diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java
index 2a60cf6ca2c..7dcaf89de40 100644
--- a/src/forge/CardFactory_Instants.java
+++ b/src/forge/CardFactory_Instants.java
@@ -2161,32 +2161,7 @@ public class CardFactory_Instants {
         }//*************** END ************ END **************************
         
         
-      //*************** START *********** START **************************
-        else if(cardName.equals("Elephant Ambush")) {
-            SpellAbility spell = new Spell(card) {
-                
-                private static final long serialVersionUID = 1808366787563573082L;
-                
-                @Override
-                public void resolve() {
-                    CardFactoryUtil.makeToken("Elephant", "G 3 3 Elephant", card, "G", new String[] {
-                            "Creature", "Elephant"}, 3, 3, new String[] {""});
-                }//resolve()
-            };
-            
-            spell.setDescription("Put a 3/3 green Elephant creature token into play.");
-            spell.setStackDescription(card.getController()
-                    + " puts a 3/3 green Elephant creature token into play.");
-            
-            card.setFlashback(true);
-            card.clearSpellAbility();
-            card.addSpellAbility(spell);
-            card.addSpellAbility(CardFactoryUtil.ability_Flashback(card, "6 G G", "0"));
-            
-        }//*************** END ************ END **************************
-        
-        
-      //*************** START *********** START **************************
+        //*************** START *********** START **************************
         else if(cardName.equals("Beast Attack")) {
             SpellAbility spell = new Spell(card) {