From 9a3fc4e0ccf737e13b7e8ca785c74b2dbb70bcbb Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Sun, 7 Apr 2024 18:18:39 -0400
Subject: [PATCH] [OTC] Implement Graywater's Fixer

---
 .../src/mage/cards/g/GraywatersFixer.java     | 77 +++++++++++++++++++
 .../OutlawsOfThunderJunctionCommander.java    |  1 +
 .../abilities/keyword/UnearthAbility.java     |  5 +-
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 Mage.Sets/src/mage/cards/g/GraywatersFixer.java

diff --git a/Mage.Sets/src/mage/cards/g/GraywatersFixer.java b/Mage.Sets/src/mage/cards/g/GraywatersFixer.java
new file mode 100644
index 00000000000..c1b1a7818a5
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/g/GraywatersFixer.java
@@ -0,0 +1,77 @@
+package mage.cards.g;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.keyword.UnearthAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.game.Game;
+import mage.players.Player;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class GraywatersFixer extends CardImpl {
+
+    public GraywatersFixer(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{R}");
+
+        this.subtype.add(SubType.LIZARD);
+        this.subtype.add(SubType.MERCENARY);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Each outlaw creature card in your graveyard has encore {X}, where X is its mana value.
+        this.addAbility(new SimpleStaticAbility(new GraywatersFixerEffect()));
+    }
+
+    private GraywatersFixer(final GraywatersFixer card) {
+        super(card);
+    }
+
+    @Override
+    public GraywatersFixer copy() {
+        return new GraywatersFixer(this);
+    }
+}
+
+class GraywatersFixerEffect extends ContinuousEffectImpl {
+    GraywatersFixerEffect() {
+        super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
+        staticText = "each outlaw creature card in your graveyard has encore {X}, where X is its mana value";
+    }
+
+    private GraywatersFixerEffect(final GraywatersFixerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller == null) {
+            return false;
+        }
+        for (Card card : controller.getGraveyard().getCards(game)) {
+            if (!card.isCreature(game) || !card.isOutlaw(game)) {
+                continue;
+            }
+            UnearthAbility ability = new UnearthAbility(new GenericManaCost(card.getManaValue()));
+            ability.setSourceId(card.getId());
+            ability.setControllerId(card.getOwnerId());
+            game.getState().addOtherAbility(card, ability);
+        }
+        return true;
+    }
+
+    @Override
+    public GraywatersFixerEffect copy() {
+        return new GraywatersFixerEffect(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunctionCommander.java b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunctionCommander.java
index a0f54f48c8c..fafebe64b9d 100644
--- a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunctionCommander.java
+++ b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunctionCommander.java
@@ -129,6 +129,7 @@ public final class OutlawsOfThunderJunctionCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Glittering Stockpile", 167, Rarity.UNCOMMON, mage.cards.g.GlitteringStockpile.class));
         cards.add(new SetCardInfo("Goblin Electromancer", 228, Rarity.COMMON, mage.cards.g.GoblinElectromancer.class));
         cards.add(new SetCardInfo("Gonti, Lord of Luxury", 135, Rarity.RARE, mage.cards.g.GontiLordOfLuxury.class));
+        cards.add(new SetCardInfo("Graywater's Fixer", 36, Rarity.RARE, mage.cards.g.GraywatersFixer.class));
         cards.add(new SetCardInfo("Grenzo, Havoc Raiser", 168, Rarity.RARE, mage.cards.g.GrenzoHavocRaiser.class));
         cards.add(new SetCardInfo("Guttersnipe", 169, Rarity.COMMON, mage.cards.g.Guttersnipe.class));
         cards.add(new SetCardInfo("Harrow", 194, Rarity.COMMON, mage.cards.h.Harrow.class));
diff --git a/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java b/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java
index a924b3db748..dc669636304 100644
--- a/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java
@@ -3,7 +3,7 @@ package mage.abilities.keyword;
 import mage.abilities.Ability;
 import mage.abilities.ActivatedAbilityImpl;
 import mage.abilities.DelayedTriggeredAbility;
-import mage.abilities.costs.mana.ManaCosts;
+import mage.abilities.costs.Cost;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
 import mage.abilities.effects.common.ExileSourceEffect;
@@ -14,7 +14,6 @@ import mage.constants.TimingRule;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
 import mage.game.events.ZoneChangeEvent;
 
 /**
@@ -32,7 +31,7 @@ import mage.game.events.ZoneChangeEvent;
  */
 public class UnearthAbility extends ActivatedAbilityImpl {
 
-    public UnearthAbility(ManaCosts costs) {
+    public UnearthAbility(Cost costs) {
         super(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(false, true, true), costs);
         this.timing = TimingRule.SORCERY;
         this.addEffect(new CreateDelayedTriggeredAbilityEffect(new UnearthDelayedTriggeredAbility()));