From 73e207e8107a2bad793ecaf8b8b87a13b5590fbd Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 05:59:37 +0000 Subject: [PATCH] - Moved Resuscitate from CardFactory to CardFactory_Instants. --- src/forge/CardFactory.java | 22 ---------------------- src/forge/CardFactory_Instants.java | 25 +++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 83c45cbf0eb..991027b0870 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -4814,28 +4814,6 @@ public class CardFactory implements NewConstants { - - - //*************** START *********** START ************************** - else if (cardName.equals("Resuscitate")) { - /** - * This card does not work and this is a place holder. - * May require a keyword factory. - */ - final SpellAbility spell = new Spell(card) { - private static final long serialVersionUID = 2024445242584858534L; - - @Override - public void resolve() { - - }//resolve - };//SpellAbility - spell.setStackDescription(card.getName() + " - I do nothing but go to the graveyard."); - card.clearSpellAbility(); - card.addSpellAbility(spell); - }//*************** END ************ END ************************** - - //*************** START *********** START ************************** else if(cardName.equals("Pyrohemia")) { SpellAbility ability = new Ability(card, "R") { diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java index 5d892b72e26..4e0f2f1371e 100644 --- a/src/forge/CardFactory_Instants.java +++ b/src/forge/CardFactory_Instants.java @@ -17,9 +17,30 @@ public class CardFactory_Instants { } public static Card getCard(final Card card, final String cardName, String owner) { + + + //*************** START *********** START ************************** + if (cardName.equals("Resuscitate")) { + /** + * This card does not work and this is a place holder. + * May require a keyword factory. + */ + final SpellAbility spell = new Spell(card) { + private static final long serialVersionUID = 2024445242584858534L; + + @Override + public void resolve() { + + }//resolve + };//SpellAbility + spell.setStackDescription(card.getName() + " - I do nothing but go to the graveyard."); + card.clearSpellAbility(); + card.addSpellAbility(spell); + }//*************** END ************ END ************************** + //*************** START *********** START ************************** - if (cardName.equals("Brave the Elements")) { + else if (cardName.equals("Brave the Elements")) { /** * This card now works slightly better than it did before the spAllPump * keyword was created. The AI is too simple and needs some work. @@ -125,7 +146,7 @@ public class CardFactory_Instants { }//*************** END ************ END ************************** - //*************** START *********** START ************************** + //*************** START *********** START ************************** else if(cardName.equals("Pongify")) { final SpellAbility spell = new Spell(card) { private static final long serialVersionUID = -7657135492744577568L;