From a7641c81eecebe5998607fe434e1d08dd1f9a898 Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Sat, 5 Nov 2011 23:02:19 +0000 Subject: [PATCH] little java cleanups --- src/main/java/forge/Card.java | 5 ++--- .../forge/card/abilityfactory/AbilityFactoryCopy.java | 9 ++++----- .../forge/card/cardfactory/CardFactoryPlaneswalkers.java | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index bdf3754a045..c35ce09aa0b 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -2461,14 +2461,13 @@ public class Card extends GameEntity implements Comparable { sb.append(")\r\n"); } } - + //Convoke for (String keyw : kw) { - if(keyw.equals("Convoke")) { + if (keyw.equals("Convoke")) { if (sb.toString().endsWith("\r\n\r\n")) { sb.delete(sb.lastIndexOf("\r\n"), sb.lastIndexOf("\r\n") + 3); } - sb.append("Convoke (Each creature you tap while casting this spell reduces its cost by 1 or by one mana of that creature's color.)\r\n"); } } diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java index 27f8dd40889..86fb7ec3be9 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java @@ -416,11 +416,10 @@ public final class AbilityFactoryCopy { copy.setManaCost(""); copy.setBaseAttack(2); copy.setBaseDefense(2); - copy.setIntrinsicKeyword(new ArrayList()); // remove - // all - // keywords - copy.setType(new ArrayList()); // remove all - // types + //remove all keywords + copy.setIntrinsicKeyword(new ArrayList()); + //remove all types + copy.setType(new ArrayList()); copy.addType("Creature"); copy.clearSpellAbility(); // disallow "morph_up" copy.setCurSetCode(""); diff --git a/src/main/java/forge/card/cardfactory/CardFactoryPlaneswalkers.java b/src/main/java/forge/card/cardfactory/CardFactoryPlaneswalkers.java index 3800b971ccd..22431a126ab 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryPlaneswalkers.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryPlaneswalkers.java @@ -48,8 +48,8 @@ public class CardFactoryPlaneswalkers { card.addComesIntoPlayCommand(CardFactoryUtil.entersBattleFieldWithCounters(card, Counters.LOYALTY, card.getBaseLoyalty())); } - - // *************** START *********** START ************************** + + //*************** START *********** START ************************** if (cardName.equals("Sarkhan the Mad")) { // Planeswalker book-keeping