From 03fb8b24d175d4d1044968ce554f410041501ee9 Mon Sep 17 00:00:00 2001
From: swordshine <swordshine@cardforge.org>
Date: Tue, 17 Sep 2013 00:25:23 +0000
Subject: [PATCH] - THS: Added 13 cards

---
 res/cardsfolder/m/makeshift_mannequin.txt                   | 6 +++---
 .../forge/card/staticability/StaticAbilityCostChange.java   | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/res/cardsfolder/m/makeshift_mannequin.txt b/res/cardsfolder/m/makeshift_mannequin.txt
index df0c922daf3..fc866b9941d 100644
--- a/res/cardsfolder/m/makeshift_mannequin.txt
+++ b/res/cardsfolder/m/makeshift_mannequin.txt
@@ -3,9 +3,9 @@ ManaCost:3 B
 Types:Instant
 A:SP$ ChangeZone | Cost$ 3 B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature from your graveyard | Origin$ Graveyard | Destination$ Battlefield | RememberTargets$ True | SubAbility$ DBCounter | SpellDescription$ Return target creature card from your graveyard to the battlefield with a mannequin counter on it. For as long as that creature has a mannequin counter on it, it has "When this creature becomes the target of a spell or ability, sacrifice it."
 SVar:DBCounter:DB$ PutCounter | CounterType$ MANNEQUIN | CounterNum$ 1 | Defined$ Remembered | SubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Triggers$ BecomesTarget | sVars$ TrigSac | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
+SVar:DBAnimate:DB$ Animate | Triggers$ BecomesTarget | sVars$ MakeshiftSac | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:BecomesTarget:Mode$ BecomesTarget | ValidTarget$ Card.Self+counters_GE1_MANNEQUIN | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When CARDNAME becomes the target of a spell or ability, sacrifice it.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
+SVar:BecomesTarget:Mode$ BecomesTarget | ValidTarget$ Card.Self+counters_GE1_MANNEQUIN | TriggerZones$ Battlefield | Execute$ MakeshiftSac | TriggerDescription$ When CARDNAME becomes the target of a spell or ability, sacrifice it.
+SVar:MakeshiftSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/makeshift_mannequin.jpg
 Oracle:Return target creature card from your graveyard to the battlefield with a mannequin counter on it. For as long as that creature has a mannequin counter on it, it has "When this creature becomes the target of a spell or ability, sacrifice it."
\ No newline at end of file
diff --git a/src/main/java/forge/card/staticability/StaticAbilityCostChange.java b/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
index 29014a1a715..428ff315752 100644
--- a/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
+++ b/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
@@ -230,6 +230,11 @@ public class StaticAbilityCostChange {
                 if (!sa.isSpell() || !((Spell) sa).isCastFaceDown()) {
                     return;
                 }
+            } else if (params.get("Type").equals("SelfMonstrosity")) {
+                if (!(sa instanceof AbilityActivated) || !sa.hasParam("Monstrosity") || sa.isTemporary()) {
+                    // Nemesis of Mortals
+                    return;
+                }
             }
         }
         if (params.containsKey("ValidTarget")) {