diff --git a/Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java b/Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java index 8132b6571dc..17780304825 100644 --- a/Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java +++ b/Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java @@ -79,14 +79,25 @@ class ApproachOfTheSecondSunEffect extends OneShotEffect { for (int i = 0; i < 6 && controller.getLibrary().hasCards(); ++i) { top6.add(controller.getLibrary().removeFromTop(game)); } + + // Is the library now empty, thus the rise is on the bottom (for the message to the players)? + boolean isOnBottom = !controller.getLibrary().hasCards(); + // Put this card (if the ability came from an ApproachOfTheSecondSun spell card) on top - controller.moveCardToLibraryWithInfo(spellCard, source.getSourceId(), game, Zone.STACK, true, true); + spellCard.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); // put the top 6 we took earlier back on top (going in reverse order this time to get them back // on top in the proper order) for (int i = top6.size() - 1; i >= 0; --i) { controller.getLibrary().putOnTop(top6.get(i), game); } + + // Inform the players + if (isOnBottom) { + game.informPlayers(controller.getLogName() + " puts " + spell.getLogName() + " on the bottom of his or her library."); + } else { + game.informPlayers(controller.getLogName() + " puts " + spell.getLogName() + " into his or her library 6th from the top."); + } } } return true; diff --git a/Mage.Sets/src/mage/cards/b/BonePicker.java b/Mage.Sets/src/mage/cards/b/BonePicker.java index 634e3cd278b..8ad905c6b95 100644 --- a/Mage.Sets/src/mage/cards/b/BonePicker.java +++ b/Mage.Sets/src/mage/cards/b/BonePicker.java @@ -97,7 +97,7 @@ class BonePickerCostAdjustmentAbility extends SimpleStaticAbility implements Adj @Override public String getRule() { - return "If a creature died this turn, {this} costs 3 less to cast."; + return "If a creature died this turn, {this} costs {3} less to cast."; } @Override diff --git a/Mage.Sets/src/mage/cards/m/ManticoreOfTheGauntlet.java b/Mage.Sets/src/mage/cards/m/ManticoreOfTheGauntlet.java index c0d45ff1449..d8798b8a515 100644 --- a/Mage.Sets/src/mage/cards/m/ManticoreOfTheGauntlet.java +++ b/Mage.Sets/src/mage/cards/m/ManticoreOfTheGauntlet.java @@ -60,15 +60,17 @@ public class ManticoreOfTheGauntlet extends CardImpl { // When Manticore of the Gauntlet enters the battlefield, put a -1/-1 counter on target creature you control. Manticore of the Gauntlet deals 3 damage to target opponent. Effect counters = new AddCountersTargetEffect(CounterType.M1M1.createInstance()); + counters.setText("put a -1/-1 counter on target creature you control"); counters.setTargetPointer(new FirstTargetPointer()); Effect damage = new DamageTargetEffect(new StaticValue(3), true, "", true); + damage.setText("{this} deals 3 damage to target opponent."); damage.setTargetPointer(new SecondTargetPointer()); Ability ability = new EntersBattlefieldTriggeredAbility(counters); - ability.addTarget(new TargetControlledCreaturePermanent()); - ability.addEffect(damage); + + ability.addTarget(new TargetControlledCreaturePermanent()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MercilessJavelineer.java b/Mage.Sets/src/mage/cards/m/MercilessJavelineer.java index b5e3f8ee594..b0fee3a7f17 100644 --- a/Mage.Sets/src/mage/cards/m/MercilessJavelineer.java +++ b/Mage.Sets/src/mage/cards/m/MercilessJavelineer.java @@ -69,7 +69,9 @@ public class MercilessJavelineer extends CardImpl { new StaticValue(1), Outcome.Removal), new ManaCostsImpl("{2}")); - ability.addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); + ability.addEffect( + new CantBlockTargetEffect(Duration.EndOfTurn) + .setText("That creature can't block this turn.")); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RakdosDrake.java b/Mage.Sets/src/mage/cards/r/RakdosDrake.java index 683e6d716d0..90751ddc78c 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosDrake.java +++ b/Mage.Sets/src/mage/cards/r/RakdosDrake.java @@ -49,12 +49,6 @@ import mage.filter.predicate.permanent.ControllerPredicate; public class RakdosDrake extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other creatures you control"); - static { - filter.add(new AnotherPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); - } - public RakdosDrake (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); this.subtype.add("Drake"); diff --git a/Mage.Sets/src/mage/cards/r/RiverSerpent.java b/Mage.Sets/src/mage/cards/r/RiverSerpent.java index cf05d530fab..e5ed656644c 100644 --- a/Mage.Sets/src/mage/cards/r/RiverSerpent.java +++ b/Mage.Sets/src/mage/cards/r/RiverSerpent.java @@ -98,6 +98,10 @@ class RiverSerpentEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return new CardsInControllerGraveyardCount().calculate(game, source, this) < 5; + if (permanent.getId().equals(source.getSourceId())) { + return new CardsInControllerGraveyardCount().calculate(game, source, this) < 5; + } else { + return false; + } } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/w/WarfireJavelineer.java b/Mage.Sets/src/mage/cards/w/WarfireJavelineer.java index 53cfa52352b..9fab807880e 100644 --- a/Mage.Sets/src/mage/cards/w/WarfireJavelineer.java +++ b/Mage.Sets/src/mage/cards/w/WarfireJavelineer.java @@ -56,7 +56,8 @@ public class WarfireJavelineer extends CardImpl { EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility( new DamageTargetEffect( - new CardsInControllerGraveyardCount(new FilterInstantOrSorceryCard()))); + new CardsInControllerGraveyardCount(new FilterInstantOrSorceryCard())) + .setText("it deals X damage to target creature an opponent controls, where X is the number of instant and sorcery cards in your graveyard.")); ability.addTarget(new TargetOpponentsCreaturePermanent()); this.addAbility(ability); }