From 45e8ef57dde9cce50f971467a2bdd07d03a24f69 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 18:58:48 +0000 Subject: [PATCH] convert Marsh Viper to triggers --- res/cardsfolder/marsh_viper.txt | 4 +++- src/forge/GameActionUtil.java | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/res/cardsfolder/marsh_viper.txt b/res/cardsfolder/marsh_viper.txt index 99f54684917..995d9bba15e 100644 --- a/res/cardsfolder/marsh_viper.txt +++ b/res/cardsfolder/marsh_viper.txt @@ -1,8 +1,10 @@ Name:Marsh Viper ManaCost:3 G Types:Creature Snake -Text:Whenever Marsh Viper deals damage to an opponent, that player gets two poison counters. +Text:no text PT:1/2 +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPoison | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, that player gets two poison counters. (A player with ten or more poison counters loses the game.) +SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ Opponent | Num$ 2 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/marsh_viper.jpg SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/177.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 3802f158ee2..29127d65816 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -4361,8 +4361,7 @@ public class GameActionUtil { if(c.getKeyword().contains("Whenever this creature deals damage to a player, that player gets a poison counter.")) playerCombatDamage_PoisonCounter(c, 1); - if(c.getName().equals("Marsh Viper")) playerCombatDamage_PoisonCounter(c, 2); - else if(c.getName().equals("Nicol Bolas")) playerCombatDamage_Nicol_Bolas(c); + 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")) playerCombatDamage_Whirling_Dervish(c);