From f99e02c68d0e26b03de7c44d5245243c08ffbe5e Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 19:21:53 +0000
Subject: [PATCH] convert Emeria Angel to triggers

---
 res/cardsfolder/emeria_angel.txt |  5 +++--
 src/forge/GameActionUtil.java    | 25 +------------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/res/cardsfolder/emeria_angel.txt b/res/cardsfolder/emeria_angel.txt
index 0268422d169..c43ea2aaa10 100644
--- a/res/cardsfolder/emeria_angel.txt
+++ b/res/cardsfolder/emeria_angel.txt
@@ -1,10 +1,11 @@
 Name:Emeria Angel
 ManaCost:2 W W
 Types:Creature Angel
-Text:Landfall - Whenever a land enters the battlefield under your control, you may put a 1/1 white Bird creature token with flying onto the battlefield.
+Text:no text
 PT:3/3
 K:Flying
-K:Landfall
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | Optional$ True | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may put a 1/1 white Bird creature token with flying onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emeria_angel.jpg
 SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/11.jpg
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index ff9f3cf1fd0..87dc92ffd96 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -2492,8 +2492,7 @@ public class GameActionUtil {
 	//***CREATURES END HERE***
 
 	public static void executeLandfallEffects(Card c) {
-		if(c.getName().equals("Emeria Angel")) landfall_Emeria_Angel(c);
-		else if(c.getName().equals("Ob Nixilis, the Fallen")) landfall_Ob_Nixilis(c);
+		if(c.getName().equals("Ob Nixilis, the Fallen")) landfall_Ob_Nixilis(c);
 		else if(c.getName().equals("Lotus Cobra")) landfall_Lotus_Cobra(c);
 		else if(c.getName().equals("Avenger of Zendikar")) landfall_Avenger_of_Zendikar(c);
 		else if(c.getName().equals("Eternity Vessel")) landfall_Eternity_Vessel(c);
@@ -2624,28 +2623,6 @@ public class GameActionUtil {
 		else return true;
 	}
 
-	private static void landfall_Emeria_Angel(Card c) {
-		final Card crd = c;
-		Ability ability = new Ability(c, "0") {
-			@Override
-			public void resolve() {
-				CardFactoryUtil.makeToken("Bird", "W 1 1 Bird", crd.getController(), "W", new String[] {"Creature", "Bird"}, 1, 1,
-						new String[] {"Flying"});
-			}
-		};
-		
-		StringBuilder sb = new StringBuilder();
-		sb.append(c.getName()).append(" - Landfall: ").append(c.getController());
-		sb.append(" puts a 1/1 white Bird creature token with flying onto the battlefield.");
-		ability.setStackDescription(sb.toString());
-
-		if(c.getController().equals(AllZone.HumanPlayer)) {
-			if(showLandfallDialog(c)) AllZone.Stack.add(ability);
-		}
-
-		else if(c.getController().equals(AllZone.ComputerPlayer)) AllZone.Stack.add(ability);
-	}//landfall_Emeria_Angel
-
 	private static void landfall_Ob_Nixilis(Card c) {
 		final Card crd = c;
 		Ability ability = new Ability(c, "0") {