diff --git a/Mage.Sets/src/mage/cards/e/EcstaticElectromancer.java b/Mage.Sets/src/mage/cards/e/EcstaticElectromancer.java
new file mode 100644
index 00000000000..e94f6461ee8
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/e/EcstaticElectromancer.java
@@ -0,0 +1,46 @@
+package mage.cards.e;
+
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility;
+import mage.abilities.costs.common.DiscardCardCost;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.keyword.ProwessAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class EcstaticElectromancer extends CardImpl {
+
+    public EcstaticElectromancer(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U/R}{U/R}");
+
+        this.subtype.add(SubType.GOBLIN);
+        this.subtype.add(SubType.WIZARD);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(3);
+
+        // Prowess
+        this.addAbility(new ProwessAbility());
+
+        // Whenever Ecstatic Electromancer enters the battlefield or attacks, you may discard a card. If you do, draw a card.
+        this.addAbility(new EntersBattlefieldOrAttacksSourceTriggeredAbility(
+                new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new DiscardCardCost())
+        ));
+    }
+
+    private EcstaticElectromancer(final EcstaticElectromancer card) {
+        super(card);
+    }
+
+    @Override
+    public EcstaticElectromancer copy() {
+        return new EcstaticElectromancer(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/RavnicaClueEdition.java b/Mage.Sets/src/mage/sets/RavnicaClueEdition.java
index 74a754851ee..16a6f489a9d 100644
--- a/Mage.Sets/src/mage/sets/RavnicaClueEdition.java
+++ b/Mage.Sets/src/mage/sets/RavnicaClueEdition.java
@@ -26,6 +26,7 @@ public final class RavnicaClueEdition extends ExpansionSet {
         cards.add(new SetCardInfo("Commander Mustard", 6, Rarity.RARE, mage.cards.c.CommanderMustard.class));
         cards.add(new SetCardInfo("Conclave Evangelist", 27, Rarity.RARE, mage.cards.c.ConclaveEvangelist.class));
         cards.add(new SetCardInfo("Dining Room", 15, Rarity.UNCOMMON, mage.cards.d.DiningRoom.class));
+        cards.add(new SetCardInfo("Ecstatic Electromancer", 31, Rarity.UNCOMMON, mage.cards.e.EcstaticElectromancer.class));
         cards.add(new SetCardInfo("Godless Shrine", 276, Rarity.RARE, mage.cards.g.GodlessShrine.class));
         cards.add(new SetCardInfo("Hallowed Fountain", 277, Rarity.RARE, mage.cards.h.HallowedFountain.class));
         cards.add(new SetCardInfo("Knife", 10, Rarity.UNCOMMON, mage.cards.k.Knife.class));