github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Some minor changes.

Browse source
This commit is contained in:
LevelX2 2017-08-26 09:52:51 +02:00
parent 42d9312599
commit cf7d718226
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/cards/j/JeeringHomunculus.java
View file

@ -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);

16
Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java
View file

@ -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;

8
Mage/src/main/java/mage/abilities/keyword/TributeAbility.java
View file

@ -66,12 +66,8 @@ public class TributeAbility extends EntersBattlefieldAbility {
@Override
public String getRule() {
StringBuilder sb = new StringBuilder("Tribute ");
sb.append(tributeValue);
sb.append(" <i>(As this creature enters the battlefield, an opponent of your choice may put ");
sb.append(tributeValue);
sb.append(" +1/+1 counter on it.)</i>");
return sb.toString();
return "Tribute " + tributeValue + " <i>(As this creature enters the battlefield, an opponent of your choice may put "
+ tributeValue + " +1/+1 counter on it.)</i>";
}
}