Tainted Pact - Fixed mismatched code.

This commit is contained in:
LevelX2 2013-10-18 08:48:02 +02:00
parent d70c02c22c
commit 969e00f891

View file

@ -27,92 +27,6 @@
*/
package mage.sets.odyssey;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.game.Game;
import mage.players.Player;
/**
*
* @author cbt33, Ad Nauseum (North), Izzet Staticaster (LevelX2), Bane Alley Broker (LevelX2)
*/
public class TaintedPact extends CardImpl<TaintedPact> {
public TaintedPact(UUID ownerId) {
super(ownerId, 164, "Tainted Pact", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}");
this.expansionSetCode = "ODY";
this.color.setBlack(true);
// Exile the top card of your library. You may put that card into your hand unless it has the same name as another card exiled this way. Repeat this process until you put a card into your hand or you exile two cards with the same name, whichever comes first.
this.getSpellAbility().addEffect(new TaintedPactEffect());
}
public TaintedPact(final TaintedPact card) {
super(card);
}
@Override
public TaintedPact copy() {
return new TaintedPact(this);
}
}
class TaintedPactEffect extends OneShotEffect<TaintedPactEffect>{
public TaintedPactEffect() {
super(Outcome.DrawCard);
this.staticText = "Exile the top card of your library. You may put that card into your hand unless it has the same name as another card exiled this way. Repeat this process until you put a card into your hand or you exile two cards with the same name, whichever comes first.";
}
public TaintedPactEffect(final TaintedPactEffect effect) {
super(effect);
}
@Override
public TaintedPactEffect copy() {
return new TaintedPactEffect(this);
}
@Override
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.odyssey;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
@ -182,13 +96,13 @@ class TaintedPactEffect extends OneShotEffect<TaintedPactEffect>{
if (card != null) {
card.moveToExile(null, null, source.getSourceId(), game);
// Checks if there was already exiled a card with the same name
// Checks if there was already exiled a card with the same name
if (names.contains(card.getName())) {
break;
}
names.add(card.getName());
if (player.chooseUse(outcome, new StringBuilder("Put ").append(card.getName()).append("into your hand?").toString(), game)) {
//Adds the current card to hand if it is chosen.
//Adds the current card to hand if it is chosen.
card.moveToZone(Zone.HAND, source.getSourceId(), game, true);
break;
}
@ -197,5 +111,3 @@ class TaintedPactEffect extends OneShotEffect<TaintedPactEffect>{
return true;
}
}
}