From 49e5cd00acbf16fab49de6ab8fdc8fa12dee06e5 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 05:12:44 +0000
Subject: [PATCH] - Added AEther Adept, Grave Titan.

---
 res/cards.txt                        | 13 +++++++++++++
 src/forge/CardFactory_Creatures.java | 29 +++++++++++++++++++++++++++-
 src/forge/CombatUtil.java            | 20 +++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/res/cards.txt b/res/cards.txt
index 67b1b7c481f..0a321eec026 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -1,3 +1,16 @@
+Grave Titan
+4 B B
+Creature Giant
+Whenever Grave Titan enters the battlefield or attacks, put two 2/2 black Zombie creature tokens onto the battlefield.
+6/6
+Deathtouch
+
+AEther Adept
+1 U U
+Creature Human Wizard
+When AEther Adept enters the battlefield, return target creature to its owner's hand.
+2/2
+
 Tireless Missionaries
 4 W
 Creature Human Cleric
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 96e43893e58..5a39c3c890b 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -3844,7 +3844,7 @@ public class CardFactory_Creatures {
         
 
         //*************** START *********** START **************************
-        else if(cardName.equals("Man-o'-War") || cardName.equals("Sun Ce, Young Conquerer")) {
+        else if(cardName.equals("Man-o'-War") || cardName.equals("Sun Ce, Young Conquerer") || cardName.equals("AEther Adept")) {
             final SpellAbility ability = new Ability(card, "0") {
                 @Override
                 public void resolve() {
@@ -14255,6 +14255,33 @@ public class CardFactory_Creatures {
             
         }//*************** END ************ END **************************
         
+        //*************** START *********** START **************************
+        else if(cardName.equals("Grave Titan")) {
+            final SpellAbility ability = new Ability(card, "0") {
+                @Override
+                public void resolve() {
+                    for(int i = 0; i < 2; i++)
+                        makeToken();
+                }//resolve()
+                
+                void makeToken() {
+                    CardFactoryUtil.makeToken("Zombie", "B 2 2 Zombie", card, "B", new String[] {
+                            "Creature", "Zombie"}, 2, 2, new String[] {""});
+                }
+            };
+            Command intoPlay = new Command() {
+
+				private static final long serialVersionUID = 4152436387481421717L;
+
+				public void execute() {
+                    ability.setStackDescription("Grave Titan - put two black 2/2 Zombie creature tokens onto the battlefield.");
+                    AllZone.Stack.add(ability);
+                }
+            };
+            card.addComesIntoPlayCommand(intoPlay);
+            
+        }//*************** END ************ END **************************
+        
         //*************** START *********** START **************************
         else if(cardName.equals("Mogg War Marshal") || cardName.equals("Goblin Marshal")) {
             final SpellAbility ability = new Ability(card, "0") {
diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java
index d48b27bb0a8..59eeae48ace 100644
--- a/src/forge/CombatUtil.java
+++ b/src/forge/CombatUtil.java
@@ -1541,6 +1541,26 @@ public class CombatUtil {
                 
             }//Jedit
             
+            else if(c.getName().equals("Grave Titan") && !c.getCreatureAttackedThisCombat()) {
+                final Card grave = c;
+                Ability ability2 = new Ability(c, "0") {
+                    @Override
+                    public void resolve() {
+                    	for (int i=0;i<2;i++)
+                    		CardFactoryUtil.makeToken("Zombie", "B 2 2 Zombie", grave, "B", new String[] {
+                                "Creature", "Zombie"}, 2, 2, new String[] {""});
+                        //(anger) :
+                        //GameActionUtil.executeCardStateEffects(); 
+                    }
+                }; //Ability
+                
+
+                ability2.setStackDescription(c.getName()
+                        + " - put a 2/2 green Cat Warrior creature token with forestwalk into play.");
+                AllZone.Stack.add(ability2);
+                
+            }//Grave Titan
+            
             else if(c.getName().equals("Preeminent Captain") && !c.getCreatureAttackedThisCombat()) {
                 System.out.println("Preeminent Captain Attacks");
                 PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, c.getController());