From dee7305f6e12c7133e4363c87bb33a171fcbe71a Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 19:17:32 +0000
Subject: [PATCH] convert Megrim to triggers

---
 res/cardsfolder/megrim.txt |  4 +++-
 src/forge/GameAction.java  | 24 ------------------------
 src/forge/Player.java      |  4 +---
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/res/cardsfolder/megrim.txt b/res/cardsfolder/megrim.txt
index 9ed878debad..25e98ddcae2 100644
--- a/res/cardsfolder/megrim.txt
+++ b/res/cardsfolder/megrim.txt
@@ -1,7 +1,9 @@
 Name:Megrim
 ManaCost:2 B
 Types:Enchantment
-Text:Whenever an opponent discards a card, Megrim deals 2 damage to that player.
+Text:no text
+T:Mode$ Discarded | ValidCard$ Card.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever an opponent discards a card, CARDNAME deals 2 damage to that player.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 2    
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/megrim.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/143.jpg
diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index f854f88a045..0a0cd32e2fe 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -339,30 +339,6 @@ public class GameAction {
     		c.setCounter(Counters.P1P1, 2, false);
     }
     
-    public void discard_megrim(Card c) {
-        /* 
-         * Whenever an opponent discards a card, Megrim deals 2 damage to that player.
-        */
-    	final Player owner = c.getOwner();  //discarded card owner
-        final Player opponent = owner.getOpponent();  //check this for Megrim
-        CardList megrims = AllZoneUtil.getPlayerCardsInPlay(opponent, "Megrim");
-        for(Card megrim:megrims) {
-        	final Card thisMegrim = megrim;
-        	final Ability ability = new Ability(megrim, "0") {
-        		@Override
-        		public void resolve() {
-        			owner.addDamage(2, thisMegrim);
-        		}
-        	};
-        	
-        	StringBuilder sb = new StringBuilder();
-        	sb.append(megrim.getName()).append(" - deals 2 damage to ").append(owner);
-        	ability.setStackDescription(sb.toString());
-        	
-        	AllZone.Stack.add(ability);
-        }
-    }
-    
     public void discard_madness(Card c) {
     	// Whenever a card with madness is discarded, you may cast it for it's madness cost
     	if (!c.hasMadness())
diff --git a/src/forge/Player.java b/src/forge/Player.java
index 5f5b8e172d5..bae0fc54eb5 100644
--- a/src/forge/Player.java
+++ b/src/forge/Player.java
@@ -646,9 +646,7 @@ public abstract class Player extends MyObservable{
     					sa.getSourceCard().getController()+" loses 5 life.");
     			AllZone.Stack.add(ability);
     		}
-    	} 
-    	
-        AllZone.GameAction.discard_megrim(c);
+    	}
         
         // necro disrupts madness
         if(AllZoneUtil.getPlayerCardsInPlay(c.getOwner(), "Necropotence").size() > 0) {