From aa8594d4595e666a4f33d46b59609210bd590ef1 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 15:41:54 +0000 Subject: [PATCH] - Converted Dimir Cutpurse to Trigger. - Added Cabal Executioner and Akki Underminer. --- .gitattributes | 2 ++ res/cardsfolder/air_bladder.txt | 2 +- res/cardsfolder/akki_underminer.txt | 10 ++++++++++ res/cardsfolder/cabal_executioner.txt | 11 +++++++++++ res/cardsfolder/dimir_cutpurse.txt | 5 ++++- src/forge/GameActionUtil.java | 8 ++++---- 6 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 res/cardsfolder/akki_underminer.txt create mode 100644 res/cardsfolder/cabal_executioner.txt diff --git a/.gitattributes b/.gitattributes index e749cc57299..4d7e28aaa1a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -98,6 +98,7 @@ res/cardsfolder/akki_coalflinger.txt -text svneol=native#text/plain res/cardsfolder/akki_drillmaster.txt -text svneol=native#text/plain res/cardsfolder/akki_raider.txt -text svneol=native#text/plain res/cardsfolder/akki_underling.txt -text svneol=native#text/plain +res/cardsfolder/akki_underminer.txt -text svneol=native#text/plain res/cardsfolder/akoum_boulderfoot.txt -text svneol=native#text/plain res/cardsfolder/akoum_refuge.txt -text svneol=native#text/plain res/cardsfolder/akrasan_squire.txt -text svneol=native#text/plain @@ -750,6 +751,7 @@ res/cardsfolder/burst_of_energy.txt -text svneol=native#text/plain res/cardsfolder/burst_of_speed.txt -text svneol=native#text/plain res/cardsfolder/cabal_archon.txt -text svneol=native#text/plain res/cardsfolder/cabal_coffers.txt -text svneol=native#text/plain +res/cardsfolder/cabal_executioner.txt -text svneol=native#text/plain res/cardsfolder/cabal_pit.txt svneol=native#text/plain res/cardsfolder/cabal_ritual.txt -text svneol=native#text/plain res/cardsfolder/cabal_torturer.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/air_bladder.txt b/res/cardsfolder/air_bladder.txt index d2c28e546e8..7334a5364c2 100644 --- a/res/cardsfolder/air_bladder.txt +++ b/res/cardsfolder/air_bladder.txt @@ -3,7 +3,7 @@ ManaCost:U Types:Enchantment Aura Text:no text K:Enchant creature -K:enPump:Flying & CARDNAME can block only creatures with flying.:Enchanted creature has flying and can block only creatures with flying. +K:enPump:Flying & HIDDEN CARDNAME can block only creatures with flying.:Enchanted creature has flying and can block only creatures with flying. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/air_bladder.jpg SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/28.jpg diff --git a/res/cardsfolder/akki_underminer.txt b/res/cardsfolder/akki_underminer.txt new file mode 100644 index 00000000000..eda466ad6e5 --- /dev/null +++ b/res/cardsfolder/akki_underminer.txt @@ -0,0 +1,10 @@ +Name:Akki Underminer +ManaCost:3 R +Types:creature Goblin Rogue Shaman +Text:no text +PT:1/1 +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player sacrifices a permanent. +SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | SacValid$ Permanent +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/akki_underminer.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/cabal_executioner.txt b/res/cardsfolder/cabal_executioner.txt new file mode 100644 index 00000000000..08a605af266 --- /dev/null +++ b/res/cardsfolder/cabal_executioner.txt @@ -0,0 +1,11 @@ +Name:Cabal Executioner +ManaCost:2 B B +Types:Creature Human Cleric +Text:no text +PT:2/2 +K:Morph:3 B B +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player sacrifices a creature. +SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | SacValid$ Creature +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/cabal_executioner.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/dimir_cutpurse.txt b/res/cardsfolder/dimir_cutpurse.txt index ec1d9be36d2..ef4d40361c0 100644 --- a/res/cardsfolder/dimir_cutpurse.txt +++ b/res/cardsfolder/dimir_cutpurse.txt @@ -1,8 +1,11 @@ Name:Dimir Cutpurse ManaCost:1 U B Types:Creature Spirit -Text:Whenever Dimir Cutpurse deals combat damage to a player, that player discards a card and you draw a card. +Text:no text PT:2/2 +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDrawDiscard | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card and you draw a card. +SVar:TrigDrawDiscard:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$SVar=DBDiscard +SVar:DBDiscard:DB$Discard | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_cutpurse.jpg SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/201.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 8d049692be7..0b14e5e67e9 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -6149,8 +6149,8 @@ public class GameActionUtil { }//isEquipped - if(c.getName().equals("Dimir Cutpurse")) playerCombatDamage_Dimir_Cutpurse(c); - else if(c.getName().equals("Ghastlord of Fugue")) playerCombatDamage_Ghastlord_of_Fugue(c); + //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); @@ -6329,7 +6329,7 @@ public class GameActionUtil { if(c.getController().equals(AllZone.HumanPlayer)) AllZone.GameAction.playSpellAbility(sa[1]); else ComputerUtil.playNoStack(sa[1]); } - + /* private static void playerCombatDamage_Dimir_Cutpurse(Card c) { final Player player = c.getController(); final Player opponent = player.getOpponent(); @@ -6349,7 +6349,7 @@ public class GameActionUtil { AllZone.Stack.add(ability2); } - } + }*/ private static void playerDamage_Dissipation_Field(final Card c, final Card crd) {