From 1ea6632ef3efeeafaafa3c464c44434a126ade68 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 16:21:57 +0000
Subject: [PATCH] Ulamog, the Infinite Gyre

---
 res/cardsfolder/ulamog_the_infinite_gyre.txt |  4 +-
 src/forge/GameActionUtil.java                | 45 +-------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/res/cardsfolder/ulamog_the_infinite_gyre.txt b/res/cardsfolder/ulamog_the_infinite_gyre.txt
index 83475f130c8..4d9cd88286f 100644
--- a/res/cardsfolder/ulamog_the_infinite_gyre.txt
+++ b/res/cardsfolder/ulamog_the_infinite_gyre.txt
@@ -1,11 +1,13 @@
 Name:Ulamog, the Infinite Gyre
 ManaCost:11
 Types:Legendary Creature Eldrazi
-Text:When you cast Ulamog, the Infinite Gyre, destroy target permanent.
+Text:no text
 PT:10/10
 K:Indestructible
 K:Annihilator 4
 K:When CARDNAME is put into a graveyard from anywhere, reveal CARDNAME and its owner shuffles his or her graveyard into his or her library.
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDestroy  | TriggerDescription$ When you cast CARDNAME, destroy target permanent.
+SVar:TrigDestroy | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ulamog_the_infinite_gyre.jpg
 SetInfo:ROE|Mythic|http://magiccards.info/scans/en/roe/12.jpg
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 3dc910ae674..8d9fb4c01e6 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -470,9 +470,7 @@ public class GameActionUtil {
 		// (called in MagicStack.java)
 		Card c = sa.getSourceCard();
 		
-		if (c.getName().equals("Ulamog, the Infinite Gyre"))
-			playCard_Ulamog(c);
-		else if (c.getName().equals("Emrakul, the Aeons Torn"))
+		if (c.getName().equals("Emrakul, the Aeons Torn"))
 			playCard_Emrakul(c);
 		else if (c.getName().equals("Artisan of Kozilek"))
 			playCard_Artisan_of_Kozilek(c);
@@ -528,47 +526,6 @@ public class GameActionUtil {
 		AllZone.GameAction.checkWheneverKeyword(c,"CastSpell",null);
 	}
 	
-	public static void playCard_Ulamog(Card c)
-	{
-		final Card ulamog = c;
-		final Player controller = c.getController();
-		final Ability ability = new Ability(c, "0")
-		{
-			public void chooseTargetAI()
-			{
-				CardList list = AllZoneUtil.getPlayerCardsInPlay(AllZone.HumanPlayer);
-				list = list.filter(new CardListFilter()
-				{
-					public boolean addCard(Card card)
-					{
-						return CardFactoryUtil.canTarget(ulamog, card);
-					}
-				});
-				
-				if (list.size()>0)
-				{
-					CardListUtil.sortCMC(list);
-					setTargetCard(list.get(0));
-				}
-			}
-			public void resolve()
-			{
-				Card crd = getTargetCard();
-				if (crd!=null) {
-					if (CardFactoryUtil.canTarget(ulamog, crd))
-						AllZone.GameAction.destroy(crd);
-				}
-			}
-		};
-		ability.setBeforePayMana(CardFactoryUtil.input_targetPermanent(ability));
-		if (controller.equals(AllZone.HumanPlayer))
-			AllZone.GameAction.playSpellAbility(ability);
-		else {
-			ability.chooseTargetAI();
-			AllZone.Stack.add(ability);
-		}
-	}
-	
 	public static void playCard_Emrakul(Card c)
 	{
 		final Player controller = c.getController();