From c77459b7a0a2f04a0ca09f898b64b64b6faf938b Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Sun, 30 Jan 2022 14:14:40 -0500
Subject: [PATCH] [NEC] Implemented Chishiro, the Shattered Blade

---
 .../cards/c/ChishiroTheShatteredBlade.java    | 67 +++++++++++++++++++
 .../src/mage/sets/NeonDynastyCommander.java   |  1 +
 .../game/permanent/token/SpiritRedToken.java  | 28 ++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/c/ChishiroTheShatteredBlade.java
 create mode 100644 Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java

diff --git a/Mage.Sets/src/mage/cards/c/ChishiroTheShatteredBlade.java b/Mage.Sets/src/mage/cards/c/ChishiroTheShatteredBlade.java
new file mode 100644
index 00000000000..fc1d21fec3b
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/c/ChishiroTheShatteredBlade.java
@@ -0,0 +1,67 @@
+package mage.cards.c;
+
+import mage.MageInt;
+import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.ModifiedPredicate;
+import mage.game.permanent.token.SpiritRedToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ChishiroTheShatteredBlade extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent("an Aura or Equipment");
+    private static final FilterPermanent filter2 = new FilterControlledPermanent("modified creature you control");
+
+    static {
+        filter.add(Predicates.or(
+                SubType.AURA.getPredicate(),
+                SubType.EQUIPMENT.getPredicate()
+        ));
+        filter2.add(ModifiedPredicate.instance);
+    }
+
+    public ChishiroTheShatteredBlade(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{G}");
+
+        this.addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.SNAKE);
+        this.subtype.add(SubType.SAMURAI);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Whenever an Aura or Equipment enters the battlefield under your control, create a 2/2 red Spirit creature token.
+        this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
+                new CreateTokenEffect(new SpiritRedToken()), filter
+        ));
+
+        // At the beginning of your end step, put a +1/+1 counter on each modified creature you control.
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(new AddCountersAllEffect(
+                CounterType.P1P1.createInstance(), filter2
+        ), TargetController.YOU, false));
+    }
+
+    private ChishiroTheShatteredBlade(final ChishiroTheShatteredBlade card) {
+        super(card);
+    }
+
+    @Override
+    public ChishiroTheShatteredBlade copy() {
+        return new ChishiroTheShatteredBlade(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/NeonDynastyCommander.java b/Mage.Sets/src/mage/sets/NeonDynastyCommander.java
index 635f6b22ed2..bd05e55dbab 100644
--- a/Mage.Sets/src/mage/sets/NeonDynastyCommander.java
+++ b/Mage.Sets/src/mage/sets/NeonDynastyCommander.java
@@ -19,6 +19,7 @@ public final class NeonDynastyCommander extends ExpansionSet {
         super("Neon Dynasty Commander", "NEC", ExpansionSet.buildDate(2022, 2, 18), SetType.SUPPLEMENTAL);
         this.hasBasicLands = false;
 
+        cards.add(new SetCardInfo("Chishiro, the Shattered Blade", 1, Rarity.MYTHIC, mage.cards.c.ChishiroTheShatteredBlade.class));
         cards.add(new SetCardInfo("Kotori, Pilot Prodigy", 2, Rarity.MYTHIC, mage.cards.k.KotoriPilotProdigy.class));
     }
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java
new file mode 100644
index 00000000000..ad4d2692544
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java
@@ -0,0 +1,28 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+/**
+ * @author TheElk801
+ */
+public final class SpiritRedToken extends TokenImpl {
+
+    public SpiritRedToken() {
+        super("Spirit token", "2/2 red Spirit creature token");
+        cardType.add(CardType.CREATURE);
+        subtype.add(SubType.SPIRIT);
+        color.setRed(true);
+        power = new MageInt(2);
+        toughness = new MageInt(2);
+    }
+
+    public SpiritRedToken(final SpiritRedToken token) {
+        super(token);
+    }
+
+    public SpiritRedToken copy() {
+        return new SpiritRedToken(this);
+    }
+}