diff --git a/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java b/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java
new file mode 100644
index 0000000000..b7e67ca344
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java
@@ -0,0 +1,104 @@
+package mage.cards.n;
+
+import mage.abilities.Ability;
+import mage.abilities.LoyaltyAbility;
+import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.MyTurnCondition;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.common.PayVariableLoyaltyCost;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.effects.common.cost.AbilitiesCostReductionControllerEffect;
+import mage.abilities.keyword.EquipAbility;
+import mage.abilities.keyword.FirstStrikeAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.filter.FilterPermanent;
+import mage.filter.StaticFilters;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.game.Game;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class NahiriStormOfStone extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterCreaturePermanent("tapped creature");
+
+    static {
+        filter.add(TappedPredicate.instance);
+    }
+
+    public NahiriStormOfStone(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{2}{R/W}{R/W}");
+
+        this.addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.NAHIRI);
+        this.addAbility(new PlaneswalkerEntersWithLoyaltyCountersAbility(6));
+
+        // As long as it's your turn, creatures you control have first strike and equip abilities you activate cost {1} less to activate.
+        Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect(
+                new GainAbilityControlledEffect(
+                        FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield,
+                        StaticFilters.FILTER_PERMANENT_CREATURE
+                ), MyTurnCondition.instance, "As long as it's your turn, " +
+                "creatures you control have first strike"
+        ));
+        ability.addEffect(new ConditionalContinuousEffect(
+                new AbilitiesCostReductionControllerEffect(
+                        EquipAbility.class, "Equip"
+                ), MyTurnCondition.instance, "and equip abilities you activate cost {1} less to activate"
+        ));
+        this.addAbility(ability);
+
+        // -X: Nahiri, Storm of Stone deals X damage to target tapped creature.
+        ability = new LoyaltyAbility(new DamageTargetEffect(NahiriStormOfStoneValue.instance));
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(ability);
+    }
+
+    private NahiriStormOfStone(final NahiriStormOfStone card) {
+        super(card);
+    }
+
+    @Override
+    public NahiriStormOfStone copy() {
+        return new NahiriStormOfStone(this);
+    }
+}
+
+enum NahiriStormOfStoneValue implements DynamicValue {
+    instance;
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        for (Cost cost : sourceAbility.getCosts()) {
+            if (cost instanceof PayVariableLoyaltyCost) {
+                return ((PayVariableLoyaltyCost) cost).getAmount();
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public DynamicValue copy() {
+        return instance;
+    }
+
+    @Override
+    public String getMessage() {
+        return "X";
+    }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/WarOfTheSpark.java b/Mage.Sets/src/mage/sets/WarOfTheSpark.java
index 48bb0ed648..2d20550407 100644
--- a/Mage.Sets/src/mage/sets/WarOfTheSpark.java
+++ b/Mage.Sets/src/mage/sets/WarOfTheSpark.java
@@ -77,6 +77,7 @@ public final class WarOfTheSpark extends ExpansionSet {
         cards.add(new SetCardInfo("Mowu, Loyal Companion", 167, Rarity.UNCOMMON, mage.cards.m.MowuLoyalCompanion.class));
         cards.add(new SetCardInfo("Naga Eternal", 60, Rarity.COMMON, mage.cards.n.NagaEternal.class));
         cards.add(new SetCardInfo("Nahiri's Stoneblades", 139, Rarity.COMMON, mage.cards.n.NahirisStoneblades.class));
+        cards.add(new SetCardInfo("Nahiri, Storm of Stone", 233, Rarity.UNCOMMON, mage.cards.n.NahiriStormOfStone.class));
         cards.add(new SetCardInfo("Neheb, Dreadhorde Champion", 140, Rarity.RARE, mage.cards.n.NehebDreadhordeChampion.class));
         cards.add(new SetCardInfo("No Escape", 63, Rarity.COMMON, mage.cards.n.NoEscape.class));
         cards.add(new SetCardInfo("Ob Nixilis's Cruelty", 101, Rarity.COMMON, mage.cards.o.ObNixilissCruelty.class));