From 2f6fc78bbe9a9494555fa49f580fb3272b40bb25 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 19:55:50 +0000
Subject: [PATCH] convert Jade statue to AF_Animate

---
 res/cardsfolder/jade_statue.txt       |  3 +-
 src/forge/AbilityFactory_Animate.java | 10 ++++-
 src/forge/CardFactory.java            | 59 ---------------------------
 3 files changed, 10 insertions(+), 62 deletions(-)

diff --git a/res/cardsfolder/jade_statue.txt b/res/cardsfolder/jade_statue.txt
index d70210ab044..47526d01f04 100644
--- a/res/cardsfolder/jade_statue.txt
+++ b/res/cardsfolder/jade_statue.txt
@@ -1,7 +1,8 @@
 Name:Jade Statue
 ManaCost:4
 Types:Artifact
-Text:2: Jade Statue becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat.
+Text:no text
+A:AB$Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 6 | Types$ Creature,Artifact,Golem | UntilEndOfCombat$ True | ActivatingPhases$ BeginCombat->EndCombat | SpellDescription$ becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_statue.jpg
diff --git a/src/forge/AbilityFactory_Animate.java b/src/forge/AbilityFactory_Animate.java
index 537649f833d..5d3ed20b3d1 100644
--- a/src/forge/AbilityFactory_Animate.java
+++ b/src/forge/AbilityFactory_Animate.java
@@ -136,7 +136,10 @@ public class AbilityFactory_Animate {
 		//sb.append(types)
 		//sb.append(keywords)
 		//sb.append(triggers)
-		if(!permanent) sb.append(" until end of turn.");
+		if(!permanent) {
+			if(params.containsKey("UntilEndOfCombat")) sb.append(" until end of combat.");
+			else sb.append(" until end of turn.");
+		}
 		else sb.append(".");
 
 		Ability_Sub abSub = sa.getSubAbility();
@@ -281,7 +284,10 @@ public class AbilityFactory_Animate {
 				}
 			};
 
-			if(!permanent) AllZone.EndOfTurn.addUntil(unactivate);
+			if(!permanent) {
+				if(params.containsKey("UntilEndOfCombat")) AllZone.EndOfCombat.addUntil(unactivate);
+				else AllZone.EndOfTurn.addUntil(unactivate);
+			}
 		}
 
 		if (af.hasSubAbility()){
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 0cc4ecef3b0..3383c44766c 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -6381,65 +6381,6 @@ public class CardFactory implements NewConstants {
         	ability.setDescription(abCost+"Exchange life totals with target opponent. Activate this ability only during your upkeep.");
         	card.addSpellAbility(ability);
         }//*************** END ************ END **************************
-        
-        
-        //*************** START *********** START **************************
-        else if(cardName.equals("Jade Statue")) {
-        	/*
-        	 * 2: Jade Statue becomes a 3/6 Golem artifact creature until
-        	 * end of combat. Activate this ability only during combat.
-        	 */
-        	final long[] timeStamp = new long[1];
-            
-            final SpellAbility a1 = new Ability(card, "2") {
-                @Override
-                public boolean canPlayAI() {
-                    return false;
-                }
-                
-                @Override
-                public boolean canPlay() {
-                	return Phase.canPlayDuringCombat();
-                }
-                
-                @Override
-                public void resolve() {
-                    Card c = card;
-                    String[] types = { "Creature", "Golem" };
-                    String[] keywords = {  };
-                    timeStamp[0] = CardFactoryUtil.activateManland(c, 3, 6, types, keywords, "4");
-
-                    final Command untilEOC = new Command() {
-        				private static final long serialVersionUID = -8432597117196682284L;
-        				long stamp = timeStamp[0];
-        				public void execute() {
-                            Card c = card;
-                            String[] types = { "Creature", "Golem" };
-                            String[] keywords = {  };
-                            CardFactoryUtil.revertManland(c, types, keywords, "4", stamp);
-                        }
-                    };
-                    
-                    AllZone.EndOfCombat.addUntil(untilEOC);
-                }
-            };//SpellAbility
-            
-            card.addSpellAbility(a1);
-            
-            StringBuilder sb = new StringBuilder();
-            sb.append(card).append(" becomes a 3/6 Golem creature until End of Combat");
-            a1.setStackDescription(sb.toString());
-            
-            Command paid1 = new Command() {
-				private static final long serialVersionUID = 1531378274457977155L;
-
-				public void execute() {
-                    AllZone.Stack.add(a1);
-                }
-            };
-            
-            a1.setBeforePayMana(new Input_PayManaCost_Ability(a1.getManaCost(), paid1));
-        }//*************** END ************ END **************************
 
         
         //*************** START *********** START **************************