From 895453169b722cd763bd6a920bc975e7a5f4a62b Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Tue, 8 Sep 2020 10:32:42 -0400
Subject: [PATCH] [ZNR] Implemented Felidar Retreat

---
 .../src/mage/cards/f/FelidarRetreat.java      | 53 +++++++++++++++++++
 Mage.Sets/src/mage/sets/ZendikarRising.java   |  1 +
 .../game/permanent/token/CatBeastToken.java   | 29 ++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/f/FelidarRetreat.java
 create mode 100644 Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java

diff --git a/Mage.Sets/src/mage/cards/f/FelidarRetreat.java b/Mage.Sets/src/mage/cards/f/FelidarRetreat.java
new file mode 100644
index 00000000000..3d1936dd827
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/f/FelidarRetreat.java
@@ -0,0 +1,53 @@
+package mage.cards.f;
+
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.common.LandfallAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.counters.CounterType;
+import mage.filter.StaticFilters;
+import mage.game.permanent.token.CatBeastToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class FelidarRetreat extends CardImpl {
+
+    public FelidarRetreat(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}");
+
+        // Landfall — Whenever a land enters the battlefield under your control, choose one —
+        // • Create a 2/2 white Cat Beast creature token.
+        Ability ability = new LandfallAbility(new CreateTokenEffect(new CatBeastToken()));
+
+        // • Put a +1/+1 counter on each creature you control. Those creatures gain vigilance until end of turn.
+        Mode mode = new Mode(new AddCountersAllEffect(
+                CounterType.P1P1.createInstance(),
+                StaticFilters.FILTER_CONTROLLED_CREATURE
+        ));
+        mode.addEffect(new GainAbilityAllEffect(
+                VigilanceAbility.getInstance(), Duration.EndOfTurn,
+                StaticFilters.FILTER_CONTROLLED_CREATURE
+        ).setText("Those creatures gain vigilance until end of turn"));
+        ability.addMode(mode);
+        this.addAbility(ability);
+    }
+
+    private FelidarRetreat(final FelidarRetreat card) {
+        super(card);
+    }
+
+    @Override
+    public FelidarRetreat copy() {
+        return new FelidarRetreat(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/ZendikarRising.java b/Mage.Sets/src/mage/sets/ZendikarRising.java
index 18c2af1334f..2bb948c8bbf 100644
--- a/Mage.Sets/src/mage/sets/ZendikarRising.java
+++ b/Mage.Sets/src/mage/sets/ZendikarRising.java
@@ -148,6 +148,7 @@ public final class ZendikarRising extends ExpansionSet {
         cards.add(new SetCardInfo("Farsight Adept", 14, Rarity.COMMON, mage.cards.f.FarsightAdept.class));
         cards.add(new SetCardInfo("Fearless Fledgling", 15, Rarity.UNCOMMON, mage.cards.f.FearlessFledgling.class));
         cards.add(new SetCardInfo("Feed the Swarm", 102, Rarity.COMMON, mage.cards.f.FeedTheSwarm.class));
+        cards.add(new SetCardInfo("Felidar Retreat", 16, Rarity.RARE, mage.cards.f.FelidarRetreat.class));
         cards.add(new SetCardInfo("Field Research", 58, Rarity.COMMON, mage.cards.f.FieldResearch.class));
         cards.add(new SetCardInfo("Fissure Wizard", 140, Rarity.COMMON, mage.cards.f.FissureWizard.class));
         cards.add(new SetCardInfo("Forest", 278, Rarity.LAND, mage.cards.basiclands.Forest.class, FULL_ART_BFZ_VARIOUS));
diff --git a/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java
new file mode 100644
index 00000000000..b5d68b88265
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java
@@ -0,0 +1,29 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+/**
+ * @author TheElk801
+ */
+public final class CatBeastToken extends TokenImpl {
+
+    public CatBeastToken() {
+        super("Cat Beast", "2/2 white Cat Beast creature token");
+        cardType.add(CardType.CREATURE);
+        color.setWhite(true);
+        subtype.add(SubType.CAT);
+        subtype.add(SubType.BEAST);
+        power = new MageInt(2);
+        toughness = new MageInt(2);
+    }
+
+    public CatBeastToken(final CatBeastToken token) {
+        super(token);
+    }
+
+    public CatBeastToken copy() {
+        return new CatBeastToken(this);
+    }
+}