Merge/origin

This commit is contained in:
fireshoes 2016-03-16 23:27:46 -05:00
parent 58e4cb45c3
commit 98d8269918

View file

@ -1,108 +1,106 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.sets.portalthreekingdoms; package mage.sets.portalthreekingdoms;
import java.util.ArrayList; import java.util.UUID;
import java.util.List; import mage.abilities.Ability;
import java.util.UUID; import mage.abilities.effects.ContinuousEffect;
import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.DontUntapInOpponentsNextUntapStepAllEffect;
import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl;
import mage.abilities.effects.common.DontUntapInOpponentsNextUntapStepAllEffect; import mage.constants.CardType;
import mage.cards.CardImpl; import mage.constants.Outcome;
import mage.constants.CardType; import mage.constants.Rarity;
import mage.constants.Outcome; import mage.filter.FilterPermanent;
import mage.constants.Rarity; import mage.filter.predicate.Predicates;
import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.Predicates; import mage.game.Game;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.players.Player;
import mage.game.Game; import mage.target.common.TargetOpponent;
import mage.players.Player; import mage.target.targetpointer.FixedTarget;
import mage.target.common.TargetOpponent;
import mage.target.targetpointer.FixedTargets; /**
*
/** * @author emerald000
* */
* @author emerald000 public class Exhaustion extends CardImpl {
*/
public class Exhaustion extends CardImpl { public Exhaustion(UUID ownerId) {
super(ownerId, 42, "Exhaustion", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}");
public Exhaustion(UUID ownerId) { this.expansionSetCode = "PTK";
super(ownerId, 42, "Exhaustion", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}");
this.expansionSetCode = "PTK"; // Creatures and lands target opponent controls don't untap during his or her next untap step.
this.getSpellAbility().addEffect(new ExhaustionEffect());
// Creatures and lands target opponent controls don't untap during his or her next untap step. this.getSpellAbility().addTarget(new TargetOpponent());
this.getSpellAbility().addEffect(new ExhaustionEffect()); }
this.getSpellAbility().addTarget(new TargetOpponent());
} public Exhaustion(final Exhaustion card) {
super(card);
public Exhaustion(final Exhaustion card) { }
super(card);
} @Override
public Exhaustion copy() {
@Override return new Exhaustion(this);
public Exhaustion copy() { }
return new Exhaustion(this); }
}
} class ExhaustionEffect extends OneShotEffect {
class ExhaustionEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent();
private static final FilterPermanent filter = new FilterPermanent(); static {
filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND)));
static { }
filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND)));
} ExhaustionEffect() {
super(Outcome.Detriment);
ExhaustionEffect() { this.staticText = "Creatures and lands target opponent controls don't untap during his or her next untap step.";
super(Outcome.Detriment); }
this.staticText = "Creatures and lands target opponent controls don't untap during his or her next untap step.";
} ExhaustionEffect(final ExhaustionEffect effect) {
super(effect);
ExhaustionEffect(final ExhaustionEffect effect) { }
super(effect);
} @Override
public ExhaustionEffect copy() {
@Override return new ExhaustionEffect(this);
public ExhaustionEffect copy() { }
return new ExhaustionEffect(this);
} @Override
public boolean apply(Game game, Ability source) {
@Override Player player = game.getPlayer(source.getFirstTarget());
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getFirstTarget()); if (player != null) {
ContinuousEffect effect = new DontUntapInOpponentsNextUntapStepAllEffect(filter);
if (player != null) { effect.setTargetPointer(new FixedTarget(player.getId()));
ContinuousEffect effect = new DontUntapInOpponentsNextUntapStepAllEffect(filter); game.addEffect(effect, source);
effect.setTargetPointer(new FixedTarget(player.getId())); return true;
game.addEffect(effect, source); }
return true; return false;
} }
return false; }
}
}