From 5b04f40a66d90f1b9d08f70da1fffe85aaad6e5b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 17 Jan 2015 13:09:13 +0100 Subject: [PATCH] [FRF] Minor changes to Renowned Weaponsmith and Temur Battle Rage. --- .../sets/fatereforged/RenownedWeaponsmith.java | 16 +++++++++------- .../mage/sets/fatereforged/TemurBattleRage.java | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/sets/fatereforged/RenownedWeaponsmith.java b/Mage.Sets/src/mage/sets/fatereforged/RenownedWeaponsmith.java index f592afdabf6..e25692eac75 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/RenownedWeaponsmith.java +++ b/Mage.Sets/src/mage/sets/fatereforged/RenownedWeaponsmith.java @@ -72,7 +72,7 @@ public class RenownedWeaponsmith extends CardImpl { // {t}: Add {2} to your mana pool. Spend this mana only to cast artifact spells or activate abilities of artifacts. this.addAbility(new ConditionalColorlessManaAbility(new TapSourceCost(), 2, new RenownedWeaponsmithManaBuilder())); - // {U}, {t}: Search your library for a card named Heart-Piercer Bow or Vial of Dragonfire, reveal it, put it into your hand, then shuffle your library. + // {U}, {T}: Search your library for a card named Heart-Piercer Bow or Vial of Dragonfire, reveal it, put it into your hand, then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RenownedWeaponsmithEffect(), new ManaCostsImpl("{U")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -122,11 +122,11 @@ class RenownedWeaponsmithCondition implements Condition { class RenownedWeaponsmithEffect extends OneShotEffect { - private static final FilterCard filter = new FilterCard("card named Heart-Piercer Bow or Heart-Piercer Bow"); + private static final FilterCard filter = new FilterCard("card named Heart-Piercer Vial of Dragonfire"); static { filter.add(Predicates.or(new NamePredicate("Heart-Piercer Bow"), - new NamePredicate("Heart-Piercer Bow"))); + new NamePredicate("Vial of Dragonfire"))); } public RenownedWeaponsmithEffect() { @@ -141,18 +141,20 @@ class RenownedWeaponsmithEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - if (controller != null) { + MageObject sourceObject = game.getObject(source.getSourceId()); + if (sourceObject != null && controller != null) { TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, game)) { if (target.getTargets().size() > 0) { Card card = game.getCard(target.getFirstTarget()); Cards revealed = new CardsImpl(); revealed.add(card); - controller.revealCards("Renowned Weaponsmith", revealed, game); - controller.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.LIBRARY); - controller.shuffleLibrary(game); + controller.revealCards(sourceObject.getLogName(), revealed, game); + controller.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.LIBRARY); } } + controller.shuffleLibrary(game); + return true; } return false; } diff --git a/Mage.Sets/src/mage/sets/fatereforged/TemurBattleRage.java b/Mage.Sets/src/mage/sets/fatereforged/TemurBattleRage.java index 8dff3f95380..98fc599d25f 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/TemurBattleRage.java +++ b/Mage.Sets/src/mage/sets/fatereforged/TemurBattleRage.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class TemurBattleRage extends CardImpl { - private final static String rule = "Ferocious — That creature also gains trample until end of turn if you control a creature with power 4 or greater"; + private final static String rule = "
Ferocious — That creature also gains trample until end of turn if you control a creature with power 4 or greater"; public TemurBattleRage(UUID ownerId) { super(ownerId, 116, "Temur Battle Rage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}");