External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 06:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[BOK] Added 5 green cards.

Browse source
This commit is contained in:
LevelX2 2014-10-20 00:51:38 +02:00
parent 2fae1df8c7
commit 59702e4867
9 changed files with 533 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java
View file

@ -42,13 +42,19 @@ import mage.players.Player;
*/
public class PutLandFromHandOntoBattlefieldEffect extends OneShotEffect {
private boolean tapped;
public PutLandFromHandOntoBattlefieldEffect() {
this(false);
}
public PutLandFromHandOntoBattlefieldEffect(boolean tapped) {
super(Outcome.PutLandInPlay);
staticText = "You may put a land card from your hand onto the battlefield";
staticText = "you may put a land card from your hand onto the battlefield" + (tapped ? " tapped":"");
}
public PutLandFromHandOntoBattlefieldEffect(final PutLandFromHandOntoBattlefieldEffect effect) {
super(effect);
this.tapped = effect.tapped;
}
@Override
@ -57,7 +63,7 @@ public class PutLandFromHandOntoBattlefieldEffect extends OneShotEffect {
if (controller != null) {
Card card = game.getCard(targetPointer.getFirst(game, source));
if (card != null) {
controller.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId());
controller.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId(), tapped);
}
return true;
@ -71,4 +77,4 @@ public class PutLandFromHandOntoBattlefieldEffect extends OneShotEffect {
return new PutLandFromHandOntoBattlefieldEffect(this);
}
}
}

76
Mage/src/mage/abilities/keyword/SoulshiftAbility.java
View file

@ -1,23 +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.abilities.keyword;
import java.util.UUID;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.filter.Filter;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game;
import mage.target.common.TargetCardInYourGraveyard;
/**
*
* 702.45. Soulshift
* 702.45a Soulshift is a triggered ability. “Soulshift N” means “When this permanent is put into a graveyard from play,
* you may return target Spirit card with converted mana cost N or less from your graveyard to your hand.”
* 702.45b If a permanent has multiple instances of soulshift, each triggers separately.
*
* The soulshift number tells you the maximum converted mana cost of the Spirit card you can target.
* You choose whether or not to return the targeted creature card when the ability resolves.
*
* @author Loki, LevelX2
*/
public class SoulshiftAbility extends DiesTriggeredAbility {
private int amount;
private final DynamicValue amount;
public SoulshiftAbility(int amount) {
this(new StaticValue(amount));
}
public SoulshiftAbility(DynamicValue amount) {
super(new ReturnToHandTargetEffect());
FilterCard filter = new FilterCard("Spirit card with converted mana cost " + amount + " or less from your graveyard");
filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, amount + 1));
filter.add(new SubtypePredicate("Spirit"));
this.addTarget(new TargetCardInYourGraveyard(filter));
this.amount = amount;
this.amount = amount;
}
public SoulshiftAbility(final SoulshiftAbility ability) {
@ -25,6 +70,17 @@ public class SoulshiftAbility extends DiesTriggeredAbility {
this.amount = ability.amount;
}
@Override
public void trigger(Game game, UUID controllerId) {
this.getTargets().clear();
int intValue = amount.calculate(game, this, null);
FilterCard filter = new FilterCard("Spirit card with converted mana cost " + intValue + " or less from your graveyard");
filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, intValue + 1));
filter.add(new SubtypePredicate("Spirit"));
this.addTarget(new TargetCardInYourGraveyard(filter));
super.trigger(game, controllerId); //To change body of generated methods, choose Tools | Templates.
}
@Override
public DiesTriggeredAbility copy() {
return new SoulshiftAbility(this);
@ -32,6 +88,12 @@ public class SoulshiftAbility extends DiesTriggeredAbility {
@Override
public String getRule() {
return "Soulshift " + amount;
if (amount instanceof StaticValue) {
return "Soulshift " + amount.toString() + " <i>(When this creature dies, you may return target Spirit card with converted mana cost " + amount.toString() + " or less from your graveyard to your hand.)<i/>";
} else {
return "{this} has soulshift X, where X is the number of " + amount.getMessage() +
". <i>(When this creature dies, you may return target Spirit card with converted mana cost X or less from your graveyard to your hand.)<i/>";
}
}
}