From e43982081c6f3a43bc4e5a82d15235d999f5fe96 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 19:04:06 +0000 Subject: [PATCH] convert Necromantic Thirst to triggers --- res/cardsfolder/necromantic_thirst.txt | 4 +++- res/cardsfolder/the_unspeakable.txt | 2 +- res/cardsfolder/woebearer.txt | 2 +- src/forge/GameActionUtil.java | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/res/cardsfolder/necromantic_thirst.txt b/res/cardsfolder/necromantic_thirst.txt index 4cbea2dbc52..b5e65b0d8dc 100644 --- a/res/cardsfolder/necromantic_thirst.txt +++ b/res/cardsfolder/necromantic_thirst.txt @@ -1,8 +1,10 @@ Name:Necromantic Thirst ManaCost:2 B B Types:Enchantment Aura -Text:Whenever enchanted creature deals combat damage to a player, you may return target creature card from your graveyard to your hand. +Text:no text K:Enchant Creature +T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReturn | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever enchanted creature deals combat damage to a player, you may return target creature card from your graveyard to your hand. +SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/necromantic_thirst.jpg SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/97.jpg diff --git a/res/cardsfolder/the_unspeakable.txt b/res/cardsfolder/the_unspeakable.txt index e8e7b9d078e..205079c2ad7 100644 --- a/res/cardsfolder/the_unspeakable.txt +++ b/res/cardsfolder/the_unspeakable.txt @@ -5,7 +5,7 @@ Text:no text PT:6/7 K:Flying K:Trample -T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigReturn | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may return target Arcane card from your graveyard to your hand. +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReturn | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may return target Arcane card from your graveyard to your hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Arcane.YouCtrl SVar:Rarity:Rare SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card78693.jpg diff --git a/res/cardsfolder/woebearer.txt b/res/cardsfolder/woebearer.txt index 4cbda3ab113..1908f8f87a4 100644 --- a/res/cardsfolder/woebearer.txt +++ b/res/cardsfolder/woebearer.txt @@ -4,7 +4,7 @@ Types:Creature Zombie Text:no text PT:2/3 K:Fear -T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigReturn | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may return target creature card from your graveyard to your hand. +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReturn | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may return target creature card from your graveyard to your hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/woebearer.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index cbb87a7c8b3..eb25e11fda8 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -4433,7 +4433,6 @@ public class GameActionUtil { else if(c.getName().equals("Silent Specter")) opponent_Discard(c, 2); */ - else if(c.isEnchantedBy("Necromantic Thirst")) may_Return_Graveyard_to_Hand(c, "Creature".split(",")); else if(c.isEnchantedBy("Celestial Mantle")) execute_Celestial_Mantle( c); //Unused variable