Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[SWS] Fixed some problems.

Browse source
This commit is contained in:
LevelX2 2016-10-03 00:38:39 +02:00
parent 7cedf8b193
commit e19172fb91
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/sets/starwars/N1Starfighter.java
View file

@ -35,7 +35,7 @@ import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DoIfCostPaid;
import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect;
import mage.abilities.keyword.SpaceflightAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
@ -67,8 +67,8 @@ public class N1Starfighter extends CardImpl {
this.addAbility(SpaceflightAbility.getInstance());
// Whenever N-1 Starfighter deals combat damage to a player, you may pay {1}. If you do, exile another creature you control, then return that card to the battlefield under its owner's control.
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new ExileTargetForSourceEffect(), new GenericManaCost(1)), true);
Effect effect = new ReturnToBattlefieldUnderYourControlTargetEffect(true);
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new ExileTargetForSourceEffect(), new GenericManaCost(1)), false);
Effect effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(false, true);
effect.setText(", then return the card to the battlefield under their owner's control");
ability.addEffect(effect);
ability.addTarget(new TargetControlledCreaturePermanent(filter));

3
Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
View file

@ -35,6 +35,7 @@ import mage.constants.Outcome;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.util.CardUtil;
/**
*
@ -80,7 +81,7 @@ public class UntapTargetEffect extends OneShotEffect {
}
if (target.getMaxNumberOfTargets() > 1 || target.getNumberOfTargets() == 0) {
sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName()).append("s");
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" target ").append(target.getTargetName()).append("s");
} else {
if (!target.getTargetName().startsWith("another")) {
sb.append("target ");