Refactor - make VampireToken classes inner classes to avoid collision

This commit is contained in:
JOAC69 2016-09-26 01:04:49 -05:00
parent 171e9f183d
commit 01592c7e50
4 changed files with 42 additions and 32 deletions

View file

@ -96,18 +96,17 @@ public class SorinLordOfInnistrad extends CardImpl {
public SorinLordOfInnistrad copy() { public SorinLordOfInnistrad copy() {
return new SorinLordOfInnistrad(this); return new SorinLordOfInnistrad(this);
} }
}
class VampireToken extends Token { class VampireToken extends Token {
VampireToken() {
VampireToken() { super("Vampire", "a 1/1 black Vampire creature token with lifelink");
super("Vampire", "a 1/1 black Vampire creature token with lifelink"); cardType.add(CardType.CREATURE);
cardType.add(CardType.CREATURE); color.setBlack(true);
color.setBlack(true); subtype.add("Vampire");
subtype.add("Vampire"); power = new MageInt(1);
power = new MageInt(1); toughness = new MageInt(1);
toughness = new MageInt(1); addAbility(LifelinkAbility.getInstance());
addAbility(LifelinkAbility.getInstance()); }
} }
} }

View file

@ -91,16 +91,16 @@ public class BloodlineKeeper extends CardImpl {
public BloodlineKeeper copy() { public BloodlineKeeper copy() {
return new BloodlineKeeper(this); return new BloodlineKeeper(this);
} }
}
class VampireToken extends Token { class VampireToken extends Token {
VampireToken() { VampireToken() {
super("Vampire", "a 2/2 black Vampire creature token with flying"); super("Vampire", "a 2/2 black Vampire creature token with flying");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
color.setBlack(true); color.setBlack(true);
subtype.add("Vampire"); subtype.add("Vampire");
power = new MageInt(2); power = new MageInt(2);
toughness = new MageInt(2); toughness = new MageInt(2);
addAbility(FlyingAbility.getInstance()); addAbility(FlyingAbility.getInstance());
}
} }
} }

View file

@ -43,6 +43,7 @@ import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.permanent.token.Token;
/** /**
* *
@ -83,4 +84,16 @@ public class LordOfLineage extends CardImpl {
public LordOfLineage copy() { public LordOfLineage copy() {
return new LordOfLineage(this); return new LordOfLineage(this);
} }
class VampireToken extends Token {
VampireToken() {
super("Vampire", "a 2/2 black Vampire creature token with flying");
cardType.add(CardType.CREATURE);
color.setBlack(true);
subtype.add("Vampire");
power = new MageInt(2);
toughness = new MageInt(2);
addAbility(FlyingAbility.getInstance());
}
}
} }

View file

@ -101,17 +101,15 @@ class KalitasDestroyEffect extends OneShotEffect {
} }
return true; return true;
} }
}
class VampireToken extends Token { class VampireToken extends Token {
public VampireToken(int tokenPower, int tokenToughness) {
public VampireToken(int tokenPower, int tokenToughness) { super("Vampire", new StringBuilder(tokenPower).append("/").append(tokenToughness).append(" black Vampire creature token").toString());
super("Vampire", new StringBuilder(tokenPower).append("/").append(tokenToughness).append(" black Vampire creature token").toString()); cardType.add(CardType.CREATURE);
cardType.add(CardType.CREATURE); color.setBlack(true);
color.setBlack(true); subtype.add("Vampire");
subtype.add("Vampire"); power = new MageInt(tokenPower);
power = new MageInt(tokenPower); toughness = new MageInt(tokenToughness);
toughness = new MageInt(tokenToughness); }
} }
} }