External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 19:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix type ordering on some Artifact Creature tokens

Browse source
This commit is contained in:
xenohedron 2023-08-16 20:39:26 -04:00
parent 454627eaf6
commit 9eca83dd7e
20 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.permanent.token.StoneTrapIdolToken; import mage.game.permanent.token.StoneIdolToken;
import java.util.UUID; import java.util.UUID;
@ -44,7 +44,7 @@ public final class AncientStoneIdol extends CardImpl {
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// When Ancient Stone Idol dies, create a 6/12 colorless Construct artifact creature token with trample. // When Ancient Stone Idol dies, create a 6/12 colorless Construct artifact creature token with trample.
this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new StoneTrapIdolToken()))); this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new StoneIdolToken())));
} }
private AncientStoneIdol(final AncientStoneIdol card) { private AncientStoneIdol(final AncientStoneIdol card) {

2
Mage.Sets/src/mage/cards/d/DreadStatuary.java
View file

@ -43,8 +43,8 @@ class DreadStatuaryToken extends TokenImpl {
public DreadStatuaryToken() { public DreadStatuaryToken() {
super("", "4/2 Golem artifact creature"); super("", "4/2 Golem artifact creature");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.GOLEM); subtype.add(SubType.GOLEM);
power = new MageInt(4); power = new MageInt(4);
toughness = new MageInt(2); toughness = new MageInt(2);

2
Mage.Sets/src/mage/cards/f/ForiysianTotem.java
View file

@ -57,8 +57,8 @@ class ForiysianTotemToken extends TokenImpl {
public ForiysianTotemToken() { public ForiysianTotemToken() {
super("", "4/4 red Giant artifact creature with trample"); super("", "4/4 red Giant artifact creature with trample");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.GIANT); subtype.add(SubType.GIANT);
color.setRed(true); color.setRed(true);
power = new MageInt(4); power = new MageInt(4);

2
Mage.Sets/src/mage/cards/f/FountainOfIchor.java
View file

@ -45,8 +45,8 @@ class FountainOfIchorToken extends TokenImpl {
FountainOfIchorToken() { FountainOfIchorToken() {
super("", "3/3 Dinosaur artifact creature"); super("", "3/3 Dinosaur artifact creature");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.DINOSAUR); subtype.add(SubType.DINOSAUR);
power = new MageInt(3); power = new MageInt(3);
toughness = new MageInt(3); toughness = new MageInt(3);

2
Mage.Sets/src/mage/cards/g/GruulWarPlow.java
View file

@ -47,8 +47,8 @@ class GruulWarPlowToken extends TokenImpl {
GruulWarPlowToken() { GruulWarPlowToken() {
super("Juggernaut", "4/4 Juggernaut artifact creature"); super("Juggernaut", "4/4 Juggernaut artifact creature");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.JUGGERNAUT); subtype.add(SubType.JUGGERNAUT);
power = new MageInt(4); power = new MageInt(4);
toughness = new MageInt(4); toughness = new MageInt(4);

4
Mage.Sets/src/mage/cards/s/StoneIdolTrap.java
View file

@ -12,7 +12,7 @@ import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.AttackingPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.token.StoneTrapIdolToken; import mage.game.permanent.token.StoneIdolToken;
import mage.util.CardUtil; import mage.util.CardUtil;
import java.util.UUID; import java.util.UUID;
@ -102,7 +102,7 @@ class StoneIdolTrapEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
CreateTokenEffect effect = new CreateTokenEffect(new StoneTrapIdolToken()); CreateTokenEffect effect = new CreateTokenEffect(new StoneIdolToken());
if (effect.apply(game, source)) { if (effect.apply(game, source)) {
effect.exileTokensCreatedAtNextEndStep(game, source); effect.exileTokensCreatedAtNextEndStep(game, source);
return true; return true;

2
Mage.Sets/src/mage/cards/w/WardenOfTheWall.java
View file

@ -55,8 +55,8 @@ class GargoyleToken extends TokenImpl {
public GargoyleToken() { public GargoyleToken() {
super("", "2/3 Gargoyle artifact creature with flying"); super("", "2/3 Gargoyle artifact creature with flying");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.GARGOYLE); subtype.add(SubType.GARGOYLE);
power = new MageInt(2); power = new MageInt(2);
toughness = new MageInt(3); toughness = new MageInt(3);

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

@ -15,8 +15,8 @@ public final class ATATToken extends TokenImpl {
super("AT-AT Token", "5/5 white artifact AT-AT creature tokens with \"When this creature dies, create two 1/1 white Trooper creature tokens.\""); super("AT-AT Token", "5/5 white artifact AT-AT creature tokens with \"When this creature dies, create two 1/1 white Trooper creature tokens.\"");
this.power = new MageInt(5); this.power = new MageInt(5);
this.toughness = new MageInt(5); this.toughness = new MageInt(5);
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setWhite(true); color.setWhite(true);
addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TrooperToken(), 2))); addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TrooperToken(), 2)));
subtype.add(SubType.ATAT); subtype.add(SubType.ATAT);
@ -30,4 +30,3 @@ public final class ATATToken extends TokenImpl {
return new ATATToken(this); return new ATATToken(this);
} }
} }

2
Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java
View file

@ -14,8 +14,8 @@ public final class BallisticBoulder extends TokenImpl {
public BallisticBoulder() { public BallisticBoulder() {
super("Ballistic Boulder", "2/1 colorless Construct artifact creature token with flying named Ballistic Boulder"); super("Ballistic Boulder", "2/1 colorless Construct artifact creature token with flying named Ballistic Boulder");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.CONSTRUCT); subtype.add(SubType.CONSTRUCT);
power = new MageInt(2); power = new MageInt(2);
toughness = new MageInt(1); toughness = new MageInt(1);

2
Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java
View file

@ -8,8 +8,8 @@ public final class BrudicladTelchorMyrToken extends TokenImpl {
public BrudicladTelchorMyrToken() { public BrudicladTelchorMyrToken() {
super("Phyrexian Myr Token", "2/1 blue Phyrexian Myr artifact creature token"); super("Phyrexian Myr Token", "2/1 blue Phyrexian Myr artifact creature token");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.PHYREXIAN); subtype.add(SubType.PHYREXIAN);
subtype.add(SubType.MYR); subtype.add(SubType.MYR);
color.setBlue(true); color.setBlue(true);

2
Mage/src/main/java/mage/game/permanent/token/DroidToken.java
View file

@ -12,8 +12,8 @@ public final class DroidToken extends TokenImpl {
public DroidToken() { public DroidToken() {
super("Droid Token", "1/1 colorless Droid creature token"); super("Droid Token", "1/1 colorless Droid creature token");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.DROID); subtype.add(SubType.DROID);
power = new MageInt(1); power = new MageInt(1);

2
Mage/src/main/java/mage/game/permanent/token/DroneToken.java
View file

@ -16,8 +16,8 @@ public class DroneToken extends TokenImpl {
public DroneToken() { public DroneToken() {
super("Drone Token", "2/2 colorless Drone artifact creature token with deathtouch and \"When this creature leaves the battlefield, each opponent loses 2 life and you gain 2 life.\""); super("Drone Token", "2/2 colorless Drone artifact creature token with deathtouch and \"When this creature leaves the battlefield, each opponent loses 2 life and you gain 2 life.\"");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.DRONE); subtype.add(SubType.DRONE);
power = new MageInt(2); power = new MageInt(2);
toughness = new MageInt(2); toughness = new MageInt(2);

2
Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java
View file

@ -12,8 +12,8 @@ public final class GargoyleToken extends TokenImpl {
public GargoyleToken() { public GargoyleToken() {
super("Gargoyle Token", "3/4 colorless Gargoyle artifact creature token with flying"); super("Gargoyle Token", "3/4 colorless Gargoyle artifact creature token with flying");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.GARGOYLE); subtype.add(SubType.GARGOYLE);
power = new MageInt(3); power = new MageInt(3);
toughness = new MageInt(4); toughness = new MageInt(4);

2
Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java
View file

@ -13,8 +13,8 @@ public final class HomunculusToken extends TokenImpl {
public HomunculusToken() { public HomunculusToken() {
super("Homunculus Token", "0/1 blue Homunculus artifact creature token"); super("Homunculus Token", "0/1 blue Homunculus artifact creature token");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlue(true); color.setBlue(true);
subtype.add(SubType.HOMUNCULUS); subtype.add(SubType.HOMUNCULUS);
power = new MageInt(0); power = new MageInt(0);

2
Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java
View file

@ -11,8 +11,8 @@ public final class MetallicSliverToken extends TokenImpl {
public MetallicSliverToken() { public MetallicSliverToken() {
super("Metallic Sliver", "1/1 colorless Sliver artifact creature token named Metallic Sliver"); super("Metallic Sliver", "1/1 colorless Sliver artifact creature token named Metallic Sliver");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.SLIVER); subtype.add(SubType.SLIVER);
power = new MageInt(1); power = new MageInt(1);
toughness = new MageInt(1); toughness = new MageInt(1);

2
Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java
View file

@ -14,8 +14,8 @@ public final class RebelStarshipToken extends TokenImpl {
super("B-Wing Token", "2/3 blue Rebel Starship artifact creature tokens with spaceflight name B-Wing"); super("B-Wing Token", "2/3 blue Rebel Starship artifact creature tokens with spaceflight name B-Wing");
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
abilities.add(SpaceflightAbility.getInstance()); abilities.add(SpaceflightAbility.getInstance());
color.setBlue(true); color.setBlue(true);
subtype.add(SubType.REBEL); subtype.add(SubType.REBEL);

12
Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java → Mage/src/main/java/mage/game/permanent/token/StoneIdolToken.java
View file

@ -8,23 +8,23 @@ import mage.constants.SubType;
/** /**
* @author spjspj * @author spjspj
*/ */
public final class StoneTrapIdolToken extends TokenImpl { public final class StoneIdolToken extends TokenImpl {
public StoneTrapIdolToken() { public StoneIdolToken() {
super("Construct Token", "6/12 colorless Construct artifact creature token with trample"); super("Construct Token", "6/12 colorless Construct artifact creature token with trample");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.CONSTRUCT); subtype.add(SubType.CONSTRUCT);
power = new MageInt(6); power = new MageInt(6);
toughness = new MageInt(12); toughness = new MageInt(12);
addAbility(TrampleAbility.getInstance()); addAbility(TrampleAbility.getInstance());
} }
protected StoneTrapIdolToken(final StoneTrapIdolToken token) { protected StoneIdolToken(final StoneIdolToken token) {
super(token); super(token);
} }
public StoneTrapIdolToken copy() { public StoneIdolToken copy() {
return new StoneTrapIdolToken(this); return new StoneIdolToken(this);
} }
} }

2
Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java
View file

@ -14,8 +14,8 @@ public final class TIEFighterToken extends TokenImpl {
super("TIE Fighter", "1/1 black Starship artifact creature tokens with Spaceflight named TIE Fighter"); super("TIE Fighter", "1/1 black Starship artifact creature tokens with Spaceflight named TIE Fighter");
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlack(true); color.setBlack(true);
addAbility(SpaceflightAbility.getInstance()); addAbility(SpaceflightAbility.getInstance());
subtype.add(SubType.STARSHIP); subtype.add(SubType.STARSHIP);

2
Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java
View file

@ -16,8 +16,8 @@ public final class TetraviteToken extends TokenImpl {
public TetraviteToken() { public TetraviteToken() {
super("Tetravite Token", "1/1 colorless Tetravite artifact creature token with flying and \"This creature can't be enchanted.\""); super("Tetravite Token", "1/1 colorless Tetravite artifact creature token with flying and \"This creature can't be enchanted.\"");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.TETRAVITE); subtype.add(SubType.TETRAVITE);
power = new MageInt(1); power = new MageInt(1);
toughness = new MageInt(1); toughness = new MageInt(1);

2
Mage/src/main/java/mage/game/permanent/token/ThopterToken.java
View file

@ -12,8 +12,8 @@ public final class ThopterToken extends TokenImpl {
public ThopterToken() { public ThopterToken() {
super("Thopter Token", "1/1 blue Thopter artifact creature token with flying"); super("Thopter Token", "1/1 blue Thopter artifact creature token with flying");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlue(true); color.setBlue(true);
subtype.add(SubType.THOPTER); subtype.add(SubType.THOPTER);
power = new MageInt(1); power = new MageInt(1);