github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #38 from maurerit/master

Browse source 
GSZ and Pod fix.
This commit is contained in:
lokimage 2012-08-13 01:23:09 -07:00
commit 58eb2a8bb1
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/mirrodinbesieged/GreenSunsZenith.java
View file

@ -97,7 +97,7 @@ class GreenSunsZenithSearchEffect extends OneShotEffect<GreenSunsZenithSearchEff
if (target.getTargets().size() > 0) {
Card card = player.getLibrary().getCard(target.getFirstTarget(), game);
if (card != null)
card.putOntoBattlefield(game, Constants.Zone.HAND, source.getId(), source.getControllerId());
card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId());
}
player.shuffleLibrary(game);
return true;

2
Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java
View file

@ -112,7 +112,7 @@ class BirthingPodEffect extends OneShotEffect<BirthingPodEffect> {
for (UUID cardId : target.getTargets()) {
Card card = player.getLibrary().getCard(cardId, game);
if (card != null) {
card.putOntoBattlefield(game, Constants.Zone.HAND, source.getId(), source.getControllerId());
card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId());
}
}
}

8
Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java
View file

@ -40,6 +40,8 @@ import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.filter.Filter.ComparisonType;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.game.Game;
import mage.players.Player;
@ -93,6 +95,12 @@ class GenesisWaveEffect extends OneShotEffect<GenesisWaveEffect> {
}
FilterCard filter = new FilterCard("card with converted mana cost " + count + " or less to put onto the battlefield");
filter.add(new ConvertedManaCostPredicate(ComparisonType.LessThan, count + 1));
filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT),
new CardTypePredicate(CardType.CREATURE),
new CardTypePredicate(CardType.ENCHANTMENT),
new CardTypePredicate(CardType.LAND),
new CardTypePredicate(CardType.PLANESWALKER)
));
TargetCard target1 = new TargetCard(Zone.PICK, filter);
while (cards.size() > 0 && player.choose(Outcome.PutCardInPlay, cards, target1, game)) {
Card card = cards.get(target1.getFirstTarget(), game);