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

* Dromar, the Banisher - Fixed that it returned all types of permanents instead of only creatures (fixes #1294).

Browse source
This commit is contained in:
LevelX2 2015-10-01 21:36:52 +02:00
parent 964eb0b643
commit 334f919ef9
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage.Sets/src/mage/sets/invasion/DromarTheBanisher.java
View file

@ -41,7 +41,7 @@ import mage.choices.ChoiceColor;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game;
import mage.players.Player;
@ -63,7 +63,7 @@ public class DromarTheBanisher extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Whenever Dromar, the Banisher deals combat damage to a player, you may pay {2}{U}. If you do, choose a color, then return all creatures of that color to their owners' hands.
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new DromarTheBanisherEffect(), new ManaCostsImpl("{2}{U}")), false));
}
@ -79,30 +79,30 @@ public class DromarTheBanisher extends CardImpl {
}
class DromarTheBanisherEffect extends OneShotEffect {
DromarTheBanisherEffect() {
super(Outcome.ReturnToHand);
this.staticText = "choose a color, then return all creatures of that color to their owners' hands.";
}
DromarTheBanisherEffect(final DromarTheBanisherEffect effect) {
super(effect);
}
@Override
public DromarTheBanisherEffect copy() {
return new DromarTheBanisherEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
ChoiceColor choice = new ChoiceColor();
player.choose(outcome, choice, game);
if (choice.getColor() != null) {
game.informPlayers(new StringBuilder(player.getLogName()).append(" chooses ").append(choice.getColor()).toString());
FilterPermanent filter = new FilterPermanent();
game.informPlayers(player.getLogName() + " chooses " + choice.getChoice());
FilterCreaturePermanent filter = new FilterCreaturePermanent();
filter.add(new ColorPredicate(choice.getColor()));
new ReturnToHandFromBattlefieldAllEffect(filter).apply(game, source);
return true;