github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed duplicate enchantment bird token class

Browse source
This commit is contained in:
PurpleCrowbar 2022-06-05 13:40:55 +01:00
parent 2074a02920
commit cb6e6b234f
7 changed files with 58 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/resources/card-pictures-tok.txt
View file

@ -278,8 +278,8 @@
|Generate|TOK:BFZ|Kor Ally|||KorAllyToken|
|Generate|TOK:BFZ|Octopus|||OctopusToken|
|Generate|TOK:BFZ|Plant|||GrovetenderDruidsPlantToken|
|Generate|TOK:BNG|Bird|1||BirdToken|
|Generate|TOK:BNG|Bird|2||AerieWorshippersBirdToken|
|Generate|TOK:BNG|Bird|1||EnchantmentBirdToken|
|Generate|TOK:BNG|Bird|2||BirdToken|
|Generate|TOK:BNG|Cat Soldier|||CatSoldierCreatureToken|
|Generate|TOK:BNG|Centaur|||CentaurEnchantmentCreatureToken|
|Generate|TOK:BNG|Elemental|||SatyrNyxSmithElementalToken|

4
Mage.Sets/src/mage/cards/a/AerieWorshippers.java
View file

@ -11,7 +11,7 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.game.permanent.token.AerieWorshippersBirdToken;
import mage.game.permanent.token.EnchantmentBirdToken;
/**
*
@ -28,7 +28,7 @@ public final class AerieWorshippers extends CardImpl {
this.toughness = new MageInt(4);
// <i>Inspired</i> &mdash; Whenever Aerie Worshipers becomes untapped, you may pay {2}{U}. If you do, create a 2/2 blue Bird enchantment creature token with flying.
this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new AerieWorshippersBirdToken()), new ManaCostsImpl<>("{2}{U}"))));
this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new EnchantmentBirdToken()), new ManaCostsImpl<>("{2}{U}"))));
}
private AerieWorshippers(final AerieWorshippers card) {

4
Mage.Sets/src/mage/cards/r/RiseOfEagles.java
View file

@ -7,7 +7,7 @@ import mage.abilities.effects.keyword.ScryEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.game.permanent.token.RiseOfEaglesBirdToken;
import mage.game.permanent.token.EnchantmentBirdToken;
/**
*
@ -19,7 +19,7 @@ public final class RiseOfEagles extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{U}{U}");
// Create two 2/2 blue Bird enchantment creature tokens with flying. Scry 1.
this.getSpellAbility().addEffect(new CreateTokenEffect(new RiseOfEaglesBirdToken(), 2));
this.getSpellAbility().addEffect(new CreateTokenEffect(new EnchantmentBirdToken(), 2));
this.getSpellAbility().addEffect(new ScryEffect(1));
}

38
Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java
View file

@ -1,38 +0,0 @@
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
import mage.abilities.keyword.FlyingAbility;
/**
*
* @author spjspj
*/
public final class AerieWorshippersBirdToken extends TokenImpl {
public AerieWorshippersBirdToken() {
super("Bird Token", "2/2 blue Bird enchantment creature token with flying");
cardType.add(CardType.ENCHANTMENT);
cardType.add(CardType.CREATURE);
color.setBlue(true);
subtype.add(SubType.BIRD);
power = new MageInt(2);
toughness = new MageInt(2);
this.addAbility(FlyingAbility.getInstance());
this.setOriginalExpansionSetCode("BNG");
this.setTokenType(2);
}
public AerieWorshippersBirdToken(final AerieWorshippersBirdToken token) {
super(token);
}
public AerieWorshippersBirdToken copy() {
return new AerieWorshippersBirdToken(this);
}
}

3
Mage/src/main/java/mage/game/permanent/token/BirdToken.java
View file

@ -43,5 +43,8 @@ public final class BirdToken extends TokenImpl {
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) {
setTokenType(2);
}
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BNG")) {
setTokenType(2);
}
}
}

49
Mage/src/main/java/mage/game/permanent/token/EnchantmentBirdToken.java Normal file
View file

@ -0,0 +1,49 @@
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
import mage.abilities.keyword.FlyingAbility;
import java.util.Arrays;
/**
*
* @author spjspj
*/
public final class EnchantmentBirdToken extends TokenImpl {
public EnchantmentBirdToken() {
super("Bird Token", "2/2 blue Bird enchantment creature token with flying");
cardType.add(CardType.ENCHANTMENT);
cardType.add(CardType.CREATURE);
color.setBlue(true);
subtype.add(SubType.BIRD);
power = new MageInt(2);
toughness = new MageInt(2);
this.addAbility(FlyingAbility.getInstance());
availableImageSetCodes = Arrays.asList("BNG");
}
@Override
public void setExpansionSetCodeForImage(String code) {
super.setExpansionSetCodeForImage(code);
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BNG")) {
setTokenType(1);
}
}
public EnchantmentBirdToken(final EnchantmentBirdToken token) {
super(token);
}
public EnchantmentBirdToken copy() {
return new EnchantmentBirdToken(this);
}
}

36
Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java
View file

@ -1,36 +0,0 @@
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.keyword.FlyingAbility;
/**
*
* @author spjspj
*/
public final class RiseOfEaglesBirdToken extends TokenImpl {
public RiseOfEaglesBirdToken() {
super("Bird Token", "2/2 blue Bird enchantment creature tokens with flying");
this.setOriginalExpansionSetCode("BNG");
this.setTokenType(2);
cardType.add(CardType.ENCHANTMENT);
cardType.add(CardType.CREATURE);
color.setColor(ObjectColor.BLUE);
subtype.add(SubType.BIRD);
power = new MageInt(2);
toughness = new MageInt(2);
addAbility(FlyingAbility.getInstance());
}
public RiseOfEaglesBirdToken(final RiseOfEaglesBirdToken token) {
super(token);
}
public RiseOfEaglesBirdToken copy() {
return new RiseOfEaglesBirdToken(this);
}
}