External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 20:59:14 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes and improvements to tooltip rule generation.

Browse source
This commit is contained in:
LevelX2 2013-01-08 00:15:41 +01:00
parent c3412211d3
commit 8cef2df859
9 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@ import java.util.UUID;
*/
public class RestorationAngel extends CardImpl<RestorationAngel> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Angel");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Angel creature you control, then ");
static {
filter.add(Predicates.not(new SubtypePredicate("Angel")));

4
Mage.Sets/src/mage/sets/championsofkamigawa/BloodSpeaker.java
View file

@ -52,8 +52,8 @@ import mage.target.common.TargetCardInLibrary;
*/
public class BloodSpeaker extends CardImpl<BloodSpeaker> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Demon");
private static final FilterCard filterCard = new FilterCard("Demon");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Demon under your control");
private static final FilterCard filterCard = new FilterCard("Demon card");
static {
filter.add(new SubtypePredicate("Demon"));
filterCard.add(new SubtypePredicate("Demon"));

4
Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java
View file

@ -60,7 +60,7 @@ public class CruelUltimatum extends CardImpl<CruelUltimatum> {
// Target opponent sacrifices a creature, discards three cards, then loses 5 life. You return a creature card from your graveyard to your hand, draw three cards, then gain 5 life.
this.getSpellAbility().addTarget(new TargetOpponent());
this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target opponent sacrifices a creature"));
this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target opponent"));
this.getSpellAbility().addEffect(new DiscardTargetEffect(3));
this.getSpellAbility().addEffect(new LoseLifeTargetEffect(5));
@ -83,7 +83,7 @@ class CruelUltimatumEffect extends OneShotEffect<CruelUltimatumEffect> {
public CruelUltimatumEffect() {
super(Outcome.ReturnToHand);
this.staticText = "return a creature card from your graveyard to your hand";
this.staticText = "Return a creature card from your graveyard to your hand";
}
public CruelUltimatumEffect(final CruelUltimatumEffect effect) {

6
Mage.Sets/src/mage/sets/urzaslegacy/GoblinWelder.java
View file

@ -40,6 +40,7 @@ import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.filter.common.FilterArtifactCard;
import mage.filter.common.FilterArtifactPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -65,7 +66,7 @@ public class GoblinWelder extends CardImpl<GoblinWelder> {
// {tap}: Choose target artifact a player controls and target artifact card in that player's graveyard. If both targets are still legal as this ability resolves, that player simultaneously sacrifices the artifact and returns the artifact card to the battlefield.
Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GoblinWelderEffect(), new TapSourceCost());
ability.addTarget(new TargetArtifactPermanent());
ability.addTarget(new TargetArtifactPermanent(new FilterArtifactPermanent("artifact a player controls")));
ability.addTarget(new GoblinWelderTarget());
this.addAbility(ability);
}
@ -119,9 +120,8 @@ public class GoblinWelder extends CardImpl<GoblinWelder> {
@Override
public String getText(Mode mode) {
return "Sacrifices " + mode.getTargets().get(0).getTargetName() + " and returns " + mode.getTargets().get(1).getTargetName() + " to the battlefield";
return "Choose " + mode.getTargets().get(0).getTargetName() + " and " + mode.getTargets().get(1).getTargetName() + ". If both targets are still legal as this ability resolves, that player simultaneously sacrifices the artifact and returns the artifact card to the battlefield";
}
}
class GoblinWelderTarget extends TargetCard<TargetCardInYourGraveyard> {