External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

TrooperToken2 -> TrooperBlackToken. TrooperToken -> TrooperWhiteToken for consistency

Browse source
This commit is contained in:
Muz Ali 2026-01-26 08:27:08 -06:00
parent 4a8b693111
commit 9fed66761e
10 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/c/CaptainPhasma.java
View file

@ -16,7 +16,7 @@ import mage.cards.CardSetInfo;
import mage.filter.common.FilterCreatureCard;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.permanent.token.TrooperToken;
import mage.game.permanent.token.TrooperWhiteToken;
import mage.target.common.TargetCardInLibrary;
/**
@ -36,7 +36,7 @@ public final class CaptainPhasma extends CardImpl {
public CaptainPhasma(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}");
this.supertype.add(SuperType.LEGENDARY);
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.TROOPER);
@ -44,7 +44,7 @@ public final class CaptainPhasma extends CardImpl {
this.toughness = new MageInt(4);
// Nontoken Trooper creatures you control have "When this creature enters the battlefield, create 1/1/ white Trooper creature token."
Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new TrooperToken()), false)
Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new TrooperWhiteToken()), false)
.setTriggerPhrase("When this creature enters, ");
this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter, false)));

4
Mage.Sets/src/mage/cards/c/CommanderCody.java
View file

@ -10,7 +10,7 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.permanent.token.TrooperToken;
import mage.game.permanent.token.TrooperWhiteToken;
import java.util.UUID;
@ -36,7 +36,7 @@ public final class CommanderCody extends CardImpl {
// Non-token Trooper creatures you control have "At the beginning of your upkeep, create a 1/1 white Trooper creature token."
this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(
new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new TrooperToken())),
new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new TrooperWhiteToken())),
Duration.WhileOnBattlefield, filter, false)
.withForceQuotes()
));

4
Mage.Sets/src/mage/cards/d/DeployTheTroops.java
View file

@ -6,7 +6,7 @@ import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.game.permanent.token.TrooperToken;
import mage.game.permanent.token.TrooperWhiteToken;
/**
*
@ -18,7 +18,7 @@ public final class DeployTheTroops extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{W}");
// Create 3 1/1 white Trooper creature tokens.
this.getSpellAbility().addEffect(new CreateTokenEffect(new TrooperToken(), 3));
this.getSpellAbility().addEffect(new CreateTokenEffect(new TrooperWhiteToken(), 3));
}

12
Mage.Sets/src/mage/cards/d/DirectorKrennic.java
View file

@ -13,7 +13,7 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.filter.FilterPermanent;
import mage.game.permanent.token.TrooperToken2;
import mage.game.permanent.token.TrooperBlackToken;
import mage.target.TargetPermanent;
/**
@ -23,15 +23,15 @@ import mage.target.TargetPermanent;
public final class DirectorKrennic extends CardImpl {
private static final FilterPermanent filterLand = new FilterPermanent("basic land");
static {
filterLand.add(CardType.LAND.getPredicate());
filterLand.add(SuperType.BASIC.getPredicate());
}
public DirectorKrennic(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
this.supertype.add(SuperType.LEGENDARY);
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.ADVISOR);
@ -39,8 +39,8 @@ public final class DirectorKrennic extends CardImpl {
this.toughness = new MageInt(4);
// When Director Krennic enters the battlefield, create two 1/1 black Trooper creature tokens.
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new TrooperToken2(), 2)));
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new TrooperBlackToken(), 2)));
// When Director Krennic leaves the battlefield, destroy target basic land.
Ability ability = new LeavesBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
ability.addTarget(new TargetPermanent(filterLand));

4
Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java
View file

@ -16,7 +16,7 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.filter.FilterSpell;
import mage.game.permanent.token.TrooperToken;
import mage.game.permanent.token.TrooperWhiteToken;
/**
*
@ -40,7 +40,7 @@ public final class KaminoCloningFacility extends CardImpl {
this.addAbility(new ConditionalAnyColorManaAbility(new TapSourceCost(), 1, new ConditionalSpellManaBuilder(FILTER), true));
// {5}, {T}: Create a 1/1 white Trooper creature tokens.
Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new TrooperToken(), 1), new ManaCostsImpl<>("{5}"));
Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new TrooperWhiteToken(), 1), new ManaCostsImpl<>("{5}"));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/cards/l/LAATGunship.java
View file

@ -15,7 +15,7 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.Zone;
import mage.game.permanent.token.TrooperToken;
import mage.game.permanent.token.TrooperWhiteToken;
/**
*
@ -30,7 +30,7 @@ public final class LAATGunship extends CardImpl {
this.toughness = new MageInt(2);
// When LAAT Gunship attacks, create a 1/1 white Trooper creature token on to battlefield tapped and attacking.
this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new TrooperToken(), 1, true, true), false));
this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new TrooperWhiteToken(), 1, true, true), false));
// {W}: LAAT Gunship gains spaceflight until the end of turn. Activate this ability only as a sorcery
this.addAbility(new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(SpaceflightAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")));

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

@ -18,7 +18,7 @@ public final class ATATToken extends TokenImpl {
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setWhite(true);
addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TrooperToken(), 2)));
addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TrooperWhiteToken(), 2)));
subtype.add(SubType.ATAT);
}

10
Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java → Mage/src/main/java/mage/game/permanent/token/TrooperBlackToken.java
View file

@ -7,9 +7,9 @@ import mage.constants.SubType;
/**
* @author NinthWorld
*/
public final class TrooperToken2 extends TokenImpl {
public final class TrooperBlackToken extends TokenImpl {
public TrooperToken2() {
public TrooperBlackToken() {
super("Trooper Token", "1/1 black Trooper creature token");
cardType.add(CardType.CREATURE);
@ -20,11 +20,11 @@ public final class TrooperToken2 extends TokenImpl {
toughness = new MageInt(1);
}
protected TrooperToken2(final TrooperToken2 token) {
protected TrooperBlackToken(final TrooperBlackToken token) {
super(token);
}
public TrooperToken2 copy() {
return new TrooperToken2(this);
public TrooperBlackToken copy() {
return new TrooperBlackToken(this);
}
}

10
Mage/src/main/java/mage/game/permanent/token/TrooperToken.java → Mage/src/main/java/mage/game/permanent/token/TrooperWhiteToken.java
View file

@ -7,9 +7,9 @@ import mage.constants.SubType;
/**
* @author Styxo
*/
public final class TrooperToken extends TokenImpl {
public final class TrooperWhiteToken extends TokenImpl {
public TrooperToken() {
public TrooperWhiteToken() {
super("Trooper Token", "1/1 white Trooper creature token");
cardType.add(CardType.CREATURE);
@ -20,11 +20,11 @@ public final class TrooperToken extends TokenImpl {
toughness = new MageInt(1);
}
private TrooperToken(final TrooperToken token) {
private TrooperWhiteToken(final TrooperWhiteToken token) {
super(token);
}
public TrooperToken copy() {
return new TrooperToken(this);
public TrooperWhiteToken copy() {
return new TrooperWhiteToken(this);
}
}

2
Mage/src/main/resources/tokens-database.txt
View file

@ -976,7 +976,7 @@
|TOK:SWS|Rebel||RebelToken|
|TOK:SWS|Royal Guard||RoyalGuardToken|
|TOK:SWS|TIE Fighter||TIEFighterToken|
|TOK:SWS|Trooper||TrooperToken|
|TOK:SWS|Trooper||TrooperWhiteToken|
|TOK:SWS|Tusken Raider||TuskenRaiderToken|
# THS