From cf7d718226de5b6e4de90a30dbde9e04cd8ad0a5 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 26 Aug 2017 09:52:51 +0200 Subject: [PATCH] * Some minor changes. --- .../src/mage/cards/j/JeeringHomunculus.java | 1 + .../common/PutPermanentOnBattlefieldEffect.java | 16 ++++++++-------- .../mage/abilities/keyword/TributeAbility.java | 8 ++------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Mage.Sets/src/mage/cards/j/JeeringHomunculus.java b/Mage.Sets/src/mage/cards/j/JeeringHomunculus.java index 111330e7b7d..8e8e55d3e4e 100644 --- a/Mage.Sets/src/mage/cards/j/JeeringHomunculus.java +++ b/Mage.Sets/src/mage/cards/j/JeeringHomunculus.java @@ -51,6 +51,7 @@ public class JeeringHomunculus extends CardImpl { this.toughness = new MageInt(4); // When Jeering Homunculus enters the battlefield, you may goad target creature. + // (Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.) Ability ability = new EntersBattlefieldTriggeredAbility(new GoadTargetEffect(), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java index f559340ecce..fbde03f3d6a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java @@ -53,16 +53,16 @@ public class PutPermanentOnBattlefieldEffect extends OneShotEffect { } else { player = game.getPlayer(source.getControllerId()); } - String choiceText = "Put " + filter.getMessage() + " from your hand onto the battlefield?"; - if (player == null || !player.chooseUse(Outcome.PutCardInPlay, choiceText, source, game)) { + if (player == null) { return false; } - - TargetCardInHand target = new TargetCardInHand(filter); - if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { - Card card = game.getCard(target.getFirstTarget()); - if (card != null) { - return player.moveCards(card, Zone.BATTLEFIELD, source, game); + if (player.chooseUse(Outcome.PutCardInPlay, "Put " + filter.getMessage() + " from your hand onto the battlefield?", source, game)) { + TargetCardInHand target = new TargetCardInHand(filter); + if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { + Card card = game.getCard(target.getFirstTarget()); + if (card != null) { + return player.moveCards(card, Zone.BATTLEFIELD, source, game); + } } } return true; diff --git a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java index 65e9fceb141..a94550889fa 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java @@ -66,12 +66,8 @@ public class TributeAbility extends EntersBattlefieldAbility { @Override public String getRule() { - StringBuilder sb = new StringBuilder("Tribute "); - sb.append(tributeValue); - sb.append(" (As this creature enters the battlefield, an opponent of your choice may put "); - sb.append(tributeValue); - sb.append(" +1/+1 counter on it.)"); - return sb.toString(); + return "Tribute " + tributeValue + " (As this creature enters the battlefield, an opponent of your choice may put " + + tributeValue + " +1/+1 counter on it.)"; } }