From afbb649087a9d13b366ac12cb31c640a8ffb4642 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Thu, 10 Feb 2022 17:19:07 -0500
Subject: [PATCH] [NEC] Implemented Akki Battle Squad

---
 .../src/mage/cards/a/AkkiBattleSquad.java     | 53 +++++++++++++++++++
 .../src/mage/sets/NeonDynastyCommander.java   |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/a/AkkiBattleSquad.java

diff --git a/Mage.Sets/src/mage/cards/a/AkkiBattleSquad.java b/Mage.Sets/src/mage/cards/a/AkkiBattleSquad.java
new file mode 100644
index 00000000000..846e9e22b71
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AkkiBattleSquad.java
@@ -0,0 +1,53 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility;
+import mage.abilities.effects.common.AdditionalCombatPhaseEffect;
+import mage.abilities.effects.common.UntapAllEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.permanent.ModifiedPredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AkkiBattleSquad extends CardImpl {
+
+    private static final FilterControlledCreaturePermanent filter
+            = new FilterControlledCreaturePermanent("modified creatures you control");
+
+    static {
+        filter.add(ModifiedPredicate.instance);
+    }
+
+    public AkkiBattleSquad(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{R}");
+
+        this.subtype.add(SubType.GOBLIN);
+        this.subtype.add(SubType.SAMURAI);
+        this.power = new MageInt(6);
+        this.toughness = new MageInt(6);
+
+        // Whenever one or more modified creatures you control attack, untap all modified creatures you control. After this combat phase, there is an additional combat phase. This ability triggers only once each turn.
+        Ability ability = new AttacksCreatureYouControlTriggeredAbility(
+                new UntapAllEffect(filter), false, filter
+        ).setTriggerPhrase("Whenever one or more modified creatures you control attack, ").setTriggersOnce(true);
+        ability.addEffect(new AdditionalCombatPhaseEffect());
+        this.addAbility(ability);
+    }
+
+    private AkkiBattleSquad(final AkkiBattleSquad card) {
+        super(card);
+    }
+
+    @Override
+    public AkkiBattleSquad copy() {
+        return new AkkiBattleSquad(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/NeonDynastyCommander.java b/Mage.Sets/src/mage/sets/NeonDynastyCommander.java
index 33a97a80050..7dba734fb01 100644
--- a/Mage.Sets/src/mage/sets/NeonDynastyCommander.java
+++ b/Mage.Sets/src/mage/sets/NeonDynastyCommander.java
@@ -24,6 +24,7 @@ public final class NeonDynastyCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Aerial Surveyor", 5, Rarity.RARE, mage.cards.a.AerialSurveyor.class));
         cards.add(new SetCardInfo("Aeronaut Admiral", 79, Rarity.UNCOMMON, mage.cards.a.AeronautAdmiral.class));
         cards.add(new SetCardInfo("Agitator Ant", 102, Rarity.RARE, mage.cards.a.AgitatorAnt.class));
+        cards.add(new SetCardInfo("Akki Battle Squad", 18, Rarity.RARE, mage.cards.a.AkkiBattleSquad.class));
         cards.add(new SetCardInfo("Arcane Signet", 144, Rarity.COMMON, mage.cards.a.ArcaneSignet.class));
         cards.add(new SetCardInfo("Arcanist's Owl", 135, Rarity.UNCOMMON, mage.cards.a.ArcanistsOwl.class));
         cards.add(new SetCardInfo("Armed and Armored", 80, Rarity.UNCOMMON, mage.cards.a.ArmedAndArmored.class));