External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 22:42:03 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pictures for some tokens from recent sets

Browse source
This commit is contained in:
Quercitron 2015-11-08 20:07:04 +03:00
parent 8caf33cdf0
commit e23fc13db0
29 changed files with 336 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java
View file

@ -34,6 +34,7 @@ import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.common.TapTargetCost;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
@ -46,7 +47,6 @@ import mage.filter.predicate.permanent.TappedPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.SpiritWhiteToken;
import mage.game.permanent.token.Token;
import mage.players.Player;
import mage.target.common.TargetControlledPermanent;
import mage.target.common.TargetCreaturePermanent;
@ -111,8 +111,7 @@ class GallowsAtWillowHillEffect extends OneShotEffect {
Player controller = game.getPlayer(permanent.getControllerId());
permanent.destroy(source.getSourceId(), game, false);
if (controller != null) {
Token spirit = new SpiritWhiteToken("AVR", 1);
spirit.putOntoBattlefield(1, game, source.getSourceId(), controller.getId());
new CreateTokenEffect(new SpiritWhiteToken()).apply(game, source);
}
affectedTargets++;
}

2
Mage.Sets/src/mage/sets/avacynrestored/MoonsilverSpear.java
View file

@ -54,7 +54,7 @@ public class MoonsilverSpear extends CardImpl {
// Equipped creature has first strike.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT)));
// Whenever equipped creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield.
this.addAbility(new AttacksAttachedTriggeredAbility(new CreateTokenEffect(new AngelToken(expansionSetCode))));
this.addAbility(new AttacksAttachedTriggeredAbility(new CreateTokenEffect(new AngelToken())));
// Equip {4}
this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4)));
}

1
Mage.Sets/src/mage/sets/battleforzendikar/AkoumStonewaker.java
View file

@ -122,5 +122,6 @@ class AkoumStonewakerElementalToken extends Token {
this.addAbility(TrampleAbility.getInstance());
this.addAbility(HasteAbility.getInstance());
this.setOriginalExpansionSetCode("BFZ");
this.setTokenType(1);
}
}

2
Mage.Sets/src/mage/sets/battleforzendikar/OmnathLocusOfRage.java
View file

@ -88,7 +88,7 @@ class OmnathElementalToken extends Token {
OmnathElementalToken() {
super("Elemental", "5/5 red and green Elemental creature token");
setTokenType(1);
setTokenType(2);
setOriginalExpansionSetCode("BFZ");
cardType.add(CardType.CREATURE);
subtype.add("Elemental");

16
Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java
View file

@ -45,7 +45,7 @@ import mage.filter.FilterSpell;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.game.Game;
import mage.game.permanent.token.Token;
import mage.game.permanent.token.ThrullToken;
import mage.game.stack.Spell;
import mage.target.targetpointer.FixedTarget;
@ -114,22 +114,10 @@ class EndrekSahrMasterBreederEffect extends OneShotEffect {
if (spell != null) {
int cmc = spell.getConvertedManaCost();
if (cmc > 0) {
return new CreateTokenEffect(new EndrekSahrMasterBreederThrullToken(), cmc).apply(game, source);
return new CreateTokenEffect(new ThrullToken(), cmc).apply(game, source);
}
return true;
}
return false;
}
}
class EndrekSahrMasterBreederThrullToken extends Token {
public EndrekSahrMasterBreederThrullToken() {
super("Thrull", "1/1 black Thrull creature token");
cardType.add(CardType.CREATURE);
color.setBlack(true);
subtype.add("Thrull");
power = new MageInt(1);
toughness = new MageInt(1);
}
}

2
Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java
View file

@ -101,7 +101,7 @@ public class HuntmasterOfTheFells extends CardImpl {
class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl {
public HuntmasterOfTheFellsAbility() {
super(Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken(Token.Type.SECOND)), false);
super(Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken()), false);
this.addEffect(new GainLifeEffect(2));
}

2
Mage.Sets/src/mage/sets/darkascension/RequiemAngel.java
View file

@ -67,7 +67,7 @@ public class RequiemAngel extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Whenever another non-Spirit creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken(expansionSetCode), 1), false, filter));
this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken("ISD"), 1), false, filter));
}
public RequiemAngel(final RequiemAngel card) {

9
Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java
View file

@ -36,9 +36,8 @@ import mage.abilities.Ability;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.constants.Outcome;
import mage.filter.common.FilterArtifactSpell;
import mage.game.Game;
import mage.game.permanent.token.MyrToken;
@ -71,9 +70,9 @@ public class Myrsmith extends CardImpl {
}
}
class MyrsmithEffect extends OneShotEffect {
class MyrsmithEffect extends CreateTokenEffect {
public MyrsmithEffect() {
super(Outcome.PutCreatureInPlay);
super(new MyrToken());
staticText = "you may pay {1}. If you do, put a 1/1 colorless Myr artifact creature token onto the battlefield";
}
@ -86,7 +85,7 @@ class MyrsmithEffect extends OneShotEffect {
Cost cost = new GenericManaCost(1);
cost.clearPaid();
if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false)) {
new MyrToken().putOntoBattlefield(1, game, source.getControllerId(), source.getControllerId());
super.apply(game, source);
}
return true;
}

2
Mage.Sets/src/mage/sets/tempestremastered/FieldOfSouls.java
View file

@ -57,7 +57,7 @@ public class FieldOfSouls extends CardImpl {
this.expansionSetCode = "TPR";
// Whenever a nontoken creature is put into your graveyard from the battlefield, put a 1/1 white Spirit creature token with flying onto the battlefield.
this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken("KTK")), false, filter));
this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()), false, filter));
}
public FieldOfSouls(final FieldOfSouls card) {

12
Mage.Sets/src/mage/sets/timespiral/SarpadianEmpiresVolVii.java
View file

@ -46,6 +46,7 @@ import mage.game.Game;
import mage.game.permanent.token.CitizenToken;
import mage.game.permanent.token.GoblinToken;
import mage.game.permanent.token.SaprolingToken;
import mage.game.permanent.token.ThrullToken;
import mage.game.permanent.token.Token;
import mage.players.Player;
@ -165,14 +166,3 @@ class CamaridToken extends Token {
toughness = new MageInt(1);
}
}
class ThrullToken extends Token {
public ThrullToken() {
super("Thrull", "1/1 black Thrull creature token");
cardType.add(CardType.CREATURE);
subtype.add("Thrull");
color.setBlack(true);
power = new MageInt(1);
toughness = new MageInt(1);
}
}

2
Mage.Sets/src/mage/sets/vintagemasters/DecreeOfJustice.java
View file

@ -60,7 +60,7 @@ public class DecreeOfJustice extends CardImpl {
// Put X 4/4 white Angel creature tokens with flying onto the battlefield.
this.getSpellAbility().addEffect(new CreateTokenEffect(new AngelToken("C14"), new ManacostVariableValue()));
this.getSpellAbility().addEffect(new CreateTokenEffect(new AngelToken(), new ManacostVariableValue()));
// Cycling {2}{W}
this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{W}")));