Merge branch 'master' of https://github.com/magefree/mage

Mage.Sets/src/mage/cards/s/ScentOfBrine.java

@@ -0,0 +1,76 @@
+package mage.cards.s;
+
+import java.util.UUID;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.costs.common.RevealTargetFromHandCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.CounterUnlessPaysEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.target.TargetSpell;
+import mage.target.common.TargetCardInHand;
+
+/**
+ *
+ * @author TheElk801
+ */
+public final class ScentOfBrine extends CardImpl {
+
+    public ScentOfBrine(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
+
+        // Reveal any number of blue cards in your hand. Counter target spell unless its controller pays {1} for each card revealed this way.
+        this.getSpellAbility().addEffect(new ScentOfBrineEffect());
+        this.getSpellAbility().addTarget(new TargetSpell());
+    }
+
+    public ScentOfBrine(final ScentOfBrine card) {
+        super(card);
+    }
+
+    @Override
+    public ScentOfBrine copy() {
+        return new ScentOfBrine(this);
+    }
+}
+
+class ScentOfBrineEffect extends OneShotEffect {
+
+    private static final FilterCard filter = new FilterCard("any number of blue cards in your hand");
+
+    static {
+        filter.add(new ColorPredicate(ObjectColor.BLUE));
+    }
+
+    public ScentOfBrineEffect() {
+        super(Outcome.Detriment);
+        this.staticText = "reveal any number of blue cards in your hand. "
+                + "Counter target spell unless its controller pays {1} for each card revealed this way";
+    }
+
+    public ScentOfBrineEffect(final ScentOfBrineEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ScentOfBrineEffect copy() {
+        return new ScentOfBrineEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        RevealTargetFromHandCost cost = new RevealTargetFromHandCost(new TargetCardInHand(0, Integer.MAX_VALUE, filter));
+        if (!cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) {
+            return false;
+        }
+        int xValue = cost.getNumberRevealedCards();
+        return new CounterUnlessPaysEffect(new GenericManaCost(xValue)).apply(game, source);
+    }
+}

Mage.Sets/src/mage/cards/s/ScentOfCinder.java

@@ -0,0 +1,75 @@
+package mage.cards.s;
+
+import java.util.UUID;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.costs.common.RevealTargetFromHandCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.target.common.TargetAnyTarget;
+import mage.target.common.TargetCardInHand;
+
+/**
+ *
+ * @author TheElk801
+ */
+public final class ScentOfCinder extends CardImpl {
+
+    public ScentOfCinder(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}");
+
+        // Reveal any number of red cards in your hand. Scent of Cinder deals X damage to any target, where X is the number of cards revealed this way.
+        this.getSpellAbility().addEffect(new ScentOfCinderEffect());
+        this.getSpellAbility().addTarget(new TargetAnyTarget());
+    }
+
+    public ScentOfCinder(final ScentOfCinder card) {
+        super(card);
+    }
+
+    @Override
+    public ScentOfCinder copy() {
+        return new ScentOfCinder(this);
+    }
+}
+
+class ScentOfCinderEffect extends OneShotEffect {
+
+    private static final FilterCard filter = new FilterCard("any number of red cards in your hand");
+
+    static {
+        filter.add(new ColorPredicate(ObjectColor.RED));
+    }
+
+    public ScentOfCinderEffect() {
+        super(Outcome.Damage);
+        this.staticText = "reveal any number of red cards in your hand. "
+                + "{this} deals X damage to any target, where X is the number of cards revealed this way";
+    }
+
+    public ScentOfCinderEffect(final ScentOfCinderEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ScentOfCinderEffect copy() {
+        return new ScentOfCinderEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        RevealTargetFromHandCost cost = new RevealTargetFromHandCost(new TargetCardInHand(0, Integer.MAX_VALUE, filter));
+        if (!cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) {
+            return false;
+        }
+        int xValue = cost.getNumberRevealedCards();
+        return new DamageTargetEffect(xValue).apply(game, source);
+    }
+}

Mage.Sets/src/mage/cards/s/ScentOfIvy.java

@@ -0,0 +1,77 @@
+package mage.cards.s;
+
+import java.util.UUID;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.costs.common.RevealTargetFromHandCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.target.common.TargetCardInHand;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public final class ScentOfIvy extends CardImpl {
+
+    public ScentOfIvy(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{G}");
+
+        // Reveal any number of green cards in your hand. Target creature gets +X/+X until end of turn, where X is the number of cards revealed this way.
+        this.getSpellAbility().addEffect(new ScentOfIvyEffect());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+    }
+
+    public ScentOfIvy(final ScentOfIvy card) {
+        super(card);
+    }
+
+    @Override
+    public ScentOfIvy copy() {
+        return new ScentOfIvy(this);
+    }
+}
+
+class ScentOfIvyEffect extends OneShotEffect {
+
+    private static final FilterCard filter = new FilterCard("any number of green cards in your hand");
+
+    static {
+        filter.add(new ColorPredicate(ObjectColor.GREEN));
+    }
+
+    public ScentOfIvyEffect() {
+        super(Outcome.BoostCreature);
+        this.staticText = "reveal any number of green cards in your hand. "
+                + "Target creature gets +X/+X until end of turn, where X is the number of cards revealed this way";
+    }
+
+    public ScentOfIvyEffect(final ScentOfIvyEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ScentOfIvyEffect copy() {
+        return new ScentOfIvyEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        RevealTargetFromHandCost cost = new RevealTargetFromHandCost(new TargetCardInHand(0, Integer.MAX_VALUE, filter));
+        if (!cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) {
+            return false;
+        }
+        int xValue = cost.getNumberRevealedCards();
+        game.addEffect(new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn), source);
+        return true;
+    }
+}

Mage.Sets/src/mage/cards/s/ScentOfNightshade.java

@@ -0,0 +1,78 @@
+package mage.cards.s;
+
+import java.util.UUID;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.costs.common.RevealTargetFromHandCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.target.common.TargetCardInHand;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public final class ScentOfNightshade extends CardImpl {
+
+    public ScentOfNightshade(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}");
+
+        // Reveal any number of black cards in your hand. Target creature gets -X/-X until end of turn, where X is the number of cards revealed this way.
+        this.getSpellAbility().addEffect(new ScentOfNightshadeEffect());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+    }
+
+    public ScentOfNightshade(final ScentOfNightshade card) {
+        super(card);
+    }
+
+    @Override
+    public ScentOfNightshade copy() {
+        return new ScentOfNightshade(this);
+    }
+}
+
+class ScentOfNightshadeEffect extends OneShotEffect {
+
+    private static final FilterCard filter = new FilterCard("any number of black cards in your hand");
+
+    static {
+        filter.add(new ColorPredicate(ObjectColor.BLACK));
+    }
+
+    public ScentOfNightshadeEffect() {
+        super(Outcome.Detriment);
+        this.staticText = "reveal any number of black cards in your hand. "
+                + "Target creature gets -X/-X until end of turn, "
+                + "where X is the number of cards revealed this way";
+    }
+
+    public ScentOfNightshadeEffect(final ScentOfNightshadeEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ScentOfNightshadeEffect copy() {
+        return new ScentOfNightshadeEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        RevealTargetFromHandCost cost = new RevealTargetFromHandCost(new TargetCardInHand(0, Integer.MAX_VALUE, filter));
+        if (!cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) {
+            return false;
+        }
+        int xValue = -1 * cost.getNumberRevealedCards();
+        game.addEffect(new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn), source);
+        return true;
+    }
+}

Mage.Sets/src/mage/sets/MediaInserts.java

@@ -171,6 +171,7 @@ public final class MediaInserts extends ExpansionSet {
         cards.add(new SetCardInfo("Sanctifier of Souls", 157, Rarity.RARE, mage.cards.s.SanctifierOfSouls.class));
         cards.add(new SetCardInfo("Sandsteppe Citadel", 134, Rarity.SPECIAL, mage.cards.s.SandsteppeCitadel.class));
         cards.add(new SetCardInfo("Scavenging Ooze", 70, Rarity.RARE, mage.cards.s.ScavengingOoze.class));
+        cards.add(new SetCardInfo("Scent of Cinder", 9, Rarity.SPECIAL, mage.cards.s.ScentOfCinder.class));
         cards.add(new SetCardInfo("Scrap Trawler", 164, Rarity.RARE, mage.cards.s.ScrapTrawler.class));
         cards.add(new SetCardInfo("Scythe Leopard", 141, Rarity.SPECIAL, mage.cards.s.ScytheLeopard.class));
         cards.add(new SetCardInfo("Seeker of the Way", 130, Rarity.SPECIAL, mage.cards.s.SeekerOfTheWay.class));

Mage.Sets/src/mage/sets/UrzasDestiny.java

@@ -117,7 +117,11 @@ public final class UrzasDestiny extends ExpansionSet {
         cards.add(new SetCardInfo("Rescue", 44, Rarity.COMMON, mage.cards.r.Rescue.class));
         cards.add(new SetCardInfo("Rofellos, Llanowar Emissary", 118, Rarity.RARE, mage.cards.r.RofellosLlanowarEmissary.class));
         cards.add(new SetCardInfo("Sanctimony", 16, Rarity.UNCOMMON, mage.cards.s.Sanctimony.class));
+        cards.add(new SetCardInfo("Scent of Brine", 45, Rarity.COMMON, mage.cards.s.ScentOfBrine.class));
+        cards.add(new SetCardInfo("Scent of Cinder", 96, Rarity.COMMON, mage.cards.s.ScentOfCinder.class));
+        cards.add(new SetCardInfo("Scent of Ivy", 120, Rarity.COMMON, mage.cards.s.ScentOfIvy.class));
         cards.add(new SetCardInfo("Scent of Jasmine", 17, Rarity.COMMON, mage.cards.s.ScentOfJasmine.class));
+        cards.add(new SetCardInfo("Scent of Nightshade", 69, Rarity.COMMON, mage.cards.s.ScentOfNightshade.class));
         cards.add(new SetCardInfo("Scour", 18, Rarity.UNCOMMON, mage.cards.s.Scour.class));
         cards.add(new SetCardInfo("Serra Advocate", 19, Rarity.UNCOMMON, mage.cards.s.SerraAdvocate.class));
         cards.add(new SetCardInfo("Sigil of Sleep", 46, Rarity.COMMON, mage.cards.s.SigilOfSleep.class));