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

fix Erratic Explosion

Browse source 
wouldn't reveal any cards, since ec7c888

updated Erratic Mutation to match, but it wasn't broken
This commit is contained in:
Neil Gentleman 2015-11-22 18:18:45 -08:00
parent f06de472a4
commit 99d33eb771
2 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java
View file

@ -28,6 +28,8 @@
package mage.sets.planarchaos;
import java.util.UUID;
import mage.MageObject;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
@ -40,13 +42,10 @@ import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardsImpl;
import mage.game.Game;
import mage.players.Library;
import mage.players.Player;
import mage.target.common.TargetCreaturePermanent;
import mage.target.targetpointer.FixedTarget;
/**
*
* @author LevelX2
@ -57,7 +56,6 @@ public class ErraticMutation extends CardImpl {
super(ownerId, 41, "Erratic Mutation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}");
this.expansionSetCode = "PLC";
// Choose target creature. Reveal cards from the top of your library until you reveal a nonland card. That creature gets +X/-X until end of turn, where X is that card's converted mana cost. Put all cards revealed this way on the bottom of your library in any order.
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addEffect(new ErraticMutationEffect());
@ -77,7 +75,7 @@ public class ErraticMutation extends CardImpl {
class ErraticMutationEffect extends OneShotEffect {
public ErraticMutationEffect() {
super(Outcome.DrawCard);
super(Outcome.UnboostCreature);
this.staticText = "Choose target creature. Reveal cards from the top of your library until you reveal a nonland card. That creature gets +X/-X until end of turn, where X is that card's converted mana cost. Put all cards revealed this way on the bottom of your library in any order";
}
@ -92,29 +90,33 @@ class ErraticMutationEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null && player.getLibrary().size() > 0) {
CardsImpl cards = new CardsImpl();
Library library = player.getLibrary();
Card card = null;
do {
card = library.removeFromTop(game);
if (card != null) {
cards.add(card);
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = game.getObject(source.getSourceId());
if (controller != null && sourceObject != null) {
CardsImpl toReveal = new CardsImpl();
Card nonLandCard = null;
while (nonLandCard == null && controller.getLibrary().size() > 0) {
Card card = controller.getLibrary().removeFromTop(game);
toReveal.add(card);
if (!card.getCardType().contains(CardType.LAND)) {
nonLandCard = card;
}
}
} while (library.size() > 0 && card != null && card.getCardType().contains(CardType.LAND));
// reveal cards
if (!cards.isEmpty()) {
player.revealCards("Erratic Mutation", cards, game);
if (!toReveal.isEmpty()) {
controller.revealCards(sourceObject.getIdName(), toReveal, game);
}
// the nonland card
int boostValue = card.getManaCost().convertedManaCost();
if (nonLandCard != null) {
int boostValue = nonLandCard.getManaCost().convertedManaCost();
// unboost target
ContinuousEffect effect = new BoostTargetEffect(boostValue, boostValue * -1, Duration.EndOfTurn);
ContinuousEffect effect = new BoostTargetEffect(boostValue, -boostValue, Duration.EndOfTurn);
effect.setTargetPointer(new FixedTarget(this.getTargetPointer().getFirst(game, source)));
game.addEffect(effect, source);
}
// put the cards on the bottom of the library in any order
return player.putCardsOnBottomOfLibrary(cards, game, source, true);
return controller.putCardsOnBottomOfLibrary(toReveal, game, source, true);
}
return false;
}

11
Mage.Sets/src/mage/sets/planechase2012/ErraticExplosion.java
View file

@ -89,13 +89,14 @@ class ErraticExplosionEffect extends OneShotEffect {
MageObject sourceObject = game.getObject(source.getSourceId());
if (controller != null && sourceObject != null) {
CardsImpl toReveal = new CardsImpl();
boolean nonLandFound = false;
Card nonLandCard = null;
while (nonLandFound && controller.getLibrary().size() > 0) {
nonLandCard = controller.getLibrary().removeFromTop(game);
toReveal.add(nonLandCard);
nonLandFound = nonLandCard.getCardType().contains(CardType.LAND);
while (nonLandCard == null && controller.getLibrary().size() > 0) {
Card card = controller.getLibrary().removeFromTop(game);
toReveal.add(card);
if (!card.getCardType().contains(CardType.LAND)) {
nonLandCard = card;
}
}
// reveal cards
if (!toReveal.isEmpty()) {