github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-27 20:06:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Rise // Fall - Fixed a bug that the discard of Fall did not work correctly.

Browse source
This commit is contained in:
LevelX2 2015-04-02 23:53:38 +02:00
parent 788187fd10
commit 15ce5c6ff2
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/sets/dissension/RiseFall.java
View file

@ -57,24 +57,16 @@ public class RiseFall extends SplitCard {
super(ownerId, 156, "Rise", "Fall", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{U}{B}","{B}{R}", false ); super(ownerId, 156, "Rise", "Fall", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{U}{B}","{B}{R}", false );
this.expansionSetCode = "DIS"; this.expansionSetCode = "DIS";
this.color.setBlue(true);
this.color.setBlack(true);
this.color.setRed(true);
// Rise // Rise
// Return target creature card from a graveyard and target creature on the battlefield to their owners' hands. // Return target creature card from a graveyard and target creature on the battlefield to their owners' hands.
getLeftHalfCard().getSpellAbility().addEffect(new RiseEffect()); getLeftHalfCard().getSpellAbility().addEffect(new RiseEffect());
getLeftHalfCard().getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); getLeftHalfCard().getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard")));
getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
getLeftHalfCard().getColor().setBlue(true);
getLeftHalfCard().getColor().setBlack(true);
// Fall // Fall
// Target player reveals two cards at random from his or her hand, then discards each nonland card revealed this way. // Target player reveals two cards at random from his or her hand, then discards each nonland card revealed this way.
getRightHalfCard().getSpellAbility().addEffect(new FallEffect()); getRightHalfCard().getSpellAbility().addEffect(new FallEffect());
getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer()); getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer());
getLeftHalfCard().getColor().setBlack(true);
getLeftHalfCard().getColor().setRed(true);
} }
public RiseFall(final RiseFall card) { public RiseFall(final RiseFall card) {
@ -156,7 +148,7 @@ class FallEffect extends OneShotEffect {
} }
targetPlayer.revealCards(sourceObject.getLogName(), cards, game); targetPlayer.revealCards(sourceObject.getLogName(), cards, game);
for (Card cardToDiscard: cards.getCards(game)) { for (Card cardToDiscard: cards.getCards(game)) {
if (!card.getCardType().contains(CardType.LAND)) { if (!cardToDiscard.getCardType().contains(CardType.LAND)) {
targetPlayer.discard(cardToDiscard, source, game); targetPlayer.discard(cardToDiscard, source, game);
} }
} }