From fe00f490d42bcfaeed22321f7129a6ae2209189d Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 3 Nov 2011 07:32:44 +0000 Subject: [PATCH] - Converted Psychic Purge to script. --- res/cardsfolder/p/psychic_purge.txt | 4 +++- src/main/java/forge/Player.java | 16 ---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/res/cardsfolder/p/psychic_purge.txt b/res/cardsfolder/p/psychic_purge.txt index e763c446651..daf97c98e87 100644 --- a/res/cardsfolder/p/psychic_purge.txt +++ b/res/cardsfolder/p/psychic_purge.txt @@ -1,8 +1,10 @@ Name:Psychic Purge ManaCost:U Types:Sorcery -Text:When a spell or ability an opponent controls causes you to discard Psychic Purge, that player loses 5 life.\r\n +Text:no text A:SP$ DealDamage | Cost$ U | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player. +T:Mode$ Discarded | ValidCard$ Card.Self | ValidCause$ Card.YouDontCtrl | Execute$ TrigLoseLife | TriggerDescription$ When a spell or ability an opponent controls causes you to discard CARDNAME, that player loses 5 life. +SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 5 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/psychic_purge.jpg SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/68.jpg diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 5e37e12e644..7e16a3be706 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -1386,22 +1386,6 @@ public abstract class Player extends GameEntity { sa.addCostToHashList(c, "Discarded"); } - /* - * When a spell or ability an opponent controls causes you to discard - * Psychic Purge, that player loses 5 life. - */ - if (c.getName().equals("Psychic Purge")) { - if (null != sa && !sa.getSourceCard().getController().equals(this)) { - SpellAbility ability = new Ability(c, "") { - public void resolve() { - sa.getSourceCard().getController().loseLife(5, c); - } - }; - ability.setStackDescription(c.getName() + " - " + sa.getSourceCard().getController() + " loses 5 life."); - AllZone.getStack().add(ability); - } - } - AllZone.getGameAction().discardMadness(c); if ((c.hasKeyword("If a spell or ability an opponent controls causes "