[SOI] Added 7 blue cards.

Mage.Sets/src/mage/sets/shadowsoverinnistrad/BrokenConcentration.java

@@ -0,0 +1,64 @@
+/*
+ *  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.shadowsoverinnistrad;
+
+import java.util.UUID;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.CounterTargetEffect;
+import mage.abilities.keyword.MadnessAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.TargetSpell;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class BrokenConcentration extends CardImpl {
+
+    public BrokenConcentration(UUID ownerId) {
+        super(ownerId, 50, "Broken Concentration", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}");
+        this.expansionSetCode = "SOI";
+
+        // Counter target spell.
+        this.getSpellAbility().addEffect(new CounterTargetEffect());
+        this.getSpellAbility().addTarget(new TargetSpell());
+        // Madness {3}{U}
+        this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{3}{U}")));
+    }
+
+    public BrokenConcentration(final BrokenConcentration card) {
+        super(card);
+    }
+
+    @Override
+    public BrokenConcentration copy() {
+        return new BrokenConcentration(this);
+    }
+}

Mage.Sets/src/mage/sets/shadowsoverinnistrad/DenyExistence.java

@@ -0,0 +1,62 @@
+/*
+ *  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.shadowsoverinnistrad;
+
+import java.util.UUID;
+import mage.abilities.effects.common.CounterTargetWithReplacementEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreatureSpell;
+import mage.target.TargetSpell;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class DenyExistence extends CardImpl {
+
+    public DenyExistence(UUID ownerId) {
+        super(ownerId, 55, "Deny Existence", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}");
+        this.expansionSetCode = "SOI";
+
+        // Counter target creature spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
+        this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Zone.EXILED));
+        this.getSpellAbility().addTarget(new TargetSpell(new FilterCreatureSpell()));
+    }
+
+    public DenyExistence(final DenyExistence card) {
+        super(card);
+    }
+
+    @Override
+    public DenyExistence copy() {
+        return new DenyExistence(this);
+    }
+}

Mage.Sets/src/mage/sets/shadowsoverinnistrad/DrownyardExplorers.java

@@ -0,0 +1,64 @@
+/*
+ *  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.shadowsoverinnistrad;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.keyword.InvestigateEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class DrownyardExplorers extends CardImpl {
+
+    public DrownyardExplorers(UUID ownerId) {
+        super(ownerId, 56, "Drownyard Explorers", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}");
+        this.expansionSetCode = "SOI";
+        this.subtype.add("Human");
+        this.subtype.add("Wizard");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(4);
+
+        // When Drownyard Explorers enters the battlefield, investigate.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new InvestigateEffect(), false));
+    }
+
+    public DrownyardExplorers(final DrownyardExplorers card) {
+        super(card);
+    }
+
+    @Override
+    public DrownyardExplorers copy() {
+        return new DrownyardExplorers(this);
+    }
+}

Mage.Sets/src/mage/sets/shadowsoverinnistrad/DrunauCorpseTrawler.java

@@ -0,0 +1,79 @@
+/*
+ *  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.shadowsoverinnistrad;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.keyword.DeathtouchAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.permanent.token.ZombieToken;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class DrunauCorpseTrawler extends CardImpl {
+
+    public DrunauCorpseTrawler(UUID ownerId) {
+        super(ownerId, 57, "Drunau Corpse Trawler", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}");
+        this.expansionSetCode = "SOI";
+        this.subtype.add("Zombie");
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // When Drunau Corpse Trawler enters the battlefield, put a 2/2 black Zombie creature token onto the battlefield.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken())));
+
+        // {2}{B}: Target Zombie gains deathtouch until end of turn.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"));
+        ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("Zombie", "Zombie")));
+        this.addAbility(ability);
+
+    }
+
+    public DrunauCorpseTrawler(final DrunauCorpseTrawler card) {
+        super(card);
+    }
+
+    @Override
+    public DrunauCorpseTrawler copy() {
+        return new DrunauCorpseTrawler(this);
+    }
+}

Mage.Sets/src/mage/sets/shadowsoverinnistrad/EpiphanyAtTheDrownyard.java

@@ -0,0 +1,182 @@
+/*
+ *  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.shadowsoverinnistrad;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import mage.MageObject;
+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.FilterCard;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.Target;
+import mage.target.TargetCard;
+import mage.target.common.TargetOpponent;
+import mage.util.GameLog;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class EpiphanyAtTheDrownyard extends CardImpl {
+
+    public EpiphanyAtTheDrownyard(UUID ownerId) {
+        super(ownerId, 59, "Epiphany at the Drownyard", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{U}");
+        this.expansionSetCode = "SOI";
+
+        // Reveal the top X plus one cards of your library and separate them into two piles. An opponent chooses one of those piles. Put that pile into your hand and the other into your graveyard.
+        this.getSpellAbility().addEffect(new EpiphanyAtTheDrownyardEffect());
+        this.getSpellAbility().addTarget(new TargetOpponent());
+    }
+
+    public EpiphanyAtTheDrownyard(final EpiphanyAtTheDrownyard card) {
+        super(card);
+    }
+
+    @Override
+    public EpiphanyAtTheDrownyard copy() {
+        return new EpiphanyAtTheDrownyard(this);
+    }
+}
+
+class EpiphanyAtTheDrownyardEffect extends OneShotEffect {
+
+    public EpiphanyAtTheDrownyardEffect() {
+        super(Outcome.DrawCard);
+        this.staticText = "Reveal the top X plus one cards of your library and separate them into two piles. An opponent chooses one of those piles. Put that pile into your hand and the other into your graveyard";
+    }
+
+    public EpiphanyAtTheDrownyardEffect(final EpiphanyAtTheDrownyardEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public EpiphanyAtTheDrownyardEffect copy() {
+        return new EpiphanyAtTheDrownyardEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        MageObject sourceObject = game.getObject(source.getSourceId());
+        if (controller == null || sourceObject == null) {
+            return false;
+        }
+
+        Cards cards = new CardsImpl();
+        cards.addAll(controller.getLibrary().getTopCards(game, source.getManaCostsToPay().getX() + 1));
+        controller.revealCards(sourceObject.getIdName(), cards, game);
+
+        Player opponent;
+        Set<UUID> opponents = game.getOpponents(controller.getId());
+        if (opponents.size() == 1) {
+            opponent = game.getPlayer(opponents.iterator().next());
+        } else {
+            Target target = new TargetOpponent(true);
+            controller.chooseTarget(Outcome.Detriment, target, source, game);
+            opponent = game.getPlayer(target.getFirstTarget());
+        }
+
+        if (opponent != null) {
+            TargetCard target = new TargetCard(0, cards.size(), Zone.LIBRARY, new FilterCard("cards to put in the first pile"));
+            List<Card> pile1 = new ArrayList<>();
+            Cards pile1CardsIds = new CardsImpl();
+            target.setRequired(false);
+            if (controller.choose(Outcome.Neutral, cards, target, game)) {
+                List<UUID> targets = target.getTargets();
+                for (UUID targetId : targets) {
+                    Card card = game.getCard(targetId);
+                    if (card != null) {
+                        pile1.add(card);
+                        pile1CardsIds.add(card.getId());
+                    }
+                }
+            }
+            List<Card> pile2 = new ArrayList<>();
+            Cards pile2CardsIds = new CardsImpl();
+            for (UUID cardId : cards) {
+                Card card = game.getCard(cardId);
+                if (card != null && !pile1.contains(card)) {
+                    pile2.add(card);
+                    pile2CardsIds.add(card.getId());
+                }
+            }
+            boolean choice = opponent.choosePile(Outcome.Detriment, "Choose a pile to put into " + controller.getName() + "'s hand.", pile1, pile2, game);
+
+            Zone pile1Zone = Zone.GRAVEYARD;
+            Zone pile2Zone = Zone.HAND;
+            if (choice) {
+                pile1Zone = Zone.HAND;
+                pile2Zone = Zone.GRAVEYARD;
+            }
+
+            StringBuilder sb = new StringBuilder(sourceObject.getLogName() + ": Pile 1, going to ").append(pile1Zone.equals(Zone.HAND) ? "Hand" : "Graveyard").append(": ");
+            int i = 0;
+            for (UUID cardUuid : pile1CardsIds) {
+                i++;
+                Card card = game.getCard(cardUuid);
+                if (card != null) {
+                    sb.append(GameLog.getColoredObjectName(card));
+                    if (i < pile1CardsIds.size()) {
+                        sb.append(", ");
+                    }
+                    card.moveToZone(pile1Zone, source.getSourceId(), game, false);
+                }
+            }
+            game.informPlayers(sb.toString());
+
+            sb = new StringBuilder(sourceObject.getLogName() + ": Pile 2, going to ").append(pile2Zone.equals(Zone.HAND) ? "Hand" : "Graveyard").append(":");
+            i = 0;
+            for (UUID cardUuid : pile2CardsIds) {
+                Card card = game.getCard(cardUuid);
+                if (card != null) {
+                    i++;
+                    sb.append(" ").append(GameLog.getColoredObjectName(card));
+                    if (i < pile2CardsIds.size()) {
+                        sb.append(", ");
+                    }
+                    card.moveToZone(pile2Zone, source.getSourceId(), game, false);
+                }
+            }
+            game.informPlayers(sb.toString());
+        }
+
+        return true;
+    }
+}

Mage.Sets/src/mage/sets/shadowsoverinnistrad/ErdwalIlluminator.java

@@ -0,0 +1,148 @@
+/*
+ *  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.shadowsoverinnistrad;
+
+import java.util.HashMap;
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.keyword.InvestigateEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.WatcherScope;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.watchers.Watcher;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ErdwalIlluminator extends CardImpl {
+
+    public ErdwalIlluminator(UUID ownerId) {
+        super(ownerId, 60, "Erdwal Illuminator", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}");
+        this.expansionSetCode = "SOI";
+        this.subtype.add("Spirit");
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(3);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+        // Whenever you investigate for the first time each turn, investigate an additional time.
+        this.addAbility(new ErdwalIlluminatorTriggeredAbility());
+
+    }
+
+    public ErdwalIlluminator(final ErdwalIlluminator card) {
+        super(card);
+    }
+
+    @Override
+    public ErdwalIlluminator copy() {
+        return new ErdwalIlluminator(this);
+    }
+}
+
+class ErdwalIlluminatorTriggeredAbility extends TriggeredAbilityImpl {
+
+    public ErdwalIlluminatorTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new InvestigateEffect(), false);
+    }
+
+    public ErdwalIlluminatorTriggeredAbility(final ErdwalIlluminatorTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType().equals(EventType.INVESTIGATED);
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        InvestigatedWatcher watcher = (InvestigatedWatcher) game.getState().getWatchers().get(InvestigatedWatcher.class.getName());
+        return watcher != null && watcher.getTimesInvestigated(getControllerId()) == 1;
+    }
+
+    @Override
+    public ErdwalIlluminatorTriggeredAbility copy() {
+        return new ErdwalIlluminatorTriggeredAbility(this);
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever you investigate for the first time each turn, investigate an additional time.";
+    }
+}
+
+class InvestigatedWatcher extends Watcher {
+
+    private final HashMap<UUID, Integer> timesInvestigated = new HashMap<>();
+
+    public InvestigatedWatcher() {
+        super(InvestigatedWatcher.class.getName(), WatcherScope.GAME);
+    }
+
+    public InvestigatedWatcher(final InvestigatedWatcher watcher) {
+        super(watcher);
+    }
+
+    @Override
+    public InvestigatedWatcher copy() {
+        return new InvestigatedWatcher(this);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (EventType.INVESTIGATED.equals(event.getType())) {
+            if (!timesInvestigated.containsKey(event.getPlayerId())) {
+                timesInvestigated.put(event.getPlayerId(), timesInvestigated.get(event.getPlayerId()) + 1);
+            } else {
+                timesInvestigated.put(event.getPlayerId(), 1);
+            }
+        }
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        timesInvestigated.clear();
+    }
+
+    public int getTimesInvestigated(UUID playerId) {
+        if (timesInvestigated.containsKey(playerId)) {
+            return timesInvestigated.get(playerId);
+        }
+        return 0;
+    }
+}

Mage.Sets/src/mage/sets/shadowsoverinnistrad/EssenceFlux.java

@@ -0,0 +1,116 @@
+/*
+ *  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.shadowsoverinnistrad;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.ExileTargetForSourceEffect;
+import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect;
+import mage.abilities.effects.common.counter.AddCountersTargetEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.counters.CounterType;
+import mage.game.ExileZone;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetControlledCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
+import mage.util.CardUtil;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class EssenceFlux extends CardImpl {
+
+    public EssenceFlux(UUID ownerId) {
+        super(ownerId, 61, "Essence Flux", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}");
+        this.expansionSetCode = "SOI";
+
+        // Exile target creature you control, then return that card to the battlefield under its owner's control. If it's a Spirit, put a +1/+1 counter on it.
+        this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
+        Effect effect = new ExileTargetForSourceEffect();
+        effect.setApplyEffectsAfter();
+        this.getSpellAbility().addEffect(effect);
+        this.getSpellAbility().addEffect(new EssenceFluxEffect(false, true));
+    }
+
+    public EssenceFlux(final EssenceFlux card) {
+        super(card);
+    }
+
+    @Override
+    public EssenceFlux copy() {
+        return new EssenceFlux(this);
+    }
+}
+
+class EssenceFluxEffect extends ReturnToBattlefieldUnderOwnerControlTargetEffect {
+
+    public EssenceFluxEffect(boolean tapped, boolean fromExileZone) {
+        super(tapped, fromExileZone);
+        staticText = ", then return that card to the battlefield under its owner's control. If it's a Spirit, put a +1/+1 counter on it";
+    }
+
+    public EssenceFluxEffect(final EssenceFluxEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public EssenceFluxEffect copy() {
+        return new EssenceFluxEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Card card = null;
+        UUID exilZoneId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
+        if (exilZoneId != null) {
+            ExileZone exileZone = game.getExile().getExileZone(exilZoneId);
+            if (exileZone != null && getTargetPointer().getFirst(game, source) != null) {
+                card = exileZone.get(getTargetPointer().getFirst(game, source), game);
+            }
+        }
+        if (super.apply(game, source)) {
+            if (card != null) {
+
+                Permanent permanent = game.getPermanent(card.getId());
+                if (permanent != null && permanent.getSubtype().contains("Spirit")) {
+                    Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance());
+                    effect.setTargetPointer(new FixedTarget(permanent, game));
+                    return effect.apply(game, source);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}

Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java

@@ -27,13 +27,17 @@
  */
 package mage.abilities.effects.common;
 
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
 import mage.cards.CardsImpl;
 import mage.constants.Outcome;
 import mage.constants.Zone;
+import mage.game.ExileZone;
 import mage.game.Game;
 import mage.players.Player;
+import mage.util.CardUtil;
 
 /**
  *
@@ -42,20 +46,27 @@ import mage.players.Player;
 public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEffect {
 
     private boolean tapped;
+    protected boolean fromExileZone;
 
     public ReturnToBattlefieldUnderOwnerControlTargetEffect() {
         this(false);
     }
 
     public ReturnToBattlefieldUnderOwnerControlTargetEffect(boolean tapped) {
+        this(tapped, false);
+    }
+
+    public ReturnToBattlefieldUnderOwnerControlTargetEffect(boolean tapped, boolean fromExileZone) {
         super(Outcome.Benefit);
         staticText = "return that card to the battlefield under its owner's control";
         this.tapped = tapped;
+        this.fromExileZone = fromExileZone;
     }
 
     public ReturnToBattlefieldUnderOwnerControlTargetEffect(final ReturnToBattlefieldUnderOwnerControlTargetEffect effect) {
         super(effect);
         this.tapped = effect.tapped;
+        this.fromExileZone = effect.fromExileZone;
     }
 
     @Override
@@ -67,9 +78,23 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            controller.moveCards(new CardsImpl(getTargetPointer().getTargets(game, source)).getCards(game),
-                    Zone.BATTLEFIELD, source, game, tapped, false, true, null);
-            return true;
+            Card card = null;
+            if (fromExileZone) {
+                UUID exilZoneId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
+                if (exilZoneId != null) {
+                    ExileZone exileZone = game.getExile().getExileZone(exilZoneId);
+                    if (exileZone != null && getTargetPointer().getFirst(game, source) != null) {
+                        card = exileZone.get(getTargetPointer().getFirst(game, source), game);
+                    }
+                }
+            } else {
+                card = game.getCard(getTargetPointer().getFirst(game, source));
+            }
+            if (card != null) {
+                controller.moveCards(new CardsImpl(card).getCards(game),
+                        Zone.BATTLEFIELD, source, game, tapped, false, true, null);
+                return true;
+            }
         }
         return false;
     }

Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java

@@ -5,7 +5,10 @@
  */
 package mage.abilities.effects.keyword;
 
+import mage.abilities.Ability;
 import mage.abilities.effects.common.CreateTokenEffect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
 import mage.game.permanent.token.ClueArtifactToken;
 
 /**
@@ -23,8 +26,17 @@ public class InvestigateEffect extends CreateTokenEffect {
         super(effect);
     }
 
+    @Override
+    public boolean apply(Game game, Ability source) {
+        if (super.apply(game, source)) {
+            game.fireEvent(GameEvent.getEvent(GameEvent.EventType.INVESTIGATED, source.getSourceId(), source.getSourceId(), source.getControllerId()));
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public InvestigateEffect copy() {
         return new InvestigateEffect(this);
     }
-}
+}

Mage/src/main/java/mage/game/events/GameEvent.java

@@ -91,6 +91,7 @@ public class GameEvent implements Serializable {
         DRAW_CARD, DREW_CARD,
         MIRACLE_CARD_REVEALED,
         MADNESS_CARD_EXILED,
+        INVESTIGATED,
         DISCARD_CARD,
         DISCARDED_CARD,
         CYCLE_CARD, CYCLED_CARD,