From c43b4c09af6329f37c4fab5708faaee13366d85d Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 20:18:16 +0000
Subject: [PATCH] convert Dread and No Mercy to triggers

---
 res/cardsfolder/dread.txt     |  7 +++++--
 res/cardsfolder/no_mercy.txt  |  4 +++-
 src/forge/GameActionUtil.java | 31 -------------------------------
 3 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/res/cardsfolder/dread.txt b/res/cardsfolder/dread.txt
index 397afb5be44..c2933d908e3 100644
--- a/res/cardsfolder/dread.txt
+++ b/res/cardsfolder/dread.txt
@@ -1,10 +1,13 @@
 Name:Dread
 ManaCost:3 B B B
 Types:Creature Elemental Incarnation
-Text:Whenever a creature deals damage to you, destroy it.
+Text:no text
 PT:6/6
 K:Fear
-K:When CARDNAME is put into a graveyard from anywhere, shuffle it into its owner's library.
+T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You  | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature deals damage to you, destroy it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.Self  | Execute$ TrigShuffle | TriggerDescription$ When CARDNAME is put into a graveyard from anywhere, shuffle it into its owner's library.
+SVar:TrigShuffle:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Library | Shuffle$ True | Defined$ Self
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredSource
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread.jpg
 SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/107.jpg
diff --git a/res/cardsfolder/no_mercy.txt b/res/cardsfolder/no_mercy.txt
index b20b66ab583..cb519e93dde 100644
--- a/res/cardsfolder/no_mercy.txt
+++ b/res/cardsfolder/no_mercy.txt
@@ -1,7 +1,9 @@
 Name:No Mercy
 ManaCost:2 B B
 Types:Enchantment
-Text:Whenever a creature deals damage to you, destroy it.
+Text:no text
+T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You  | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature deals damage to you, destroy it.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredSource
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/no_mercy.jpg
 SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/56.jpg
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 3caac1fd322..f194bbeeef1 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -2522,18 +2522,6 @@ public class GameActionUtil {
 				playerDamage_Dissipation_Field(c, crd);
 			}
 		}
-		if (c.isCreature() && (playerPerms.getName("Dread").size() > 0 || playerPerms.getName("No Mercy").size() > 0))
-		{
-			CardList l = playerPerms.filter(new CardListFilter()
-			{
-				public boolean addCard(Card crd)
-				{
-					return crd.getName().equals("Dread") || crd.getName().equals("No Mercy");
-				}
-			});
-			for (Card crd:l)
-				playerDamage_No_Mercy(c, crd);
-		}
 		if (playerPerms.getName("Farsight Mask").size() > 0)    		
 		{
 			final Card c1 = c;
@@ -2738,25 +2726,6 @@ public class GameActionUtil {
 		AllZone.Stack.add(ability);
 	}
 	
-	private static void playerDamage_No_Mercy(final Card c, final Card crd)
-	{		
-		Ability ability = new Ability(crd,"0")
-		{
-			public void resolve() {
-				if (AllZone.GameAction.isCardInPlay(c))
-				{
-					AllZone.GameAction.destroy(c);
-				}
-			}	
-		};// Ability
-		
-		StringBuilder sb = new StringBuilder();
-		sb.append(crd).append(" - destroys ").append(c).append(".");
-		ability.setStackDescription(sb.toString());
-		
-		AllZone.Stack.add(ability);
-	}
-	
 	private static void playerDamage_Farsight_Mask(final Player player, final Card c, final Card crd)
 	{
 		Ability ability = new Ability(crd,"0")