From bca58752d3edb0c0aa33382f987e8eb7e9795c16 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 18:58:56 +0000 Subject: [PATCH] convert Lu Xun, Scholar General, Shadowmage Infiltrator, and Thieving Magpie to triggers --- res/cardsfolder/lu_xun_scholar_general.txt | 4 +- res/cardsfolder/shadowmage_infiltrator.txt | 2 + res/cardsfolder/thieving_magpie.txt | 4 +- src/forge/GameActionUtil.java | 58 +--------------------- 4 files changed, 9 insertions(+), 59 deletions(-) diff --git a/res/cardsfolder/lu_xun_scholar_general.txt b/res/cardsfolder/lu_xun_scholar_general.txt index c194e0fee2b..8e4b58825e8 100644 --- a/res/cardsfolder/lu_xun_scholar_general.txt +++ b/res/cardsfolder/lu_xun_scholar_general.txt @@ -1,9 +1,11 @@ Name:Lu Xun, Scholar General ManaCost:2 U U Types:Legendary Creature Human Soldier -Text:Whenever Lu Xun, Scholar General deals combat damage to a player, you may draw a card. +Text:no text PT:1/3 K:Horsemanship +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw | Optional$ True | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, you may draw a card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/lu_xun_scholar_general.jpg SetInfo:PTK|Rare|http://magiccards.info/scans/en/p3k/48.jpg diff --git a/res/cardsfolder/shadowmage_infiltrator.txt b/res/cardsfolder/shadowmage_infiltrator.txt index aa6079de4c0..fb95fc04502 100644 --- a/res/cardsfolder/shadowmage_infiltrator.txt +++ b/res/cardsfolder/shadowmage_infiltrator.txt @@ -4,6 +4,8 @@ Types:Creature Human Wizard Text:Whenever Shadowmage Infiltrator deals combat damage to a player, you may draw a card. PT:1/3 K:Fear +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | Optional$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/shadowmage_infiltrator.jpg SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/294.jpg diff --git a/res/cardsfolder/thieving_magpie.txt b/res/cardsfolder/thieving_magpie.txt index b3e669d9e71..b7f3fb66e02 100644 --- a/res/cardsfolder/thieving_magpie.txt +++ b/res/cardsfolder/thieving_magpie.txt @@ -1,9 +1,11 @@ Name:Thieving Magpie ManaCost:2 U U Types:Creature Bird -Text:Whenever Thieving Magpie deals damage to an opponent, you draw a card. +Text:no text PT:1/3 K:Flying +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, draw a card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/thieving_magpie.jpg SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/107.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 29127d65816..191ba3a5943 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -4362,7 +4362,6 @@ public class GameActionUtil { playerCombatDamage_PoisonCounter(c, 1); 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); else if(AllZoneUtil.isCardInPlay("Living Artifact", player)) execute_Living_Artifact(player, damage); @@ -4479,16 +4478,9 @@ public class GameActionUtil { }//isEquipped - //if(c.getName().equals("Dimir Cutpurse")) playerCombatDamage_Dimir_Cutpurse(c); if(c.getName().equals("Ghastlord of Fugue")) playerCombatDamage_Ghastlord_of_Fugue(c); else if(c.getName().equals("Garza Zol, Plague Queen")) playerCombatDamage_May_draw(c); - else if(c.getName().equals("Scalpelexis")) playerCombatDamage_Scalpelexis(c); - //else if(c.getName().equals("Guul Draz Specter")) opponent_Discard(c, 1); - //else if(c.getName().equals("Chilling Apparition")) opponent_Discard(c, 1); - //else if(c.getName().equals("Sedraxis Specter")) opponent_Discard(c, 1); - //else if(c.getName().equals("Headhunter")) opponent_Discard(c, 1); - //else if(c.getName().equals("Riptide Pilferer")) opponent_Discard(c, 1); - else if(c.getName().equals("Shadowmage Infiltrator")) playerCombatDamage_Shadowmage_Infiltrator(c); + else if(c.getName().equals("Scalpelexis")) playerCombatDamage_Scalpelexis(c); else if(c.getName().equals("Augury Adept")) playerCombatDamage_Augury_Adept(c); else if(c.getName().equals("Spawnwrithe")) playerCombatDamage_Spawnwrithe(c); else if(c.getName().equals("Glint-Eye Nephilim") || c.getName().equals("Cold-Eyed Selkie")) playerCombatDamage_Glint_Eye_Nephilim(c); @@ -4645,29 +4637,6 @@ public class GameActionUtil { final Player opponent = c.getController().getOpponent(); opponent.addPoisonCounters(n); } - - - /* - private static void playerCombatDamage_Dimir_Cutpurse(Card c) { - final Player player = c.getController(); - final Player opponent = player.getOpponent(); - - if(c.getNetAttack() > 0) { - Ability ability2 = new Ability(c, "0") { - @Override - public void resolve() { - opponent.discard(this); - player.drawCard(); - } - };// ability2 - - StringBuilder sb = new StringBuilder(); - sb.append(c.getName()).append(" - ").append(player).append(" draws a card, opponent discards a card"); - ability2.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability2); - } - }*/ private static void playerDamage_Dissipation_Field(final Card c, final Card crd) { @@ -5045,31 +5014,6 @@ public class GameActionUtil { } }//nicol bolas - private static void playerCombatDamage_Shadowmage_Infiltrator(Card c) { - //Player player = c.getController(); - final Player[] player = new Player[1]; - final Card crd = c; - - - if(c.getNetAttack() > 0) { - Ability ability2 = new Ability(c, "0") { - @Override - public void resolve() { - player[0] = crd.getController(); - player[0].drawCard(); - } - };// ability2 - - player[0] = c.getController(); - - StringBuilder sb = new StringBuilder(); - sb.append(c.getName()).append(" - ").append(player[0]).append(" draws a card."); - ability2.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability2); - } - } - private static void playerCombatDamage_Augury_Adept(Card c) { final Player[] player = new Player[1]; final Card crd = c;