From bd77dc4794e04ea27192f3ef1a28b3d71443f227 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 19:08:40 +0000
Subject: [PATCH] convert Warp Artifact to triggers

---
 res/cardsfolder/warp_artifact.txt |  4 +++-
 src/forge/GameActionUtil.java     | 39 -------------------------------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/res/cardsfolder/warp_artifact.txt b/res/cardsfolder/warp_artifact.txt
index 006b74fbd20..e0d894e6e29 100644
--- a/res/cardsfolder/warp_artifact.txt
+++ b/res/cardsfolder/warp_artifact.txt
@@ -1,8 +1,10 @@
 Name:Warp Artifact
 ManaCost:B B
 Types:Enchantment Aura
-Text:At the beginning of the upkeep of enchanted artifact's controller, Warp Artifact deals 1 damage to that player.
+Text:no text
 K:Enchant Artifact Curse
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of the upkeep of enchanted artifact's controller, CARDNAME deals 1 damage to that player.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ EnchantedController | NumDmg$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warp_artifact.jpg
 SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/42.jpg
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index e136e993110..28b2ff76204 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -50,7 +50,6 @@ public class GameActionUtil {
 		upkeep_Feedback();
 		upkeep_Farmstead();
 		upkeep_Unstable_Mutation();
-		upkeep_Warp_Artifact();
 		
 		/* Converteded to AF Trigger
 		upkeep_Plague_Spitter();
@@ -4948,44 +4947,6 @@ public class GameActionUtil {
 		}
 	}//upkeep_Farmstead()
 	
-	private static void upkeep_Warp_Artifact() {
-		final String auraName = "Warp Artifact";
-        final Player player = AllZone.Phase.getPlayerTurn();
-        PlayerZone playZone = AllZone.getZone(Constant.Zone.Battlefield, player);
-        
-        CardList list = new CardList(playZone.getCards());
-        list = list.filter(new CardListFilter() {
-            public boolean addCard(Card c) {
-                return c.isArtifact() && c.isEnchanted();
-            }
-        });
-        
-        if(list.size() > 0) {
-        	Ability ability;
-        	for(Card target:list) {
-        		if(target.isEnchantedBy(auraName)) {
-        			CardList auras = new CardList(target.getEnchantedBy().toArray());
-        			auras = auras.getName(auraName);
-        			for(Card aura:auras) {
-        				final Card source = aura;
-        				ability = new Ability(aura, "0") {
-        					@Override
-        					public void resolve() {
-        						player.addDamage(1, source);
-        					}
-        				};
-        				
-        				StringBuilder sb = new StringBuilder();
-        				sb.append(auraName).append(" -  deals 1 damage to ").append(player);
-        				ability.setStackDescription(sb.toString());
-        				
-                        AllZone.Stack.add(ability);
-        			} 
-        		}
-        	}
-        }//list > 0
-    }//upkeep_Warp_Artifact()
-	
 	private static void upkeep_Wanderlust() {
 		final String auraName = "Wanderlust";
         final Player player = AllZone.Phase.getPlayerTurn();