From 9f66ebbe5408eb574db1f037754cb30d287e8bdd Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Wed, 26 Jun 2019 08:12:09 -0400
Subject: [PATCH] Implemented Salvager of Ruin

---
 .../src/mage/cards/s/SalvagerOfRuin.java      | 72 +++++++++++++++++++
 Mage.Sets/src/mage/sets/CoreSet2020.java      |  1 +
 2 files changed, 73 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/s/SalvagerOfRuin.java

diff --git a/Mage.Sets/src/mage/cards/s/SalvagerOfRuin.java b/Mage.Sets/src/mage/cards/s/SalvagerOfRuin.java
new file mode 100644
index 00000000000..d5d7b88f7ce
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/s/SalvagerOfRuin.java
@@ -0,0 +1,72 @@
+package mage.cards.s;
+
+import mage.MageInt;
+import mage.MageObjectReference;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeSourceCost;
+import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterPermanentCard;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+import mage.target.common.TargetCardInYourGraveyard;
+import mage.watchers.common.CardsPutIntoGraveyardWatcher;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class SalvagerOfRuin extends CardImpl {
+
+    private static final FilterCard filter = new FilterPermanentCard(
+            "permanent card in your graveyard that were put there from the battlefield this turn"
+    );
+
+    static {
+        filter.add(SalvagerOfRuinPredicate.instance);
+    }
+
+    public SalvagerOfRuin(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}");
+
+        this.subtype.add(SubType.CONSTRUCT);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(1);
+
+        // Sacrifice Salvager of Ruin: Choose target permanent card in your graveyard that was put there from the battlefield this turn. Return it to your hand.
+        Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect().setText(
+                "Choose target permanent card in your graveyard " +
+                        "that was put there from the battlefield this turn. " +
+                        "Return it to your hand."
+        ), new SacrificeSourceCost());
+        ability.addTarget(new TargetCardInYourGraveyard(1, filter));
+        this.addAbility(ability, new CardsPutIntoGraveyardWatcher());
+    }
+
+    private SalvagerOfRuin(final SalvagerOfRuin card) {
+        super(card);
+    }
+
+    @Override
+    public SalvagerOfRuin copy() {
+        return new SalvagerOfRuin(this);
+    }
+}
+
+enum SalvagerOfRuinPredicate implements Predicate<Card> {
+    instance;
+
+    @Override
+    public boolean apply(Card input, Game game) {
+        CardsPutIntoGraveyardWatcher watcher = game.getState().getWatcher(CardsPutIntoGraveyardWatcher.class);
+        return watcher != null
+                && watcher.getCardsPutToGraveyardFromBattlefield().contains(new MageObjectReference(input, game));
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/CoreSet2020.java b/Mage.Sets/src/mage/sets/CoreSet2020.java
index dab0d5a3871..5799c6178e3 100644
--- a/Mage.Sets/src/mage/sets/CoreSet2020.java
+++ b/Mage.Sets/src/mage/sets/CoreSet2020.java
@@ -256,6 +256,7 @@ public final class CoreSet2020 extends ExpansionSet {
         cards.add(new SetCardInfo("Rugged Highlands", 250, Rarity.COMMON, mage.cards.r.RuggedHighlands.class));
         cards.add(new SetCardInfo("Rule of Law", 35, Rarity.UNCOMMON, mage.cards.r.RuleOfLaw.class));
         cards.add(new SetCardInfo("Sage's Row Denizen", 73, Rarity.COMMON, mage.cards.s.SagesRowDenizen.class));
+        cards.add(new SetCardInfo("Salvager of Ruin", 237, Rarity.UNCOMMON, mage.cards.s.SalvagerOfRuin.class));
         cards.add(new SetCardInfo("Sanitarium Skeleton", 112, Rarity.COMMON, mage.cards.s.SanitariumSkeleton.class));
         cards.add(new SetCardInfo("Savage Gorger", 291, Rarity.COMMON, mage.cards.s.SavageGorger.class));
         cards.add(new SetCardInfo("Savannah Sage", 284, Rarity.COMMON, mage.cards.s.SavannahSage.class));