diff --git a/Mage.Sets/src/mage/sets/magicorigins/DarkDabbling.java b/Mage.Sets/src/mage/sets/magicorigins/DarkDabbling.java
new file mode 100644
index 0000000000..f8b734832f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/DarkDabbling.java
@@ -0,0 +1,98 @@
+/*
+ * 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.magicorigins;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.condition.common.SpellMasteryCondition;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.RegenerateTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class DarkDabbling extends CardImpl {
+
+ public DarkDabbling(UUID ownerId) {
+ super(ownerId, 89, "Dark Dabbling", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}");
+ this.expansionSetCode = "ORI";
+
+ // Regenerate target creature. Draw a card.
+ this.getSpellAbility().addEffect(new RegenerateTargetEffect());
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+ // Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, also regenerate each other creature you control.
+ this.getSpellAbility().addEffect(new DarkDabblingEffect());
+ }
+
+ public DarkDabbling(final DarkDabbling card) {
+ super(card);
+ }
+
+ @Override
+ public DarkDabbling copy() {
+ return new DarkDabbling(this);
+ }
+}
+
+class DarkDabblingEffect extends OneShotEffect {
+
+ public DarkDabblingEffect() {
+ super(Outcome.Benefit);
+ this.staticText = "Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, also regenerate each other creature you control";
+ }
+
+ public DarkDabblingEffect(final DarkDabblingEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public DarkDabblingEffect copy() {
+ return new DarkDabblingEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ if (SpellMasteryCondition.getInstance().apply(game, source)) {
+ for (Permanent permanent : game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), source.getControllerId(), game)) {
+ if (!permanent.getId().equals(getTargetPointer().getFirst(game, source))) {
+ permanent.regenerate(source.getSourceId(), game);
+ }
+ }
+ }
+ return true;
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Nightsnare.java b/Mage.Sets/src/mage/sets/magicorigins/Nightsnare.java
new file mode 100644
index 0000000000..6c728ad2ad
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/Nightsnare.java
@@ -0,0 +1,121 @@
+/*
+ * 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.magicorigins;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.Cards;
+import mage.cards.CardsImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterNonlandCard;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.TargetCard;
+import mage.target.common.TargetOpponent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class Nightsnare extends CardImpl {
+
+ public Nightsnare(UUID ownerId) {
+ super(ownerId, 111, "Nightsnare", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}");
+ this.expansionSetCode = "ORI";
+
+ // Target opponent reveals his or her hand. You may choose a nonland card from it. If you do, that player discards that card. If you don't, that player discards two cards.
+ this.getSpellAbility().addTarget(new TargetOpponent());
+ this.getSpellAbility().addEffect(new NightsnareDiscardEffect());
+ }
+
+ public Nightsnare(final Nightsnare card) {
+ super(card);
+ }
+
+ @Override
+ public Nightsnare copy() {
+ return new Nightsnare(this);
+ }
+}
+
+class NightsnareDiscardEffect extends OneShotEffect {
+
+ public NightsnareDiscardEffect() {
+ super(Outcome.Discard);
+ staticText = "Target opponent reveals his or her hand. You may choose a nonland card from it. If you do, that player discards that card. If you don't, that player discards two cards";
+ }
+
+ public NightsnareDiscardEffect(final NightsnareDiscardEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player player = game.getPlayer(targetPointer.getFirst(game, source));
+ Player controller = game.getPlayer(source.getControllerId());
+ Card sourceCard = game.getCard(source.getSourceId());
+ if (player != null && controller != null) {
+ if (!player.getHand().isEmpty()) {
+ Cards revealedCards = new CardsImpl(Zone.HAND);
+ revealedCards.addAll(player.getHand());
+ player.revealCards(sourceCard != null ? sourceCard.getIdName() : "Discard", revealedCards, game);
+ // You may choose a nonland card from it.
+ if (controller.chooseUse(outcome, "Choose a a card to discard? (Otherwise " + player.getLogName() + " has to discard 2 cards).", source, game)) {
+ TargetCard target = new TargetCard(1, Zone.HAND, new FilterNonlandCard());
+ if (controller.choose(Outcome.Benefit, revealedCards, target, game)) {
+ for (Object targetId : target.getTargets()) {
+ Card card = revealedCards.get((UUID) targetId, game);
+ if (card != null) {
+ player.discard(card, source, game);
+ }
+ }
+ }
+
+ } else {
+ player.discard(2, false, source, game);
+ }
+ }
+ return true;
+
+ }
+ return false;
+
+ }
+
+ @Override
+ public NightsnareDiscardEffect copy() {
+ return new NightsnareDiscardEffect(this);
+ }
+
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ShadowsOfThePast.java b/Mage.Sets/src/mage/sets/magicorigins/ShadowsOfThePast.java
new file mode 100644
index 0000000000..0c70c600fb
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/ShadowsOfThePast.java
@@ -0,0 +1,76 @@
+/*
+ * 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.magicorigins;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.DiesCreatureTriggeredAbility;
+import mage.abilities.condition.common.CardsInControllerGraveCondition;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.effects.common.LoseLifeOpponentsEffect;
+import mage.abilities.effects.keyword.ScryEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreatureCard;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ShadowsOfThePast extends CardImpl {
+
+ public ShadowsOfThePast(UUID ownerId) {
+ super(ownerId, 118, "Shadows of the Past", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}");
+ this.expansionSetCode = "ORI";
+
+ // Whenever a creature dies, scry 1.
+ this.addAbility(new DiesCreatureTriggeredAbility(new ScryEffect(1), false));
+
+ // {4}{B}: Each opponent loses 2 life and you gain 2 life. Activate this ability only if there are four or more creature cards in your graveyard.
+ Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD,
+ new LoseLifeOpponentsEffect(2), new ManaCostsImpl<>("{4}{B}"), new CardsInControllerGraveCondition(4, new FilterCreatureCard()));
+ Effect effect = new GainLifeEffect(2);
+ effect.setText("and you gain 2 life");
+ ability.addEffect(effect);
+ this.addAbility(ability);
+ }
+
+ public ShadowsOfThePast(final ShadowsOfThePast card) {
+ super(card);
+ }
+
+ @Override
+ public ShadowsOfThePast copy() {
+ return new ShadowsOfThePast(this);
+ }
+}
diff --git a/Mage/src/mage/abilities/condition/common/CardsInControllerGraveCondition.java b/Mage/src/mage/abilities/condition/common/CardsInControllerGraveCondition.java
index d36c9c9687..2cd6cef755 100644
--- a/Mage/src/mage/abilities/condition/common/CardsInControllerGraveCondition.java
+++ b/Mage/src/mage/abilities/condition/common/CardsInControllerGraveCondition.java
@@ -2,6 +2,7 @@ package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
+import mage.filter.FilterCard;
import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
@@ -14,20 +15,31 @@ import mage.util.CardUtil;
public class CardsInControllerGraveCondition implements Condition {
private final int value;
+ private final FilterCard filter;
public CardsInControllerGraveCondition(int value) {
+ this(value, null);
+ }
+
+ public CardsInControllerGraveCondition(int value, FilterCard filter) {
this.value = value;
+ this.filter = filter;
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
+ if (filter != null) {
+ return player != null && player.getGraveyard().count(filter, source.getSourceId(), source.getControllerId(), game) >= value;
+ }
return player != null && player.getGraveyard().size() >= value;
}
@Override
public String toString() {
- return "there are " + CardUtil.numberToText(value, "one") + " or more cards in your graveyard";
+ return "there are " + CardUtil.numberToText(value, "one") + " or more "
+ + (filter == null ? "cards" : filter.getMessage())
+ + " in your graveyard";
}
}