From 5e5527b65f8a23e48d25203ee56af532240edfd9 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 08:23:55 +0000
Subject: [PATCH] add Afterlife (from Mercadian Masques)

---
 .gitattributes                 |  1 +
 res/cardsfolder/afterlife.txt  |  8 ++++++++
 src/forge/CardFactoryUtil.java | 11 +++++++----
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 res/cardsfolder/afterlife.txt

diff --git a/.gitattributes b/.gitattributes
index 24c6ad9bd11..31249ff380a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -65,6 +65,7 @@ res/cardsfolder/aetherflame_wall.txt -text svneol=native#text/plain
 res/cardsfolder/aethersnipe.txt -text svneol=native#text/plain
 res/cardsfolder/affa_guard_hound.txt -text svneol=native#text/plain
 res/cardsfolder/afflict.txt -text svneol=native#text/plain
+res/cardsfolder/afterlife.txt -text svneol=native#text/plain
 res/cardsfolder/ageless_entity.txt -text svneol=native#text/plain
 res/cardsfolder/agent_of_masks.txt -text svneol=native#text/plain
 res/cardsfolder/agent_of_shauku.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/afterlife.txt b/res/cardsfolder/afterlife.txt
new file mode 100644
index 00000000000..cc99af3d2ba
--- /dev/null
+++ b/res/cardsfolder/afterlife.txt
@@ -0,0 +1,8 @@
+Name:Afterlife
+ManaCost:2 W
+Types:Instant
+Text:Destroy target creature. It can't be regenerated. Its controller puts a 1/1 white Spirit creature token with flying onto the battlefield.
+K:spDestroyTgt:Creature:NoRegen:Drawback$MakeToken<>1<>Spirit<>W 1 1 Spirit<>TargetController<>W<>Creature;Spirit<>1<>1<>Flying
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/afterlife.jpg
+End
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index f1983a6d545..66a8aa37560 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -3945,16 +3945,19 @@ public class CardFactoryUtil {
             final int defense = Integer.valueOf(k[8]);
             final String[] keywords = k[9].split(";");
             
-            String controller = controllerString.equals("Controller") ? cardController : Opp;
-			if(keywords[0].equals("None")) keywords[0] = "";
+            String controller = "";
+            if(controllerString.equals("Controller")) controller = cardController;
+            else if(controllerString.equals("Opponent")) controller = Opp;
+            else if(controllerString.equals("TargetController"))controller = TgtC.getController();
+			
+            if(keywords[0].equals("None")) keywords[0] = "";
 			
 			int num = xString ? CardFactoryUtil.xCount(TgtC, numString) : Integer.valueOf(numString);
             for(int i = 0; i < num; i ++ ){
             	CardFactoryUtil.makeToken(name, imageName, controller, manaCost, types, attack, defense, keywords);
             }
         }//end MakeToken drawback
-        
-        
+            
         if(d[0].contains("ReturnFromYard")) // placeholder for effect
         X = X + 0;