mirror of
https://github.com/correl/mage.git
synced 2024-12-25 11:11:16 +00:00
Added Ixidor's Will and Overburden
This commit is contained in:
parent
10f9eaf395
commit
4653864c5e
4 changed files with 266 additions and 35 deletions
68
Mage.Sets/src/mage/sets/onslaught/IxidorsWill.java
Normal file
68
Mage.Sets/src/mage/sets/onslaught/IxidorsWill.java
Normal file
|
@ -0,0 +1,68 @@
|
|||
/*
|
||||
* 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.onslaught;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
|
||||
import mage.abilities.effects.Effect;
|
||||
import mage.abilities.effects.common.CounterUnlessPaysEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Rarity;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.target.TargetSpell;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Quercitron
|
||||
*/
|
||||
public class IxidorsWill extends CardImpl {
|
||||
|
||||
private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("Wizard", "Wizard");
|
||||
|
||||
public IxidorsWill(UUID ownerId) {
|
||||
super(ownerId, 90, "Ixidor's Will", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}");
|
||||
this.expansionSetCode = "ONS";
|
||||
|
||||
// Counter target spell unless its controller pays {2} for each Wizard on the battlefield.
|
||||
Effect effect = new CounterUnlessPaysEffect(new PermanentsOnBattlefieldCount(FILTER, 2));
|
||||
effect.setText("Counter target spell unless its controller pays {2} for each Wizard on the battlefield");
|
||||
this.getSpellAbility().addEffect(effect);
|
||||
this.getSpellAbility().addTarget(new TargetSpell());
|
||||
}
|
||||
|
||||
public IxidorsWill(final IxidorsWill card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IxidorsWill copy() {
|
||||
return new IxidorsWill(this);
|
||||
}
|
||||
}
|
82
Mage.Sets/src/mage/sets/prophecy/Overburden.java
Normal file
82
Mage.Sets/src/mage/sets/prophecy/Overburden.java
Normal file
|
@ -0,0 +1,82 @@
|
|||
/*
|
||||
* 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.prophecy;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
|
||||
import mage.abilities.effects.common.ReturnToHandChosenPermanentEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SetTargetPointer;
|
||||
import mage.constants.Zone;
|
||||
import mage.filter.common.FilterControlledLandPermanent;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.Predicates;
|
||||
import mage.filter.predicate.permanent.TokenPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Quercitron
|
||||
*/
|
||||
public class Overburden extends CardImpl {
|
||||
|
||||
private static final FilterCreaturePermanent ENTERS_BATTLEFIELD_FILTER = new FilterCreaturePermanent("a nontoken creature");
|
||||
|
||||
private static final FilterControlledLandPermanent RETURN_FILTER = new FilterControlledLandPermanent("a land");
|
||||
|
||||
static {
|
||||
ENTERS_BATTLEFIELD_FILTER.add(Predicates.not(new TokenPredicate()));
|
||||
}
|
||||
|
||||
public Overburden(UUID ownerId) {
|
||||
super(ownerId, 39, "Overburden", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}");
|
||||
this.expansionSetCode = "PCY";
|
||||
|
||||
// Whenever a player puts a nontoken creature onto the battlefield,
|
||||
// that player returns a land he or she controls to its owner's hand.
|
||||
this.addAbility(new EntersBattlefieldAllTriggeredAbility(
|
||||
Zone.BATTLEFIELD,
|
||||
new ReturnToHandChosenPermanentEffect(RETURN_FILTER),
|
||||
ENTERS_BATTLEFIELD_FILTER,
|
||||
false,
|
||||
SetTargetPointer.PLAYER,
|
||||
"Whenever a player puts a nontoken creature onto the battlefield," +
|
||||
" that player returns a land he or she controls to its owner's hand."));
|
||||
}
|
||||
|
||||
public Overburden(final Overburden card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Overburden copy() {
|
||||
return new Overburden(this);
|
||||
}
|
||||
}
|
|
@ -28,40 +28,33 @@
|
|||
package mage.abilities.effects.common;
|
||||
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.cards.CardsImpl;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.Zone;
|
||||
import mage.filter.common.FilterControlledPermanent;
|
||||
import mage.game.Game;
|
||||
import mage.players.Player;
|
||||
import mage.target.common.TargetControlledPermanent;
|
||||
import mage.target.targetpointer.FixedTarget;
|
||||
import mage.util.CardUtil;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Plopmans
|
||||
* @author Quercitron
|
||||
*/
|
||||
public class ReturnToHandChosenControlledPermanentEffect extends OneShotEffect {
|
||||
|
||||
private final FilterControlledPermanent filter;
|
||||
private int number;
|
||||
public class ReturnToHandChosenControlledPermanentEffect extends ReturnToHandChosenPermanentEffect {
|
||||
|
||||
public ReturnToHandChosenControlledPermanentEffect(FilterControlledPermanent filter) {
|
||||
this(filter, 1);
|
||||
super(filter);
|
||||
}
|
||||
|
||||
public ReturnToHandChosenControlledPermanentEffect(FilterControlledPermanent filter, int number) {
|
||||
super(Outcome.ReturnToHand);
|
||||
this.filter = filter;
|
||||
this.number = number;
|
||||
this.staticText = getText();
|
||||
super(filter, number);
|
||||
}
|
||||
|
||||
public ReturnToHandChosenControlledPermanentEffect(final ReturnToHandChosenControlledPermanentEffect effect) {
|
||||
public ReturnToHandChosenControlledPermanentEffect(ReturnToHandChosenControlledPermanentEffect effect) {
|
||||
super(effect);
|
||||
this.filter = effect.filter;
|
||||
this.number = effect.number;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
this.targetPointer = new FixedTarget(source.getControllerId());
|
||||
return super.apply(game, source);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -70,22 +63,7 @@ public class ReturnToHandChosenControlledPermanentEffect extends OneShotEffect {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
Player controller = game.getPlayer(source.getControllerId());
|
||||
if (controller != null) {
|
||||
int available = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game);
|
||||
if (available > 0) {
|
||||
TargetControlledPermanent target = new TargetControlledPermanent(Math.min(number, available), number, filter, true);
|
||||
if (controller.chooseTarget(this.outcome, target, source, game)) {
|
||||
controller.moveCards(new CardsImpl(target.getTargets()), Zone.BATTLEFIELD, Zone.HAND, source, game);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private String getText() {
|
||||
protected String getText() {
|
||||
StringBuilder sb = new StringBuilder("return ");
|
||||
if (!filter.getMessage().startsWith("another")) {
|
||||
sb.append(CardUtil.numberToText(number, "a"));
|
||||
|
@ -98,4 +76,5 @@ public class ReturnToHandChosenControlledPermanentEffect extends OneShotEffect {
|
|||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,102 @@
|
|||
/*
|
||||
* 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.abilities.effects.common;
|
||||
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.cards.CardsImpl;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.Zone;
|
||||
import mage.filter.common.FilterControlledPermanent;
|
||||
import mage.game.Game;
|
||||
import mage.players.Player;
|
||||
import mage.target.common.TargetControlledPermanent;
|
||||
import mage.util.CardUtil;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Plopmans
|
||||
*/
|
||||
public class ReturnToHandChosenPermanentEffect extends OneShotEffect {
|
||||
|
||||
protected final FilterControlledPermanent filter;
|
||||
protected int number;
|
||||
|
||||
public ReturnToHandChosenPermanentEffect(FilterControlledPermanent filter) {
|
||||
this(filter, 1);
|
||||
}
|
||||
|
||||
public ReturnToHandChosenPermanentEffect(FilterControlledPermanent filter, int number) {
|
||||
super(Outcome.ReturnToHand);
|
||||
this.filter = filter;
|
||||
this.number = number;
|
||||
this.staticText = getText();
|
||||
}
|
||||
|
||||
public ReturnToHandChosenPermanentEffect(final ReturnToHandChosenPermanentEffect effect) {
|
||||
super(effect);
|
||||
this.filter = effect.filter;
|
||||
this.number = effect.number;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReturnToHandChosenPermanentEffect copy() {
|
||||
return new ReturnToHandChosenPermanentEffect(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source));
|
||||
if (player != null) {
|
||||
int available = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game);
|
||||
if (available > 0) {
|
||||
TargetControlledPermanent target = new TargetControlledPermanent(Math.min(number, available), number, filter, true);
|
||||
if (player.chooseTarget(this.outcome, target, source, game)) {
|
||||
player.moveCards(new CardsImpl(target.getTargets()), Zone.BATTLEFIELD, Zone.HAND, source, game);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
protected String getText() {
|
||||
StringBuilder sb = new StringBuilder("that player returns ");
|
||||
if (!filter.getMessage().startsWith("another")) {
|
||||
sb.append(CardUtil.numberToText(number, "a"));
|
||||
}
|
||||
sb.append(" ").append(filter.getMessage());
|
||||
sb.append(" he or she controls");
|
||||
if (number > 1) {
|
||||
sb.append(" to their owner's hand");
|
||||
} else {
|
||||
sb.append(" to its owner's hand");
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue