From 33b9c85ebd5943e07f93fd350189a58ea680e669 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:46:00 +0000 Subject: [PATCH] - Deleted the "1, Sacrifice CARDNAME: Draw a card." code from CardFactory.java and CardFactoryUtil.java. Converted the cards using this keyword to abDrawCards 1 Sac<1/CARDNAME>:1:Draw a card. Impacts the 5 Spellbombs and Grave-Shell Scarab. --- res/cardsfolder/aether_spellbomb.txt | 2 +- res/cardsfolder/grave_shell_scarab.txt | 2 +- res/cardsfolder/lifespark_spellbomb.txt | 2 +- res/cardsfolder/necrogen_spellbomb.txt | 2 +- res/cardsfolder/pyrite_spellbomb.txt | 2 +- res/cardsfolder/sunbeam_spellbomb.txt | 2 +- src/forge/CardFactory.java | 10 ---------- src/forge/CardFactoryUtil.java | 25 ------------------------- 8 files changed, 6 insertions(+), 41 deletions(-) diff --git a/res/cardsfolder/aether_spellbomb.txt b/res/cardsfolder/aether_spellbomb.txt index bda7e11f457..f44b9202e10 100644 --- a/res/cardsfolder/aether_spellbomb.txt +++ b/res/cardsfolder/aether_spellbomb.txt @@ -2,7 +2,7 @@ Name:AEther Spellbomb ManaCost:1 Types:Artifact Text:no text -K:1, Sacrifice CARDNAME: Draw a card. +K:abDrawCards 1 Sac<1/CARDNAME>:1:Draw a card.:AEther Spellbomb - Controller draws a card. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_spellbomb.jpg End diff --git a/res/cardsfolder/grave_shell_scarab.txt b/res/cardsfolder/grave_shell_scarab.txt index a0b1950454f..0c586e4853c 100644 --- a/res/cardsfolder/grave_shell_scarab.txt +++ b/res/cardsfolder/grave_shell_scarab.txt @@ -3,7 +3,7 @@ ManaCost:2 B G G Types:Creature Insect Text:no text PT:4/4 -K:1, Sacrifice CARDNAME: Draw a card. +K:abDrawCards 1 Sac<1/CARDNAME>:1:Draw a card.:Grave-Shell Scarab - Controller draws a card. K:Dredge 1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/grave_shell_scarab.jpg diff --git a/res/cardsfolder/lifespark_spellbomb.txt b/res/cardsfolder/lifespark_spellbomb.txt index 8f357b9dae3..abb27490861 100644 --- a/res/cardsfolder/lifespark_spellbomb.txt +++ b/res/cardsfolder/lifespark_spellbomb.txt @@ -2,7 +2,7 @@ Name:Lifespark Spellbomb ManaCost:1 Types:Artifact Text:no text -K:1, Sacrifice CARDNAME: Draw a card. +K:abDrawCards 1 Sac<1/CARDNAME>:1:Draw a card.:Lifespark Spellbomb - Controller draws a card. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/lifespark_spellbomb.jpg End diff --git a/res/cardsfolder/necrogen_spellbomb.txt b/res/cardsfolder/necrogen_spellbomb.txt index a7214b606b7..6b3f2a6954b 100644 --- a/res/cardsfolder/necrogen_spellbomb.txt +++ b/res/cardsfolder/necrogen_spellbomb.txt @@ -2,7 +2,7 @@ Name:Necrogen Spellbomb ManaCost:1 Types:Artifact Text:no text -K:1, Sacrifice CARDNAME: Draw a card. +K:abDrawCards 1 Sac<1/CARDNAME>:1:Draw a card.:Necrogen Spellbomb - Controller draws a card. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/necrogen_spellbomb.jpg End diff --git a/res/cardsfolder/pyrite_spellbomb.txt b/res/cardsfolder/pyrite_spellbomb.txt index 7746f90132e..3ef6ff6310f 100644 --- a/res/cardsfolder/pyrite_spellbomb.txt +++ b/res/cardsfolder/pyrite_spellbomb.txt @@ -2,7 +2,7 @@ Name:Pyrite Spellbomb ManaCost:1 Types:Artifact Text:no text -K:1, Sacrifice CARDNAME: Draw a card. +K:abDrawCards 1 Sac<1/CARDNAME>:1:Draw a card.:Pyrite Spellbomb - Controller draws a card. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/pyrite_spellbomb.jpg End diff --git a/res/cardsfolder/sunbeam_spellbomb.txt b/res/cardsfolder/sunbeam_spellbomb.txt index 2882fff458f..25aac2caef7 100644 --- a/res/cardsfolder/sunbeam_spellbomb.txt +++ b/res/cardsfolder/sunbeam_spellbomb.txt @@ -2,7 +2,7 @@ Name:Sunbeam Spellbomb ManaCost:1 Types:Artifact Text:no text -K:1, Sacrifice CARDNAME: Draw a card. +K:abDrawCards 1 Sac<1/CARDNAME>:1:Draw a card.:Sunbeam Spellbomb - Controller draws a card. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/sunbeam_spellbomb.jpg End diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index be8254d7dcf..bae9cf367c6 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -4958,16 +4958,6 @@ public class CardFactory implements NewConstants { } // if etbCounter - if(hasKeyword(card, "1, Sacrifice CARDNAME: Draw a card.") != -1) { - int n = hasKeyword(card, "1, Sacrifice CARDNAME: Draw a card."); - if(n != -1) { - String parse = card.getKeyword().get(n).toString(); - card.removeIntrinsicKeyword(parse); - - card.addSpellAbility(CardFactoryUtil.ability_Spellbomb(card)); - } - }//Spellbomb - // Generic target creature pump if(hasKeyword(card, "spPumpTgt") != -1) { int n = hasKeyword(card, "spPumpTgt"); diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java index 5573b9acc70..7bf0ebefd44 100644 --- a/src/forge/CardFactoryUtil.java +++ b/src/forge/CardFactoryUtil.java @@ -1116,31 +1116,6 @@ public class CardFactoryUtil { return morph_down; } - public static SpellAbility ability_Spellbomb(final Card sourceCard) { - final SpellAbility ability = new Ability(sourceCard, "1") { - @Override - public boolean canPlay() { - return AllZone.GameAction.isCardInPlay(sourceCard) - && !AllZone.Stack.getSourceCards().contains(sourceCard);//in play and not already activated(Sac cost problems) - } - - @Override - public boolean canPlayAI() { - return (AllZone.Computer_Hand.size() < 4) && (AllZone.Computer_Library.size() > 0) - && MyRandom.random.nextBoolean(); - } - - @Override - public void resolve() { - AllZone.GameAction.drawCard(sourceCard.getController()); - AllZone.GameAction.sacrifice(getSourceCard()); - } - }; - ability.setDescription("1, Sacrifice " + sourceCard.getName() + ": Draw a card."); - ability.setStackDescription(sourceCard.getName() + " - Draw a card."); - return ability; - } - public static Ability ability_Morph_Up(final Card sourceCard, String cost, String orgManaCost, int a, int d) { //final String player = sourceCard.getController(); //final String manaCost = cost;