diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/InquisitorsOx.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/InquisitorsOx.java
new file mode 100644
index 00000000000..adb1ddec65f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/InquisitorsOx.java
@@ -0,0 +1,74 @@
+/*
+ * 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.SimpleStaticAbility;
+import mage.abilities.condition.common.DeliriumCondition;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class InquisitorsOx extends CardImpl {
+
+ public InquisitorsOx(UUID ownerId) {
+ super(ownerId, 24, "Inquisitor's Ox", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}");
+ this.expansionSetCode = "SOI";
+ this.subtype.add("Ox");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(5);
+ this.color.setWhite(true);
+
+ // Delirium — Inquisitor's Ox gets +1/+0 and has vigilance as long as there are four or more card types among cards in your graveyard.
+ ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), DeliriumCondition.getInstance(), "Delirium — {this} gets +1/+0");
+ Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
+ ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), DeliriumCondition.getInstance(), "and has vigilance as long as there are four or more card types among cards in your graveyard."));
+ this.addAbility(ability);
+ }
+
+ public InquisitorsOx(final InquisitorsOx card) {
+ super(card);
+ }
+
+ @Override
+ public InquisitorsOx copy() {
+ return new InquisitorsOx(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MilitantInquisitor.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MilitantInquisitor.java
new file mode 100644
index 00000000000..6e4b4cc1e49
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MilitantInquisitor.java
@@ -0,0 +1,78 @@
+/*
+ * 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.SimpleStaticAbility;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.dynamicvalue.common.StaticValue;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class MilitantInquisitor extends CardImpl {
+
+ private static final FilterControlledPermanent filter = new FilterControlledPermanent("equipment you control");
+
+ static {
+ filter.add(new CardTypePredicate(CardType.ARTIFACT));
+ filter.add(new SubtypePredicate("Equipment"));
+ }
+
+ public MilitantInquisitor(UUID ownerId) {
+ super(ownerId, 26, "Militant Inquisitor", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+ this.expansionSetCode = "SOI";
+ this.subtype.add("Human");
+ this.subtype.add("Cleric");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(3);
+
+ // Miltant Inquisitor gets +1/+0 for each Equipment you control.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.WhileOnBattlefield)));
+ }
+
+ public MilitantInquisitor(final MilitantInquisitor card) {
+ super(card);
+ }
+
+ @Override
+ public MilitantInquisitor copy() {
+ return new MilitantInquisitor(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MoorlandDrifter.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MoorlandDrifter.java
new file mode 100644
index 00000000000..bf767787f3f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/MoorlandDrifter.java
@@ -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.shadowsoverinnistrad;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.DeliriumCondition;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class MoorlandDrifter extends CardImpl {
+
+ public MoorlandDrifter(UUID ownerId) {
+ super(ownerId, 27, "Moorland Drifter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}");
+ this.expansionSetCode = "SOI";
+ this.subtype.add("Spirit");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ // Delirium — Moorland Drifter has flying as long as there are four or more card types among cards in your graveyard.
+ ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), DeliriumCondition.getInstance(), "Delirium — Moorland Drifter has flying as long as there are four or more card types among cards in your graveyard.");
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
+ }
+
+ public MoorlandDrifter(final MoorlandDrifter card) {
+ super(card);
+ }
+
+ @Override
+ public MoorlandDrifter copy() {
+ return new MoorlandDrifter(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/NearheathChaplain.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/NearheathChaplain.java
new file mode 100644
index 00000000000..51356502d18
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/NearheathChaplain.java
@@ -0,0 +1,75 @@
+/*
+ * 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.ActivateAsSorceryActivatedAbility;
+import mage.abilities.costs.common.ExileSourceFromGraveCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.keyword.LifelinkAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.permanent.token.SpiritWhiteToken;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class NearheathChaplain extends CardImpl {
+
+ public NearheathChaplain(UUID ownerId) {
+ super(ownerId, 29, "Nearheath Chaplain", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}");
+ this.expansionSetCode = "SOI";
+ this.subtype.add("Human");
+ this.subtype.add("Cleric");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(1);
+
+ // Lifelink
+ this.addAbility(LifelinkAbility.getInstance());
+
+ // {2}{W}, Exile Neaheath Chaplain from your graveyard: Put two 1/1 white Spirit creature tokens with flying onto the battlefield. Activate this ability only any time you could cast a sorcery.
+ Ability ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new SpiritWhiteToken(), 2), new ManaCostsImpl("{2}{W}"));
+ ability.addCost(new ExileSourceFromGraveCost());
+ this.addAbility(ability);
+ }
+
+ public NearheathChaplain(final NearheathChaplain card) {
+ super(card);
+ }
+
+ @Override
+ public NearheathChaplain copy() {
+ return new NearheathChaplain(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/NotForgotten.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/NotForgotten.java
new file mode 100644
index 00000000000..b327b8eacd6
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/NotForgotten.java
@@ -0,0 +1,103 @@
+/*
+ * 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.OneShotEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.permanent.token.SpiritWhiteToken;
+import mage.game.permanent.token.Token;
+import mage.players.Player;
+import mage.target.common.TargetCardInGraveyard;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class NotForgotten extends CardImpl {
+
+ public NotForgotten(UUID ownerId) {
+ super(ownerId, 30, "Not Forgotten", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{W}");
+ this.expansionSetCode = "SOI";
+
+ // Put target card from a graveyard on the top or bottom of its owner's library.
+ // Put a 1/1 white Spirit creature token with flying onto the battlefield.
+ this.getSpellAbility().addEffect(new NotForgottenEffect());
+ this.getSpellAbility().addTarget(new TargetCardInGraveyard());
+ }
+
+ public NotForgotten(final NotForgotten card) {
+ super(card);
+ }
+
+ @Override
+ public NotForgotten copy() {
+ return new NotForgotten(this);
+ }
+}
+
+class NotForgottenEffect extends OneShotEffect {
+
+ public NotForgottenEffect() {
+ super(Outcome.Benefit);
+ this.staticText = "Put target card from a graveyard on the top or bottom of its owner's library. Put a 1/1 white Spirit creature token with flying onto the battlefield.";
+ }
+
+ public NotForgottenEffect(final NotForgottenEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public NotForgottenEffect copy() {
+ return new NotForgottenEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player controller = game.getPlayer(source.getControllerId());
+ Card targetCard = game.getCard(source.getFirstTarget());
+
+ if (controller != null && targetCard != null) {
+ boolean onTop = controller.chooseUse(outcome, "Put " + targetCard.getName() + " on top of it's owners library (otherwise on bottom)?", source, game);
+ boolean moved = controller.moveCardToLibraryWithInfo(targetCard, source.getSourceId(), game, Zone.GRAVEYARD, onTop, true);
+ if (moved) {
+ Token token = new SpiritWhiteToken();
+ token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId(), false, false);
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/OdricLunarchMarshal.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/OdricLunarchMarshal.java
new file mode 100644
index 00000000000..5ee59ecbdb1
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/OdricLunarchMarshal.java
@@ -0,0 +1,203 @@
+/*
+ * 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.BeginningOfCombatTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.keyword.DeathtouchAbility;
+import mage.abilities.keyword.DoubleStrikeAbility;
+import mage.abilities.keyword.FirstStrikeAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.HasteAbility;
+import mage.abilities.keyword.HexproofAbility;
+import mage.abilities.keyword.IndestructibleAbility;
+import mage.abilities.keyword.LifelinkAbility;
+import mage.abilities.keyword.MenaceAbility;
+import mage.abilities.keyword.ReachAbility;
+import mage.abilities.keyword.SkulkAbility;
+import mage.abilities.keyword.TrampleAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.mageobject.AbilityPredicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class OdricLunarchMarshal extends CardImpl {
+
+ public OdricLunarchMarshal(UUID ownerId) {
+ super(ownerId, 31, "Odric, Lunarch Marshal", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}");
+ this.expansionSetCode = "SOI";
+ this.supertype.add("Legendary");
+ this.subtype.add("Human");
+ this.subtype.add("Soldier");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(3);
+
+ // At the beginning of each combat, creatures you control gain first strike until end of turn if a creature you control has first strike. The same is true for flying, deathtouch, double strike, haste, hexproof, indestructible, lifelink, menace, reach, skulk, trample, and vigilance.
+ this.addAbility(new BeginningOfCombatTriggeredAbility(new OdricLunarchMarshalEffect(), TargetController.YOU, false));
+ }
+
+ public OdricLunarchMarshal(final OdricLunarchMarshal card) {
+ super(card);
+ }
+
+ @Override
+ public OdricLunarchMarshal copy() {
+ return new OdricLunarchMarshal(this);
+ }
+}
+
+class OdricLunarchMarshalEffect extends OneShotEffect {
+
+ private static final FilterControlledCreaturePermanent filterFirstStrike = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterFlying = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterDeathtouch = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterDoubleStrike = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterHaste = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterHexproof = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterIndestructible = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterLifelink = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterMenace = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterReach = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterSkulk = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterTrample = new FilterControlledCreaturePermanent();
+ private static final FilterControlledCreaturePermanent filterVigilance = new FilterControlledCreaturePermanent();
+
+ static {
+ filterFirstStrike.add(new AbilityPredicate(FirstStrikeAbility.class));
+ filterFlying.add(new AbilityPredicate(FlyingAbility.class));
+ filterDeathtouch.add(new AbilityPredicate(DeathtouchAbility.class));
+ filterDoubleStrike.add(new AbilityPredicate(DoubleStrikeAbility.class));
+ filterHaste.add(new AbilityPredicate(HasteAbility.class));
+ filterHexproof.add(new AbilityPredicate(HexproofAbility.class));
+ filterIndestructible.add(new AbilityPredicate(IndestructibleAbility.class));
+ filterLifelink.add(new AbilityPredicate(LifelinkAbility.class));
+ filterMenace.add(new AbilityPredicate(MenaceAbility.class));
+ filterReach.add(new AbilityPredicate(ReachAbility.class));
+ filterSkulk.add(new AbilityPredicate(SkulkAbility.class));
+ filterTrample.add(new AbilityPredicate(TrampleAbility.class));
+ filterVigilance.add(new AbilityPredicate(VigilanceAbility.class));
+ }
+
+ OdricLunarchMarshalEffect() {
+ super(Outcome.BoostCreature);
+ this.staticText = "creatures you control gain first strike until end of turn if a creature you control has first strike. The same is true for flying, deathtouch, double strike, haste, hexproof, indestructible, lifelink, menace, reach, skulk, trample, and vigilance.";
+ }
+
+ OdricLunarchMarshalEffect(final OdricLunarchMarshalEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public OdricLunarchMarshalEffect copy() {
+ return new OdricLunarchMarshalEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+
+ // First strike
+ if (game.getBattlefield().contains(filterFirstStrike, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Flying
+ if (game.getBattlefield().contains(filterFlying, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Deathtouch
+ if (game.getBattlefield().contains(filterDeathtouch, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Double strike
+ if (game.getBattlefield().contains(filterDoubleStrike, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Haste
+ if (game.getBattlefield().contains(filterHaste, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Hexproof
+ if (game.getBattlefield().contains(filterHexproof, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Indestructible
+ if (game.getBattlefield().contains(filterIndestructible, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Lifelink
+ if (game.getBattlefield().contains(filterLifelink, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Menace
+ if (game.getBattlefield().contains(filterMenace, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(new MenaceAbility(), Duration.EndOfTurn), source);
+ }
+
+ // Reach
+ if (game.getBattlefield().contains(filterReach, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(ReachAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Skulk
+ if (game.getBattlefield().contains(filterSkulk, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(new SkulkAbility(), Duration.EndOfTurn), source);
+ }
+
+ // Trample
+ if (game.getBattlefield().contains(filterTrample, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+
+ // Vigilance
+ if (game.getBattlefield().contains(filterVigilance, source.getControllerId(), 1, game)) {
+ game.addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), source);
+ }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt
index 4afba9fe198..c981b298857 100644
--- a/Utils/mtg-cards-data.txt
+++ b/Utils/mtg-cards-data.txt
@@ -56968,7 +56968,7 @@ Inspiring Captain|Shadows over Innistrad|25|C|{3}{W}|Creature - Human Knight|3|3
Militant Inquisitor|Shadows over Innistrad|26|C|{2}{W}|Creature - Human Cleric|2|3|Miltant Inquisitor gets +1/+0 for each Equipment you control.|
Moorland Drifter|Shadows over Innistrad|27|C|{1}{W}|Creature - Spirit|2|2|Delirium — Moorland Drifter has flying as long as there are four or more card types among cards in your graveyard.|
Nahiri's Machinations|Shadows over Innistrad|28|U|{1}{W}|Enchantment|||At the beginning of combat on your turn, target creature you control gains indestructible until end of turn.${1}{R}: Nahiri's Machinations deals 1 damage to target blocking creature.|
-Nearheath Caplain|Shadows over Innistrad|29|U|{3}{W}|Creature - Human Cleric|3|1|Lifelink${2}{W}, Exile Neaheath Chaplain from your graveyard: Put two 1/1 white Spirit creature tokens with flying onto the battlefield. Activate this ability only any time you could cast a sorcery.|
+Nearheath Chaplain|Shadows over Innistrad|29|U|{3}{W}|Creature - Human Cleric|3|1|Lifelink${2}{W}, Exile Neaheath Chaplain from your graveyard: Put two 1/1 white Spirit creature tokens with flying onto the battlefield. Activate this ability only any time you could cast a sorcery.|
Not Forgotten|Shadows over Innistrad|30|U|{1}{W}|Sorcery|||Put target card from a graveyard on the top or bottom of its owner's library. Put a 1/1 white Spirit creature token with flying onto the battlefield.|
Odric, Lunarch Marshal|Shadows over Innistrad|31|R|{3}{W}|Legendary Creature - Human Soldier|3|3|At the beginning of each combat, creatures you control gain first strike until end of turn if a creature you control has first strike. The same is true for flying, deathtouch, double strike, haste, hexproof, indestructible, lifelink, menace, reach, skulk, trample, and vigilance.|
Open the Armory|Shadows over Innistrad|32|U|{1}{W}|Sorcery|||Search your library for an Aura or Equipment card, reveal it, and put it into your hand. Then shuffle your library.|