mirror of
https://github.com/correl/mage.git
synced 2024-11-25 11:09:53 +00:00
Removed duplicate black and green worm token class
This commit is contained in:
parent
3fc84d9ba4
commit
bde2791624
5 changed files with 19 additions and 46 deletions
|
@ -363,7 +363,7 @@
|
||||||
|Generate|TOK:C16|Spirit|2||SpiritWhiteToken|
|
|Generate|TOK:C16|Spirit|2||SpiritWhiteToken|
|
||||||
|Generate|TOK:C16|Squid|||SquidToken|
|
|Generate|TOK:C16|Squid|||SquidToken|
|
||||||
|Generate|TOK:C16|Thopter|||ThopterToken|
|
|Generate|TOK:C16|Thopter|||ThopterToken|
|
||||||
|Generate|TOK:C16|Worm|||WormHarvestToken|
|
|Generate|TOK:C16|Worm|||BlackGreenWormToken|
|
||||||
|Generate|TOK:C16|Zombie|||ZombieToken|
|
|Generate|TOK:C16|Zombie|||ZombieToken|
|
||||||
|Generate|TOK:C17|Bat|||BatToken|
|
|Generate|TOK:C17|Bat|||BatToken|
|
||||||
|Generate|TOK:C17|Cat|||CatToken|
|
|Generate|TOK:C17|Cat|||CatToken|
|
||||||
|
@ -399,7 +399,7 @@
|
||||||
|Generate|TOK:C18|Thopter|1||ThopterColorlessToken|
|
|Generate|TOK:C18|Thopter|1||ThopterColorlessToken|
|
||||||
|Generate|TOK:C18|Thopter|2||ThopterColorlessToken|
|
|Generate|TOK:C18|Thopter|2||ThopterColorlessToken|
|
||||||
|Generate|TOK:C18|Thopter|3||ThopterToken|
|
|Generate|TOK:C18|Thopter|3||ThopterToken|
|
||||||
|Generate|TOK:C18|Worm|||WormHarvestToken|
|
|Generate|TOK:C18|Worm|||BlackGreenWormToken|
|
||||||
|Generate|TOK:C18|Zombie|||ZombieToken|
|
|Generate|TOK:C18|Zombie|||ZombieToken|
|
||||||
|Generate|TOK:C19|Assassin|||AssassinToken|
|
|Generate|TOK:C19|Assassin|||AssassinToken|
|
||||||
|Generate|TOK:C19|Beast|1||BeastToken|
|
|Generate|TOK:C19|Beast|1||BeastToken|
|
||||||
|
@ -632,7 +632,7 @@
|
||||||
|Generate|TOK:EVE|Kithkin Soldier|||KithkinSoldierToken|
|
|Generate|TOK:EVE|Kithkin Soldier|||KithkinSoldierToken|
|
||||||
|Generate|TOK:EVE|Spirit|||BeckonApparitionToken|
|
|Generate|TOK:EVE|Spirit|||BeckonApparitionToken|
|
||||||
|Generate|TOK:EVE|Wolf|||WolfToken|
|
|Generate|TOK:EVE|Wolf|||WolfToken|
|
||||||
|Generate|TOK:EVE|Worm|||WormHarvestToken|
|
|Generate|TOK:EVE|Worm|||BlackGreenWormToken|
|
||||||
|Generate|TOK:EVG|Elemental|||VoiceOfTheWoodsElementalToken|
|
|Generate|TOK:EVG|Elemental|||VoiceOfTheWoodsElementalToken|
|
||||||
|Generate|TOK:EVG|Elf Warrior|||ElfWarriorToken|
|
|Generate|TOK:EVG|Elf Warrior|||ElfWarriorToken|
|
||||||
|Generate|TOK:EVG|Goblin|||GoblinToken|
|
|Generate|TOK:EVG|Goblin|||GoblinToken|
|
||||||
|
@ -855,7 +855,7 @@
|
||||||
|Generate|TOK:MM2|Spirit|||SpiritWhiteToken|
|
|Generate|TOK:MM2|Spirit|||SpiritWhiteToken|
|
||||||
|Generate|TOK:MM2|Thrull|||ThrullToken|
|
|Generate|TOK:MM2|Thrull|||ThrullToken|
|
||||||
|Generate|TOK:MM2|Wolf|||WolfToken|
|
|Generate|TOK:MM2|Wolf|||WolfToken|
|
||||||
|Generate|TOK:MM2|Worm|||WormHarvestToken|
|
|Generate|TOK:MM2|Worm|||BlackGreenWormToken|
|
||||||
|Generate|TOK:MM3|Angel||
|
|Generate|TOK:MM3|Angel||
|
||||||
|Generate|TOK:MM3|Beast|1|
|
|Generate|TOK:MM3|Beast|1|
|
||||||
|Generate|TOK:MM3|Beast|2|
|
|Generate|TOK:MM3|Beast|2|
|
||||||
|
@ -889,7 +889,7 @@
|
||||||
|Generate|TOK:MMA|Soldier|||SoldierToken|
|
|Generate|TOK:MMA|Soldier|||SoldierToken|
|
||||||
|Generate|TOK:MMA|Spider|||PenumbraSpiderToken|
|
|Generate|TOK:MMA|Spider|||PenumbraSpiderToken|
|
||||||
|Generate|TOK:MMA|Treefolk Shaman|||TreefolkShamanToken|
|
|Generate|TOK:MMA|Treefolk Shaman|||TreefolkShamanToken|
|
||||||
|Generate|TOK:MMA|Worm|||WormHarvestToken|
|
|Generate|TOK:MMA|Worm|||BlackGreenWormToken|
|
||||||
|Generate|TOK:MMA|Zombie|||ZombieToken|
|
|Generate|TOK:MMA|Zombie|||ZombieToken|
|
||||||
|Generate|TOK:MMQ|Ape|||ApeToken|
|
|Generate|TOK:MMQ|Ape|||ApeToken|
|
||||||
|Generate|TOK:MMQ|Insect Butterfly|||ButterflyToken|
|
|Generate|TOK:MMQ|Insect Butterfly|||ButterflyToken|
|
||||||
|
|
|
@ -17,7 +17,7 @@ import mage.constants.TargetController;
|
||||||
import mage.constants.Zone;
|
import mage.constants.Zone;
|
||||||
import mage.filter.common.FilterCreaturePermanent;
|
import mage.filter.common.FilterCreaturePermanent;
|
||||||
import mage.filter.predicate.mageobject.ColorPredicate;
|
import mage.filter.predicate.mageobject.ColorPredicate;
|
||||||
import mage.game.permanent.token.CreakwoodLiegeToken;
|
import mage.game.permanent.token.BlackGreenWormToken;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -45,7 +45,7 @@ public final class CreakwoodLiege extends CardImpl {
|
||||||
// Other green creatures you control get +1/+1.
|
// Other green creatures you control get +1/+1.
|
||||||
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreenCreature, true)));
|
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreenCreature, true)));
|
||||||
// At the beginning of your upkeep, you may create a 1/1 black and green Worm creature token.
|
// At the beginning of your upkeep, you may create a 1/1 black and green Worm creature token.
|
||||||
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new CreakwoodLiegeToken(), 1), TargetController.YOU, true));
|
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new BlackGreenWormToken(), 1), TargetController.YOU, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
private CreakwoodLiege(final CreakwoodLiege card) {
|
private CreakwoodLiege(final CreakwoodLiege card) {
|
||||||
|
|
|
@ -9,7 +9,7 @@ import mage.cards.CardImpl;
|
||||||
import mage.cards.CardSetInfo;
|
import mage.cards.CardSetInfo;
|
||||||
import mage.constants.CardType;
|
import mage.constants.CardType;
|
||||||
import mage.filter.common.FilterLandCard;
|
import mage.filter.common.FilterLandCard;
|
||||||
import mage.game.permanent.token.WormHarvestToken;
|
import mage.game.permanent.token.BlackGreenWormToken;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -22,7 +22,7 @@ public final class WormHarvest extends CardImpl {
|
||||||
|
|
||||||
// Create a 1/1 black and green Worm creature token for each land card in your graveyard.
|
// Create a 1/1 black and green Worm creature token for each land card in your graveyard.
|
||||||
CardsInControllerGraveyardCount value = new CardsInControllerGraveyardCount(new FilterLandCard());
|
CardsInControllerGraveyardCount value = new CardsInControllerGraveyardCount(new FilterLandCard());
|
||||||
this.getSpellAbility().addEffect(new CreateTokenEffect(new WormHarvestToken(), value));
|
this.getSpellAbility().addEffect(new CreateTokenEffect(new BlackGreenWormToken(), value));
|
||||||
|
|
||||||
// Retrace
|
// Retrace
|
||||||
this.addAbility(new RetraceAbility(this));
|
this.addAbility(new RetraceAbility(this));
|
||||||
|
|
|
@ -1,17 +1,19 @@
|
||||||
|
|
||||||
|
|
||||||
package mage.game.permanent.token;
|
package mage.game.permanent.token;
|
||||||
|
|
||||||
import mage.constants.CardType;
|
import mage.constants.CardType;
|
||||||
import mage.constants.SubType;
|
import mage.constants.SubType;
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author spjspj
|
* @author spjspj
|
||||||
*/
|
*/
|
||||||
public final class CreakwoodLiegeToken extends TokenImpl {
|
public final class BlackGreenWormToken extends TokenImpl {
|
||||||
|
|
||||||
public CreakwoodLiegeToken() {
|
public BlackGreenWormToken() {
|
||||||
super("Worm Token", "1/1 black and green Worm creature token");
|
super("Worm Token", "1/1 black and green Worm creature token");
|
||||||
cardType.add(CardType.CREATURE);
|
cardType.add(CardType.CREATURE);
|
||||||
color.setBlack(true);
|
color.setBlack(true);
|
||||||
|
@ -19,13 +21,15 @@ public final class CreakwoodLiegeToken extends TokenImpl {
|
||||||
subtype.add(SubType.WORM);
|
subtype.add(SubType.WORM);
|
||||||
power = new MageInt(1);
|
power = new MageInt(1);
|
||||||
toughness = new MageInt(1);
|
toughness = new MageInt(1);
|
||||||
|
|
||||||
|
availableImageSetCodes = Arrays.asList("EVE", "MMA", "MM2", "C16", "C18");
|
||||||
}
|
}
|
||||||
|
|
||||||
public CreakwoodLiegeToken(final CreakwoodLiegeToken token) {
|
public BlackGreenWormToken(final BlackGreenWormToken token) {
|
||||||
super(token);
|
super(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CreakwoodLiegeToken copy() {
|
public BlackGreenWormToken copy() {
|
||||||
return new CreakwoodLiegeToken(this);
|
return new BlackGreenWormToken(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,31 +0,0 @@
|
||||||
|
|
||||||
package mage.game.permanent.token;
|
|
||||||
|
|
||||||
import mage.constants.CardType;
|
|
||||||
import mage.constants.SubType;
|
|
||||||
import mage.MageInt;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author spjspj
|
|
||||||
*/
|
|
||||||
public final class WormHarvestToken extends TokenImpl {
|
|
||||||
|
|
||||||
public WormHarvestToken() {
|
|
||||||
super("Worm Token", "1/1 black and green Worm creature token");
|
|
||||||
cardType.add(CardType.CREATURE);
|
|
||||||
color.setBlack(true);
|
|
||||||
color.setGreen(true);
|
|
||||||
subtype.add(SubType.WORM);
|
|
||||||
power = new MageInt(1);
|
|
||||||
toughness = new MageInt(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public WormHarvestToken(final WormHarvestToken token) {
|
|
||||||
super(token);
|
|
||||||
}
|
|
||||||
|
|
||||||
public WormHarvestToken copy() {
|
|
||||||
return new WormHarvestToken(this);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in a new issue