From d2a456cd0da2654937da0cd13ca5c17567ba4339 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Tue, 6 Sep 2011 10:10:28 +0000
Subject: [PATCH] - Converted the triggered ability of Necropotence to script
 (actually it wasn't even a triggered ability). Updated the wording on the
 activated ability.

---
 res/cardsfolder/n/necropotence.txt                        | 6 ++++--
 src/main/java/forge/Player.java                           | 6 ------
 .../java/forge/card/cardFactory/AbstractCardFactory.java  | 8 ++++----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/res/cardsfolder/n/necropotence.txt b/res/cardsfolder/n/necropotence.txt
index 1cf4507c2f3..a54092c9c62 100644
--- a/res/cardsfolder/n/necropotence.txt
+++ b/res/cardsfolder/n/necropotence.txt
@@ -1,8 +1,10 @@
 Name:Necropotence
 ManaCost:B B B
 Types:Enchantment
-Text:Skip your draw step.\r\nWhenever you discard a card, exile that card from your graveyard.
-SVar:RemRandomDeck:True
+Text:Skip your draw step.
+T:Mode$ Discarded | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Whenever you discard a card, exile that card from your graveyard.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Exile
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necropotence.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/44.jpg
diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java
index 96c2cbca5f9..011a92aea63 100644
--- a/src/main/java/forge/Player.java
+++ b/src/main/java/forge/Player.java
@@ -983,12 +983,6 @@ public abstract class Player extends GameEntity {
             }
         }
 
-        // necro disrupts madness
-        if (AllZoneUtil.getPlayerCardsInPlay(c.getOwner(), "Necropotence").size() > 0) {
-            AllZone.getGameAction().exile(c);
-            return;
-        }
-
         AllZone.getGameAction().discard_madness(c);
 
         if ((c.hasKeyword("If a spell or ability an opponent controls causes you to discard CARDNAME, put it onto the battlefield instead of putting it into your graveyard.")
diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
index 8f287c77cab..3effee77c7a 100644
--- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
+++ b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
@@ -724,13 +724,13 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
                 }
             }; //SpellAbility
 
-            ability.setDescription("Pay 1 life: Set aside the top card of your library face down. "
-                    + "At the end of your turn, put that card into your hand.");
+            ability.setDescription("Pay 1 life: Exile the top card of your library face down. " +
+            		"Put that card into your hand at the beginning of your next end step.");
 
             StringBuilder sb = new StringBuilder();
             sb.append(card.getName());
-            sb.append(" - Set aside the top card of your library face down. "
-                    + "At the end of your turn, put that card into your hand.");
+            sb.append(" - Exile the top card of your library face down. " +
+            		"Put that card into your hand at the beginning of your next end step.");
             ability.setStackDescription(sb.toString());
 
             card.addSpellAbility(ability);