[TLA] Implement Aang, Swift Savior / Aang and La, Ocean's Fury

Mage.Sets/src/mage/cards/a/AangAndLaOceansFury.java

@@ -0,0 +1,60 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
+import mage.abilities.keyword.ReachAbility;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.permanent.TappedPredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AangAndLaOceansFury extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterControlledCreaturePermanent("tapped creature you control");
+
+    static {
+        filter.add(TappedPredicate.TAPPED);
+    }
+
+    public AangAndLaOceansFury(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.AVATAR);
+        this.subtype.add(SubType.SPIRIT);
+        this.subtype.add(SubType.ALLY);
+        this.power = new MageInt(5);
+        this.toughness = new MageInt(5);
+        this.nightCard = true;
+
+        // Reach
+        this.addAbility(ReachAbility.getInstance());
+
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+
+        // Whenever Aang and La attack, put a +1/+1 counter on each tapped creature you control.
+        this.addAbility(new AttacksTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter)));
+    }
+
+    private AangAndLaOceansFury(final AangAndLaOceansFury card) {
+        super(card);
+    }
+
+    @Override
+    public AangAndLaOceansFury copy() {
+        return new AangAndLaOceansFury(this);
+    }
+}

Mage.Sets/src/mage/cards/a/AangSwiftSavior.java

@@ -0,0 +1,71 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.WaterbendCost;
+import mage.abilities.effects.common.TransformSourceEffect;
+import mage.abilities.effects.keyword.AirbendTargetEffect;
+import mage.abilities.keyword.FlashAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.TransformAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.filter.common.FilterSpellOrPermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
+import mage.target.common.TargetSpellOrPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AangSwiftSavior extends CardImpl {
+
+    private static final FilterSpellOrPermanent filter = new FilterSpellOrPermanent("other target creature or spell");
+
+    static {
+        filter.getPermanentFilter().add(CardType.CREATURE.getPredicate());
+        filter.getPermanentFilter().add(AnotherPredicate.instance);
+    }
+
+    public AangSwiftSavior(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.AVATAR);
+        this.subtype.add(SubType.ALLY);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(3);
+        this.secondSideCardClazz = mage.cards.a.AangAndLaOceansFury.class;
+
+        // Flash
+        this.addAbility(FlashAbility.getInstance());
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // When Aang enters, airbend up to one other target creature or spell.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new AirbendTargetEffect());
+        ability.addTarget(new TargetSpellOrPermanent(0, 1, filter, false));
+        this.addAbility(ability);
+
+        // Waterbend {8}: Transform Aang.
+        this.addAbility(new TransformAbility());
+        this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new WaterbendCost(8)));
+    }
+
+    private AangSwiftSavior(final AangSwiftSavior card) {
+        super(card);
+    }
+
+    @Override
+    public AangSwiftSavior copy() {
+        return new AangSwiftSavior(this);
+    }
+}

Mage.Sets/src/mage/sets/AvatarTheLastAirbender.java

@@ -25,6 +25,10 @@ public final class AvatarTheLastAirbender extends ExpansionSet {
         this.rotationSet = true;
         this.hasBasicLands = true;
 
+        cards.add(new SetCardInfo("Aang and La, Ocean's Fury", 204, Rarity.RARE, mage.cards.a.AangAndLaOceansFury.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Aang and La, Ocean's Fury", 298, Rarity.RARE, mage.cards.a.AangAndLaOceansFury.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Aang and La, Ocean's Fury", 347, Rarity.RARE, mage.cards.a.AangAndLaOceansFury.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Aang and La, Ocean's Fury", 359, Rarity.RARE, mage.cards.a.AangAndLaOceansFury.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Aang's Iceberg", 336, Rarity.RARE, mage.cards.a.AangsIceberg.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Aang's Iceberg", 5, Rarity.RARE, mage.cards.a.AangsIceberg.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Aang's Journey", 1, Rarity.COMMON, mage.cards.a.AangsJourney.class));
@@ -34,6 +38,10 @@ public final class AvatarTheLastAirbender extends ExpansionSet {
         cards.add(new SetCardInfo("Aang, Master of Elements", 207, Rarity.MYTHIC, mage.cards.a.AangMasterOfElements.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Aang, Master of Elements", 308, Rarity.MYTHIC, mage.cards.a.AangMasterOfElements.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Aang, Master of Elements", 363, Rarity.MYTHIC, mage.cards.a.AangMasterOfElements.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Aang, Swift Savior", 204, Rarity.RARE, mage.cards.a.AangSwiftSavior.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Aang, Swift Savior", 298, Rarity.RARE, mage.cards.a.AangSwiftSavior.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Aang, Swift Savior", 347, Rarity.RARE, mage.cards.a.AangSwiftSavior.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Aang, Swift Savior", 359, Rarity.RARE, mage.cards.a.AangSwiftSavior.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Aang, at the Crossroads", 203, Rarity.RARE, mage.cards.a.AangAtTheCrossroads.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Aang, at the Crossroads", 304, Rarity.RARE, mage.cards.a.AangAtTheCrossroads.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Aang, at the Crossroads", 346, Rarity.RARE, mage.cards.a.AangAtTheCrossroads.class, NON_FULL_USE_VARIOUS));

Mage/src/main/java/mage/abilities/effects/keyword/AirbendTargetEffect.java

@@ -17,11 +17,11 @@ import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.targetpointer.FixedTarget;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -47,18 +47,21 @@ public class AirbendTargetEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
-        Set<Permanent> permanents = this
+        if (player == null) {
+            return false;
+        }
+        Set<Card> objects = this
                 .getTargetPointer()
                 .getTargets(game, source)
                 .stream()
-                .map(game::getPermanent)
+                .map(uuid -> Optional.ofNullable((Card) game.getPermanent(uuid)).orElseGet(() -> game.getSpell(uuid)))
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
-        if (player == null || permanents.isEmpty()) {
+        if (objects.isEmpty()) {
             return false;
         }
-        player.moveCards(permanents, Zone.EXILED, source, game);
+        player.moveCards(objects, Zone.EXILED, source, game);
-        Cards cards = new CardsImpl(permanents);
+        Cards cards = new CardsImpl(objects);
         cards.retainZone(Zone.EXILED, game);
         for (Card card : cards.getCards(game)) {
             game.addEffect(new AirbendingCastEffect(card, game), source);