From f92b984cb1151fd521e5f403a4ed80aadc2a9bea Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 16:33:36 +0000 Subject: [PATCH] convert Hypnotic Specter to triggers. --- res/cardsfolder/hypnotic_specter.txt | 4 +++- src/forge/GameActionUtil.java | 23 ----------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/res/cardsfolder/hypnotic_specter.txt b/res/cardsfolder/hypnotic_specter.txt index 0dffbff4f3b..daaade90e30 100644 --- a/res/cardsfolder/hypnotic_specter.txt +++ b/res/cardsfolder/hypnotic_specter.txt @@ -1,9 +1,11 @@ Name:Hypnotic Specter ManaCost:1 B B Types:Creature Specter -Text:Whenever Hypnotic Specter deals damage to an opponent, that player discards a card at random. +Text:no text PT:2/2 K:Flying +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, that player discards a card at random. +SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ Random SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/hypnotic_specter.jpg SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/21.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 569eb044144..81fb6b5bb8c 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -4854,7 +4854,6 @@ public class GameActionUtil { if(c.getName().equals("Marsh Viper")) playerCombatDamage_PoisonCounter(c, 2); else if(c.getName().equals("Abyssal Specter")) opponent_Discard(c, 1); - else if(c.getName().equals("Hypnotic Specter")) opponent_Discard_Random(c, 1); else if(c.getName().equals("Nicol Bolas")) playerCombatDamage_Nicol_Bolas(c); else if(c.getName().equals("Thieving Magpie")|| c.getName().equals("Lu Xun, Scholar General")) playerCombatDamage_Shadowmage_Infiltrator(c); else if(c.getName().equals("Whirling Dervish") || c.getName().equals("Dunerider Outlaw")) @@ -5621,28 +5620,6 @@ public class GameActionUtil { AllZone.Stack.add(ability2); } } - - private static void opponent_Discard_Random(final Card source, final int num) { - final Player player = source.getController().getOpponent(); - - if(source.getNetAttack() > 0 && !source.isFaceDown()) { - Ability ability = new Ability(source, "0") { - @Override - public void resolve() { - player.discardRandom(num, this); - } - };// ability - - StringBuilder sb = new StringBuilder(); - sb.append(source.getName()).append(" - ").append(player).append(" discards "); - sb.append(num).append(" card"); - if(1 != num) sb.append("s"); - sb.append(" at random"); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - } - } private static void opponent_Discard(final Card source, final int num) { final Player player = source.getController().getOpponent();