GUI: fixed error with miss tray icon in some linux systems like gnome (#14130)

Fix tracking Commander in play when your commander is a (M)DFC.

Fixes #7530, #7637, #7699, #7773

Mage.Client/src/main/java/mage/client/components/BracketLegalityLabel.java

@@ -39,10 +39,9 @@ public class BracketLegalityLabel extends LegalityLabel {
     private static final Logger logger = Logger.getLogger(BracketLegalityLabel.class);
 
     private static final String GROUP_GAME_CHANGES = "Game Changers";
-    private static final String GROUP_INFINITE_COMBOS = "Infinite Combos";
+    private static final String GROUP_INFINITE_COMBOS = "Early-game 2-Card Combos";
     private static final String GROUP_MASS_LAND_DESTRUCTION = "Mass Land Destruction";
     private static final String GROUP_EXTRA_TURN = "Extra Turns";
-    private static final String GROUP_TUTORS = "Tutors";
 
     private static final Map<String, List<Integer>> MAX_GROUP_LIMITS = new LinkedHashMap<>();
 
@@ -78,8 +77,6 @@ public class BracketLegalityLabel extends LegalityLabel {
                 Arrays.asList(0, 0, 0, 0, 99, 99));
         MAX_GROUP_LIMITS.put(GROUP_EXTRA_TURN,
                 Arrays.asList(0, 0, 0, 3, 99, 99));
-        MAX_GROUP_LIMITS.put(GROUP_TUTORS,
-                Arrays.asList(0, 3, 3, 99, 99, 99));
     }
 
     private static final String RESOURCE_INFINITE_COMBOS = "brackets/infinite-combos.txt";
@@ -92,7 +89,6 @@ public class BracketLegalityLabel extends LegalityLabel {
     private final List<String> foundInfiniteCombos = new ArrayList<>();
     private final List<String> foundMassLandDestruction = new ArrayList<>();
     private final List<String> foundExtraTurn = new ArrayList<>();
-    private final List<String> foundTutors = new ArrayList<>();
 
     private final List<String> badCards = new ArrayList<>();
     private final List<String> fullGameChanges = new ArrayList<>();
@@ -126,9 +122,6 @@ public class BracketLegalityLabel extends LegalityLabel {
         if (this.foundExtraTurn.size() > getMaxCardsLimit(GROUP_EXTRA_TURN)) {
             this.badCards.addAll(this.foundExtraTurn);
         }
-        if (this.foundTutors.size() > getMaxCardsLimit(GROUP_TUTORS)) {
-            this.badCards.addAll(this.foundTutors);
-        }
     }
 
     private Integer getMaxCardsLimit(String groupName) {
@@ -165,7 +158,6 @@ public class BracketLegalityLabel extends LegalityLabel {
         groups.put(GROUP_INFINITE_COMBOS + getStats(GROUP_INFINITE_COMBOS), this.foundInfiniteCombos);
         groups.put(GROUP_MASS_LAND_DESTRUCTION + getStats(GROUP_MASS_LAND_DESTRUCTION), this.foundMassLandDestruction);
         groups.put(GROUP_EXTRA_TURN + getStats(GROUP_EXTRA_TURN), this.foundExtraTurn);
-        groups.put(GROUP_TUTORS + getStats(GROUP_TUTORS), this.foundTutors);
         groups.forEach((group, cards) -> {
             showInfo.add("<br>");
             showInfo.add("<span style='font-weight:bold;font-size: " + infoFontTextSize + "px;'>" + group + "</span>");
@@ -199,9 +191,6 @@ public class BracketLegalityLabel extends LegalityLabel {
             case GROUP_EXTRA_TURN:
                 currentAmount = this.foundExtraTurn.size();
                 break;
-            case GROUP_TUTORS:
-                currentAmount = this.foundTutors.size();
-                break;
             default:
                 throw new IllegalArgumentException("Unknown group " + groupName);
         }
@@ -222,7 +211,6 @@ public class BracketLegalityLabel extends LegalityLabel {
         collectInfiniteCombos(deck);
         collectMassLandDestruction(deck);
         collectExtraTurn(deck);
-        collectTutors(deck);
     }
 
     private void collectGameChangers(Deck deck) {
@@ -244,12 +232,9 @@ public class BracketLegalityLabel extends LegalityLabel {
                     "Consecrated Sphinx",
                     "Crop Rotation",
                     "Cyclonic Rift",
-                    "Deflecting Swat",
                     "Enlightened Tutor",
-                    "Expropriate",
                     "Field of the Dead",
                     "Fierce Guardianship",
-                    "Food Chain",
                     "Force of Will",
                     "Gaea's Cradle",
                     "Gamble",
@@ -261,8 +246,6 @@ public class BracketLegalityLabel extends LegalityLabel {
                     "Imperial Seal",
                     "Intuition",
                     "Jeska's Will",
-                    "Jin-Gitaxias, Core Augur",
-                    "Kinnan, Bonder Prodigy",
                     "Lion's Eye Diamond",
                     "Mana Vault",
                     "Mishra's Workshop",
@@ -280,18 +263,13 @@ public class BracketLegalityLabel extends LegalityLabel {
                     "Serra's Sanctum",
                     "Smothering Tithe",
                     "Survival of the Fittest",
-                    "Sway of the Stars",
                     "Teferi's Protection",
                     "Tergrid, God of Fright",
                     "Thassa's Oracle",
                     "The One Ring",
                     "The Tabernacle at Pendrell Vale",
                     "Underworld Breach",
-                    "Urza, Lord High Artificer",
                     "Vampiric Tutor",
-                    "Vorinclex, Voice of Hunger",
-                    "Yuriko, the Tiger's Shadow",
-                    "Winota, Joiner of Forces",
                     "Worldly Tutor"
             ));
         }
@@ -393,19 +371,6 @@ public class BracketLegalityLabel extends LegalityLabel {
                 .forEach(this.foundExtraTurn::add);
     }
 
-    private void collectTutors(Deck deck) {
-        // edh power level uses search for land and non-land card, but bracket need only non-land cards searching
-        this.foundTutors.clear();
-        Stream.concat(deck.getCards().stream(), deck.getSideboard().stream())
-                .filter(card -> card.getRules().stream()
-                        .map(s -> s.toLowerCase(Locale.ENGLISH))
-                        .anyMatch(s -> s.contains("search your library") && !isTextContainsLandCard(s))
-                )
-                .map(Card::getName)
-                .sorted()
-                .forEach(this.foundTutors::add);
-    }
-
     private boolean isTextContainsLandCard(String lowerText) {
         // TODO: share code with AbstractCommander and edh power level
         // TODO: add tests

Mage.Client/src/main/java/mage/client/components/tray/MageTray.java

@@ -79,13 +79,15 @@ public enum MageTray {
             } catch (AWTException e) {
                 log.error("TrayIcon could not be added: ", e);
             }
-
         } catch (Exception e) {
             log.error(e);
         }
     }
 
     public synchronized void blink() {
+        if (trayIcon == null)
+            return;
+
         if (state == 0) {
             synchronized (MageTray.class) {
                 if (state == 0) {

Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form

@@ -2115,6 +2115,9 @@
                   </Events>
                 </Component>
                 <Component class="javax.swing.JTextField" name="txtBackgroundImagePath">
+                  <Properties>
+                    <Property name="toolTipText" type="java.lang.String" value="The selected image will be used as the background picture. Requires client restart to see changes."/>
+                  </Properties>
                 </Component>
                 <Component class="javax.swing.JButton" name="btnBrowseBackgroundImage">
                   <Properties>
@@ -2254,16 +2257,13 @@
               <SubComponents>
                 <Component class="javax.swing.JCheckBox" name="cbUseDefaultImageFolder">
                   <Properties>
-                    <Property name="text" type="java.lang.String" value="Use default location to save images"/>
+                    <Property name="text" type="java.lang.String" value="Use default location to save card images"/>
                   </Properties>
                   <Events>
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbUseDefaultImageFolderActionPerformed"/>
                   </Events>
                 </Component>
                 <Component class="javax.swing.JTextField" name="txtImageFolderPath">
-                  <Properties>
-                    <Property name="toolTipText" type="java.lang.String" value="The selected image will be used as background picture. You have to restart MAGE to view a changed background image."/>
-                  </Properties>
                 </Component>
                 <Component class="javax.swing.JButton" name="btnBrowseImageLocation">
                   <Properties>

Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java

@@ -2155,6 +2155,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
             }
         });
 
+        txtBackgroundImagePath.setToolTipText("The selected image will be used as the background picture. Requires client restart to see changes.");
+
         btnBrowseBackgroundImage.setText("Browse...");
         btnBrowseBackgroundImage.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -2254,15 +2256,13 @@ public class PreferencesDialog extends javax.swing.JDialog {
 
         panelCardImages.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Card images"));
 
-        cbUseDefaultImageFolder.setText("Use default location to save images");
+        cbUseDefaultImageFolder.setText("Use default location to save card images");
         cbUseDefaultImageFolder.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 cbUseDefaultImageFolderActionPerformed(evt);
             }
         });
 
-        txtImageFolderPath.setToolTipText("The selected image will be used as background picture. You have to restart MAGE to view a changed background image.");
-
         btnBrowseImageLocation.setText("Browse...");
         btnBrowseImageLocation.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {

Mage.Client/src/main/java/mage/client/table/TablesPanel.java

@@ -1700,7 +1700,7 @@ public class TablesPanel extends javax.swing.JPanel {
             MatchOptions options = new MatchOptions(gameName, gameType, multiPlayer);
             options.getPlayerTypes().add(PlayerType.HUMAN);
             options.getPlayerTypes().add(aiType);
-            for (int i=2 ; i < numPlayers ; i++) {
+            for (int i = 2; i < numPlayers; i++) {
                 options.getPlayerTypes().add(aiType);
             }
             options.setDeckType("Variant Magic - Freeform Commander");
@@ -1719,9 +1719,9 @@ public class TablesPanel extends javax.swing.JPanel {
             table = SessionHandler.createTable(roomId, options);
 
             SessionHandler.joinTable(roomId, table.getTableId(), "Human", PlayerType.HUMAN, 1, testDeck, "");
-            SessionHandler.joinTable(roomId, table.getTableId(), "Computer", aiType, 1, testDeck, "");
-            for (int i=2 ; i < numPlayers ; i++) {
-                SessionHandler.joinTable(roomId, table.getTableId(), "Computer" + i, aiType, 1, testDeck, "");
+            SessionHandler.joinTable(roomId, table.getTableId(), "Computer" + (multiPlayer ? " 2" : ""), aiType, 1, testDeck, "");
+            for (int i = 2; i < numPlayers; i++) {
+                SessionHandler.joinTable(roomId, table.getTableId(), "Computer " + (i + 1), aiType, 1, testDeck, "");
             }
             SessionHandler.startMatch(roomId, table.getTableId());
         } catch (HeadlessException ex) {

Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java

@@ -940,8 +940,13 @@ public abstract class CardPanel extends MagePermanent implements ComponentListen
     private void setGameCardSides(CardView gameCard) {
         if (this.cardSideMain == null) {
             // new card
+            if (gameCard instanceof PermanentView) {
+                this.cardSideMain = gameCard;
+                this.cardSideOther = gameCard.isTransformed() ? ((PermanentView) gameCard).getOriginal() : gameCard.getSecondCardFace();
+            } else {
                 this.cardSideMain = gameCard;
                 this.cardSideOther = gameCard.getSecondCardFace();
+            }
         } else {
             // updated card
             if (this.cardSideMain.getName().equals(gameCard.getName())) {

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java

@@ -611,10 +611,15 @@ public class ScryfallImageSupportCards {
             add("EOS"); // Edge of Eternities: Stellar Sights
             add("SPM"); // Marvel's Spider-Man
             add("SPE"); // Marvel's Spider-Man Eternal
+            add("LMAR"); // Marvel Legends Series Inserts
             add("MAR"); // Marvel Universe
             add("TLA"); // Avatar: The Last Airbender
             add("TLE"); // Avatar: The Last Airbender Eternal
             add("ECL"); // Lorwyn Eclipsed
+            add("TMT"); // Teenage Mutant Ninja Turtles
+            add("TMC"); // Teenage Mutant Ninja Turtles Eternal
+            add("MSH"); // Marvel Super Heroes
+            add("MSC"); // Marvel Super Heroes Commander
 
             // Custom sets using Scryfall images - must provide a direct link for each card in directDownloadLinks
             add("CALC"); // Custom Alchemized versions of existing cards
@@ -715,6 +720,7 @@ public class ScryfallImageSupportCards {
             put("SLD/Sol Ring/1512b", "https://api.scryfall.com/cards/sld/1512/en?format=image&face=back");
             put("SLD/Steely Resolve/1326b", "https://api.scryfall.com/cards/sld/1326/en?format=image&face=back");
             put("SLD/Stitch in Time/382b", "https://api.scryfall.com/cards/sld/382/en?format=image&face=back");
+            put("SLD/Teferi's Ageless Insight/2214b", "https://api.scryfall.com/cards/sld/2214/en?format=image&face=back");
             put("SLD/Terror/750b", "https://api.scryfall.com/cards/sld/750/en?format=image&face=back");
             put("SLD/Tuvasa the Sunlit/1328b", "https://api.scryfall.com/cards/sld/1328/en?format=image&face=back");
             put("SLD/Ulamog, the Ceaseless Hunger/1122b", "https://api.scryfall.com/cards/sld/1122/en?format=image&face=back");

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java

@@ -1,10 +1,10 @@
 package org.mage.plugins.card.dl.sources;
 
+import mage.cards.repository.TokenRepository;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import mage.cards.repository.TokenRepository;
-
 /**
  * @author JayDi85
  */
@@ -817,10 +817,13 @@ public class ScryfallImageSupportTokens {
 
             // SLD
             put("SLD/Angel", "https://api.scryfall.com/cards/sld/1340?format=image");
+            put("SLD/Blood", "https://api.scryfall.com/cards/sld/2180?format=image");
             put("SLD/Cat/1", "https://api.scryfall.com/cards/sld/1517?format=image");
             put("SLD/Cat/2", "https://api.scryfall.com/cards/sld/27?format=image");
             put("SLD/Cat/3", "https://api.scryfall.com/cards/sld/28?format=image");
             put("SLD/Clue", "https://api.scryfall.com/cards/sld/348/en?format=image");
+            put("SLD/Cordyceps Infected/1", "https://api.scryfall.com/cards/sld/2201?format=image");
+            put("SLD/Cordyceps Infected/2", "https://api.scryfall.com/cards/sld/2206?format=image");
             put("SLD/Dog", "https://api.scryfall.com/cards/sld/1516?format=image");
             put("SLD/Egg", "https://api.scryfall.com/cards/sld/1398?format=image");
             put("SLD/Faerie Rogue/1", "https://api.scryfall.com/cards/sld/13/en?format=image");
@@ -2546,6 +2549,7 @@ public class ScryfallImageSupportTokens {
 
             // DSK
             put("DSK/Beast", "https://api.scryfall.com/cards/tdsk/3?format=image");
+            put("DSK/Demon", "https://api.scryfall.com/cards/tdsk/9?format=image");
             put("DSK/Emblem Kaito", "https://api.scryfall.com/cards/tdsk/17/en?format=image");
             put("DSK/Everywhere", "https://api.scryfall.com/cards/tdsk/16?format=image");
             put("DSK/Glimmer", "https://api.scryfall.com/cards/tdsk/4?format=image");
@@ -2558,6 +2562,7 @@ public class ScryfallImageSupportTokens {
             put("DSK/Spider", "https://api.scryfall.com/cards/tdsk/12?format=image");
             put("DSK/Spirit/1", "https://api.scryfall.com/cards/tdsk/6?format=image");
             put("DSK/Spirit/2", "https://api.scryfall.com/cards/tdsk/8?format=image");
+            put("DSK/Toy", "https://api.scryfall.com/cards/tdsk/7?format=image");
             put("DSK/Treasure", "https://api.scryfall.com/cards/tdsk/15?format=image");
 
             // DSC
@@ -2826,6 +2831,35 @@ public class ScryfallImageSupportTokens {
             put("SPM/Spider", "https://api.scryfall.com/cards/tspm/3?format=image");
             put("SPM/Treasure", "https://api.scryfall.com/cards/tspm/7?format=image");
 
+            // TLA
+            put("TLA/Ally/1", "https://api.scryfall.com/cards/ttla/4/?format=image");
+            put("TLA/Ally/2", "https://api.scryfall.com/cards/ttla/5/?format=image");
+            put("TLA/Ally/3", "https://api.scryfall.com/cards/ttla/6/?format=image");
+            put("TLA/Ally/4", "https://api.scryfall.com/cards/ttla/7/?format=image");
+            put("TLA/Ally/5", "https://api.scryfall.com/cards/ttla/8/?format=image");
+            put("TLA/Ballistic Boulder", "https://api.scryfall.com/cards/ttla/13/?format=image");
+            put("TLA/Bear", "https://api.scryfall.com/cards/ttla/12/?format=image");
+            put("TLA/Clue/1", "https://api.scryfall.com/cards/ttla/14/?format=image");
+            put("TLA/Clue/2", "https://api.scryfall.com/cards/ttla/15/?format=image");
+            put("TLA/Clue/3", "https://api.scryfall.com/cards/ttla/16/?format=image");
+            put("TLA/Clue/4", "https://api.scryfall.com/cards/ttla/17/?format=image");
+            put("TLA/Clue/5", "https://api.scryfall.com/cards/ttla/18/?format=image");
+            put("TLA/Dragon", "https://api.scryfall.com/cards/ttla/9/?format=image");
+            put("TLA/Food/1", "https://api.scryfall.com/cards/ttla/19/?format=image");
+            put("TLA/Food/2", "https://api.scryfall.com/cards/ttla/20/?format=image");
+            put("TLA/Food/3", "https://api.scryfall.com/cards/ttla/21/?format=image");
+            put("TLA/Monk", "https://api.scryfall.com/cards/ttla/10/?format=image");
+            put("TLA/Soldier", "https://api.scryfall.com/cards/ttla/11/?format=image");
+            put("TLA/Spirit", "https://api.scryfall.com/cards/ttla/3/?format=image");
+            put("TLA/Treasure", "https://api.scryfall.com/cards/ttla/22?format=image");
+
+            // TLE
+            put("TLE/Marit Lage", "https://api.scryfall.com/cards/ttle/1/?format=image");
+            put("TLE/Soldier", "https://api.scryfall.com/cards/ttle/2?format=image");
+
+            // TMT
+            put("TMT/Mutagen", "https://api.scryfall.com/cards/ttmt/9?format=image");
+
             // JVC
             put("JVC/Elemental Shaman", "https://api.scryfall.com/cards/tjvc/4?format=image");
 

Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java

@@ -558,12 +558,12 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
                         );
                         allCardsUrls.add(url);
                     }
-                    if (card.isModalDoubleFacedCard()) {
-                        if (card.getModalDoubleFacedSecondSideName() == null || card.getModalDoubleFacedSecondSideName().trim().isEmpty()) {
+                    if (card.isDoubleFacedCard()) {
+                        if (card.getDoubleFacedSecondSideName() == null || card.getDoubleFacedSecondSideName().trim().isEmpty()) {
                             throw new IllegalStateException("MDF card can't have empty name.");
                         }
                         CardDownloadData cardDownloadData = new CardDownloadData(
-                                card.getModalDoubleFacedSecondSideName(),
+                                card.getDoubleFacedSecondSideName(),
                                 card.getSetCode(),
                                 card.getCardNumber(),
                                 card.usesVariousArt(),

Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java

@@ -82,7 +82,7 @@ public class ThemePluginImpl implements ThemePlugin {
             }
 
             if (ui.containsKey("gamePanel") && ui.containsKey("jLayeredPane")) {
-                ImagePanel bgPanel = new ImagePanel(backgroundImage, ImagePanelStyle.TILED);
+                ImagePanel bgPanel = new ImagePanel(backgroundImage, ImagePanelStyle.COVER);
 
                 // TODO: research - is all components used? And why it make transparent?
                 unsetOpaque(ui.get("splitChatAndLogs"));

Mage.Common/src/main/java/mage/components/ImagePanel.java

@@ -78,6 +78,9 @@ public class ImagePanel extends JPanel {
             case ACTUAL:
                 drawActual(g);
                 break;
+            case COVER:
+                drawCover(g);
+                break;
         }
     }
 
@@ -99,4 +102,25 @@ public class ImagePanel extends JPanel {
         float y = (d.height - image.getHeight(null)) * alignmentY;
         g.drawImage(image, (int) x, (int) y, this);
     }
+
+    private void drawCover(Graphics g) {
+        Dimension d = getSize();
+        int imageWidth = image.getWidth(null);
+        int imageHeight = image.getHeight(null);
+
+        // Calculate scale to cover the entire panel while maintaining aspect ratio
+        double scaleX = (double) d.width / imageWidth;
+        double scaleY = (double) d.height / imageHeight;
+        double scale = Math.max(scaleX, scaleY);
+
+        // Calculate the scaled dimensions
+        int scaledWidth = (int) (imageWidth * scale);
+        int scaledHeight = (int) (imageHeight * scale);
+
+        // Center the image
+        int x = (d.width - scaledWidth) / 2;
+        int y = (d.height - scaledHeight) / 2;
+
+        g.drawImage(image, x, y, scaledWidth, scaledHeight, null);
+    }
 }

Mage.Common/src/main/java/mage/components/ImagePanelStyle.java

@@ -4,5 +4,5 @@ package mage.components;
  * Created by IGOUDT on 7-3-2017.
  */
 public enum ImagePanelStyle {
-    TILED, SCALED, ACTUAL
+    TILED, SCALED, ACTUAL, COVER
 }

Mage.Common/src/main/java/mage/utils/SystemUtil.java

@@ -601,14 +601,13 @@ public final class SystemUtil {
                     continue;
                 }
 
-                Optional<Player> playerOptional = findPlayer(game, command.player);
-                if (!playerOptional.isPresent()) {
+                Player player = findPlayer(game, command.player, feedbackPlayer);
+                if (player == null) {
                     String mes = String.format("Unknown player: %s", line);
                     errorsList.add(mes);
                     logger.warn(mes);
                     continue;
                 }
-                Player player = playerOptional.get();
 
                 // SPECIAL token/emblem call (without SET name)
                 if ("token".equalsIgnoreCase(command.zone)) {
@@ -860,17 +859,54 @@ public final class SystemUtil {
         return false;
     }
 
-    /**
-     * Find player by name.
-     *
-     * @param game
-     * @param name
-     * @return
-     */
-    private static Optional<Player> findPlayer(Game game, String name) {
-        return game.getPlayers().values().stream()
-                .filter(player -> player.getName().equals(name)).findFirst();
+    private static Player findPlayer(Game game, String needName, Player feedbackPlayer) {
+        // real names
+        Player res = game.getPlayerList().stream()
+                .map(game::getPlayer)
+                .filter(Objects::nonNull)
+                .filter(player -> player.getName().equals(needName))
+                .findFirst()
+                .orElse(null);
 
+        // test names - cheat commands will be compatible in both modes (quick test and normal)
+        if (res == null) {
+            switch (needName.toLowerCase(Locale.ENGLISH)) {
+                case "me":
+                case "human":
+                case "human 1":
+                    res = feedbackPlayer;
+                    break;
+                case "opponent":
+                case "opponent 1":
+                case "computer":
+                case "computer 1": // multiplayer game uses Computer 2+ naming
+                case "ai":
+                case "ai 1":
+                    // try AI
+                    res = game.getPlayerList().stream()
+                            .map(game::getPlayer)
+                            .filter(Objects::nonNull)
+                            .filter(Player::isInGame)
+                            .filter(Player::isComputer)
+                            .findFirst()
+                            .orElse(null);
+                    if (res == null) {
+                        // try opponent (human only games)
+                        res = game.getOpponents(feedbackPlayer.getId(), true).stream()
+                                .map(game::getPlayer)
+                                .filter(Objects::nonNull)
+                                .filter(Player::isInGame)
+                                .findFirst()
+                                .orElse(null);
+                    }
+                    break;
+                default:
+                    // raise error message due unknown player name
+                    break;
+            }
+        }
+
+        return res;
     }
 
     public static String sanitize(String input) {

Mage.Common/src/main/java/mage/view/CardView.java

@@ -27,11 +27,13 @@ import mage.counters.Counter;
 import mage.counters.CounterType;
 import mage.designations.Designation;
 import mage.filter.FilterMana;
+import mage.game.ControllableOrOwnerable;
 import mage.game.Game;
 import mage.game.command.Dungeon;
 import mage.game.command.Emblem;
 import mage.game.command.Plane;
 import mage.game.permanent.Permanent;
+import mage.game.permanent.PermanentCard;
 import mage.game.permanent.PermanentToken;
 import mage.game.permanent.token.Token;
 import mage.game.stack.Spell;
@@ -115,7 +117,7 @@ public class CardView extends SimpleCardView {
     protected List<String> rightSplitRules;
     protected String rightSplitTypeLine;
 
-    protected boolean isModalDoubleFacedCard;
+    protected boolean isDoubleFacedCard;
 
     protected ArtRect artRect = ArtRect.NORMAL;
 
@@ -237,7 +239,7 @@ public class CardView extends SimpleCardView {
         this.rightSplitRules = cardView.rightSplitRules == null ? null : new ArrayList<>(cardView.rightSplitRules);
         this.rightSplitTypeLine = cardView.rightSplitTypeLine;
 
-        this.isModalDoubleFacedCard = cardView.isModalDoubleFacedCard;
+        this.isDoubleFacedCard = cardView.isDoubleFacedCard;
 
         this.artRect = cardView.artRect;
         this.targets = cardView.targets == null ? null : new ArrayList<>(cardView.targets);
@@ -427,11 +429,17 @@ public class CardView extends SimpleCardView {
                 this.manaCostLeftStr = splitCard.getLeftHalfCard().getManaCostSymbols();
                 this.manaCostRightStr = splitCard.getRightHalfCard().getManaCostSymbols();
             } else if (card instanceof ModalDoubleFacedCard) {
-                this.isModalDoubleFacedCard = true;
-                ModalDoubleFacedCard mainCard = ((ModalDoubleFacedCard) card);
+                this.isDoubleFacedCard = true;
+                DoubleFacedCard mainCard = ((DoubleFacedCard) card);
                 fullCardName = mainCard.getLeftHalfCard().getName() + MockCard.MODAL_DOUBLE_FACES_NAME_SEPARATOR + mainCard.getRightHalfCard().getName();
                 this.manaCostLeftStr = mainCard.getLeftHalfCard().getManaCostSymbols();
                 this.manaCostRightStr = mainCard.getRightHalfCard().getManaCostSymbols();
+            } else if (card instanceof TransformingDoubleFacedCard) {
+                this.isDoubleFacedCard = true;
+                DoubleFacedCard mainCard = ((DoubleFacedCard) card);
+                fullCardName = mainCard.getLeftHalfCard().getName() + MockCard.MODAL_DOUBLE_FACES_NAME_SEPARATOR + mainCard.getRightHalfCard().getName();
+                this.manaCostLeftStr = mainCard.getLeftHalfCard().getManaCostSymbols();
+                this.manaCostRightStr = new ArrayList<>();
             }  else if (card instanceof CardWithSpellOption) {
                 this.isSplitCard = true;
                 CardWithSpellOption mainCard = ((CardWithSpellOption) card);
@@ -530,7 +538,9 @@ public class CardView extends SimpleCardView {
 
             this.extraDeckCard = card.isExtraDeckCard();
 
+            // TODO: can probably remove this after tdfc rework
             // transformable, double faces cards
+            if (!(sourceCard.getMainCard() instanceof DoubleFacedCard)) {
                 this.transformable = card.isTransformable();
 
                 Card secondSideCard = card.getSecondCardFace();
@@ -538,17 +548,23 @@ public class CardView extends SimpleCardView {
                     this.secondCardFace = new CardView(secondSideCard, game);
                     this.alternateName = secondCardFace.getName();
                 }
+            } else if (card instanceof PermanentCard && card.isTransformable()) {
+                this.transformable = card.isTransformable();
+                Card secondSideCard = (Card) ((PermanentCard) card).getOtherFace();
+                this.secondCardFace = new CardView(secondSideCard, game);
+                this.alternateName = secondSideCard.getName();
+            }
 
             this.flipCard = card.isFlipCard();
             if (card.isFlipCard() && card.getFlipCardName() != null) {
                 this.alternateName = card.getFlipCardName();
             }
 
-            if (card instanceof ModalDoubleFacedCard) {
+            if (card instanceof DoubleFacedCard) {
                 this.transformable = true; // enable GUI day/night button
-                ModalDoubleFacedCard mdfCard = (ModalDoubleFacedCard) card;
-                this.secondCardFace = new CardView(mdfCard.getRightHalfCard(), game);
-                this.alternateName = mdfCard.getRightHalfCard().getName();
+                DoubleFacedCard doubleFacedCard = (DoubleFacedCard) card;
+                this.secondCardFace = new CardView(doubleFacedCard.getRightHalfCard(), game);
+                this.alternateName = doubleFacedCard.getRightHalfCard().getName();
             }
 
             Card meldsToCard = card.getMeldsToCard();
@@ -764,7 +780,11 @@ public class CardView extends SimpleCardView {
                         String info;
                         MageObject targetObject = game.getObject(t);
                         if (targetObject != null) {
-                            info = targetObject.getIdName();
+                            Player player = null;
+                            if (targetObject instanceof ControllableOrOwnerable) {
+                                player = game.getPlayer(((ControllableOrOwnerable) targetObject).getControllerOrOwnerId());
+                            }
+                            info = (player == null ? "" : player.getName() + ": ") + targetObject.getIdName();
                         } else {
                             Player targetPlayer = game.getPlayer(t);
                             if (targetPlayer != null) {

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AbstractCommander.java

@@ -27,8 +27,7 @@ public abstract class AbstractCommander extends Constructed {
 
     private static List<CommanderValidator> validators = Arrays.asList(
             PartnerValidator.instance,
-            PartnerSurvivorsValidator.instance,
-            PartnerFatherAndSonValidator.instance,
+            PartnerVariantValidator.instance,
             FriendsForeverValidator.instance,
             PartnerWithValidator.instance,
             ChooseABackgroundValidator.instance,

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java

@@ -44,7 +44,6 @@ public class DuelCommander extends Commander {
         banned.add("Library of Alexandria");
         banned.add("Lion's Eye Diamond");
         banned.add("Lotus Petal");
-        banned.add("Loyal Retainers");
         banned.add("Lutri, the Spellchaser");
         banned.add("Maddening Hex");
         banned.add("Mana Crypt");
@@ -93,8 +92,6 @@ public class DuelCommander extends Commander {
 
         bannedCommander.add("Ajani, Nacatl Pariah");
         bannedCommander.add("Arahbo, Roar of the World");
-        bannedCommander.add("Asmoranomardicadaistinaculdacar");
-        bannedCommander.add("Baral, Chief of Compliance");
         bannedCommander.add("Breya, Etherium Shaper");
         bannedCommander.add("Derevi, Empyrial Tactician");
         bannedCommander.add("Dihada, Binder of Wills");
@@ -102,7 +99,6 @@ public class DuelCommander extends Commander {
         bannedCommander.add("Edric, Spymaster of Trest");
         bannedCommander.add("Emry, Lurker of the Loch");
         bannedCommander.add("Eris, Roar of the Storm");
-        bannedCommander.add("Esior, Wardwing Familiar");
         bannedCommander.add("Ezio Auditore da Firenze");
         bannedCommander.add("Geist of Saint Traft");
         bannedCommander.add("Inalla, Archmage Ritualist");
@@ -116,7 +112,6 @@ public class DuelCommander extends Commander {
         bannedCommander.add("Omnath, Locus of Creation");
         bannedCommander.add("Prime Speaker Vannifar");
         bannedCommander.add("Raffine, Scheming Seer");
-        bannedCommander.add("Rofellos, Llanowar Emissary");
         bannedCommander.add("Shorikai, Genesis Engine");
         bannedCommander.add("Tamiyo, Inquisitive Student");
         bannedCommander.add("Tasigur, the Golden Fang");

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Legacy.java

@@ -32,6 +32,7 @@ public class Legacy extends Constructed {
         banned.add("Dig Through Time");
         banned.add("Dreadhorde Arcanist");
         banned.add("Earthcraft");
+        banned.add("Entomb");
         banned.add("Fastbond");
         banned.add("Flash");
         banned.add("Frantic Search");
@@ -56,6 +57,7 @@ public class Legacy extends Constructed {
         banned.add("Mox Ruby");
         banned.add("Mox Sapphire");
         banned.add("Mystical Tutor");
+        banned.add("Nadu, Winged Wisdom");
         banned.add("Necropotence");
         banned.add("Oath of Druids");
         banned.add("Oko, Thief of Crowns");

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pauper.java

@@ -46,6 +46,7 @@ public class Pauper extends Constructed {
         banned.add("Gitaxian Probe");
         banned.add("Grapeshot");
         banned.add("Gush");
+        banned.add("High Tide");
         banned.add("Hymn to Tourach");
         banned.add("Invigorate");
         banned.add("Kuldotha Rebirth");

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java

@@ -30,6 +30,7 @@ public class Pioneer extends Constructed {
         banned.add("Field of the Dead");
         banned.add("Flooded Strand");
         banned.add("Geological Appraiser");
+        banned.add("Heartfire Hero");
         banned.add("Inverter of Truth");
         banned.add("Jegantha, the Wellspring");
         banned.add("Karn, the Great Creator");

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java

@@ -24,8 +24,11 @@ public class Standard extends Constructed {
         banned.add("Heartfire Hero");
         banned.add("Hopeless Nightmare");
         banned.add("Monstrous Rage");
+        banned.add("Proft's Eidetic Memory");
+        banned.add("Screaming Nemesis");
         banned.add("This Town Ain't Big Enough");
         banned.add("Up the Beanstalk");
+        banned.add("Vivi Ornitier");
     }
 
     static List<String> makeLegalSets() {

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java

@@ -206,9 +206,9 @@ public class TinyLeaders extends Constructed {
         if (card instanceof SplitCard) {
             costs.add(((SplitCard) card).getLeftHalfCard().getManaValue());
             costs.add(((SplitCard) card).getRightHalfCard().getManaValue());
-        } else if (card instanceof ModalDoubleFacedCard) {
-            costs.add(((ModalDoubleFacedCard) card).getLeftHalfCard().getManaValue());
-            costs.add(((ModalDoubleFacedCard) card).getRightHalfCard().getManaValue());
+        } else if (card instanceof DoubleFacedCard) {
+            costs.add(((DoubleFacedCard) card).getLeftHalfCard().getManaValue());
+            costs.add(((DoubleFacedCard) card).getRightHalfCard().getManaValue());
         } else {
             costs.add(card.getManaValue());
         }

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

@@ -0,0 +1,58 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.common.DiesCreatureTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.LessonsInGraveCondition;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.counters.CounterType;
+import mage.filter.StaticFilters;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AangALotToLearn extends CardImpl {
+
+    public AangALotToLearn(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G/W}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.AVATAR);
+        this.subtype.add(SubType.ALLY);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+        // Aang has vigilance as long as there's a Lesson card in your graveyard.
+        this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
+                new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield),
+                LessonsInGraveCondition.ONE, "{this} has vigilance as long as there's a Lesson card in your graveyard"
+        )).addHint(LessonsInGraveCondition.getHint()));
+
+        // Whenever another creature you control dies, put a +1/+1 counter on Aang.
+        this.addAbility(new DiesCreatureTriggeredAbility(
+                new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
+                false, StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL
+        ));
+    }
+
+    private AangALotToLearn(final AangALotToLearn card) {
+        super(card);
+    }
+
+    @Override
+    public AangALotToLearn copy() {
+        return new AangALotToLearn(this);
+    }
+}

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

@@ -0,0 +1,64 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.hint.Hint;
+import mage.abilities.hint.ValueHint;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.game.permanent.token.AllyToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AangAndKatara extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterControlledPermanent("tapped artifacts and/or creatures you control");
+
+    static {
+        filter.add(TappedPredicate.TAPPED);
+        filter.add(Predicates.or(
+                CardType.ARTIFACT.getPredicate(),
+                CardType.CREATURE.getPredicate()
+        ));
+    }
+
+    private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter, null);
+    private static final Hint hint = new ValueHint("Tapped artifacts and creatures you control", xValue);
+
+    public AangAndKatara(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{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(5);
+        this.toughness = new MageInt(5);
+
+        // Whenever Aang and Katara enter or attack, create X 1/1 white Ally creature tokens, where X is the number of tapped artifacts and/or creatures you control.
+        this.addAbility(new EntersBattlefieldOrAttacksSourceTriggeredAbility(new CreateTokenEffect(new AllyToken(), xValue))
+                .setTriggerPhrase("Whenever {this} enter or attack, ").addHint(hint));
+    }
+
+    private AangAndKatara(final AangAndKatara card) {
+        super(card);
+    }
+
+    @Override
+    public AangAndKatara copy() {
+        return new AangAndKatara(this);
+    }
+}

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

@@ -0,0 +1,89 @@
+package mage.cards.a;
+
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.LeavesBattlefieldAllTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility;
+import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
+import mage.abilities.effects.common.LookLibraryAndPickControllerEffect;
+import mage.abilities.effects.common.TransformSourceEffect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.effects.keyword.EarthbendTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
+import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
+import mage.constants.*;
+import mage.filter.FilterCard;
+import mage.filter.FilterPermanent;
+import mage.filter.StaticFilters;
+import mage.filter.common.FilterCreatureCard;
+import mage.filter.predicate.mageobject.ManaValuePredicate;
+import mage.target.common.TargetControlledLandPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AangAtTheCrossroads extends TransformingDoubleFacedCard {
+
+    private static final FilterCard filter = new FilterCreatureCard("creature card with mana value 4 or less");
+    private static final FilterPermanent saviorFilter = new FilterPermanent("land creatures");
+
+    static {
+        filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5));
+        saviorFilter.add(CardType.LAND.getPredicate());
+        saviorFilter.add(CardType.CREATURE.getPredicate());
+    }
+
+    public AangAtTheCrossroads(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.AVATAR, SubType.ALLY}, "{2}{G}{W}{U}",
+                "Aang, Destined Savior",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.AVATAR, SubType.ALLY}, "");
+
+        this.getLeftHalfCard().setPT(3, 3);
+        this.getRightHalfCard().setPT(4, 4);
+
+        // Flying
+        this.getLeftHalfCard().addAbility(FlyingAbility.getInstance());
+
+        // When Aang enters, look at the top five cards of your library. You may put a creature card with mana value 4 or less from among them onto the battlefield. Put the rest on the bottom of your library in a random order.
+        this.getLeftHalfCard().addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect(
+                5, 1, filter, PutCards.BATTLEFIELD, PutCards.BOTTOM_RANDOM
+        )));
+
+        // When another creature you control leaves the battlefield, transform Aang at the beginning of the next upkeep.
+        this.getLeftHalfCard().addAbility(new LeavesBattlefieldAllTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(
+                new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new TransformSourceEffect())
+        ).setText("transform {this} at the beginning of the next upkeep"), StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL)
+                .setTriggerPhrase("When another creature you control leaves the battlefield, "));
+
+        // Aang, Destined Savior
+
+        // Flying
+        this.getRightHalfCard().addAbility(FlyingAbility.getInstance());
+
+        // Land creatures you control have vigilance.
+        this.getRightHalfCard().addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(
+                VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, saviorFilter
+        )));
+
+        // At the beginning of combat on your turn, earthbend 2.
+        Ability ability = new BeginningOfCombatTriggeredAbility(new EarthbendTargetEffect(2));
+        ability.addTarget(new TargetControlledLandPermanent());
+        this.getRightHalfCard().addAbility(ability);
+    }
+
+    private AangAtTheCrossroads(final AangAtTheCrossroads card) {
+        super(card);
+    }
+
+    @Override
+    public AangAtTheCrossroads copy() {
+        return new AangAtTheCrossroads(this);
+    }
+}

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

@@ -1,112 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.Ability;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.costs.Cost;
-import mage.abilities.costs.CostImpl;
-import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.dynamicvalue.common.StaticValue;
-import mage.abilities.effects.common.DamagePlayersEffect;
-import mage.abilities.effects.common.DoIfCostPaid;
-import mage.abilities.effects.common.DrawCardSourceControllerEffect;
-import mage.abilities.effects.common.GainLifeEffect;
-import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect;
-import mage.abilities.effects.common.counter.AddCountersSourceEffect;
-import mage.abilities.keyword.FlyingAbility;
-import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
-import mage.cards.Card;
-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.FilterCard;
-import mage.game.Game;
-
-import java.util.Optional;
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class AangMasterOfElements extends CardImpl {
-
-    private static final FilterCard filter = new FilterCard("spells");
-
-    public AangMasterOfElements(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.ALLY);
-        this.power = new MageInt(6);
-        this.toughness = new MageInt(6);
-        this.nightCard = true;
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-
-        // Spells you cast cost {W}{U}{B}{R}{G} less to cast.
-        this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(
-                filter, new ManaCostsImpl<>("{W}{U}{B}{R}{G}"), StaticValue.get(1), true
-        )));
-
-        // At the beginning of each upkeep, you may transform Aang, Master of Elements. If you do, you gain 4 life, draw four cards, put four +1/+1 counters on him, and he deals 4 damage to each opponent.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(
-                TargetController.ANY,
-                new DoIfCostPaid(new GainLifeEffect(4), new AangMasterOfElementsCost())
-                        .addEffect(new DrawCardSourceControllerEffect(4).concatBy(","))
-                        .addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4))
-                                .setText(", put four +1/+1 counters on him"))
-                        .addEffect(new DamagePlayersEffect(4, TargetController.OPPONENT)
-                                .setText(", and he deals 4 damage to each opponent")),
-                false
-        ));
-    }
-
-    private AangMasterOfElements(final AangMasterOfElements card) {
-        super(card);
-    }
-
-    @Override
-    public AangMasterOfElements copy() {
-        return new AangMasterOfElements(this);
-    }
-}
-
-class AangMasterOfElementsCost extends CostImpl {
-
-    AangMasterOfElementsCost() {
-        super();
-        text = "transform {this}";
-    }
-
-    private AangMasterOfElementsCost(final AangMasterOfElementsCost cost) {
-        super(cost);
-    }
-
-    @Override
-    public AangMasterOfElementsCost copy() {
-        return new AangMasterOfElementsCost(this);
-    }
-
-    @Override
-    public boolean canPay(Ability ability, Ability source, UUID controllerId, Game game) {
-        return Optional
-                .ofNullable(source.getSourcePermanentIfItStillExists(game))
-                .filter(Card::isTransformable)
-                .isPresent();
-    }
-
-    @Override
-    public boolean pay(Ability ability, Game game, Ability source, UUID controllerId, boolean noMana, Cost costToPay) {
-        paid = Optional
-                .ofNullable(source.getSourcePermanentIfItStillExists(game))
-                .filter(permanent -> permanent.transform(source, game))
-                .isPresent();
-        return paid;
-    }
-}

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

@@ -0,0 +1,89 @@
+package mage.cards.a;
+
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksTriggeredAbility;
+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.common.counter.AddCountersAllEffect;
+import mage.abilities.effects.keyword.AirbendTargetEffect;
+import mage.abilities.keyword.FlashAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.ReachAbility;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
+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.common.FilterSpellOrPermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.target.common.TargetSpellOrPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AangSwiftSavior extends TransformingDoubleFacedCard {
+
+    private static final FilterSpellOrPermanent filter = new FilterSpellOrPermanent("other target creature or spell");
+    private static final FilterPermanent laFilter = new FilterControlledCreaturePermanent("tapped creature you control");
+
+    static {
+    }
+    static {
+        filter.getPermanentFilter().add(CardType.CREATURE.getPredicate());
+        filter.getPermanentFilter().add(AnotherPredicate.instance);
+        laFilter.add(TappedPredicate.TAPPED);
+    }
+
+    public AangSwiftSavior(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.AVATAR, SubType.ALLY}, "{1}{W}{U}",
+                "Aang and La, Ocean's Fury",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.AVATAR, SubType.SPIRIT, SubType.ALLY}, "");
+
+        this.getLeftHalfCard().setPT(2, 3);
+        this.getRightHalfCard().setPT(5, 5);
+
+        // Flash
+        this.getLeftHalfCard().addAbility(FlashAbility.getInstance());
+
+        // Flying
+        this.getLeftHalfCard().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.getLeftHalfCard().addAbility(ability);
+
+        // Waterbend {8}: Transform Aang.
+        this.getLeftHalfCard().addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new WaterbendCost(8)));
+
+        // Aang and La, Ocean's Fury
+
+        // Reach
+        this.getRightHalfCard().addAbility(ReachAbility.getInstance());
+
+        // Trample
+        this.getRightHalfCard().addAbility(TrampleAbility.getInstance());
+
+        // Whenever Aang and La attack, put a +1/+1 counter on each tapped creature you control.
+        this.getRightHalfCard().addAbility(new AttacksTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), laFilter)).setTriggerPhrase("Whenever {this} attack, "));
+    }
+
+    private AangSwiftSavior(final AangSwiftSavior card) {
+        super(card);
+    }
+
+    @Override
+    public AangSwiftSavior copy() {
+        return new AangSwiftSavior(this);
+    }
+}

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

@@ -0,0 +1,50 @@
+package mage.cards.a;
+
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTappedUnlessAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.condition.common.YouControlABasicLandCondition;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
+import mage.abilities.mana.WhiteManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.counters.CounterType;
+import mage.filter.StaticFilters;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AbandonedAirTemple extends CardImpl {
+
+    public AbandonedAirTemple(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
+
+        // This land enters tapped unless you control a basic land.
+        this.addAbility(new EntersBattlefieldTappedUnlessAbility(YouControlABasicLandCondition.instance)
+                .addHint(YouControlABasicLandCondition.getHint()));
+
+        // {T}: Add {W}.
+        this.addAbility(new WhiteManaAbility());
+
+        // {3}{W}, {T}: Put a +1/+1 counter on each creature you control.
+        Ability ability = new SimpleActivatedAbility(new AddCountersAllEffect(
+                CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE
+        ), new ManaCostsImpl<>("{3}{W}"));
+        ability.addCost(new TapSourceCost());
+        this.addAbility(ability);
+    }
+
+    private AbandonedAirTemple(final AbandonedAirTemple card) {
+        super(card);
+    }
+
+    @Override
+    public AbandonedAirTemple copy() {
+        return new AbandonedAirTemple(this);
+    }
+}

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

@@ -6,10 +6,10 @@ import mage.abilities.dynamicvalue.common.ManaSpentToCastCount;
 import mage.abilities.effects.common.CastSourceTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.EntersBattlefieldUnderControlOfOpponentOfChoiceEffect;
-import mage.abilities.keyword.PartnerSurvivorsAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.PartnerVariantType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.game.permanent.token.CordycepsInfectedToken;
@@ -41,7 +41,7 @@ public final class AbbyMercilessSoldier extends CardImpl {
         this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldUnderControlOfOpponentOfChoiceEffect()));
 
         // Partner--Survivors
-        this.addAbility(PartnerSurvivorsAbility.getInstance());
+        this.addAbility(PartnerVariantType.SURVIVORS.makeAbility());
     }
 
     private AbbyMercilessSoldier(final AbbyMercilessSoldier card) {

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

@@ -1,16 +1,16 @@
 
 package mage.cards.a;
 
-import mage.MageInt;
 import mage.abilities.Ability;
-import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
 import mage.abilities.keyword.FlyingAbility;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
+import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.cards.CardSetInfo;
-import mage.constants.*;
+import mage.cards.TransformingDoubleFacedCard;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.game.Game;
 import mage.players.Player;
 
@@ -19,23 +19,26 @@ import java.util.UUID;
 /**
  * @author fireshoes
  */
-public final class AberrantResearcher extends CardImpl {
+public final class AberrantResearcher extends TransformingDoubleFacedCard {
 
     public AberrantResearcher(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.INSECT);
-        this.power = new MageInt(3);
-        this.toughness = new MageInt(2);
+        super(ownerId, setInfo,
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.INSECT}, "{3}{U}",
+                "Perfected Form",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.INSECT, SubType.HORROR}, "U");
 
-        this.secondSideCardClazz = mage.cards.p.PerfectedForm.class;
+        this.getLeftHalfCard().setPT(3, 2);
+        this.getRightHalfCard().setPT(5, 4);
 
         // Flying
-        this.addAbility(FlyingAbility.getInstance());
+        this.getLeftHalfCard().addAbility(FlyingAbility.getInstance());
 
         // At the beginning of your upkeep, put the top card of your library into your graveyard. If it's an instant or sorcery card, transform Aberrant Researcher.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AberrantResearcherEffect()));
+        this.getLeftHalfCard().addAbility(new BeginningOfUpkeepTriggeredAbility(new AberrantResearcherEffect()));
+
+        // Perfected Form
+        // Flying
+        this.getRightHalfCard().addAbility(FlyingAbility.getInstance());
     }
 
     private AberrantResearcher(final AberrantResearcher card) {

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

@@ -1,51 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.Ability;
-import mage.abilities.common.TransformIntoSourceTriggeredAbility;
-import mage.abilities.effects.common.SacrificeEffect;
-import mage.abilities.keyword.FlyingAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.filter.StaticFilters;
-import mage.target.common.TargetOpponent;
-
-import java.util.UUID;
-
-/**
- * @author fireshoes
- */
-public final class AbolisherOfBloodlines extends CardImpl {
-
-    public AbolisherOfBloodlines(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
-        this.subtype.add(SubType.ELDRAZI);
-        this.subtype.add(SubType.VAMPIRE);
-        this.power = new MageInt(6);
-        this.toughness = new MageInt(5);
-
-        // this card is the second face of double-faced card
-        this.nightCard = true;
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-
-        // When this creature transforms into Abolisher of Bloodlines, target opponent sacrifices three creatures.
-        Ability ability = new TransformIntoSourceTriggeredAbility(new SacrificeEffect(
-                StaticFilters.FILTER_PERMANENT_CREATURES, 3, "target opponent"
-        ));
-        ability.addTarget(new TargetOpponent());
-        this.addAbility(ability);
-    }
-
-    private AbolisherOfBloodlines(final AbolisherOfBloodlines card) {
-        super(card);
-    }
-
-    @Override
-    public AbolisherOfBloodlines copy() {
-        return new AbolisherOfBloodlines(this);
-    }
-}

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

@@ -0,0 +1,43 @@
+package mage.cards.a;
+
+import mage.abilities.condition.common.LessonsInGraveCondition;
+import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.effects.common.LookLibraryAndPickControllerEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.PutCards;
+import mage.constants.SubType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AccumulateWisdom extends CardImpl {
+
+    public AccumulateWisdom(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
+
+        this.subtype.add(SubType.LESSON);
+
+        // Look at the top three cards of your library. Put one of those cards into your hand and the rest on the bottom of your library in any order. Put each of those cards into your hand instead if there are three or more Lesson cards in your graveyard.
+        this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
+                new LookLibraryAndPickControllerEffect(3, 3, PutCards.HAND, PutCards.BOTTOM_ANY),
+                new LookLibraryAndPickControllerEffect(3, 1, PutCards.HAND, PutCards.BOTTOM_ANY),
+                LessonsInGraveCondition.THREE, "look at the top three cards of your library. " +
+                "Put one of those cards into your hand and the rest on the bottom of your library in any order. " +
+                "Put each of those cards into your hand instead if there are three or more Lesson cards in your graveyard"
+        ));
+        this.getSpellAbility().addHint(LessonsInGraveCondition.getHint());
+    }
+
+    private AccumulateWisdom(final AccumulateWisdom card) {
+        super(card);
+    }
+
+    @Override
+    public AccumulateWisdom copy() {
+        return new AccumulateWisdom(this);
+    }
+}

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

@@ -1,49 +1,76 @@
 package mage.cards.a;
 
-import mage.MageInt;
 import mage.abilities.Ability;
+import mage.abilities.SpellAbility;
 import mage.abilities.common.DiesSourceTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.effects.common.LoseLifeTargetEffect;
+import mage.abilities.effects.common.cost.CostModificationEffectImpl;
 import mage.abilities.effects.common.cost.SpellsCostModificationThatTargetSourceEffect;
+import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.TransformAbility;
-import mage.cards.Card;
-import mage.cards.CardImpl;
+import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.cards.CardSetInfo;
+import mage.cards.DoubleFacedCardHalf;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.*;
 import mage.filter.FilterCard;
 import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.game.stack.Spell;
 import mage.players.Player;
+import mage.target.TargetPlayer;
 import mage.target.common.TargetOpponent;
+import mage.util.CardUtil;
 
+import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 /**
  * @author halljared
  */
-public final class AccursedWitch extends CardImpl {
+public final class AccursedWitch extends TransformingDoubleFacedCard {
 
     private static final FilterCard filter = new FilterCard("spells");
 
     public AccursedWitch(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.SHAMAN);
-        this.power = new MageInt(4);
-        this.toughness = new MageInt(2);
-
-        this.secondSideCardClazz = mage.cards.i.InfectiousCurse.class;
+        super(ownerId, setInfo,
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.SHAMAN}, "{3}{B}",
+                "Infectious Curse",
+                new CardType[]{CardType.ENCHANTMENT}, new SubType[]{SubType.AURA, SubType.CURSE}, "B");
+        this.getLeftHalfCard().setPT(4, 2);
 
         // Spells your opponents cast that target Accursed Witch cost {1} less to cast.
-        this.addAbility(new SimpleStaticAbility(
+        this.getLeftHalfCard().addAbility(new SimpleStaticAbility(
                 new SpellsCostModificationThatTargetSourceEffect(-1, filter, TargetController.OPPONENT))
         );
 
         // When Accursed Witch dies, return it to the battlefield transformed under your control attached to target opponent.
-        this.addAbility(new TransformAbility());
         Ability ability = new DiesSourceTriggeredAbility(new AccursedWitchReturnTransformedEffect());
         ability.addTarget(new TargetOpponent());
-        this.addAbility(ability);
+        this.getLeftHalfCard().addAbility(ability);
+
+        // Infectious Curse
+        // Enchant player
+        TargetPlayer auraTarget = new TargetPlayer();
+        this.getRightHalfCard().getSpellAbility().addTarget(auraTarget);
+        this.getRightHalfCard().getSpellAbility().addEffect(new AttachEffect(Outcome.Damage));
+        this.getRightHalfCard().addAbility(new EnchantAbility(auraTarget));
+
+        // Spells you cast that target enchanted player cost {1} less to cast.
+        this.getRightHalfCard().addAbility(new SimpleStaticAbility(new InfectiousCurseCostReductionEffect()));
+
+        // At the beginning of enchanted player's upkeep, that player loses 1 life and you gain 1 life.
+        Ability upkeepAbility = new BeginningOfUpkeepTriggeredAbility(
+                TargetController.ENCHANTED, new LoseLifeTargetEffect(1).setText("that player loses 1 life"),
+                false
+        );
+        upkeepAbility.addEffect(new GainLifeEffect(1).concatBy("and"));
+        this.getRightHalfCard().addAbility(upkeepAbility);
     }
 
     private AccursedWitch(final AccursedWitch card) {
@@ -80,16 +107,67 @@ class AccursedWitchReturnTransformedEffect extends OneShotEffect {
             return false;
         }
 
-        Card card = game.getCard(source.getSourceId());
+        DoubleFacedCardHalf card = (DoubleFacedCardHalf) game.getCard(source.getSourceId());
         if (card == null) {
             return false;
         }
 
         game.getState().setValue(TransformAbility.VALUE_KEY_ENTER_TRANSFORMED + source.getSourceId(), Boolean.TRUE);
-        game.getState().setValue("attachTo:" + source.getSourceId(), attachTo.getId());
+        game.getState().setValue("attachTo:" + card.getOtherSide().getId(), attachTo.getId());
         if (controller.moveCards(card, Zone.BATTLEFIELD, source, game)) {
-            attachTo.addAttachment(card.getId(), source, game);
+            attachTo.addAttachment(card.getOtherSide().getId(), source, game);
         }
         return true;
     }
 }
+class InfectiousCurseCostReductionEffect extends CostModificationEffectImpl {
+
+    InfectiousCurseCostReductionEffect() {
+        super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);
+        this.staticText = "Spells you cast that target enchanted player cost {1} less to cast";
+    }
+
+    private InfectiousCurseCostReductionEffect(InfectiousCurseCostReductionEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source, Ability abilityToModify) {
+        CardUtil.reduceCost(abilityToModify, 1);
+        return true;
+    }
+
+    @Override
+    public boolean applies(Ability abilityToModify, Ability source, Game game) {
+        if (!(abilityToModify instanceof SpellAbility)) {
+            return false;
+        }
+
+        if (!source.isControlledBy(abilityToModify.getControllerId())) {
+            return false;
+        }
+
+        Permanent enchantment = game.getPermanent(source.getSourceId());
+        if (enchantment == null || enchantment.getAttachedTo() == null) {
+            return false;
+        }
+
+        Spell spell = (Spell) game.getStack().getStackObject(abilityToModify.getId());
+        Set<UUID> allTargets;
+        if (spell != null) {
+            // real cast
+            allTargets = CardUtil.getAllSelectedTargets(abilityToModify, game);
+        } else {
+            // playable
+            allTargets = CardUtil.getAllPossibleTargets(abilityToModify, game);
+        }
+
+        // try to reduce all the time (if it possible to target)
+        return allTargets.stream().anyMatch(target -> Objects.equals(target, enchantment.getAttachedTo()));
+    }
+
+    @Override
+    public InfectiousCurseCostReductionEffect copy() {
+        return new InfectiousCurseCostReductionEffect(this);
+    }
+}

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

@@ -1,16 +1,23 @@
 package mage.cards.a;
 
-import mage.MageInt;
-import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.common.AttacksTriggeredAbility;
 import mage.abilities.common.DiesSourceTriggeredAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.CardsInHandCondition;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.TransformSourceEffect;
+import mage.abilities.hint.ConditionHint;
+import mage.abilities.hint.Hint;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.LifelinkAbility;
 import mage.abilities.keyword.TransformAbility;
+import mage.abilities.mana.BlackManaAbility;
 import mage.cards.*;
 import mage.constants.*;
 import mage.filter.StaticFilters;
@@ -28,33 +35,43 @@ import java.util.UUID;
 /**
  * @author Susucr
  */
-public final class AclazotzDeepestBetrayal extends CardImpl {
+public final class AclazotzDeepestBetrayal extends TransformingDoubleFacedCard {
+    private static final Condition condition = new CardsInHandCondition(ComparisonType.FEWER_THAN, 2, TargetController.ANY);
+    private static final Hint hint = new ConditionHint(condition);
 
     public AclazotzDeepestBetrayal(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
-        this.secondSideCardClazz = mage.cards.t.TempleOfTheDead.class;
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.BAT, SubType.GOD}, "{3}{B}{B}",
+                "Temple of the Dead",
+                new SuperType[]{}, new CardType[]{CardType.LAND}, new SubType[]{}, "");
 
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.BAT);
-        this.subtype.add(SubType.GOD);
-        this.power = new MageInt(4);
-        this.toughness = new MageInt(4);
+        this.getLeftHalfCard().setPT(4, 4);
 
         // Flying
-        this.addAbility(FlyingAbility.getInstance());
+        this.getLeftHalfCard().addAbility(FlyingAbility.getInstance());
 
         // Lifelink
-        this.addAbility(LifelinkAbility.getInstance());
+        this.getLeftHalfCard().addAbility(LifelinkAbility.getInstance());
 
         // Whenever Aclazotz attacks, each opponent discards a card. For each opponent who can't, you draw a card.
-        this.addAbility(new AttacksTriggeredAbility(new AclazotzDeepestBetrayalEffect()));
+        this.getLeftHalfCard().addAbility(new AttacksTriggeredAbility(new AclazotzDeepestBetrayalEffect()));
 
         // Whenever an opponent discards a land card, create a 1/1 black Bat creature token with flying.
-        this.addAbility(new AclazotzDeepestBetrayalTriggeredAbility());
+        this.getLeftHalfCard().addAbility(new AclazotzDeepestBetrayalTriggeredAbility());
 
         // When Aclazotz dies, return it to the battlefield tapped and transformed under its owner's control.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new DiesSourceTriggeredAbility(new AclazotzDeepestBetrayalTransformEffect()));
+        this.getLeftHalfCard().addAbility(new DiesSourceTriggeredAbility(new AclazotzDeepestBetrayalTransformEffect()));
+
+        // Temple of the Dead
+        // {T}: Add {B}.
+        this.getRightHalfCard().addAbility(new BlackManaAbility());
+
+        // {2}{B}, {T}: Transform Temple of the Dead. Activate only if a player has one or fewer cards in hand and only as a sorcery.
+        Ability ability = new ActivateIfConditionActivatedAbility(
+                new TransformSourceEffect(), new ManaCostsImpl<>("{2}{B}"), condition
+        ).setTiming(TimingRule.SORCERY);
+        ability.addCost(new TapSourceCost());
+        this.getRightHalfCard().addAbility(ability.addHint(hint));
     }
 
     private AclazotzDeepestBetrayal(final AclazotzDeepestBetrayal card) {

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

@@ -1,4 +1,3 @@
-
 package mage.cards.a;
 
 import java.util.UUID;
@@ -28,7 +27,9 @@ public final class AcolyteOfTheInferno extends CardImpl {
         this.addAbility(new RenownAbility(1));
         
         // Whenever Acolyte of the Inferno becomes blocked by a creature, it deals 2 damage to that creature
-        this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new DamageTargetEffect(2, true, "that creature", "it"), false));
+        this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(
+                new DamageTargetEffect(2, "it")
+                        .withTargetDescription("that creature"), false));
     }
 
     private AcolyteOfTheInferno(final AcolyteOfTheInferno card) {

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

@@ -2,16 +2,14 @@ package mage.cards.a;
 
 import mage.abilities.Ability;
 import mage.abilities.dynamicvalue.common.DevotionCount;
+import mage.abilities.effects.PreventionEffectData;
 import mage.abilities.effects.PreventionEffectImpl;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.game.Game;
-import mage.game.events.DamageEvent;
 import mage.game.events.GameEvent;
-import mage.game.events.PreventDamageEvent;
-import mage.game.events.PreventedDamageEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetAnyTarget;
@@ -46,16 +44,14 @@ public final class AcolytesReward extends CardImpl {
 
 class AcolytesRewardEffect extends PreventionEffectImpl {
 
-    protected int amount = 0;
 
     AcolytesRewardEffect() {
-        super(Duration.EndOfTurn);
+        super(Duration.EndOfTurn, 0, false, true, DevotionCount.W);
         staticText = "Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, {this} deals that much damage to any target";
     }
 
     private AcolytesRewardEffect(final AcolytesRewardEffect effect) {
         super(effect);
-        this.amount = effect.amount;
     }
 
     @Override
@@ -63,64 +59,25 @@ class AcolytesRewardEffect extends PreventionEffectImpl {
         return new AcolytesRewardEffect(this);
     }
 
-    @Override
-    public void init(Ability source, Game game) {
-        super.init(source, game);
-        amount = DevotionCount.W.calculate(game, source, this);
-    }
-
     @Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-        boolean result = false;
-        int toPrevent = amount;
-        if (event.getAmount() < this.amount) {
-            toPrevent = event.getAmount();
-            amount -= event.getAmount();
-        } else {
-            amount = 0;
+        PreventionEffectData preventionData = preventDamageAction(event, source, game);
+        if (preventionData.getPreventedDamage() > 0) {
+            Permanent targetCreature = game.getPermanent(source.getFirstTarget());
+            if (targetCreature != null) {
+                targetCreature.damage(preventionData.getPreventedDamage(), source.getSourceId(), source, game, false, true);
             }
-        GameEvent preventEvent = new PreventDamageEvent(event.getTargetId(), source.getSourceId(), source, source.getControllerId(), toPrevent, ((DamageEvent) event).isCombatDamage());
-        if (game.replaceEvent(preventEvent)) {
-            return result;
+            Player targetPlayer = game.getPlayer(source.getFirstTarget());
+            if (targetCreature != null) {
+                targetPlayer.damage(preventionData.getPreventedDamage(), source.getSourceId(), source, game, false, true);
             }
-        Permanent targetCreature = game.getPermanent(event.getTargetId());
-        if (targetCreature == null) {
-            return result;
         }
-        if (amount == 0) {
-            this.used = true;
-            this.discard();
-        }
-        if (event.getAmount() >= toPrevent) {
-            event.setAmount(event.getAmount() - toPrevent);
-        } else {
-            event.setAmount(0);
-            result = true;
-        }
-        if (toPrevent == 0) {
-            return result;
-        }
-        game.informPlayers("Acolyte's Reward prevented " + toPrevent + " to " + targetCreature.getName());
-        game.fireEvent(new PreventedDamageEvent(event.getTargetId(), source.getSourceId(), source, source.getControllerId(), toPrevent));
-
-        Player targetPlayer = game.getPlayer(source.getTargets().get(1).getFirstTarget());
-        if (targetPlayer != null) {
-            targetPlayer.damage(toPrevent, source.getSourceId(), source, game);
-            game.informPlayers("Acolyte's Reward deals " + toPrevent + " damage to " + targetPlayer.getLogName());
-            return result;
-        }
-        Permanent targetDamageCreature = game.getPermanent(source.getTargets().get(1).getFirstTarget());
-        if (targetDamageCreature == null) {
-            return result;
-        }
-        targetDamageCreature.damage(toPrevent, source.getSourceId(), source, game, false, true);
-        game.informPlayers("Acolyte's Reward deals " + toPrevent + " damage to " + targetDamageCreature.getName());
-        return result;
+        return false;
     }
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        return !this.used && super.applies(event, source, game) && event.getTargetId().equals(source.getFirstTarget());
+        return super.applies(event, source, game) && event.getTargetId().equals(source.getFirstTarget());
     }
 
 }

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

@@ -1,48 +0,0 @@
-
-package mage.cards.a;
-
-import java.util.UUID;
-import mage.abilities.Ability;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.mana.WhiteManaAbility;
-import mage.constants.SuperType;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Zone;
-import mage.game.permanent.token.IxalanVampireToken;
-
-/**
- *
- * @author TheElk801
- */
-public final class AdantoTheFirstFort extends CardImpl {
-
-    public AdantoTheFirstFort(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
-
-        this.supertype.add(SuperType.LEGENDARY);
-
-        this.nightCard = true;
-
-        // T: Add W.
-        this.addAbility(new WhiteManaAbility());
-
-        // 2W, T: Create a 1/1 white Vampire creature token with lifelink.
-        Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new IxalanVampireToken()), new ManaCostsImpl<>("{2}{W}"));
-        ability.addCost(new TapSourceCost());
-        this.addAbility(ability);
-    }
-
-    private AdantoTheFirstFort(final AdantoTheFirstFort card) {
-        super(card);
-    }
-
-    @Override
-    public AdantoTheFirstFort copy() {
-        return new AdantoTheFirstFort(this);
-    }
-}

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

@@ -41,7 +41,7 @@ public final class AdrenalineJockey extends CardImpl {
 
         // Whenever a player casts a spell, if it's not their turn, this creature deals 4 damage to them.
         this.addAbility(new SpellCastAllTriggeredAbility(
-                new DamageTargetEffect(4, true, "them"),
+                new DamageTargetEffect(4).withTargetDescription("them"),
                 filter, false, SetTargetPointer.PLAYER
         ));
 

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

@@ -1,17 +1,28 @@
 package mage.cards.a;
 
+import mage.abilities.Ability;
 import mage.abilities.Mode;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.TapTargetEffect;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.Outcome;
 import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.permanent.PermanentReferenceInCollectionPredicate;
+import mage.game.Game;
 import mage.game.permanent.token.HeroToken;
+import mage.target.Target;
+import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
 
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @author TheElk801
@@ -28,8 +39,7 @@ public final class AerithRescueMission extends CardImpl {
 
         // * Take 59 Flights of Stairs -- Tap up to three target creatures. Put a stun counter on one of them.
         this.getSpellAbility().addMode(new Mode(new TapTargetEffect())
-                .addEffect(new AddCountersTargetEffect(CounterType.STUN.createInstance())
-                        .setText("Put a stun counter on one of them"))
+                .addEffect(new AerithRescueMissionStunEffect())
                 .addTarget(new TargetCreaturePermanent(0, 3))
                 .withFlavorWord("Take 59 Flights of Stairs"));
     }
@@ -43,3 +53,34 @@ public final class AerithRescueMission extends CardImpl {
         return new AerithRescueMission(this);
     }
 }
+
+class AerithRescueMissionStunEffect extends OneShotEffect {
+
+    AerithRescueMissionStunEffect() {
+        super(Outcome.Detriment);
+        staticText = "Put a stun counter on one of them";
+    }
+
+    private AerithRescueMissionStunEffect(final AerithRescueMissionStunEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AerithRescueMissionStunEffect copy() {
+        return new AerithRescueMissionStunEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        FilterPermanent filter = new FilterPermanent("creature to put a stun counter on");
+        filter.add(new PermanentReferenceInCollectionPredicate(this.getTargetPointer().getTargets(game, source).stream()
+                .map(game::getPermanent).collect(Collectors.toList()), game));
+        Target target = new TargetPermanent(filter).withNotTarget(true);
+        if (target.choose(Outcome.UnboostCreature, source.getControllerId(), source, game)) {
+            Effect eff = new AddCountersTargetEffect(CounterType.STUN.createInstance());
+            eff.setTargetPointer(new FixedTarget(target.getFirstTarget(), game));
+            return eff.apply(game, source);
+        }
+        return false;
+    }
+}

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

@@ -1,13 +1,13 @@
 package mage.cards.a;
 
-import mage.MageInt;
 import mage.abilities.common.ActivateAsSorceryActivatedAbility;
+import mage.abilities.common.DealsCombatDamageToAPlayerOrBattleTriggeredAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
 import mage.abilities.keyword.DeathtouchAbility;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
@@ -16,23 +16,28 @@ import java.util.UUID;
 /**
  * @author TheElk801
  */
-public final class AetherbladeAgent extends CardImpl {
+public final class AetherbladeAgent extends TransformingDoubleFacedCard {
 
     public AetherbladeAgent(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}");
-
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.ROGUE);
-        this.power = new MageInt(1);
-        this.toughness = new MageInt(1);
-        this.secondSideCardClazz = mage.cards.g.GitaxianMindstinger.class;
+        super(ownerId, setInfo,
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.ROGUE}, "{1}{B}",
+                "Gitaxian Mindstinger",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.PHYREXIAN, SubType.ROGUE}, "UB");
+        this.getLeftHalfCard().setPT(1, 1);
+        this.getRightHalfCard().setPT(3, 3);
 
         // Deathtouch
-        this.addAbility(DeathtouchAbility.getInstance());
+        this.getLeftHalfCard().addAbility(DeathtouchAbility.getInstance());
 
         // {4}{U/P}: Transform Aetherblade Agent. Activate only as a sorcery.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new ActivateAsSorceryActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{4}{U/P}")));
+        this.getLeftHalfCard().addAbility(new ActivateAsSorceryActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{4}{U/P}")));
+
+        // Gitaxian Mindstinger
+        // Deathtouch
+        this.getRightHalfCard().addAbility(DeathtouchAbility.getInstance());
+
+        // Whenever Gitaxian Mindstinger deals combat damage to a player or battle, draw a card.
+        this.getRightHalfCard().addAbility(new DealsCombatDamageToAPlayerOrBattleTriggeredAbility(new DrawCardSourceControllerEffect(1),false));
     }
 
     private AetherbladeAgent(final AetherbladeAgent card) {

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

@@ -1,53 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.dynamicvalue.common.ArtifactYouControlCount;
-import mage.abilities.effects.common.continuous.SetBasePowerSourceEffect;
-import mage.abilities.keyword.CrewAbility;
-import mage.abilities.keyword.FlyingAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.*;
-
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class AetherwingGoldenScaleFlagship extends CardImpl {
-
-    public AetherwingGoldenScaleFlagship(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "");
-
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.VEHICLE);
-        this.power = new MageInt(0);
-        this.toughness = new MageInt(4);
-        this.color.setBlue(true);
-        this.color.setRed(true);
-        this.nightCard = true;
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-
-        // Aetherwing, Golden-Scale Flagship's power is equal to the number of artifacts you control.
-        this.addAbility(new SimpleStaticAbility(
-                Zone.ALL,
-                new SetBasePowerSourceEffect(ArtifactYouControlCount.instance)
-                        .setText("{this}'s power is equal to the number of artifacts you control")
-        ));
-
-        // Crew 1
-        this.addAbility(new CrewAbility(1));
-    }
-
-    private AetherwingGoldenScaleFlagship(final AetherwingGoldenScaleFlagship card) {
-        super(card);
-    }
-
-    @Override
-    public AetherwingGoldenScaleFlagship copy() {
-        return new AetherwingGoldenScaleFlagship(this);
-    }
-}

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

@@ -1,33 +1,49 @@
 package mage.cards.a;
 
-import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.TransformIntoSourceTriggeredAbility;
+import mage.abilities.common.WerewolfBackTriggeredAbility;
 import mage.abilities.common.WerewolfFrontTriggeredAbility;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
+import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.CardType;
+import mage.constants.Outcome;
 import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.game.Controllable;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetArtifactPermanent;
 
+import java.util.Optional;
 import java.util.UUID;
 
 /**
  * @author BetaSteward
  */
-public final class AfflictedDeserter extends CardImpl {
+public final class AfflictedDeserter extends TransformingDoubleFacedCard {
 
     public AfflictedDeserter(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.WEREWOLF);
-
-        this.secondSideCardClazz = mage.cards.w.WerewolfRansacker.class;
-
-        this.power = new MageInt(3);
-        this.toughness = new MageInt(2);
+        super(ownerId, setInfo,
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.WEREWOLF}, "{3}{R}",
+                "Werewolf Ransacker",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.WEREWOLF}, "R");
+        this.getLeftHalfCard().setPT(3, 2);
+        this.getRightHalfCard().setPT(5, 4);
 
         // At the beginning of each upkeep, if no spells were cast last turn, transform Afflicted Deserter.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new WerewolfFrontTriggeredAbility());
+        this.getLeftHalfCard().addAbility(new WerewolfFrontTriggeredAbility());
+
+        // Werewolf Ransacker
+        // Whenever this creature transforms into Werewolf Ransacker, you may destroy target artifact. If that artifact is put into a graveyard this way, Werewolf Ransacker deals 3 damage to that artifact's controller.
+        Ability ability = new TransformIntoSourceTriggeredAbility(new WerewolfRansackerEffect(), true, true);
+        ability.addTarget(new TargetArtifactPermanent());
+        this.getRightHalfCard().addAbility(ability);
+
+        // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Werewolf Ransacker.
+        this.getRightHalfCard().addAbility(new WerewolfBackTriggeredAbility());
+
     }
 
     private AfflictedDeserter(final AfflictedDeserter card) {
@@ -39,3 +55,39 @@ public final class AfflictedDeserter extends CardImpl {
         return new AfflictedDeserter(this);
     }
 }
+
+class WerewolfRansackerEffect extends OneShotEffect {
+
+    WerewolfRansackerEffect() {
+        super(Outcome.DestroyPermanent);
+        staticText = "destroy target artifact. If that artifact is put into a graveyard this way, " +
+                "{this} deals 3 damage to that artifact's controller";
+    }
+
+    private WerewolfRansackerEffect(final WerewolfRansackerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public WerewolfRansackerEffect copy() {
+        return new WerewolfRansackerEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
+        if (permanent == null) {
+            return false;
+        }
+        permanent.destroy(source, game);
+        if (game.getState().getZone(permanent.getId()) != Zone.GRAVEYARD) {
+            return true;
+        }
+        Optional.of(permanent)
+                .map(Controllable::getControllerId)
+                .map(game::getPlayer)
+                .ifPresent(player -> player.damage(3, source, game));
+        return true;
+    }
+}
+

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

@@ -45,7 +45,7 @@ public final class AgentVenom extends CardImpl {
         this.addAbility(FlashAbility.getInstance());
 
         // Menace
-        this.addAbility(new MenaceAbility());
+        this.addAbility(new MenaceAbility(false));
 
         // Whenever another nontoken creature you control dies, you draw a card and lose 1 life.
         Ability ability = new DiesCreatureTriggeredAbility(

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

@@ -0,0 +1,48 @@
+package mage.cards.a;
+
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTappedUnlessAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.condition.common.YouControlABasicLandCondition;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DrawDiscardControllerEffect;
+import mage.abilities.mana.BlueManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AgnaQela extends CardImpl {
+
+    public AgnaQela(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
+
+        // This land enters tapped unless you control a basic land.
+        this.addAbility(new EntersBattlefieldTappedUnlessAbility(YouControlABasicLandCondition.instance)
+                .addHint(YouControlABasicLandCondition.getHint()));
+
+        // {T}: Add {U}.
+        this.addAbility(new BlueManaAbility());
+
+        // {2}{U}, {T}: Draw a card, then discard a card.
+        Ability ability = new SimpleActivatedAbility(
+                new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{2}{U}")
+        );
+        ability.addCost(new TapSourceCost());
+        this.addAbility(ability);
+    }
+
+    private AgnaQela(final AgnaQela card) {
+        super(card);
+    }
+
+    @Override
+    public AgnaQela copy() {
+        return new AgnaQela(this);
+    }
+}

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

@@ -0,0 +1,41 @@
+package mage.cards.a;
+
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.filter.StaticFilters;
+import mage.game.permanent.token.ClueArtifactToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AirNomadLegacy extends CardImpl {
+
+    public AirNomadLegacy(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}{U}");
+
+        // When this enchantment enters, create a Clue token.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ClueArtifactToken())));
+
+        // Creatures you control with flying get +1/+1.
+        this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(
+                1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_CREATURE_FLYING
+        ).setText("creatures you control with flying get +1/+1")));
+    }
+
+    private AirNomadLegacy(final AirNomadLegacy card) {
+        super(card);
+    }
+
+    @Override
+    public AirNomadLegacy copy() {
+        return new AirNomadLegacy(this);
+    }
+}

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

@@ -0,0 +1,51 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.condition.Condition;
+import mage.abilities.condition.InvertCondition;
+import mage.abilities.condition.common.AttackedThisTurnSourceCondition;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.counters.CounterType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AirNomadStudent extends CardImpl {
+
+    private static final Condition condition = new InvertCondition(
+            AttackedThisTurnSourceCondition.instance, "{this} didn't attack this turn"
+    );
+
+    public AirNomadStudent(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
+
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.MONK);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // At the beginning of your end step, if this creature didn't attack this turn, put a +1/+1 counter on it.
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())
+                .setText("put a +1/+1 counter on it")).withInterveningIf(condition));
+    }
+
+    private AirNomadStudent(final AirNomadStudent card) {
+        super(card);
+    }
+
+    @Override
+    public AirNomadStudent copy() {
+        return new AirNomadStudent(this);
+    }
+}

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

@@ -0,0 +1,59 @@
+package mage.cards.a;
+
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.SourceHasCounterCondition;
+import mage.abilities.effects.common.ExileThenReturnTargetEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.effects.keyword.AirbendTargetEffect;
+import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.counters.CounterType;
+import mage.filter.StaticFilters;
+import mage.target.common.TargetControlledCreaturePermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AirbenderAscension extends CardImpl {
+
+    private static final Condition condition = new SourceHasCounterCondition(CounterType.QUEST, 4);
+
+    public AirbenderAscension(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}");
+
+        // When this enchantment enters, airbend up to one target creature.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new AirbendTargetEffect());
+        ability.addTarget(new TargetCreaturePermanent(0, 1));
+        this.addAbility(ability);
+
+        // Whenever a creature you control enters, put a quest counter on this enchantment.
+        this.addAbility(new EntersBattlefieldAllTriggeredAbility(
+                new AddCountersSourceEffect(CounterType.QUEST.createInstance()),
+                StaticFilters.FILTER_CONTROLLED_CREATURE
+        ));
+
+        // At the beginning of your end step, if this enchantment has four or more quest counters on it, exile up to one target creature you control, then return it to the battlefield under its owner's control.
+        ability = new BeginningOfEndStepTriggeredAbility(
+                new ExileThenReturnTargetEffect(false, false)
+        ).withInterveningIf(condition);
+        ability.addTarget(new TargetControlledCreaturePermanent(0, 1));
+        this.addAbility(ability);
+    }
+
+    private AirbenderAscension(final AirbenderAscension card) {
+        super(card);
+    }
+
+    @Override
+    public AirbenderAscension copy() {
+        return new AirbenderAscension(this);
+    }
+}

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

@@ -0,0 +1,43 @@
+package mage.cards.a;
+
+import mage.abilities.Mode;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.abilities.effects.keyword.AirbendTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.target.common.TargetAttackingCreature;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AirbendersReversal extends CardImpl {
+
+    public AirbendersReversal(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{W}");
+
+        this.subtype.add(SubType.LESSON);
+
+        // Choose one --
+        // * Destroy target attacking creature.
+        this.getSpellAbility().addEffect(new DestroyTargetEffect());
+        this.getSpellAbility().addTarget(new TargetAttackingCreature());
+
+        // * Airbend target creature you control.
+        this.getSpellAbility().addMode(new Mode(new AirbendTargetEffect())
+                .addTarget(new TargetControlledCreaturePermanent()));
+    }
+
+    private AirbendersReversal(final AirbendersReversal card) {
+        super(card);
+    }
+
+    @Override
+    public AirbendersReversal copy() {
+        return new AirbendersReversal(this);
+    }
+}

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

@@ -0,0 +1,48 @@
+package mage.cards.a;
+
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeSourceCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.mana.BlueManaAbility;
+import mage.abilities.mana.RedManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AirshipEngineRoom extends CardImpl {
+
+    public AirshipEngineRoom(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
+
+        // This land enters tapped.
+        this.addAbility(new EntersBattlefieldTappedAbility());
+
+        // {T}: Add {U} or {R}.
+        this.addAbility(new BlueManaAbility());
+        this.addAbility(new RedManaAbility());
+
+        // {4}, {T}, Sacrifice this land: Draw a card.
+        Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(4));
+        ability.addCost(new TapSourceCost());
+        ability.addCost(new SacrificeSourceCost());
+        this.addAbility(ability);
+    }
+
+    private AirshipEngineRoom(final AirshipEngineRoom card) {
+        super(card);
+    }
+
+    @Override
+    public AirshipEngineRoom copy() {
+        return new AirshipEngineRoom(this);
+    }
+}

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

@@ -1,190 +0,0 @@
-package mage.cards.a;
-
-import mage.ObjectColor;
-import mage.abilities.Ability;
-import mage.abilities.LoyaltyAbility;
-import mage.abilities.common.delayed.ReflexiveTriggeredAbility;
-import mage.abilities.condition.Condition;
-import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
-import mage.abilities.dynamicvalue.common.CreaturesYouControlCount;
-import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.DamageTargetEffect;
-import mage.abilities.effects.common.counter.AddCountersAllEffect;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.SubType;
-import mage.constants.SuperType;
-import mage.counters.CounterType;
-import mage.filter.FilterPermanent;
-import mage.filter.StaticFilters;
-import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.common.FilterNonlandPermanent;
-import mage.filter.predicate.mageobject.AnotherPredicate;
-import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.filter.predicate.permanent.ControllerIdPredicate;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-import mage.game.permanent.token.CatWarrior21Token;
-import mage.players.Player;
-import mage.target.TargetPermanent;
-import mage.target.common.TargetAnyTarget;
-import mage.util.CardUtil;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author Susucr
- */
-public final class AjaniNacatlAvenger extends CardImpl {
-
-    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(SubType.CAT, "Cat you control");
-
-    public AjaniNacatlAvenger(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "");
-
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.AJANI);
-        this.setStartingLoyalty(3);
-
-        this.color.setRed(true);
-        this.color.setWhite(true);
-        this.nightCard = true;
-
-        // +2: Put a +1/+1 counter on each Cat you control.
-        this.addAbility(new LoyaltyAbility(
-                new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), 2
-        ));
-
-        // 0: Create a 2/1 white Car Warrior creature token. When you do, if you control a red permanent other than Ajani, Nacatl Avenger, he deals damage equal to the number of creatures you control to any target.
-        this.addAbility(new LoyaltyAbility(new AjaniNacatlAvengerZeroEffect(), 0));
-
-        // -4: Each opponent chooses an artifact, a creature, an enchantment and a planeswalker from among the nonland permanents they control, then sacrifices the rest.
-        this.addAbility(new LoyaltyAbility(new AjaniNacatlAvengerMinusFourEffect(), -4));
-    }
-
-    private AjaniNacatlAvenger(final AjaniNacatlAvenger card) {
-        super(card);
-    }
-
-    @Override
-    public AjaniNacatlAvenger copy() {
-        return new AjaniNacatlAvenger(this);
-    }
-}
-
-class AjaniNacatlAvengerZeroEffect extends OneShotEffect {
-
-    private static final FilterPermanent filter = new FilterPermanent("red permanent other than {this}");
-
-    static {
-        filter.add(new ColorPredicate(ObjectColor.RED));
-        filter.add(AnotherPredicate.instance);
-    }
-
-    private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter, true);
-
-    AjaniNacatlAvengerZeroEffect() {
-        super(Outcome.PutCreatureInPlay);
-        staticText = "Create a 2/1 white Cat Warrior creature token. "
-                + "When you do, if you control a red permanent other than {this}, "
-                + "he deals damage equal to the number of creatures you control to any target.";
-    }
-
-    private AjaniNacatlAvengerZeroEffect(final AjaniNacatlAvengerZeroEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public AjaniNacatlAvengerZeroEffect copy() {
-        return new AjaniNacatlAvengerZeroEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        if (!new CreateTokenEffect(new CatWarrior21Token()).apply(game, source)) {
-            return false;
-        }
-
-        ReflexiveTriggeredAbility reflexive = new ReflexiveTriggeredAbility(
-                new DamageTargetEffect(CreaturesYouControlCount.PLURAL),
-                false,
-                "When you do, if you control a red permanent other than {this}, "
-                        + "he deals damage equal to the number of creatures you control to any target.",
-                condition
-        );
-        reflexive.addTarget(new TargetAnyTarget());
-        game.fireReflexiveTriggeredAbility(reflexive, source);
-        return true;
-    }
-}
-
-// Inspired by Mythos of Snapdax
-class AjaniNacatlAvengerMinusFourEffect extends OneShotEffect {
-
-    private static final List<CardType> cardTypes = Arrays.asList(
-            CardType.ARTIFACT,
-            CardType.CREATURE,
-            CardType.ENCHANTMENT,
-            CardType.PLANESWALKER
-    );
-
-    AjaniNacatlAvengerMinusFourEffect() {
-        super(Outcome.Benefit);
-        staticText = "Each opponent chooses an artifact, a creature, an enchantment and a planeswalker "
-                + "from among the nonland permanents they control, then sacrifices the rest.";
-    }
-
-    private AjaniNacatlAvengerMinusFourEffect(final AjaniNacatlAvengerMinusFourEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public AjaniNacatlAvengerMinusFourEffect copy() {
-        return new AjaniNacatlAvengerMinusFourEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Player controller = game.getPlayer(source.getControllerId());
-        if (controller == null) {
-            return false;
-        }
-
-        List<Player> playerList = game
-                .getOpponents(controller.getId())
-                .stream()
-                .map(game::getPlayer)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-
-        Set<UUID> toKeep = new HashSet<>();
-        for (Player player : playerList) {
-            for (CardType cardType : cardTypes) {
-                String message = CardUtil.addArticle(cardType.toString());
-                FilterPermanent filter = new FilterNonlandPermanent(message);
-                filter.add(cardType.getPredicate());
-                filter.add(new ControllerIdPredicate(player.getId()));
-                if (game.getBattlefield().count(filter, source.getControllerId(), source, game) == 0) {
-                    continue;
-                }
-                TargetPermanent target = new TargetPermanent(filter);
-                target.withNotTarget(true);
-                player.choose(outcome, target, source, game);
-                toKeep.add(target.getFirstTarget());
-            }
-        }
-
-        for (Permanent permanent : game.getBattlefield().getActivePermanents(StaticFilters.FILTER_PERMANENT_NON_LAND, source.getControllerId(), game)) {
-            if (permanent == null || toKeep.contains(permanent.getId()) || !controller.hasOpponent(permanent.getControllerId(), game)) {
-                continue;
-            }
-            permanent.sacrifice(source, game);
-        }
-        return true;
-    }
-
-}

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

@@ -1,27 +1,49 @@
 package mage.cards.a;
 
-import mage.MageInt;
-import mage.constants.Pronoun;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.DiesOneOrMoreTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.delayed.ReflexiveTriggeredAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
+import mage.abilities.dynamicvalue.common.CreaturesYouControlCount;
+import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.ExileAndReturnSourceEffect;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.*;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.StaticFilters;
+import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.common.FilterNonlandPermanent;
 import mage.filter.predicate.mageobject.AnotherPredicate;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.filter.predicate.permanent.ControllerIdPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
 import mage.game.permanent.token.CatWarrior21Token;
+import mage.players.Player;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetAnyTarget;
+import mage.util.CardUtil;
 
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author Susucr
  */
-public final class AjaniNacatlPariah extends CardImpl {
+public final class AjaniNacatlPariah extends TransformingDoubleFacedCard {
 
     public static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.CAT, "other Cats you control");
+    private static final FilterControlledCreaturePermanent nacatlAvengerFilter = new FilterControlledCreaturePermanent(SubType.CAT, "Cat you control");
 
     static {
         filter.add(AnotherPredicate.instance);
@@ -29,25 +51,34 @@ public final class AjaniNacatlPariah extends CardImpl {
     }
 
     public AjaniNacatlPariah(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.CAT, SubType.WARRIOR}, "{1}{W}",
+                "Ajani, Nacatl Avenger",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.PLANESWALKER}, new SubType[]{SubType.AJANI}, "RW");
 
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.CAT);
-        this.subtype.add(SubType.WARRIOR);
-        this.power = new MageInt(1);
-        this.toughness = new MageInt(2);
-
-        this.secondSideCardClazz = mage.cards.a.AjaniNacatlAvenger.class;
+        this.getLeftHalfCard().setPT(1, 2);
+        this.getRightHalfCard().setStartingLoyalty(3);
 
         // When Ajani, Nacatl Pariah enters the battlefield, create a 2/1 white Cat Warrior creature token.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new CatWarrior21Token())));
+        this.getLeftHalfCard().addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new CatWarrior21Token())));
 
         // Whenever one or more other Cats you control die, you may exile Ajani, then return him to the battlefield transformed under his owner's control.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new DiesOneOrMoreTriggeredAbility(
+        this.getLeftHalfCard().addAbility(new DiesOneOrMoreTriggeredAbility(
                 new ExileAndReturnSourceEffect(PutCards.BATTLEFIELD_TRANSFORMED, Pronoun.HE),
                 filter,
                 true));
+
+        // Ajani, Nacatl Avenger
+        // +2: Put a +1/+1 counter on each Cat you control.
+        this.getRightHalfCard().addAbility(new LoyaltyAbility(
+                new AddCountersAllEffect(CounterType.P1P1.createInstance(), nacatlAvengerFilter), 2
+        ));
+
+        // 0: Create a 2/1 white Car Warrior creature token. When you do, if you control a red permanent other than Ajani, Nacatl Avenger, he deals damage equal to the number of creatures you control to any target.
+        this.getRightHalfCard().addAbility(new LoyaltyAbility(new AjaniNacatlAvengerZeroEffect(), 0));
+
+        // -4: Each opponent chooses an artifact, a creature, an enchantment and a planeswalker from among the nonland permanents they control, then sacrifices the rest.
+        this.getRightHalfCard().addAbility(new LoyaltyAbility(new AjaniNacatlAvengerMinusFourEffect(), -4));
     }
 
     private AjaniNacatlPariah(final AjaniNacatlPariah card) {
@@ -59,3 +90,116 @@ public final class AjaniNacatlPariah extends CardImpl {
         return new AjaniNacatlPariah(this);
     }
 }
+
+class AjaniNacatlAvengerZeroEffect extends OneShotEffect {
+
+    private static final FilterPermanent filter = new FilterPermanent("red permanent other than {this}");
+
+    static {
+        filter.add(new ColorPredicate(ObjectColor.RED));
+        filter.add(AnotherPredicate.instance);
+    }
+
+    private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter, true);
+
+    AjaniNacatlAvengerZeroEffect() {
+        super(Outcome.PutCreatureInPlay);
+        staticText = "Create a 2/1 white Cat Warrior creature token. "
+                + "When you do, if you control a red permanent other than {this}, "
+                + "he deals damage equal to the number of creatures you control to any target.";
+    }
+
+    private AjaniNacatlAvengerZeroEffect(final AjaniNacatlAvengerZeroEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AjaniNacatlAvengerZeroEffect copy() {
+        return new AjaniNacatlAvengerZeroEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        if (!new CreateTokenEffect(new CatWarrior21Token()).apply(game, source)) {
+            return false;
+        }
+
+        ReflexiveTriggeredAbility reflexive = new ReflexiveTriggeredAbility(
+                new DamageTargetEffect(CreaturesYouControlCount.PLURAL),
+                false,
+                "When you do, if you control a red permanent other than {this}, "
+                        + "he deals damage equal to the number of creatures you control to any target.",
+                condition
+        );
+        reflexive.addTarget(new TargetAnyTarget());
+        game.fireReflexiveTriggeredAbility(reflexive, source);
+        return true;
+    }
+}
+
+// Inspired by Mythos of Snapdax
+class AjaniNacatlAvengerMinusFourEffect extends OneShotEffect {
+
+    private static final List<CardType> cardTypes = Arrays.asList(
+            CardType.ARTIFACT,
+            CardType.CREATURE,
+            CardType.ENCHANTMENT,
+            CardType.PLANESWALKER
+    );
+
+    AjaniNacatlAvengerMinusFourEffect() {
+        super(Outcome.Benefit);
+        staticText = "Each opponent chooses an artifact, a creature, an enchantment and a planeswalker "
+                + "from among the nonland permanents they control, then sacrifices the rest.";
+    }
+
+    private AjaniNacatlAvengerMinusFourEffect(final AjaniNacatlAvengerMinusFourEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AjaniNacatlAvengerMinusFourEffect copy() {
+        return new AjaniNacatlAvengerMinusFourEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller == null) {
+            return false;
+        }
+
+        List<Player> playerList = game
+                .getOpponents(controller.getId())
+                .stream()
+                .map(game::getPlayer)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+
+        Set<UUID> toKeep = new HashSet<>();
+        for (Player player : playerList) {
+            for (CardType cardType : cardTypes) {
+                String message = CardUtil.addArticle(cardType.toString());
+                FilterPermanent filter = new FilterNonlandPermanent(message);
+                filter.add(cardType.getPredicate());
+                filter.add(new ControllerIdPredicate(player.getId()));
+                if (game.getBattlefield().count(filter, source.getControllerId(), source, game) == 0) {
+                    continue;
+                }
+                TargetPermanent target = new TargetPermanent(filter);
+                target.withNotTarget(true);
+                player.choose(outcome, target, source, game);
+                toKeep.add(target.getFirstTarget());
+            }
+        }
+
+        for (Permanent permanent : game.getBattlefield().getActivePermanents(StaticFilters.FILTER_PERMANENT_NON_LAND, source.getControllerId(), game)) {
+            if (permanent == null || toKeep.contains(permanent.getId()) || !controller.hasOpponent(permanent.getControllerId(), game)) {
+                continue;
+            }
+            permanent.sacrifice(source, game);
+        }
+        return true;
+    }
+
+}

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

@@ -42,7 +42,7 @@ public final class AllOutAssault extends CardImpl {
         extraCombatAbility.addEffect(new CreateDelayedTriggeredAbilityEffect(new WhenYouAttackDelayedTriggeredAbility(
                 new UntapAllControllerEffect(
                         StaticFilters.FILTER_CONTROLLED_CREATURE, "untap each creature you control"), Duration.EndOfTurn, true)));
-        this.addAbility(extraCombatAbility.withInterveningIf(IsMainPhaseCondition.YOUR));
+        this.addAbility(extraCombatAbility.withInterveningIf(IsMainPhaseCondition.YOURS));
 
     }
 

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

@@ -0,0 +1,39 @@
+package mage.cards.a;
+
+import mage.abilities.effects.common.TargetsDamageTargetsEffect;
+import mage.abilities.keyword.AffinityAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.AffinityType;
+import mage.constants.CardType;
+import mage.target.common.TargetControlledCreaturePermanent;
+import mage.target.common.TargetOpponentsCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AlliesAtLast extends CardImpl {
+
+    public AlliesAtLast(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}");
+
+        // Affinity for Allies
+        this.addAbility(new AffinityAbility(AffinityType.ALLIES));
+
+        // Up to two target creatures you control each deal damage equal to their power to target creature an opponent controls.
+        this.getSpellAbility().addEffect(new TargetsDamageTargetsEffect(true));
+        this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, 2).setTargetTag(1));
+        this.getSpellAbility().addTarget(new TargetOpponentsCreaturePermanent().setTargetTag(3));
+    }
+
+    private AlliesAtLast(final AlliesAtLast card) {
+        super(card);
+    }
+
+    @Override
+    public AlliesAtLast copy() {
+        return new AlliesAtLast(this);
+    }
+}

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

@@ -1,35 +1,60 @@
 package mage.cards.a;
 
-import mage.MageInt;
+import mage.Mana;
+import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.TransformIntoSourceTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.TransformSourceEffect;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.effects.mana.UntilEndOfTurnManaEffect;
+import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.CardType;
+import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.target.TargetPermanent;
 
 import java.util.UUID;
 
 /**
  * @author TheElk801
  */
-public final class AlluringSuitor extends CardImpl {
+public final class AlluringSuitor extends TransformingDoubleFacedCard {
 
     public AlluringSuitor(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
-
-        this.subtype.add(SubType.VAMPIRE);
-        this.power = new MageInt(2);
-        this.toughness = new MageInt(3);
-        this.secondSideCardClazz = mage.cards.d.DeadlyDancer.class;
+        super(ownerId, setInfo,
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.VAMPIRE}, "{2}{R}",
+                "Deadly Dancer",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.VAMPIRE}, "R");
+        this.getLeftHalfCard().setPT(2, 3);
+        this.getRightHalfCard().setPT(3, 3);
 
         // When you attack with exactly two creatures, transform Alluring Suitor.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new AlluringSuitorTriggeredAbility());
+        this.getLeftHalfCard().addAbility(new AlluringSuitorTriggeredAbility());
+
+        // Deadly Dancer
+        // Trample
+        this.getRightHalfCard().addAbility(TrampleAbility.getInstance());
+
+        // When this creature transforms into Deadly Dancer, add {R}{R}. Until end of turn, you don't lose this mana as steps and phases end.
+        this.getRightHalfCard().addAbility(new TransformIntoSourceTriggeredAbility(new UntilEndOfTurnManaEffect(Mana.RedMana(2))));
+
+        // {R}{R}: Deadly Dancer and another target creature each get +1/+0 until end of turn.
+        Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(
+                1, 0, Duration.EndOfTurn
+        ).setText("{this}"), new ManaCostsImpl<>("{R}{R}"));
+        ability.addEffect(new BoostTargetEffect(1, 0)
+                .setText("and another target creature each get +1/+0 until end of turn"));
+        ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE));
+        this.getRightHalfCard().addAbility(ability);
     }
 
     private AlluringSuitor(final AlluringSuitor card) {

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

@@ -10,10 +10,7 @@ import mage.abilities.keyword.ReachAbility;
 import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.SubType;
-import mage.constants.SuperType;
+import mage.constants.*;
 import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.players.Player;
@@ -42,8 +39,8 @@ public final class AloySaviorOfMeridian extends CardImpl {
         this.addAbility(ReachAbility.getInstance());
 
         // In You, All Things Are Possible -- Whenever one or more artifact creatures you control attack, discover X, where X is the greatest power among them.
-        this.addAbility(new AttacksWithCreaturesTriggeredAbility(
-                new AloySaviorOfMeridianEffect(), 1, StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE
+        this.addAbility(new AttacksWithCreaturesTriggeredAbility(Zone.BATTLEFIELD,
+                new AloySaviorOfMeridianEffect(), 1, StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE, true
         ).setTriggerPhrase("Whenever one or more artifact creatures you control attack, ").withFlavorWord("In You, All Things Are Possible"));
     }
 

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

@@ -1,45 +1,63 @@
 package mage.cards.a;
 
-import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect;
-import mage.abilities.keyword.CraftAbility;
-import mage.cards.CardImpl;
+import mage.abilities.effects.common.continuous.SetBasePowerToughnessSourceEffect;
+import mage.abilities.keyword.*;
+import mage.cards.Card;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Zone;
+import mage.cards.TransformingDoubleFacedCard;
+import mage.constants.*;
 import mage.filter.StaticFilters;
+import mage.game.ExileZone;
 import mage.game.Game;
+import mage.game.permanent.Permanent;
 import mage.players.Player;
+import mage.util.CardUtil;
+
+import java.util.Set;
+import java.util.UUID;
 
 /**
  *
  * @author jeffwadsworth
  */
-public final class AltarOfTheWretched extends CardImpl {
+public final class AltarOfTheWretched extends TransformingDoubleFacedCard {
 
     public AltarOfTheWretched(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}{B}");
-        this.secondSideCardClazz = mage.cards.w.WretchedBonemass.class;
+        super(ownerId, setInfo, 
+                new CardType[]{CardType.ARTIFACT}, new SubType[]{}, "{2}{B}",
+                "Wretched Bonemass",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.SKELETON, SubType.HORROR}, "B");
+        this.getRightHalfCard().setPT(0, 0);
 
         // When Altar of the Wretched enters the battlefield, you may sacrifice a nontoken creature. If you do, draw X cards, then mill X cards, where X is that creature’s power.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new AltarOfTheWretchedEffect(), true));
+        this.getLeftHalfCard().addAbility(new EntersBattlefieldTriggeredAbility(new AltarOfTheWretchedEffect(), true));
 
         // Craft with one or more creatures {2}{B}{B}
-        this.addAbility(new CraftAbility(
+        this.getLeftHalfCard().addAbility(new CraftAbility(
                 "{2}{B}{B}", "one or more creatures", "other creatures you control and/or"
                 + "creature cards in your graveyard", 1, Integer.MAX_VALUE, CardType.CREATURE.getPredicate()
         ));
 
         // {2}{B}: Return Altar of the Wretched from your graveyard to your hand.
-        this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{2}{B}")));
+        this.getLeftHalfCard().addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{2}{B}")));
 
+        // Wretched Bonemass
+        // Wretched Bonemass’s power and toughness are each equal to the total power of the exiled cards used to craft it.
+        this.getRightHalfCard().addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(WretchedBonemassDynamicValue.instance).setText("{this}'s power and toughness are each equal to the total power of the exiled cards used to craft it.")));
+
+        // Wretched Bonemass has flying as long as an exiled card used to craft it has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, protection, reach, trample, and vigilance.
+        this.getRightHalfCard().addAbility(new SimpleStaticAbility(new WretchedBonemassGainAbilityEffect()));
     }
 
     private AltarOfTheWretched(final AltarOfTheWretched card) {
@@ -84,3 +102,124 @@ class AltarOfTheWretchedEffect extends OneShotEffect {
         return new AltarOfTheWretchedEffect(this);
     }
 }
+
+
+enum WretchedBonemassDynamicValue implements DynamicValue {
+    instance;
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        int totalPower = 0;
+        Permanent permanent = sourceAbility.getSourcePermanentIfItStillExists(game);
+        if (permanent == null) {
+            return 0;
+        }
+        ExileZone exileZone = game
+                .getExile()
+                .getExileZone(CardUtil.getExileZoneId(
+                        game, permanent.getMainCard().getId(), permanent.getZoneChangeCounter(game) - 1
+                ));
+        if (exileZone == null) {
+            return 0;
+        }
+        for (Card card : exileZone.getCards(game)) {
+            totalPower += card.getPower().getValue();
+        }
+        return totalPower;
+    }
+
+    @Override
+    public WretchedBonemassDynamicValue copy() {
+        return this;
+    }
+
+    @Override
+    public String getMessage() {
+        return "total power of the exiled cards used to craft it";
+    }
+
+    @Override
+    public String toString() {
+        return "0";
+    }
+}
+
+class WretchedBonemassGainAbilityEffect extends ContinuousEffectImpl {
+
+    WretchedBonemassGainAbilityEffect() {
+        super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
+        staticText = "{this} has flying as long as an exiled card used to craft it has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, protection, reach, trample, and vigilance.";
+    }
+
+    private WretchedBonemassGainAbilityEffect(final WretchedBonemassGainAbilityEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public WretchedBonemassGainAbilityEffect copy() {
+        return new WretchedBonemassGainAbilityEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent wretchedBonemass = source.getSourcePermanentIfItStillExists(game);
+        if (wretchedBonemass != null) {
+            ExileZone exileZone = game
+                    .getExile()
+                    .getExileZone(CardUtil.getExileZoneId(
+                            game, wretchedBonemass.getMainCard().getId(), wretchedBonemass.getZoneChangeCounter(game) - 1
+                    ));
+            if (exileZone != null
+                    && !exileZone.isEmpty()) {
+                Set<Card> cardsInExile = exileZone.getCards(game);
+                for (Card card : cardsInExile) {
+                    for (Ability a : card.getAbilities()) {
+                        if (a instanceof FlyingAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof FirstStrikeAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof DoubleStrikeAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof DeathtouchAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof HasteAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof HexproofAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof IndestructibleAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof LifelinkAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof MenaceAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof ProtectionAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof IndestructibleAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof ReachAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof TrampleAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                        if (a instanceof VigilanceAbility) {
+                            wretchedBonemass.addAbility(a, source.getSourceId(), game);
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+}

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

@@ -10,8 +10,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.CardsImpl;
 import mage.constants.*;
-import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.AnotherPredicate;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -23,12 +22,6 @@ import java.util.UUID;
  */
 public final class AmarethTheLustrous extends CardImpl {
 
-    private static final FilterPermanent filter = new FilterPermanent("another permanent");
-
-    static {
-        filter.add(AnotherPredicate.instance);
-    }
-
     public AmarethTheLustrous(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{W}{U}");
 
@@ -41,7 +34,9 @@ public final class AmarethTheLustrous extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Whenever another permanent you control enters, look at the top card of your library. If it shares a card type with that permanent, you may reveal that card and put it into your hand.
-        this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new AmarethTheLustrousEffect(), filter));
+        this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
+                new AmarethTheLustrousEffect(), StaticFilters.FILTER_ANOTHER_PERMANENT
+        ));
     }
 
     private AmarethTheLustrous(final AmarethTheLustrous card) {

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

@@ -1,6 +1,5 @@
 package mage.cards.a;
 
-import mage.MageInt;
 import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.condition.common.CovenCondition;
@@ -8,9 +7,9 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.TransformSourceEffect;
 import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
 import mage.abilities.hint.common.CovenHint;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
+import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.constants.SubType;
@@ -22,27 +21,31 @@ import java.util.UUID;
 /**
  * @author TheElk801
  */
-public final class AmbitiousFarmhand extends CardImpl {
+public final class AmbitiousFarmhand extends TransformingDoubleFacedCard {
 
     public AmbitiousFarmhand(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.PEASANT}, "{1}{W}",
+                "Seasoned Cathar",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.KNIGHT}, "W");
 
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.PEASANT);
-        this.power = new MageInt(1);
-        this.toughness = new MageInt(1);
-        this.secondSideCardClazz = mage.cards.s.SeasonedCathar.class;
+        // Ambitious Farmhand
+        this.getLeftHalfCard().setPT(1, 1);
 
         // When Ambitious Farmhand enters the battlefield, you may search your library for a basic Plains card, reveal it, put it into your hand, then shuffle.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(
+        this.getLeftHalfCard().addAbility(new EntersBattlefieldTriggeredAbility(
                 new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_PLAINS), true), true
         ));
 
         // Coven—{1}{W}{W}: Transform Ambitious Farmhand. Activate only if you control three or more creatures with different powers.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new ActivateIfConditionActivatedAbility(
+        this.getLeftHalfCard().addAbility(new ActivateIfConditionActivatedAbility(
                 new TransformSourceEffect(), new ManaCostsImpl<>("{1}{W}{W}"), CovenCondition.instance
         ).setAbilityWord(AbilityWord.COVEN).addHint(CovenHint.instance));
+
+        // Seasoned Cathar
+        this.getRightHalfCard().setPT(3, 3);
+
+        // Lifelink
+        this.getRightHalfCard().addAbility(LifelinkAbility.getInstance());
     }
 
     private AmbitiousFarmhand(final AmbitiousFarmhand card) {

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

@@ -1,18 +1,22 @@
 package mage.cards.a;
 
-import mage.MageInt;
+import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.common.ActivateAsSorceryActivatedAbility;
+import mage.abilities.common.AttacksTriggeredAbility;
 import mage.abilities.common.DiesCreatureTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.SacrificeTargetCost;
+import mage.abilities.dynamicvalue.common.CountersSourceCount;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.effects.common.TransformSourceEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
+import mage.abilities.keyword.LifelinkAbility;
+import mage.abilities.keyword.MenaceAbility;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.*;
 import mage.counters.CounterType;
 import mage.filter.StaticFilters;
@@ -20,38 +24,45 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
-import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.Iterator;
 import java.util.UUID;
 
 /**
  * @author Styxo
  */
-public final class AnakinSkywalker extends CardImpl {
+public final class AnakinSkywalker extends TransformingDoubleFacedCard {
 
     public AnakinSkywalker(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{B}{R}");
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.SITH);
-        this.power = new MageInt(4);
-        this.toughness = new MageInt(4);
-
-        this.secondSideCardClazz = mage.cards.d.DarthVader.class;
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.SITH},  "{3}{U}{B}{R}",
+                "Darth Vader",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.SITH}, "B");
+        this.getLeftHalfCard().setPT(4, 4);
+        this.getRightHalfCard().setPT(4, 4);
 
         // Whenever another creature dies, put a +1/+1 counter on Anakin Skywalker.
-        this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, true));
+        this.getLeftHalfCard().addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, true));
 
         // Sacrifice another creature: Target creature gets -1/-1 until end of turn. Activate this ability only as a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn),
                 new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE));
         ability.addTarget(new TargetCreaturePermanent());
-        this.addAbility(ability);
+        this.getLeftHalfCard().addAbility(ability);
 
         // If Anakin Skywalker would be destroyed, regenerate, then transform him instead.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new SimpleStaticAbility(new AnakinSkywalkerEffect()));
+        this.getLeftHalfCard().addAbility(new SimpleStaticAbility(new AnakinSkywalkerEffect()));
+
+        // Darth Vader
+        // Menace
+        this.getRightHalfCard().addAbility(new MenaceAbility());
+
+        // Lifelink
+        this.getRightHalfCard().addAbility(LifelinkAbility.getInstance());
+
+        // Whenever Darth Vader attacks, creatures defending player controls get -1/-1 until end of turn for each +1/+1 counter on Darth Vader.
+        this.getRightHalfCard().addAbility(new AttacksTriggeredAbility(new UnboostCreaturesDefendingPlayerEffect(), false, null, SetTargetPointer.PLAYER));
 
     }
 
@@ -101,3 +112,47 @@ class AnakinSkywalkerEffect extends ReplacementEffectImpl {
         return new AnakinSkywalkerEffect(this);
     }
 }
+
+
+class UnboostCreaturesDefendingPlayerEffect extends ContinuousEffectImpl {
+
+    UnboostCreaturesDefendingPlayerEffect() {
+        super(Duration.EndOfTurn, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.UnboostCreature);
+        staticText = "creatures defending player controls get -1/-1 until end of turn for each +1/+1 counter on Darth Vader";
+    }
+
+    private UnboostCreaturesDefendingPlayerEffect(final UnboostCreaturesDefendingPlayerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public UnboostCreaturesDefendingPlayerEffect copy() {
+        return new UnboostCreaturesDefendingPlayerEffect(this);
+    }
+
+    @Override
+    public void init(Ability source, Game game) {
+        super.init(source, game);
+        if (getAffectedObjectsSet()) {
+            for (Permanent creature : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, getTargetPointer().getFirst(game, source), game)) {
+                affectedObjectList.add(new MageObjectReference(creature, game));
+            }
+        }
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        for (Iterator<MageObjectReference> it = affectedObjectList.iterator(); it.hasNext(); ) {
+            Permanent permanent = it.next().getPermanent(game);
+            if (permanent != null) {
+                int unboostCount = -1 * new CountersSourceCount(CounterType.P1P1).calculate(game, source, this);
+                permanent.addPower(unboostCount);
+                permanent.addToughness(unboostCount);
+            } else {
+                it.remove();
+            }
+        }
+        return true;
+    }
+}
+

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

@@ -1,52 +0,0 @@
-package mage.cards.a;
-
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.common.AttachEffect;
-import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
-import mage.abilities.keyword.DisturbAbility;
-import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.LifelinkAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.*;
-import mage.target.TargetPermanent;
-import mage.target.common.TargetCreaturePermanent;
-
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class AncestorsEmbrace extends CardImpl {
-
-    public AncestorsEmbrace(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "");
-
-        this.subtype.add(SubType.AURA);
-        this.color.setWhite(true);
-        this.nightCard = true;
-
-        // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent();
-        this.getSpellAbility().addTarget(auraTarget);
-        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
-        this.addAbility(new EnchantAbility(auraTarget));
-
-        // Enchanted creature has lifelink.
-        this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(
-                LifelinkAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield
-        )));
-
-        // If Ancestor's Embrace would be put into a graveyard from anywhere, exile it instead.
-        this.addAbility(DisturbAbility.makeBackAbility());
-    }
-
-    private AncestorsEmbrace(final AncestorsEmbrace card) {
-        super(card);
-    }
-
-    @Override
-    public AncestorsEmbrace copy() {
-        return new AncestorsEmbrace(this);
-    }
-}

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

@@ -1,42 +0,0 @@
-
-package mage.cards.a;
-
-import java.util.UUID;
-import mage.MageInt;
-import mage.abilities.keyword.HexproofAbility;
-import mage.abilities.keyword.TrampleAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-
-/**
- *
- * @author LevelX2
- */
-public final class AncientOfTheEquinox extends CardImpl {
-
-    public AncientOfTheEquinox(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"");
-        this.subtype.add(SubType.TREEFOLK);
-        this.power = new MageInt(4);
-        this.toughness = new MageInt(4);
-        this.color.setGreen(true);
-
-        this.nightCard = true;
-
-        // Trample
-        this.addAbility(TrampleAbility.getInstance());
-        // Hexproof
-        this.addAbility(HexproofAbility.getInstance());
-    }
-
-    private AncientOfTheEquinox(final AncientOfTheEquinox card) {
-        super(card);
-    }
-
-    @Override
-    public AncientOfTheEquinox copy() {
-        return new AncientOfTheEquinox(this);
-    }
-}

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

@@ -1,59 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.common.AttacksTriggeredAbility;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.dynamicvalue.common.ControllerLifeCount;
-import mage.abilities.effects.common.GainLifeEffect;
-import mage.abilities.effects.common.continuous.GainAbilityControllerEffect;
-import mage.abilities.effects.common.continuous.SetBasePowerToughnessSourceEffect;
-import mage.abilities.keyword.FlyingAbility;
-import mage.abilities.keyword.HexproofAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.constants.Zone;
-
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class AngelicEnforcer extends CardImpl {
-
-    public AngelicEnforcer(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
-
-        this.subtype.add(SubType.ANGEL);
-        this.power = new MageInt(0);
-        this.toughness = new MageInt(0);
-        this.color.setWhite(true);
-        this.nightCard = true;
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-
-        // You have hexproof.
-        this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance())));
-
-        // Angelic Enforcer's power and toughness are each equal to your life total.
-        this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(
-                ControllerLifeCount.instance
-        ).setText("{this}'s power and toughness are each equal to your life total")));
-
-        // Whenever Angelic Enforcer attacks, double your life total.
-        this.addAbility(new AttacksTriggeredAbility(new GainLifeEffect(
-                ControllerLifeCount.instance
-        ).setText("double your life total")));
-    }
-
-    private AngelicEnforcer(final AngelicEnforcer card) {
-        super(card);
-    }
-
-    @Override
-    public AngelicEnforcer copy() {
-        return new AngelicEnforcer(this);
-    }
-}

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

@@ -1,92 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.Ability;
-import mage.abilities.common.AttacksTriggeredAbility;
-import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount;
-import mage.abilities.dynamicvalue.common.StaticValue;
-import mage.abilities.effects.common.continuous.BoostSourceEffect;
-import mage.abilities.hint.Hint;
-import mage.abilities.keyword.MenaceAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.SubType;
-import mage.filter.FilterCard;
-import mage.filter.StaticFilters;
-import mage.filter.common.FilterCreatureCard;
-import mage.filter.predicate.card.DefendingPlayerOwnsCardPredicate;
-import mage.game.Game;
-
-import java.util.Objects;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-/**
- * @author TheElk801
- */
-public final class AnimusOfNightsReach extends CardImpl {
-
-    private static final FilterCard filter
-            = new FilterCreatureCard("creature cards in defending player's graveyard");
-
-    static {
-        filter.add(DefendingPlayerOwnsCardPredicate.instance);
-    }
-
-    private static final DynamicValue xValue = new CardsInAllGraveyardsCount(filter);
-
-    public AnimusOfNightsReach(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "");
-
-        this.subtype.add(SubType.SPIRIT);
-        this.power = new MageInt(0);
-        this.toughness = new MageInt(4);
-        this.color.setBlack(true);
-        this.nightCard = true;
-
-        // Menace
-        this.addAbility(new MenaceAbility());
-
-        // Whenever Animus of Night's Reach attacks, it gets +X/+0 until end of turn, where X is the number of creature cards in defending player's graveyard.
-        this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(
-                xValue, StaticValue.get(0), Duration.EndOfTurn
-        ).setText("it gets +X/+0 until end of turn, where X is the number of creature cards in defending player's graveyard")).addHint(AnimusOfNightsReachHint.instance));
-    }
-
-    private AnimusOfNightsReach(final AnimusOfNightsReach card) {
-        super(card);
-    }
-
-    @Override
-    public AnimusOfNightsReach copy() {
-        return new AnimusOfNightsReach(this);
-    }
-}
-
-enum AnimusOfNightsReachHint implements Hint {
-    instance;
-
-    @Override
-    public String getText(Game game, Ability ability) {
-        return "Cards in each opponent's graveyard:<br>"
-                + game
-                .getOpponents(ability.getControllerId())
-                .stream()
-                .map(game::getPlayer)
-                .filter(Objects::nonNull)
-                .map(player -> player
-                        .getName()
-                        + ": " + player
-                        .getGraveyard()
-                        .count(StaticFilters.FILTER_CARD_CREATURE, game))
-                .collect(Collectors.joining("<br>"));
-    }
-
-    @Override
-    public AnimusOfNightsReachHint copy() {
-        return instance;
-    }
-}

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

@@ -2,17 +2,15 @@ package mage.cards.a;
 
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.OneShotNonTargetEffect;
+import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.cards.Cards;
-import mage.cards.CardsImpl;
 import mage.constants.CardType;
 import mage.constants.Outcome;
-import mage.constants.Zone;
 import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.players.Player;
-import mage.target.TargetCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
 import java.util.UUID;
@@ -26,7 +24,9 @@ public final class AnotherChance extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}");
 
         // You may mill two cards. Then return up to two creature cards from your graveyard to your hand.
-        this.getSpellAbility().addEffect(new AnotherChanceEffect());
+        this.getSpellAbility().addEffect(new AnotherChanceMillEffect());
+        this.getSpellAbility().addEffect(new OneShotNonTargetEffect(new ReturnFromGraveyardToHandTargetEffect().setText("Then return up to two creature cards from your graveyard to your hand."),
+                new TargetCardInYourGraveyard(0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD, true)).withTargetDescription("up to two creature cards"));
     }
 
     private AnotherChance(final AnotherChance card) {
@@ -39,23 +39,20 @@ public final class AnotherChance extends CardImpl {
     }
 }
 
-/**
- * Inspired by {@link mage.cards.u.UnsealTheNecropolis}
- */
-class AnotherChanceEffect extends OneShotEffect {
+class AnotherChanceMillEffect extends OneShotEffect {
 
-    AnotherChanceEffect() {
+    AnotherChanceMillEffect() {
         super(Outcome.Benefit);
-        staticText = "You may mill two cards. Then return up to two creature cards from your graveyard to your hand";
+        staticText = "You may mill two cards.";
     }
 
-    private AnotherChanceEffect(final AnotherChanceEffect effect) {
+    private AnotherChanceMillEffect(final AnotherChanceMillEffect effect) {
         super(effect);
     }
 
     @Override
-    public AnotherChanceEffect copy() {
-        return new AnotherChanceEffect(this);
+    public AnotherChanceMillEffect copy() {
+        return new AnotherChanceMillEffect(this);
     }
 
     @Override
@@ -68,18 +65,6 @@ class AnotherChanceEffect extends OneShotEffect {
         if (player.chooseUse(outcome, "Mill two cards?", source, game)) {
             player.millCards(2, source, game);
         }
-
-        // Make sure the mill has been processed.
-        game.processAction();
-
-        TargetCard target = new TargetCardInYourGraveyard(
-                0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD, true
-        );
-        player.choose(outcome, target, source, game);
-        Cards cards = new CardsImpl(target.getTargets());
-        if (!cards.isEmpty()) {
-            player.moveCards(cards, Zone.HAND, source, game);
-        }
         return true;
     }
 }

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

@@ -1,241 +0,0 @@
-package mage.cards.a;
-
-import mage.MageObject;
-import mage.abilities.Ability;
-import mage.abilities.common.AsEntersBattlefieldAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.effects.OneShotEffect;
-import mage.cards.Card;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.choices.Choice;
-import mage.choices.ChoiceCardType;
-import mage.constants.*;
-import mage.game.ExileZone;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-import mage.players.Player;
-import mage.util.CardUtil;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import mage.abilities.SpellAbility;
-import mage.abilities.effects.common.cost.CostModificationEffectImpl;
-
-/**
- * @author jeffwadsworth
- */
-public class ApexObservatory extends CardImpl {
-
-    public ApexObservatory(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, null);
-
-        this.nightCard = true;
-
-        // Apex Observatory enters the battlefield tapped.
-        this.addAbility(new EntersBattlefieldTappedAbility());
-
-        // As it enters, choose a card type shared among two exiled cards used to craft it.
-        this.addAbility(new AsEntersBattlefieldAbility(new ChooseCardTypeEffect()));
-
-        // The next spell you cast this turn of the chosen type can be cast without paying its mana cost.
-        this.addAbility(new SimpleActivatedAbility(new ApexObservatoryEffect(), new TapSourceCost()));
-    }
-
-    private ApexObservatory(final ApexObservatory card) {
-        super(card);
-    }
-
-    @Override
-    public ApexObservatory copy() {
-        return new ApexObservatory(this);
-    }
-}
-
-class ChooseCardTypeEffect extends OneShotEffect {
-
-    public ChooseCardTypeEffect() {
-        super(Outcome.Neutral);
-        staticText = "choose a card type shared among two exiled cards used to craft it.";
-    }
-
-    protected ChooseCardTypeEffect(final ChooseCardTypeEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Player controller = game.getPlayer(source.getControllerId());
-        MageObject mageObject = game.getPermanentEntering(source.getSourceId());
-        List<CardType> exiledCardsCardType = new ArrayList<>();
-        if (mageObject == null) {
-            mageObject = game.getObject(source);
-        }
-        if (controller != null && mageObject != null) {
-            Permanent permanent = source.getSourcePermanentIfItStillExists(game);
-            if (permanent == null) {
-                return false;
-            }
-            // chase the exile zone down...
-            ExileZone exileZone = game.getState().getExile().getExileZone(CardUtil.getExileZoneId(game, source, game.getState().getZoneChangeCounter(mageObject.getId()) - 1));
-            if (exileZone == null) {
-                return false;
-            }
-            for (Card card : exileZone.getCards(game)) {
-                exiledCardsCardType.addAll(card.getCardType(game));
-            }
-            Choice cardTypeChoice = new ChoiceCardType();
-            cardTypeChoice.getChoices().clear();
-            cardTypeChoice.getChoices().addAll(exiledCardsCardType.stream().map(CardType::toString).collect(Collectors.toList()));
-            // find only card types that each card shares; some cards have more than 1 card type
-            Map<String, Integer> cardTypeCounts = new HashMap<>();
-            for (String cardType : cardTypeChoice.getChoices()) {
-                cardTypeCounts.put(cardType, 0);
-            }
-
-            for (Card c : exileZone.getCards(game)) {
-                for (CardType cardType : c.getCardType(game)) {
-                    if (cardTypeCounts.containsKey(cardType.toString())) {
-                        cardTypeCounts.put(cardType.toString(), cardTypeCounts.get(cardType.toString()) + 1);
-                    }
-                }
-            }
-
-            List<String> sharedCardTypes = new ArrayList<>();
-            int numExiledCards = exileZone.getCards(game).size();
-            for (Map.Entry<String, Integer> entry : cardTypeCounts.entrySet()) {
-                if (entry.getValue() == numExiledCards) {
-                    sharedCardTypes.add(entry.getKey());
-                }
-            }
-            // handle situations like the double-faced instant/land Jwari Disruption // Jwari Ruins
-            if (sharedCardTypes.isEmpty()) {
-                game.informPlayers(mageObject.getIdName() + " No exiled cards shared a type in exile, so nothing is done.");
-                if (mageObject instanceof Permanent) {
-                    ((Permanent) mageObject).addInfo("chosen type", CardUtil.addToolTipMarkTags("No exiled cards have the same card type."), game);
-                }
-                return false;
-            }
-            cardTypeChoice.getChoices().retainAll(sharedCardTypes);
-            if (controller.choose(Outcome.Benefit, cardTypeChoice, game)) {
-                if (!game.isSimulation()) {
-                    game.informPlayers(mageObject.getName() + ": " + controller.getLogName() + " has chosen " + cardTypeChoice.getChoice());
-                }
-                game.getState().setValue("ApexObservatoryType_" + source.getSourceId().toString(), cardTypeChoice.getChoice());
-                if (mageObject instanceof Permanent) {
-                    ((Permanent) mageObject).addInfo("chosen type", CardUtil.addToolTipMarkTags("Chosen card type: " + cardTypeChoice.getChoice()), game);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public ChooseCardTypeEffect copy() {
-        return new ChooseCardTypeEffect(this);
-    }
-}
-
-class ApexObservatoryEffect extends OneShotEffect {
-
-    ApexObservatoryEffect() {
-        super(Outcome.Benefit);
-        staticText = "The next spell you cast this turn of the chosen type can be cast without paying its mana cost.";
-    }
-
-    private ApexObservatoryEffect(final ApexObservatoryEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public ApexObservatoryEffect copy() {
-        return new ApexObservatoryEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        String chosenCardType = (String) game.getState().getValue("ApexObservatoryType_" + source.getSourceId().toString());
-        if (chosenCardType == null) {
-            return false;
-        }
-        game.addEffect(new ApexObservatoryCastWithoutManaEffect(chosenCardType, source.getControllerId()), source);
-        return true;
-    }
-}
-
-class ApexObservatoryCastWithoutManaEffect extends CostModificationEffectImpl {
-
-    private final String chosenCardType;
-    private final UUID playerId;
-    private boolean used = false;
-
-    ApexObservatoryCastWithoutManaEffect(String chosenCardType, UUID playerId) {
-        super(Duration.EndOfTurn, Outcome.Benefit, CostModificationType.SET_COST);
-        this.chosenCardType = chosenCardType;
-        this.playerId = playerId;
-        staticText = "The next spell you cast this turn of the chosen type can be cast without paying its mana cost";
-    }
-
-    private ApexObservatoryCastWithoutManaEffect(final ApexObservatoryCastWithoutManaEffect effect) {
-        super(effect);
-        this.chosenCardType = effect.chosenCardType;
-        this.playerId = effect.playerId;
-        this.used = effect.used;
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source, Ability abilityToModify) {
-        // Ask the player if they want to use the effect
-        Player controller = game.getPlayer(playerId);
-        if (controller != null) {
-            MageObject spell = abilityToModify.getSourceObject(game);
-            if (spell != null && !game.isSimulation()) {
-                String message = "Cast " + spell.getIdName() + " without paying its mana cost?";
-                if (controller.chooseUse(Outcome.Benefit, message, source, game)) {
-                    // Set the cost to zero
-                    abilityToModify.getManaCostsToPay().clear();
-                    // Mark as used
-                    used = true;
-                    game.informPlayers(controller.getLogName() + " casts " + spell.getIdName() + " without paying its mana cost.");
-                    return true;
-                } else {
-                    // Player chose not to use the effect
-                    return false;
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public ApexObservatoryCastWithoutManaEffect copy() {
-        return new ApexObservatoryCastWithoutManaEffect(this);
-    }
-
-    @Override
-    public boolean isInactive(Ability source, Game game) {
-        return used || super.isInactive(source, game);
-    }
-
-    @Override
-    public boolean applies(Ability ability, Ability source, Game game) {
-        if (used) {
-            return false;
-        }
-        if (!ability.isControlledBy(playerId)) {
-            return false;
-        }
-        if (!(ability instanceof SpellAbility)) {
-            return false;
-        }
-        MageObject object = game.getObject(ability.getSourceId());
-        if (object != null && object.getCardType(game).stream()
-                .anyMatch(cardType -> cardType.toString().equals(chosenCardType))) {
-            return true;
-        }
-        return false;
-    }
-}

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

@@ -0,0 +1,66 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.effects.keyword.AirbendTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+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.filter.FilterPermanent;
+import mage.filter.common.FilterNonlandPermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AppaLoyalSkyBison extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterNonlandPermanent("another target nonland permanent you control");
+
+    static {
+        filter.add(AnotherPredicate.instance);
+        filter.add(TargetController.YOU.getControllerPredicate());
+    }
+
+    public AppaLoyalSkyBison(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{W}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.BISON);
+        this.subtype.add(SubType.ALLY);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Whenever Appa enters or attacks, choose one --
+        // * Target creature you control gains flying until end of turn.
+        Ability ability = new EntersBattlefieldOrAttacksSourceTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance()));
+        ability.addTarget(new TargetControlledCreaturePermanent());
+
+        // * Airbend another target nonland permanent you control.
+        ability.addMode(new Mode(new AirbendTargetEffect()).addTarget(new TargetPermanent(filter)));
+        this.addAbility(ability);
+    }
+
+    private AppaLoyalSkyBison(final AppaLoyalSkyBison card) {
+        super(card);
+    }
+
+    @Override
+    public AppaLoyalSkyBison copy() {
+        return new AppaLoyalSkyBison(this);
+    }
+}

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

@@ -0,0 +1,68 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldThisOrAnotherTriggeredAbility;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.filter.FilterPermanent;
+import mage.filter.StaticFilters;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AppaTheVigilant extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent(SubType.ALLY, "Ally");
+
+    public AppaTheVigilant(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.BISON);
+        this.subtype.add(SubType.ALLY);
+        this.power = new MageInt(6);
+        this.toughness = new MageInt(6);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Vigilance
+        this.addAbility(VigilanceAbility.getInstance());
+
+        // Whenever Appa or another Ally you control enters, creatures you control get +1/+1 and gain flying and vigilance until end of turn.
+        Ability ability = new EntersBattlefieldThisOrAnotherTriggeredAbility(
+                new BoostControlledEffect(1, 1, Duration.EndOfTurn)
+                        .setText("creatures you control get +1/+1"),
+                filter, false, true
+        );
+        ability.addEffect(new GainAbilityControlledEffect(
+                FlyingAbility.getInstance(), Duration.EndOfTurn,
+                StaticFilters.FILTER_PERMANENT_CREATURE
+        ).setText("and gain flying"));
+        ability.addEffect(new GainAbilityControlledEffect(
+                VigilanceAbility.getInstance(), Duration.EndOfTurn,
+                StaticFilters.FILTER_PERMANENT_CREATURE
+        ).setText("and vigilance until end of turn"));
+        this.addAbility(ability);
+    }
+
+    private AppaTheVigilant(final AppaTheVigilant card) {
+        super(card);
+    }
+
+    @Override
+    public AppaTheVigilant copy() {
+        return new AppaTheVigilant(this);
+    }
+}

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

@@ -0,0 +1,132 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.hint.Hint;
+import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.constants.WatcherScope;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.stack.Spell;
+import mage.watchers.Watcher;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author TheElk801
+ */
+public final class AprilONeilHacktivist extends CardImpl {
+
+    public AprilONeilHacktivist(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.SCIENTIST);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(5);
+
+        // At the beginning of your end step, draw a card for each card type among spells you've cast this turn.
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(
+                new DrawCardSourceControllerEffect(AprilONeilHacktivistValue.instance)
+        ).addHint(AprilONeilHacktivistHint.instance), new AprilONeilHacktivistWatcher());
+    }
+
+    private AprilONeilHacktivist(final AprilONeilHacktivist card) {
+        super(card);
+    }
+
+    @Override
+    public AprilONeilHacktivist copy() {
+        return new AprilONeilHacktivist(this);
+    }
+}
+
+enum AprilONeilHacktivistValue implements DynamicValue {
+    instance;
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        return AprilONeilHacktivistWatcher.getCardTypesCast(sourceAbility.getControllerId(), game).size();
+    }
+
+    @Override
+    public AprilONeilHacktivistValue copy() {
+        return this;
+    }
+
+    @Override
+    public String getMessage() {
+        return "card type among spells you've cast this turn";
+    }
+
+    @Override
+    public String toString() {
+        return "1";
+    }
+}
+
+enum AprilONeilHacktivistHint implements Hint {
+    instance;
+
+
+    @Override
+    public String getText(Game game, Ability ability) {
+        List<String> types = AprilONeilHacktivistWatcher
+                .getCardTypesCast(ability.getControllerId(), game)
+                .stream()
+                .map(CardType::toString)
+                .sorted()
+                .collect(Collectors.toList());
+        return "Card types among spells you've cast this turn: " + types.size()
+                + (types.size() > 0 ? " (" + String.join(", ", types) + ')' : "");
+    }
+
+    @Override
+    public Hint copy() {
+        return this;
+    }
+}
+
+class AprilONeilHacktivistWatcher extends Watcher {
+
+    private final Map<UUID, Set<CardType>> map = new HashMap<>();
+
+    AprilONeilHacktivistWatcher() {
+        super(WatcherScope.GAME);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() != GameEvent.EventType.SPELL_CAST) {
+            return;
+        }
+        Spell spell = game.getSpell(event.getTargetId());
+        if (spell != null) {
+            map.computeIfAbsent(spell.getControllerId(), x -> new HashSet<>()).addAll(spell.getCardType(game));
+        }
+    }
+
+    @Override
+    public void reset() {
+        map.clear();
+        super.reset();
+    }
+
+    static Set<CardType> getCardTypesCast(UUID playerId, Game game) {
+        return game
+                .getState()
+                .getWatcher(AprilONeilHacktivistWatcher.class)
+                .map
+                .getOrDefault(playerId, Collections.emptySet());
+    }
+}

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

@@ -1,21 +1,15 @@
 package mage.cards.a;
 
-import mage.abilities.Ability;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DamageTargetAndTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Outcome;
 import mage.filter.common.FilterAnyTarget;
 import mage.filter.common.FilterPermanentOrPlayer;
 import mage.filter.predicate.other.AnotherTargetPredicate;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-import mage.players.Player;
-import mage.target.Target;
+import mage.target.common.TargetAnyTarget;
 import mage.target.common.TargetPermanentOrPlayer;
 
-import java.io.ObjectStreamException;
 import java.util.UUID;
 
 /**
@@ -23,8 +17,7 @@ import java.util.UUID;
  */
 public final class ArcTrail extends CardImpl {
 
-    private static final FilterPermanentOrPlayer filter1 = new FilterAnyTarget("creature, player or planeswalker to deal 2 damage");
-    private static final FilterPermanentOrPlayer filter2 = new FilterAnyTarget("another creature, player or planeswalker to deal 1 damage");
+    private static final FilterPermanentOrPlayer filter2 = new FilterAnyTarget("another target");
 
     static {
         filter2.getPermanentFilter().add(new AnotherTargetPredicate(2));
@@ -34,10 +27,12 @@ public final class ArcTrail extends CardImpl {
     public ArcTrail(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}");
 
-        // Arc Trail deals 2 damage to any target and 1 damage to another any target
-        this.getSpellAbility().addEffect(ArcTrailEffect.getInstance());
-        this.getSpellAbility().addTarget(new TargetPermanentOrPlayer(filter1).setTargetTag(1));
-        this.getSpellAbility().addTarget(new TargetPermanentOrPlayer(filter2).setTargetTag(2));
+        // Arc Trail deals 2 damage to any target and 1 damage to another target
+        this.getSpellAbility().addEffect(new DamageTargetAndTargetEffect(2, 1));
+        this.getSpellAbility().addTarget(new TargetAnyTarget()
+                .withChooseHint("to deal 2 damage").setTargetTag(1));
+        this.getSpellAbility().addTarget(new TargetPermanentOrPlayer(filter2)
+                .withChooseHint("to deal 1 damage").setTargetTag(2));
     }
 
     private ArcTrail(final ArcTrail card) {
@@ -50,54 +45,3 @@ public final class ArcTrail extends CardImpl {
     }
 
 }
-
-class ArcTrailEffect extends OneShotEffect {
-
-    private static final ArcTrailEffect instance = new ArcTrailEffect();
-
-    private Object readResolve() throws ObjectStreamException {
-        return instance;
-    }
-
-    public static ArcTrailEffect getInstance() {
-        return instance;
-    }
-
-    private ArcTrailEffect() {
-        super(Outcome.Damage);
-        staticText = "{this} deals 2 damage to any target and 1 damage to another target";
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-
-        boolean applied = false;
-        boolean twoDamageDone = false;
-        int damage = 2;
-
-        for (Target target : source.getTargets()) {
-            Permanent permanent = game.getPermanent(target.getFirstTarget());
-
-            if (twoDamageDone) {
-                damage = 1;
-            }
-
-            if (permanent != null) {
-                applied |= (permanent.damage(damage, source.getSourceId(), source, game, false, true) > 0);
-            }
-            Player player = game.getPlayer(target.getFirstTarget());
-            if (player != null) {
-                applied |= (player.damage(damage, source.getSourceId(), source, game) > 0);
-            }
-
-            twoDamageDone = true;
-        }
-        return applied;
-    }
-
-    @Override
-    public ArcTrailEffect copy() {
-        return instance;
-    }
-
-}

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

@@ -1,112 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.common.SpellCastControllerTriggeredAbility;
-import mage.abilities.dynamicvalue.common.SavedDamageValue;
-import mage.abilities.effects.common.TransformSourceEffect;
-import mage.abilities.effects.common.counter.AddCountersSourceEffect;
-import mage.abilities.keyword.LivingMetalAbility;
-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.game.Controllable;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.stack.Spell;
-import mage.target.Target;
-
-import java.util.Collection;
-import java.util.Objects;
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class ArceeAcrobaticCoupe extends CardImpl {
-
-    public ArceeAcrobaticCoupe(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "");
-
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.VEHICLE);
-        this.power = new MageInt(2);
-        this.toughness = new MageInt(2);
-        this.color.setRed(true);
-        this.color.setWhite(true);
-        this.nightCard = true;
-
-        // Living metal
-        this.addAbility(new LivingMetalAbility());
-
-        // Whenever you cast a spell that targets one or more creatures or Vehicles you control, put that many +1/+1 counters on Arcee. Convert Arcee.
-        this.addAbility(new ArceeAcrobaticCoupeTriggeredAbility());
-    }
-
-    private ArceeAcrobaticCoupe(final ArceeAcrobaticCoupe card) {
-        super(card);
-    }
-
-    @Override
-    public ArceeAcrobaticCoupe copy() {
-        return new ArceeAcrobaticCoupe(this);
-    }
-}
-
-class ArceeAcrobaticCoupeTriggeredAbility extends SpellCastControllerTriggeredAbility {
-
-    ArceeAcrobaticCoupeTriggeredAbility() {
-        super(new AddCountersSourceEffect(
-                CounterType.P1P1.createInstance(0),
-                SavedDamageValue.MANY, false
-        ), false);
-        this.addEffect(new TransformSourceEffect());
-    }
-
-    private ArceeAcrobaticCoupeTriggeredAbility(final ArceeAcrobaticCoupeTriggeredAbility ability) {
-        super(ability);
-    }
-
-    @Override
-    public ArceeAcrobaticCoupeTriggeredAbility copy() {
-        return new ArceeAcrobaticCoupeTriggeredAbility(this);
-    }
-
-    @Override
-    public boolean checkTrigger(GameEvent event, Game game) {
-        if (!super.checkTrigger(event, game)) {
-            return false;
-        }
-        Spell spell = game.getSpell(event.getTargetId());
-        if (spell == null) {
-            return false;
-        }
-        int targets = spell
-                .getStackAbility()
-                .getTargets()
-                .stream()
-                .map(Target::getTargets)
-                .flatMap(Collection::stream)
-                .map(game::getPermanent)
-                .filter(Objects::nonNull)
-                .filter(permanent -> permanent.isCreature(game)
-                        || permanent.hasSubtype(SubType.VEHICLE, game))
-                .map(Controllable::getControllerId)
-                .map(this::isControlledBy)
-                .mapToInt(x -> x ? 1 : 0)
-                .sum();
-        if (targets > 0) {
-            this.getEffects().setValue("damage", targets);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public String getRule() {
-        return "Whenever you cast a spell that targets one or more creatures or Vehicles " +
-                "you control, put that many +1/+1 counters on {this}. Convert {this}.";
-    }
-}

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

@@ -1,44 +1,54 @@
 package mage.cards.a;
 
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SpellCastControllerTriggeredAbility;
 import mage.abilities.costs.common.RemoveVariableCountersSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.dynamicvalue.common.GetXValue;
+import mage.abilities.dynamicvalue.common.SavedDamageValue;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.FirstStrikeAbility;
+import mage.abilities.keyword.LivingMetalAbility;
 import mage.abilities.keyword.MoreThanMeetsTheEyeAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.counters.CounterType;
+import mage.game.Controllable;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.stack.Spell;
+import mage.target.Target;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.Collection;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
  * @author TheElk801
  */
-public final class ArceeSharpshooter extends CardImpl {
+public final class ArceeSharpshooter extends TransformingDoubleFacedCard {
 
     public ArceeSharpshooter(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{R}{W}");
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, new SubType[]{SubType.ROBOT}, "{1}{R}{W}",
+                "Arcee, Acrobatic Coupe",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.ARTIFACT}, new SubType[]{SubType.VEHICLE}, "RW");
 
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.ROBOT);
-        this.power = new MageInt(2);
-        this.toughness = new MageInt(2);
-        this.secondSideCardClazz = mage.cards.a.ArceeAcrobaticCoupe.class;
+        this.getLeftHalfCard().setPT(2, 2);
+        this.getRightHalfCard().setPT(2, 2);
 
         // More Than Meets the Eye {R}{W}
-        this.addAbility(new MoreThanMeetsTheEyeAbility(this, "{R}{W}"));
+        this.getLeftHalfCard().addAbility(new MoreThanMeetsTheEyeAbility(this, "{R}{W}"));
 
         // First strike
-        this.addAbility(FirstStrikeAbility.getInstance());
+        this.getLeftHalfCard().addAbility(FirstStrikeAbility.getInstance());
 
         // {1}, Remove one or more +1/+1 counters from Arcee: It deals that much damage to target creature. Convert Arcee.
         Ability ability = new SimpleActivatedAbility(
@@ -49,7 +59,14 @@ public final class ArceeSharpshooter extends CardImpl {
         ability.addCost(new RemoveVariableCountersSourceCost(CounterType.P1P1, 1));
         ability.addEffect(new TransformSourceEffect().setText("convert {this}"));
         ability.addTarget(new TargetCreaturePermanent());
-        this.addAbility(ability);
+        this.getLeftHalfCard().addAbility(ability);
+
+        // Arcee, Acrobatic Coupe
+        // Living metal
+        this.getRightHalfCard().addAbility(new LivingMetalAbility());
+
+        // Whenever you cast a spell that targets one or more creatures or Vehicles you control, put that many +1/+1 counters on Arcee. Convert Arcee.
+        this.getRightHalfCard().addAbility(new ArceeAcrobaticCoupeTriggeredAbility());
     }
 
     private ArceeSharpshooter(final ArceeSharpshooter card) {
@@ -61,3 +78,59 @@ public final class ArceeSharpshooter extends CardImpl {
         return new ArceeSharpshooter(this);
     }
 }
+
+class ArceeAcrobaticCoupeTriggeredAbility extends SpellCastControllerTriggeredAbility {
+
+    ArceeAcrobaticCoupeTriggeredAbility() {
+        super(new AddCountersSourceEffect(
+                CounterType.P1P1.createInstance(0),
+                SavedDamageValue.MANY, false
+        ), false);
+        this.addEffect(new TransformSourceEffect());
+    }
+
+    private ArceeAcrobaticCoupeTriggeredAbility(final ArceeAcrobaticCoupeTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public ArceeAcrobaticCoupeTriggeredAbility copy() {
+        return new ArceeAcrobaticCoupeTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (!super.checkTrigger(event, game)) {
+            return false;
+        }
+        Spell spell = game.getSpell(event.getTargetId());
+        if (spell == null) {
+            return false;
+        }
+        int targets = spell
+                .getStackAbility()
+                .getTargets()
+                .stream()
+                .map(Target::getTargets)
+                .flatMap(Collection::stream)
+                .map(game::getPermanent)
+                .filter(Objects::nonNull)
+                .filter(permanent -> permanent.isCreature(game)
+                        || permanent.hasSubtype(SubType.VEHICLE, game))
+                .map(Controllable::getControllerId)
+                .map(this::isControlledBy)
+                .mapToInt(x -> x ? 1 : 0)
+                .sum();
+        if (targets > 0) {
+            this.getEffects().setValue("damage", targets);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever you cast a spell that targets one or more creatures or Vehicles " +
+                "you control, put that many +1/+1 counters on {this}. Convert {this}.";
+    }
+}

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

@@ -1,66 +1,86 @@
 package mage.cards.a;
 
-import mage.MageInt;
+import mage.abilities.Ability;
 import mage.abilities.common.DiesCreatureTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.TransformIntoSourceTriggeredAbility;
 import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility;
 import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
+import mage.abilities.effects.common.DamageAllEffect;
+import mage.abilities.effects.common.DamagePlayersEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
 import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
-import mage.abilities.keyword.*;
-import mage.cards.CardImpl;
+import mage.abilities.keyword.FlashAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.IndestructibleAbility;
+import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.*;
+import mage.filter.FilterPermanent;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.AnotherPredicate;
 
 import java.util.UUID;
 
 /**
  * @author fireshoes
  */
-public final class ArchangelAvacyn extends CardImpl {
+public final class ArchangelAvacyn extends TransformingDoubleFacedCard {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a non-Angel creature you control");
+    private static final FilterCreaturePermanent nonAngelFilter = new FilterCreaturePermanent("a non-Angel creature you control");
+    private static final FilterPermanent otherCreatureFilter = new FilterCreaturePermanent("other creature");
 
     static {
-        filter.add(Predicates.not(SubType.ANGEL.getPredicate()));
-        filter.add(TargetController.YOU.getControllerPredicate());
+        otherCreatureFilter.add(AnotherPredicate.instance);
+        nonAngelFilter.add(Predicates.not(SubType.ANGEL.getPredicate()));
+        nonAngelFilter.add(TargetController.YOU.getControllerPredicate());
     }
 
     public ArchangelAvacyn(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.ANGEL}, "{3}{W}{W}",
+                "Avacyn, the Purifier",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.ANGEL}, "R");
 
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.ANGEL);
-        this.power = new MageInt(4);
-        this.toughness = new MageInt(4);
-
-        this.secondSideCardClazz = mage.cards.a.AvacynThePurifier.class;
+        this.getLeftHalfCard().setPT(4, 4);
+        this.getRightHalfCard().setPT(6, 5);
 
         // Flash
-        this.addAbility(FlashAbility.getInstance());
+        this.getLeftHalfCard().addAbility(FlashAbility.getInstance());
 
         // Flying
-        this.addAbility(FlyingAbility.getInstance());
+        this.getLeftHalfCard().addAbility(FlyingAbility.getInstance());
 
         // Vigilance
-        this.addAbility(VigilanceAbility.getInstance());
+        this.getLeftHalfCard().addAbility(VigilanceAbility.getInstance());
 
         // When Archangel Avacyn enters the battlefield, creatures you control gain indestructible until end of turn.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new GainAbilityControlledEffect(
+        this.getLeftHalfCard().addAbility(new EntersBattlefieldTriggeredAbility(new GainAbilityControlledEffect(
                 IndestructibleAbility.getInstance(), Duration.EndOfTurn,
                 StaticFilters.FILTER_PERMANENT_CREATURES
         ), false));
 
         // When a non-Angel creature you control dies, transform Archangel Avacyn at the beginning of the next upkeep.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new DiesCreatureTriggeredAbility(
+        this.getLeftHalfCard().addAbility(new DiesCreatureTriggeredAbility(
                 new CreateDelayedTriggeredAbilityEffect(
                         new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new TransformSourceEffect())
-                ).setText("transform {this} at the beginning of the next upkeep"), false, filter
+                ).setText("transform {this} at the beginning of the next upkeep"), false, nonAngelFilter
         ).setTriggerPhrase("When a non-Angel creature you control dies, "));
+
+        // Avacyn, the Purifier
+
+        // Flying
+        this.getRightHalfCard().addAbility(FlyingAbility.getInstance());
+
+        // When this creature transforms into Avacyn, the Purifier, it deals 3 damage to each other creature and each opponent.
+        Ability ability = new TransformIntoSourceTriggeredAbility(
+                new DamageAllEffect(3, "it", otherCreatureFilter)
+        );
+        ability.addEffect(new DamagePlayersEffect(3, TargetController.OPPONENT).setText("and each opponent"));
+        this.getRightHalfCard().addAbility(ability);
     }
 
     private ArchangelAvacyn(final ArchangelAvacyn card) {

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

@@ -1,54 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.costs.common.SacrificeTargetCost;
-import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.effects.common.DoIfCostPaid;
-import mage.abilities.effects.common.TapSourceEffect;
-import mage.abilities.keyword.FlyingAbility;
-import mage.abilities.keyword.TrampleAbility;
-import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.filter.common.FilterControlledPermanent;
-
-import java.util.UUID;
-
-/**
- * @author anonymous
- */
-public final class ArchdemonOfGreed extends CardImpl {
-
-    private static final FilterControlledPermanent filter = new FilterControlledPermanent(SubType.HUMAN, "Human");
-
-    public ArchdemonOfGreed(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
-        this.subtype.add(SubType.DEMON);
-        this.color.setBlack(true);
-
-        this.nightCard = true;
-
-        this.power = new MageInt(9);
-        this.toughness = new MageInt(9);
-
-        this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(TrampleAbility.getInstance());
-
-        // At the beginning of your upkeep, sacrifice a Human. If you can't, tap Archdemon of Greed and it deals 9 damage to you.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(
-                null, new TapSourceEffect(), new SacrificeTargetCost(filter), false
-        ).addOtherwiseEffect(new DamageControllerEffect(9))
-                .setText("sacrifice a Human. If you can't, tap {this} and it deals 9 damage to you")));
-    }
-
-    private ArchdemonOfGreed(final ArchdemonOfGreed card) {
-        super(card);
-    }
-
-    @Override
-    public ArchdemonOfGreed copy() {
-        return new ArchdemonOfGreed(this);
-    }
-}

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

@@ -1,45 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.common.AttacksOrBlocksTriggeredAbility;
-import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.VigilanceAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.game.permanent.token.SpiritToken;
-
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class ArchitectOfRestoration extends CardImpl {
-
-    public ArchitectOfRestoration(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "");
-
-        this.subtype.add(SubType.FOX);
-        this.subtype.add(SubType.MONK);
-        this.power = new MageInt(3);
-        this.toughness = new MageInt(4);
-        this.color.setWhite(true);
-        this.nightCard = true;
-
-        // Vigilance
-        this.addAbility(VigilanceAbility.getInstance());
-
-        // Whenever Architect of Restoration attacks or blocks, create a 1/1 colorless Spirit creature token.
-        this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateTokenEffect(new SpiritToken()), false));
-    }
-
-    private ArchitectOfRestoration(final ArchitectOfRestoration card) {
-        super(card);
-    }
-
-    @Override
-    public ArchitectOfRestoration copy() {
-        return new ArchitectOfRestoration(this);
-    }
-}

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

@@ -1,48 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.common.AttacksTriggeredAbility;
-import mage.abilities.effects.common.DrawDiscardControllerEffect;
-import mage.abilities.keyword.DisturbAbility;
-import mage.abilities.keyword.FlyingAbility;
-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 ArchiveHaunt extends CardImpl {
-
-    public ArchiveHaunt(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
-
-        this.subtype.add(SubType.SPIRIT);
-        this.subtype.add(SubType.WIZARD);
-        this.power = new MageInt(2);
-        this.toughness = new MageInt(1);
-        this.color.setBlue(true);
-        this.nightCard = true;
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-
-        // Whenever Archive Haunt attacks, draw a card, then discard a card.
-        this.addAbility(new AttacksTriggeredAbility(new DrawDiscardControllerEffect(1, 1)));
-
-        // If Archive Haunt would be put into a graveyard from anywhere, exile it instead.
-        this.addAbility(DisturbAbility.makeBackAbility());
-    }
-
-    private ArchiveHaunt(final ArchiveHaunt card) {
-        super(card);
-    }
-
-    @Override
-    public ArchiveHaunt copy() {
-        return new ArchiveHaunt(this);
-    }
-}

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

@@ -1,42 +1,56 @@
 package mage.cards.a;
 
 import mage.abilities.Ability;
-import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.FatefulHourCondition;
 import mage.abilities.costs.common.PayLifeCost;
+import mage.abilities.costs.common.SacrificeTargetCost;
+import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.dynamicvalue.common.SacrificeCostCreaturesToughness;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
+import mage.abilities.mana.BlackManaAbility;
+import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.SuperType;
-import mage.constants.Zone;
+import mage.filter.StaticFilters;
 
 import java.util.UUID;
 
 /**
  * @author TheElk801
  */
-public final class ArguelsBloodFast extends CardImpl {
+public final class ArguelsBloodFast extends TransformingDoubleFacedCard {
 
     public ArguelsBloodFast(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}");
-
-        this.supertype.add(SuperType.LEGENDARY);
-        this.secondSideCardClazz = mage.cards.t.TempleOfAclazotz.class;
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.ENCHANTMENT}, new SubType[]{}, "{1}{B}",
+                "Temple of Aclazotz",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.LAND}, new SubType[]{},"");
 
         // {1}{B}, Pay 2 life: Draw a card.
         Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{B}"));
         ability.addCost(new PayLifeCost(2));
-        this.addAbility(ability);
+        this.getLeftHalfCard().addAbility(ability);
 
         // At the beginning of your upkeep, if you have 5 or less life, you may transform Arguel's Blood Fast.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(), true
+        this.getLeftHalfCard().addAbility(new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(), true
         ).withInterveningIf(FatefulHourCondition.instance));
+
+        // Temple of Aclazotz
+        // {T}: Add {B}
+        this.getRightHalfCard().addAbility(new BlackManaAbility());
+
+        // {T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.
+        Ability activatedAbility = new SimpleActivatedAbility(new GainLifeEffect(SacrificeCostCreaturesToughness.instance)
+                .setText("you gain life equal to the sacrificed creature's toughness"), new TapSourceCost());
+        activatedAbility.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE));
+        this.getRightHalfCard().addAbility(activatedAbility);
     }
 
     private ArguelsBloodFast(final ArguelsBloodFast card) {

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

@@ -1,68 +0,0 @@
-package mage.cards.a;
-
-import mage.abilities.Ability;
-import mage.abilities.LoyaltyAbility;
-import mage.abilities.effects.common.DamageTargetEffect;
-import mage.abilities.effects.common.GetEmblemEffect;
-import mage.abilities.effects.common.TransformSourceEffect;
-import mage.abilities.effects.common.continuous.BoostControlledEffect;
-import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
-import mage.abilities.keyword.TrampleAbility;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.SubType;
-import mage.constants.SuperType;
-import mage.filter.StaticFilters;
-import mage.game.command.emblems.ArlinnEmbracedByTheMoonEmblem;
-import mage.target.common.TargetAnyTarget;
-
-import java.util.UUID;
-
-/**
- * @author fireshoes
- */
-public final class ArlinnEmbracedByTheMoon extends CardImpl {
-
-    public ArlinnEmbracedByTheMoon(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "");
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.ARLINN);
-        this.color.setRed(true);
-        this.color.setGreen(true);
-
-        this.nightCard = true;
-
-        // +1: Creatures you control get +1/+1 and gain trample until end of turn.
-        Ability ability = new LoyaltyAbility(new BoostControlledEffect(
-                1, 1, Duration.EndOfTurn,
-                StaticFilters.FILTER_PERMANENT_CREATURE
-        ).setText("Creatures you control get +1/+1"), 1);
-        ability.addEffect(new GainAbilityControlledEffect(
-                TrampleAbility.getInstance(), Duration.EndOfTurn,
-                StaticFilters.FILTER_PERMANENT_CREATURE
-        ).setText("and gain trample until end of turn"));
-        this.addAbility(ability);
-
-        // -1: Arlinn, Embraced by the Moon deals 3 damage to any target. Transform Arlinn, Embraced by the Moon.
-        this.addAbility(new TransformAbility());
-        ability = new LoyaltyAbility(new DamageTargetEffect(3), -1);
-        ability.addTarget(new TargetAnyTarget());
-        ability.addEffect(new TransformSourceEffect());
-        this.addAbility(ability);
-
-        // -6: You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to any target.'"
-        this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new ArlinnEmbracedByTheMoonEmblem()), -6));
-    }
-
-    private ArlinnEmbracedByTheMoon(final ArlinnEmbracedByTheMoon card) {
-        super(card);
-    }
-
-    @Override
-    public ArlinnEmbracedByTheMoon copy() {
-        return new ArlinnEmbracedByTheMoon(this);
-    }
-}

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

@@ -3,19 +3,26 @@ package mage.cards.a;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.GetEmblemEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.keyword.HasteAbility;
-import mage.abilities.keyword.TransformAbility;
+import mage.abilities.keyword.TrampleAbility;
 import mage.abilities.keyword.VigilanceAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.SuperType;
+import mage.filter.StaticFilters;
+import mage.game.command.emblems.ArlinnEmbracedByTheMoonEmblem;
 import mage.game.permanent.token.WolfToken;
+import mage.target.common.TargetAnyTarget;
 import mage.target.common.TargetCreaturePermanent;
 
 import java.util.UUID;
@@ -23,16 +30,14 @@ import java.util.UUID;
 /**
  * @author fireshoes
  */
-public final class ArlinnKord extends CardImpl {
+public final class ArlinnKord extends TransformingDoubleFacedCard {
 
     public ArlinnKord(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{G}");
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.ARLINN);
-
-        this.secondSideCardClazz = mage.cards.a.ArlinnEmbracedByTheMoon.class;
-
-        this.setStartingLoyalty(3);
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.PLANESWALKER}, new SubType[]{SubType.ARLINN}, "{2}{R}{G}",
+                "Arlinn, Embraced by the Moon",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.PLANESWALKER}, new SubType[]{SubType.ARLINN}, "RG");
+        this.getLeftHalfCard().setStartingLoyalty(3);
 
         // +1: Until end of turn, up to one target creature gets +2/+2 and gains vigilance and haste.
         Ability ability = new LoyaltyAbility(new BoostTargetEffect(
@@ -45,13 +50,34 @@ public final class ArlinnKord extends CardImpl {
                 HasteAbility.getInstance(), Duration.EndOfTurn
         ).setText("and haste"));
         ability.addTarget(new TargetCreaturePermanent(0, 1));
-        this.addAbility(ability);
+        this.getLeftHalfCard().addAbility(ability);
 
         // 0: Create a 2/2 green Wolf creature token. Transform Arlinn Kord.
-        this.addAbility(new TransformAbility());
         ability = new LoyaltyAbility(new CreateTokenEffect(new WolfToken()), 0);
         ability.addEffect(new TransformSourceEffect());
-        this.addAbility(ability);
+        this.getLeftHalfCard().addAbility(ability);
+
+        // Arlinn, Embraced by the Moon
+        // +1: Creatures you control get +1/+1 and gain trample until end of turn.
+        ability = new LoyaltyAbility(new BoostControlledEffect(
+                1, 1, Duration.EndOfTurn,
+                StaticFilters.FILTER_PERMANENT_CREATURE
+        ).setText("Creatures you control get +1/+1"), 1);
+        ability.addEffect(new GainAbilityControlledEffect(
+                TrampleAbility.getInstance(), Duration.EndOfTurn,
+                StaticFilters.FILTER_PERMANENT_CREATURE
+        ).setText("and gain trample until end of turn"));
+        this.getRightHalfCard().addAbility(ability);
+
+        // -1: Arlinn, Embraced by the Moon deals 3 damage to any target. Transform Arlinn, Embraced by the Moon.
+        ability = new LoyaltyAbility(new DamageTargetEffect(3), -1);
+        ability.addTarget(new TargetAnyTarget());
+        ability.addEffect(new TransformSourceEffect());
+        this.getRightHalfCard().addAbility(ability);
+
+        // -6: You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to any target.'"
+        this.getRightHalfCard().addAbility(new LoyaltyAbility(new GetEmblemEffect(new ArlinnEmbracedByTheMoonEmblem()), -6));
+
     }
 
     private ArlinnKord(final ArlinnKord card) {

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

@@ -1,118 +0,0 @@
-package mage.cards.a;
-
-import mage.Mana;
-import mage.abilities.Ability;
-import mage.abilities.LoyaltyAbility;
-import mage.abilities.effects.ContinuousEffectImpl;
-import mage.abilities.effects.mana.BasicManaEffect;
-import mage.abilities.keyword.HasteAbility;
-import mage.abilities.keyword.IndestructibleAbility;
-import mage.abilities.keyword.NightboundAbility;
-import mage.abilities.keyword.TrampleAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.*;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class ArlinnTheMoonsFury extends CardImpl {
-
-    public ArlinnTheMoonsFury(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "");
-
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.ARLINN);
-        this.setStartingLoyalty(4);
-        this.color.setRed(true);
-        this.color.setGreen(true);
-        this.nightCard = true;
-
-        // Nightbound
-        this.addAbility(new NightboundAbility());
-
-        // +2: Add {R}{G}.
-        this.addAbility(new LoyaltyAbility(new BasicManaEffect(new Mana(
-                0, 0, 0, 1, 1, 0, 0, 0
-        )), 2));
-
-        // 0: Until end of turn, Arlinn, the Moon's Fury becomes a 5/5 Werewolf creature with trample, indestructible, and haste.
-        this.addAbility(new LoyaltyAbility(new ArlinnTheMoonsFuryEffect(), 0));
-    }
-
-    private ArlinnTheMoonsFury(final ArlinnTheMoonsFury card) {
-        super(card);
-    }
-
-    @Override
-    public ArlinnTheMoonsFury copy() {
-        return new ArlinnTheMoonsFury(this);
-    }
-}
-
-class ArlinnTheMoonsFuryEffect extends ContinuousEffectImpl {
-
-    ArlinnTheMoonsFuryEffect() {
-        super(Duration.EndOfTurn, Outcome.Benefit);
-        staticText = "until end of turn, {this} becomes a 5/5 Werewolf creature with trample, indestructible, and haste";
-        this.dependencyTypes.add(DependencyType.BecomeCreature);
-    }
-
-    private ArlinnTheMoonsFuryEffect(final ArlinnTheMoonsFuryEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public ArlinnTheMoonsFuryEffect copy() {
-        return new ArlinnTheMoonsFuryEffect(this);
-    }
-
-    @Override
-    public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
-        Permanent permanent = source.getSourcePermanentIfItStillExists(game);
-        if (permanent == null) {
-            discard();
-            return false;
-        }
-        switch (layer) {
-            case TypeChangingEffects_4:
-                permanent.removeAllCardTypes(game);
-                permanent.addCardType(game, CardType.CREATURE);
-                permanent.removeAllCreatureTypes(game);
-                permanent.addSubType(game, SubType.WEREWOLF);
-                return true;
-            case AbilityAddingRemovingEffects_6:
-                permanent.addAbility(TrampleAbility.getInstance(), source.getSourceId(), game);
-                permanent.addAbility(IndestructibleAbility.getInstance(), source.getSourceId(), game);
-                permanent.addAbility(HasteAbility.getInstance(), source.getSourceId(), game);
-                return true;
-            case PTChangingEffects_7:
-                if (sublayer == SubLayer.SetPT_7b) {
-                    permanent.getPower().setModifiedBaseValue(5);
-                    permanent.getToughness().setModifiedBaseValue(5);
-                    return true;
-                }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        return false;
-    }
-
-    @Override
-    public boolean hasLayer(Layer layer) {
-        switch (layer) {
-            case TypeChangingEffects_4:
-            case AbilityAddingRemovingEffects_6:
-            case PTChangingEffects_7:
-                return true;
-        }
-        return false;
-    }
-}

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

@@ -1,21 +1,23 @@
 package mage.cards.a;
 
+import mage.Mana;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.EntersWithCountersControlledEffect;
 import mage.abilities.effects.common.continuous.CastAsThoughItHadFlashAllEffect;
-import mage.abilities.keyword.DayboundAbility;
-import mage.cards.CardImpl;
+import mage.abilities.effects.mana.BasicManaEffect;
+import mage.abilities.keyword.*;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.SubType;
-import mage.constants.SuperType;
+import mage.cards.TransformingDoubleFacedCard;
+import mage.constants.*;
 import mage.counters.CounterType;
 import mage.filter.FilterCard;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterCreatureCard;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
 import mage.game.permanent.token.WolfToken;
 
 import java.util.UUID;
@@ -23,20 +25,20 @@ import java.util.UUID;
 /**
  * @author TheElk801
  */
-public final class ArlinnThePacksHope extends CardImpl {
+public final class ArlinnThePacksHope extends TransformingDoubleFacedCard {
 
     private static final FilterCard filter = new FilterCreatureCard("creature spells");
 
     public ArlinnThePacksHope(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{G}");
-
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.ARLINN);
-        this.setStartingLoyalty(4);
-        this.secondSideCardClazz = mage.cards.a.ArlinnTheMoonsFury.class;
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.PLANESWALKER}, new SubType[]{SubType.ARLINN}, "{2}{R}{G}",
+                "Arlinn, the Moon's Fury",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.PLANESWALKER}, new SubType[]{SubType.ARLINN}, "RG");
+        this.getLeftHalfCard().setStartingLoyalty(4);
+        this.getRightHalfCard().setStartingLoyalty(4);
 
         // Daybound
-        this.addAbility(new DayboundAbility());
+        this.getLeftHalfCard().addAbility(new DayboundAbility());
 
         // +1: Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters the battlefield with an additional +1/+1 counter on it.
         Ability ability = new LoyaltyAbility(new CastAsThoughItHadFlashAllEffect(
@@ -45,10 +47,23 @@ public final class ArlinnThePacksHope extends CardImpl {
         ability.addEffect(new EntersWithCountersControlledEffect(
                 StaticFilters.FILTER_PERMANENT_CREATURE, CounterType.P1P1.createInstance(), false
         ).concatBy(", and"));
-        this.addAbility(ability);
+        this.getLeftHalfCard().addAbility(ability);
 
         // −3: Create two 2/2 green Wolf creature tokens.
-        this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new WolfToken(), 2), -3));
+        this.getLeftHalfCard().addAbility(new LoyaltyAbility(new CreateTokenEffect(new WolfToken(), 2), -3));
+
+        // Arlinn, the Moon's Fury
+        // Nightbound
+        this.getRightHalfCard().addAbility(new NightboundAbility());
+
+        // +2: Add {R}{G}.
+        this.getRightHalfCard().addAbility(new LoyaltyAbility(new BasicManaEffect(new Mana(
+                0, 0, 0, 1, 1, 0, 0, 0
+        )), 2));
+
+        // 0: Until end of turn, Arlinn, the Moon's Fury becomes a 5/5 Werewolf creature with trample, indestructible, and haste.
+        this.getRightHalfCard().addAbility(new LoyaltyAbility(new ArlinnTheMoonsFuryEffect(), 0));
+
     }
 
     private ArlinnThePacksHope(final ArlinnThePacksHope card) {
@@ -60,3 +75,66 @@ public final class ArlinnThePacksHope extends CardImpl {
         return new ArlinnThePacksHope(this);
     }
 }
+
+class ArlinnTheMoonsFuryEffect extends ContinuousEffectImpl {
+
+    ArlinnTheMoonsFuryEffect() {
+        super(Duration.EndOfTurn, Outcome.Benefit);
+        staticText = "until end of turn, {this} becomes a 5/5 Werewolf creature with trample, indestructible, and haste";
+        this.dependencyTypes.add(DependencyType.BecomeCreature);
+    }
+
+    private ArlinnTheMoonsFuryEffect(final ArlinnTheMoonsFuryEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ArlinnTheMoonsFuryEffect copy() {
+        return new ArlinnTheMoonsFuryEffect(this);
+    }
+
+    @Override
+    public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+        Permanent permanent = source.getSourcePermanentIfItStillExists(game);
+        if (permanent == null) {
+            discard();
+            return false;
+        }
+        switch (layer) {
+            case TypeChangingEffects_4:
+                permanent.removeAllCardTypes(game);
+                permanent.addCardType(game, CardType.CREATURE);
+                permanent.removeAllCreatureTypes(game);
+                permanent.addSubType(game, SubType.WEREWOLF);
+                return true;
+            case AbilityAddingRemovingEffects_6:
+                permanent.addAbility(TrampleAbility.getInstance(), source.getSourceId(), game);
+                permanent.addAbility(IndestructibleAbility.getInstance(), source.getSourceId(), game);
+                permanent.addAbility(HasteAbility.getInstance(), source.getSourceId(), game);
+                return true;
+            case PTChangingEffects_7:
+                if (sublayer == SubLayer.SetPT_7b) {
+                    permanent.getPower().setModifiedBaseValue(5);
+                    permanent.getToughness().setModifiedBaseValue(5);
+                    return true;
+                }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return false;
+    }
+
+    @Override
+    public boolean hasLayer(Layer layer) {
+        switch (layer) {
+            case TypeChangingEffects_4:
+            case AbilityAddingRemovingEffects_6:
+            case PTChangingEffects_7:
+                return true;
+        }
+        return false;
+    }
+}

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

@@ -7,7 +7,6 @@ import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.hint.common.RaidHint;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.target.common.TargetAnyTarget;
 import mage.watchers.common.PlayerAttackedWatcher;
@@ -30,7 +29,7 @@ public final class ArrowStorm extends CardImpl {
         this.getSpellAbility().addTarget(new TargetAnyTarget());
         // Raid - If you attacked with a creature this turn, instead Arrow Storm deals 5 damage to that creature or player and the damage can't be prevented.
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
-                new DamageTargetEffect(5, false),
+                new DamageTargetEffect(5).withCantBePrevented(),
                 RaidCondition.instance,
                 "<br/><br/><i>Raid</i> &mdash; If you attacked this turn, instead {this} deals 5 damage to that permanent or player and the damage can't be prevented"));
         this.getSpellAbility().addWatcher(new PlayerAttackedWatcher());

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

@@ -1,88 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.Ability;
-import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
-import mage.abilities.condition.Condition;
-import mage.abilities.decorator.ConditionalOneShotEffect;
-import mage.abilities.effects.common.counter.AddCountersSourceEffect;
-import mage.abilities.keyword.MenaceAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.constants.WatcherScope;
-import mage.counters.CounterType;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
-import mage.watchers.Watcher;
-
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class AshenReaper extends CardImpl {
-
-    public AshenReaper(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
-
-        this.subtype.add(SubType.ZOMBIE);
-        this.subtype.add(SubType.ELEMENTAL);
-        this.power = new MageInt(2);
-        this.toughness = new MageInt(1);
-        this.color.setBlack(true);
-        this.color.setRed(true);
-        this.nightCard = true;
-
-        // Menace
-        this.addAbility(new MenaceAbility(false));
-
-        // At the beginning of your end step, put a +1/+1 counter on Ashen Reaper if a permanent was put into a graveyard from the battlefield this turn.
-        this.addAbility(new BeginningOfEndStepTriggeredAbility(
-                new ConditionalOneShotEffect(
-                        new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
-                        AshenReaperCondition.instance, "put a +1/+1 counter on {this} " +
-                        "if a permanent was put into a graveyard from the battlefield this turn"
-                )
-        ));
-    }
-
-    private AshenReaper(final AshenReaper card) {
-        super(card);
-    }
-
-    @Override
-    public AshenReaper copy() {
-        return new AshenReaper(this);
-    }
-
-    public static AshenReaperWatcher makeWatcher() {
-        return new AshenReaperWatcher();
-    }
-}
-
-enum AshenReaperCondition implements Condition {
-    instance;
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        return game.getState().getWatcher(AshenReaperWatcher.class).conditionMet();
-    }
-}
-
-class AshenReaperWatcher extends Watcher {
-
-    AshenReaperWatcher() {
-        super(WatcherScope.GAME);
-    }
-
-    @Override
-    public void watch(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.ZONE_CHANGE
-                && ((ZoneChangeEvent) event).isDiesEvent()) {
-            condition = true;
-        }
-    }
-}

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

@@ -0,0 +1,76 @@
+package mage.cards.a;
+
+import mage.abilities.common.TransformIntoSourceTriggeredAbility;
+import mage.abilities.common.TransformsOrEntersTriggeredAbility;
+import mage.abilities.costs.common.DiscardCardCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.TransformSourceEffect;
+import mage.abilities.effects.mana.AddConditionalManaOfAnyColorEffect;
+import mage.abilities.mana.conditional.ConditionalSpellManaBuilder;
+import mage.abilities.meta.OrTriggeredAbility;
+import mage.abilities.triggers.BeginningOfFirstMainTriggeredAbility;
+import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
+import mage.constants.*;
+import mage.filter.FilterSpell;
+import mage.filter.predicate.mageobject.ManaValuePredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AshlingRekindled extends TransformingDoubleFacedCard {
+
+    private static final FilterSpell filter = new FilterSpell("spells with mana value 4 or greater");
+
+    static {
+        filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 3));
+    }
+
+    public AshlingRekindled(UUID ownerId, CardSetInfo setInfo) {
+        super(
+                ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.ELEMENTAL, SubType.SORCERER}, "{1}{R}",
+                "Ashling, Rimebound",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.ELEMENTAL, SubType.WIZARD}, "U"
+        );
+        this.getLeftHalfCard().setPT(1, 3);
+        this.getRightHalfCard().setPT(1, 3);
+
+        // Whenever this creature enters or transforms into Ashling, Rekindled, you may discard a card. If you do, draw a card.
+        this.getLeftHalfCard().addAbility(new TransformsOrEntersTriggeredAbility(
+                new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new DiscardCardCost()), false
+        ));
+
+        // At the beginning of your first main phase, you may pay {U}. If you do, transform Ashling.
+        this.getLeftHalfCard().addAbility(new BeginningOfFirstMainTriggeredAbility(
+                new DoIfCostPaid(new TransformSourceEffect(), new ManaCostsImpl<>("{U}"))
+        ));
+
+        // Ashling, Rimebound
+        // Whenever this creature transforms into Ashling, Rimebound and at the beginning of your first main phase, add two mana of any one color. Spend this mana only to cast spells with mana value 4 or greater.
+        this.getRightHalfCard().addAbility(new OrTriggeredAbility(
+                Zone.BATTLEFIELD,
+                new AddConditionalManaOfAnyColorEffect(2, new ConditionalSpellManaBuilder(filter)),
+                new TransformIntoSourceTriggeredAbility(null),
+                new BeginningOfFirstMainTriggeredAbility(null)
+        ));
+
+        // At the beginning of your first main phase, you may pay {R}. If you do, transform Ashling.
+        this.getRightHalfCard().addAbility(new BeginningOfFirstMainTriggeredAbility(
+                new DoIfCostPaid(new TransformSourceEffect(), new ManaCostsImpl<>("{R}"))
+        ));
+    }
+
+    private AshlingRekindled(final AshlingRekindled card) {
+        super(card);
+    }
+
+    @Override
+    public AshlingRekindled copy() {
+        return new AshlingRekindled(this);
+    }
+}

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

@@ -1,48 +0,0 @@
-package mage.cards.a;
-
-import mage.abilities.Ability;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.common.continuous.BoostEquippedEffect;
-import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
-import mage.abilities.keyword.EquipAbility;
-import mage.abilities.keyword.FirstStrikeAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.AttachmentType;
-import mage.constants.CardType;
-import mage.constants.SubType;
-
-import java.util.UUID;
-
-/**
- * @author fireshoes
- */
-public final class AshmouthBlade extends CardImpl {
-
-    public AshmouthBlade(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "");
-        this.subtype.add(SubType.EQUIPMENT);
-
-        // this card is the second face of double-faced card
-        this.nightCard = true;
-
-        // Equipped creature gets +3/+3 and has first strike.
-        Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(3, 3));
-        ability.addEffect(new GainAbilityAttachedEffect(
-                FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT
-        ).setText("and has first strike"));
-        this.addAbility(ability);
-
-        // Equip {3}
-        this.addAbility(new EquipAbility(3, false));
-    }
-
-    private AshmouthBlade(final AshmouthBlade card) {
-        super(card);
-    }
-
-    @Override
-    public AshmouthBlade copy() {
-        return new AshmouthBlade(this);
-    }
-}

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

@@ -1,50 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.Ability;
-import mage.abilities.common.SpellCastControllerTriggeredAbility;
-import mage.abilities.effects.common.DamageTargetEffect;
-import mage.abilities.keyword.FlyingAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.filter.StaticFilters;
-import mage.target.common.TargetAnyTarget;
-
-import java.util.UUID;
-
-/**
- * @author TheElk801
- */
-public final class AshmouthDragon extends CardImpl {
-
-    public AshmouthDragon(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
-
-        this.subtype.add(SubType.DRAGON);
-        this.power = new MageInt(4);
-        this.toughness = new MageInt(4);
-        this.color.setRed(true);
-        this.nightCard = true;
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-
-        // Whenever you cast an instant or sorcery spell, Ashmouth Dragon deals 2 damage to any target.
-        Ability ability = new SpellCastControllerTriggeredAbility(
-                new DamageTargetEffect(2), StaticFilters.FILTER_SPELL_AN_INSTANT_OR_SORCERY, false
-        );
-        ability.addTarget(new TargetAnyTarget());
-        this.addAbility(ability);
-    }
-
-    private AshmouthDragon(final AshmouthDragon card) {
-        super(card);
-    }
-
-    @Override
-    public AshmouthDragon copy() {
-        return new AshmouthDragon(this);
-    }
-}

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

@@ -23,7 +23,7 @@ public final class AshmouthHound extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Whenever Ashmouth Hound blocks or becomes blocked by a creature, Ashmouth Hound deals 1 damage to that creature.
-        this.addAbility(new BlocksOrBlockedByCreatureSourceTriggeredAbility(new DamageTargetEffect(1, true, "that creature")));
+        this.addAbility(new BlocksOrBlockedByCreatureSourceTriggeredAbility(new DamageTargetEffect(1).withTargetDescription("that creature")));
     }
 
     private AshmouthHound(final AshmouthHound card) {

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

@@ -1,16 +1,14 @@
 package mage.cards.a;
 
-import java.util.UUID;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.BlocksOrBlockedByCreatureSourceTriggeredAbility;
-import mage.abilities.effects.common.DamageTargetControllerEffect;
-import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.DamageTargetAndTargetControllerEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.filter.StaticFilters;
+
+import java.util.UUID;
 
 /**
  *
@@ -25,9 +23,8 @@ public final class AssembledAlphas extends CardImpl {
         this.toughness = new MageInt(5);
 
         // Whenever Assembled Alphas blocks or becomes blocked by a creature, Assembled Alphas deals 3 damage to that creature and 3 damage to that creature's controller.
-        Ability ability = new BlocksOrBlockedByCreatureSourceTriggeredAbility(new DamageTargetEffect(3, true, "that creature"));
-        ability.addEffect(new DamageTargetControllerEffect(3).setText("and 3 damage to that creature's controller"));
-        this.addAbility(ability);
+        this.addAbility(new BlocksOrBlockedByCreatureSourceTriggeredAbility(
+                new DamageTargetAndTargetControllerEffect(3, 3)));
     }
 
     private AssembledAlphas(final AssembledAlphas card) {

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

@@ -10,14 +10,10 @@ import mage.abilities.dynamicvalue.common.CountersControllerCount;
 import mage.abilities.effects.common.DamagePlayersEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.discard.DiscardControllerEffect;
-import mage.abilities.keyword.PartnerFatherAndSonAbility;
 import mage.abilities.keyword.ReachAbility;
 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.constants.*;
 import mage.counters.CounterType;
 
 import java.util.UUID;
@@ -50,7 +46,7 @@ public final class AtreusImpulsiveSon extends CardImpl {
         this.addAbility(ability);
 
         // Partner--Father & son
-        this.addAbility(PartnerFatherAndSonAbility.getInstance());
+        this.addAbility(PartnerVariantType.FATHER_AND_SON.makeAbility());
     }
 
     private AtreusImpulsiveSon(final AtreusImpulsiveSon card) {

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

@@ -0,0 +1,51 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.common.AttacksPlayerWithCreaturesTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.continuous.BoostAllEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.filter.common.FilterControlledCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AttumaAtlanteanWarlord extends CardImpl {
+
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(SubType.MERFOLK);
+
+    public AttumaAtlanteanWarlord(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.MERFOLK);
+        this.subtype.add(SubType.WARRIOR);
+        this.subtype.add(SubType.VILLAIN);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(4);
+
+        // Other Merfolk you control get +1/+1.
+        this.addAbility(new SimpleStaticAbility(new BoostAllEffect(
+                1, 1, Duration.WhileOnBattlefield, filter, true
+        )));
+
+        // Whenever one or more Merfolk you control attack a player, draw a card.
+        this.addAbility(new AttacksPlayerWithCreaturesTriggeredAbility(
+                new DrawCardSourceControllerEffect(1), filter, SetTargetPointer.NONE
+        ));
+    }
+
+    private AttumaAtlanteanWarlord(final AttumaAtlanteanWarlord card) {
+        super(card);
+    }
+
+    @Override
+    public AttumaAtlanteanWarlord copy() {
+        return new AttumaAtlanteanWarlord(this);
+    }
+}

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

@@ -1,51 +0,0 @@
-package mage.cards.a;
-
-import java.util.UUID;
-import mage.abilities.Ability;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
-import mage.abilities.mana.AnyColorManaAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SuperType;
-import mage.constants.Zone;
-import mage.filter.StaticFilters;
-import mage.target.common.TargetCardInYourGraveyard;
-
-/**
- *
- * @author LevelX2
- */
-public final class AtzalCaveOfEternity extends CardImpl {
-
-    public AtzalCaveOfEternity(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
-
-        this.supertype.add(SuperType.LEGENDARY);
-
-        this.nightCard = true;
-
-        // <i>(Transforms from Journey to Eternity.)</i>
-
-        // {t}: Add one mana of any color.
-        this.addAbility(new AnyColorManaAbility());
-
-        // {3}{B}{G}, {T}: Return target creature card from your graveyard to the battlefield.
-        Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{3}{B}{G}"));
-        ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
-        this.addAbility(ability);
-    }
-
-    private AtzalCaveOfEternity(final AtzalCaveOfEternity card) {
-        super(card);
-    }
-
-    @Override
-    public AtzalCaveOfEternity copy() {
-        return new AtzalCaveOfEternity(this);
-    }
-}

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

@@ -1,49 +0,0 @@
-
-package mage.cards.a;
-
-import java.util.UUID;
-import mage.MageInt;
-import mage.abilities.common.AttacksTriggeredAbility;
-import mage.abilities.effects.common.LoseLifeOpponentsEffect;
-import mage.abilities.keyword.DeathtouchAbility;
-import mage.abilities.keyword.FlyingAbility;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-
-/**
- *
- * @author fireshoes
- */
-public final class AuroraOfEmrakul extends CardImpl {
-
-    public AuroraOfEmrakul(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"");
-        this.subtype.add(SubType.ELDRAZI);
-        this.subtype.add(SubType.REFLECTION);
-        this.power = new MageInt(1);
-        this.toughness = new MageInt(4);
-
-        // this card is the second face of double-faced card
-        this.nightCard = true;
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-
-        // Deathtouch
-        this.addAbility(DeathtouchAbility.getInstance());
-
-        // Whenever Aurora of Emrakul attacks, each opponent loses 3 life.
-        this.addAbility(new AttacksTriggeredAbility(new LoseLifeOpponentsEffect(3),false));
-    }
-
-    private AuroraOfEmrakul(final AuroraOfEmrakul card) {
-        super(card);
-    }
-
-    @Override
-    public AuroraOfEmrakul copy() {
-        return new AuroraOfEmrakul(this);
-    }
-}

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

@@ -6,12 +6,14 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.dynamicvalue.common.CardTypesInGraveyardCount;
 import mage.abilities.effects.common.MillCardsControllerEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
-import mage.abilities.keyword.TransformAbility;
+import mage.abilities.keyword.HexproofAbility;
+import mage.abilities.keyword.TrampleAbility;
 import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.AbilityWord;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.TargetController;
 
 import java.util.UUID;
@@ -19,20 +21,28 @@ import java.util.UUID;
 /**
  * @author LevelX2
  */
-public final class AutumnalGloom extends CardImpl {
+public final class AutumnalGloom extends TransformingDoubleFacedCard {
 
     public AutumnalGloom(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
-        this.secondSideCardClazz = mage.cards.a.AncientOfTheEquinox.class;
+        super(ownerId, setInfo,
+                new CardType[]{CardType.ENCHANTMENT}, new SubType[]{}, "{2}{G}",
+                "Ancient of the Equinox",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.TREEFOLK}, "G");
+        this.getRightHalfCard().setPT(4, 4);
 
         // {B}: Put the top card of your library into your graveyard.
-        this.addAbility(new SimpleActivatedAbility(new MillCardsControllerEffect(1), new ManaCostsImpl<>("{B}")));
+        this.getLeftHalfCard().addAbility(new SimpleActivatedAbility(new MillCardsControllerEffect(1), new ManaCostsImpl<>("{B}")));
 
         // <i>Delirium</i> &mdash; At the beginning of your end step, if there are four or more card types among cards in your graveyard, transform Autumnal Gloom.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new BeginningOfEndStepTriggeredAbility(
+        this.getLeftHalfCard().addAbility(new BeginningOfEndStepTriggeredAbility(
                 TargetController.YOU, new TransformSourceEffect(), false, DeliriumCondition.instance
         ).setAbilityWord(AbilityWord.DELIRIUM).addHint(CardTypesInGraveyardCount.YOU.getHint()));
+
+        // Ancient of the Equinox
+        // Trample
+        this.getRightHalfCard().addAbility(TrampleAbility.getInstance());
+        // Hexproof
+        this.getRightHalfCard().addAbility(HexproofAbility.getInstance());
     }
 
     private AutumnalGloom(final AutumnalGloom card) {

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

@@ -1,14 +1,18 @@
 package mage.cards.a;
 
-import mage.MageInt;
 import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.abilities.keyword.DayboundAbility;
 import mage.abilities.keyword.HexproofAbility;
+import mage.abilities.keyword.NightboundAbility;
 import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.CardType;
+import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.counters.CounterType;
 import mage.filter.StaticFilters;
@@ -19,29 +23,49 @@ import java.util.UUID;
 /**
  * @author TheElk801
  */
-public final class AvabruckCaretaker extends CardImpl {
+public final class AvabruckCaretaker extends TransformingDoubleFacedCard {
 
     public AvabruckCaretaker(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
-
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.WEREWOLF);
-        this.power = new MageInt(4);
-        this.toughness = new MageInt(4);
-        this.secondSideCardClazz = mage.cards.h.HollowhengeHuntmaster.class;
+        super(ownerId, setInfo,
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.WEREWOLF}, "{4}{G}{G}",
+                "Hollowhenge Huntmaster",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.WEREWOLF}, "G");
+        this.getLeftHalfCard().setPT(4, 4);
+        this.getRightHalfCard().setPT(6, 6);
 
         // Hexproof
-        this.addAbility(HexproofAbility.getInstance());
+        this.getLeftHalfCard().addAbility(HexproofAbility.getInstance());
 
         // At the beginning of combat on your turn, put two +1/+1 counters on another target creature you control.
         Ability ability = new BeginningOfCombatTriggeredAbility(
                 new AddCountersTargetEffect(CounterType.P1P1.createInstance(2))
         );
         ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE_YOU_CONTROL));
-        this.addAbility(ability);
+        this.getLeftHalfCard().addAbility(ability);
 
         // Daybound
-        this.addAbility(new DayboundAbility());
+        this.getLeftHalfCard().addAbility(new DayboundAbility());
+
+        // Hollowhenge Huntmaster
+        // Hexproof
+        this.getRightHalfCard().addAbility(HexproofAbility.getInstance());
+
+        // Other permanents you control have hexproof.
+        this.getRightHalfCard().addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(
+                HexproofAbility.getInstance(), Duration.WhileOnBattlefield,
+                StaticFilters.FILTER_PERMANENTS, true
+        )));
+
+        // At the beginning of combat on your turn, put two +1/+1 counters on each creature you control.
+        this.getRightHalfCard().addAbility(new BeginningOfCombatTriggeredAbility(
+                new AddCountersAllEffect(
+                        CounterType.P1P1.createInstance(2),
+                        StaticFilters.FILTER_CONTROLLED_CREATURE
+                )
+        ));
+
+        // Nightbound
+        this.getRightHalfCard().addAbility(new NightboundAbility());
     }
 
     private AvabruckCaretaker(final AvabruckCaretaker card) {

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

@@ -1,62 +0,0 @@
-package mage.cards.a;
-
-import mage.MageInt;
-import mage.abilities.Ability;
-import mage.abilities.common.TransformIntoSourceTriggeredAbility;
-import mage.abilities.effects.common.DamageAllEffect;
-import mage.abilities.effects.common.DamagePlayersEffect;
-import mage.abilities.keyword.FlyingAbility;
-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.filter.FilterPermanent;
-import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.AnotherPredicate;
-
-import java.util.UUID;
-
-/**
- * @author fireshoes
- */
-public final class AvacynThePurifier extends CardImpl {
-
-    private static final FilterPermanent filter = new FilterCreaturePermanent("other creature");
-
-    static {
-        filter.add(AnotherPredicate.instance);
-    }
-
-    public AvacynThePurifier(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.ANGEL);
-        this.power = new MageInt(6);
-        this.toughness = new MageInt(5);
-        this.color.setRed(true);
-
-        // this card is the second face of double-faced card
-        this.nightCard = true;
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-
-        // When this creature transforms into Avacyn, the Purifier, it deals 3 damage to each other creature and each opponent.
-        Ability ability = new TransformIntoSourceTriggeredAbility(
-                new DamageAllEffect(3, "it", filter)
-        );
-        ability.addEffect(new DamagePlayersEffect(3, TargetController.OPPONENT).setText("and each opponent"));
-        this.addAbility(ability);
-    }
-
-    private AvacynThePurifier(final AvacynThePurifier card) {
-        super(card);
-    }
-
-    @Override
-    public AvacynThePurifier copy() {
-        return new AvacynThePurifier(this);
-    }
-}

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

@@ -1,37 +1,43 @@
 package mage.cards.a;
 
-import java.util.UUID;
-
-import mage.MageInt;
-import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
+import mage.abilities.Ability;
+import mage.abilities.common.TransformIntoSourceTriggeredAbility;
 import mage.abilities.condition.common.EquippedSourceCondition;
+import mage.abilities.effects.common.ExileUntilSourceLeavesEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
-import mage.abilities.keyword.TransformAbility;
-import mage.cards.CardImpl;
+import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.TargetController;
+import mage.filter.StaticFilters;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
 
 /**
  * @author fireshoes
  */
-public final class AvacynianMissionaries extends CardImpl {
+public final class AvacynianMissionaries extends TransformingDoubleFacedCard {
 
     public AvacynianMissionaries(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.CLERIC);
-        this.power = new MageInt(3);
-        this.toughness = new MageInt(3);
-
-        this.secondSideCardClazz = mage.cards.l.LunarchInquisitors.class;
+        super(ownerId, setInfo,
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.CLERIC}, "{3}{W}",
+                "Lunarch Inquisitors",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.CLERIC}, "W");
+        this.getLeftHalfCard().setPT(3, 3);
+        this.getRightHalfCard().setPT(4, 4);
 
         // At the beginning of your end step, if Avacynian Missionaries is equipped, transform it.
-        this.addAbility(new TransformAbility());
-        this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new TransformSourceEffect().setText("transform it"),
+        this.getLeftHalfCard().addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new TransformSourceEffect().setText("transform it"),
                 false, EquippedSourceCondition.instance));
 
+        // Lunarch Inquisitors
+        // When this creature transforms into Lunarch Inquisitors, you may exile another target creature until Lunarch Inquisitors leaves the battlefield.
+        Ability ability = new TransformIntoSourceTriggeredAbility(new ExileUntilSourceLeavesEffect(), true);
+        ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE));
+        this.getRightHalfCard().addAbility(ability);
     }
 
     private AvacynianMissionaries(final AvacynianMissionaries card) {

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

@@ -65,7 +65,7 @@ public final class AvalancheOfSector7 extends CardImpl {
 class AvalancheOfSector7TriggeredAbility extends TriggeredAbilityImpl {
 
     AvalancheOfSector7TriggeredAbility() {
-        super(Zone.BATTLEFIELD, new DamageTargetEffect(1, true, "that player", true));
+        super(Zone.BATTLEFIELD, new DamageTargetEffect(1).withTargetDescription("that player"));
         setTriggerPhrase("Whenever an opponent activates an ability of an artifact they control, ");
     }
 

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

@@ -1,50 +1,80 @@
 package mage.cards.a;
 
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.Condition;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.CostImpl;
+import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.decorator.ConditionalOneShotEffect;
-import mage.abilities.effects.common.DrawCardSourceControllerEffect;
-import mage.abilities.effects.common.TransformSourceEffect;
+import mage.abilities.dynamicvalue.common.StaticValue;
+import mage.abilities.effects.common.*;
+import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.FirebendingAbility;
 import mage.abilities.keyword.FlyingAbility;
-import mage.cards.CardImpl;
+import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
+import mage.cards.Card;
 import mage.cards.CardSetInfo;
+import mage.cards.TransformingDoubleFacedCard;
 import mage.constants.*;
+import mage.counters.CounterType;
+import mage.filter.FilterCard;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.watchers.Watcher;
 
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
 /**
  * @author TheElk801
  */
-public final class AvatarAang extends CardImpl {
+public final class AvatarAang extends TransformingDoubleFacedCard {
+
+    private static final FilterCard filter = new FilterCard("spells");
 
     public AvatarAang(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{G}{W}{U}");
+        super(ownerId, setInfo,
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.AVATAR, SubType.ALLY}, "{R}{G}{W}{U}",
+                "Aang, Master of Elements",
+                new SuperType[]{SuperType.LEGENDARY}, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.AVATAR, SubType.ALLY}, "");
 
-        this.supertype.add(SuperType.LEGENDARY);
-        this.subtype.add(SubType.HUMAN);
-        this.subtype.add(SubType.AVATAR);
-        this.subtype.add(SubType.ALLY);
-        this.power = new MageInt(4);
-        this.toughness = new MageInt(4);
-
-        this.secondSideCardClazz = mage.cards.a.AangMasterOfElements.class;
+        this.getLeftHalfCard().setPT(4, 4);
+        this.getRightHalfCard().setPT(6, 6);
 
         // Flying
-        this.addAbility(FlyingAbility.getInstance());
+        this.getLeftHalfCard().addAbility(FlyingAbility.getInstance());
 
         // Firebending 2
-        this.addAbility(new FirebendingAbility(2));
+        this.getLeftHalfCard().addAbility(new FirebendingAbility(2));
 
         // Whenever you waterbend, earthbend, firebend, or airbend, draw a card. Then if you've done all four this turn, transform Avatar Aang.
-        this.addAbility(new AvatarAangTriggeredAbility());
+        this.getLeftHalfCard().addAbility(new AvatarAangTriggeredAbility());
+
+        // Aang, Master of Elements
+        // Flying
+        this.getRightHalfCard().addAbility(FlyingAbility.getInstance());
+
+        // Spells you cast cost {W}{U}{B}{R}{G} less to cast.
+        this.getRightHalfCard().addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(
+                filter, new ManaCostsImpl<>("{W}{U}{B}{R}{G}"), StaticValue.get(1), true
+        )));
+
+        // At the beginning of each upkeep, you may transform Aang, Master of Elements. If you do, you gain 4 life, draw four cards, put four +1/+1 counters on him, and he deals 4 damage to each opponent.
+        this.getRightHalfCard().addAbility(new BeginningOfUpkeepTriggeredAbility(
+                TargetController.ANY,
+                new DoIfCostPaid(new GainLifeEffect(4), new AangMasterOfElementsCost())
+                        .addEffect(new DrawCardSourceControllerEffect(4).concatBy(","))
+                        .addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4))
+                                .setText(", put four +1/+1 counters on him"))
+                        .addEffect(new DamagePlayersEffect(4, TargetController.OPPONENT)
+                                .setText(", and he deals 4 damage to each opponent")),
+                false
+        ));
     }
 
     private AvatarAang(final AvatarAang card) {
@@ -154,3 +184,37 @@ class AvatarAangWatcher extends Watcher {
         return game.getState().getWatcher(AvatarAangWatcher.class).checkPlayer(source.getControllerId());
     }
 }
+
+class AangMasterOfElementsCost extends CostImpl {
+
+    AangMasterOfElementsCost() {
+        super();
+        text = "transform {this}";
+    }
+
+    private AangMasterOfElementsCost(final AangMasterOfElementsCost cost) {
+        super(cost);
+    }
+
+    @Override
+    public AangMasterOfElementsCost copy() {
+        return new AangMasterOfElementsCost(this);
+    }
+
+    @Override
+    public boolean canPay(Ability ability, Ability source, UUID controllerId, Game game) {
+        return Optional
+                .ofNullable(source.getSourcePermanentIfItStillExists(game))
+                .filter(Card::isTransformable)
+                .isPresent();
+    }
+
+    @Override
+    public boolean pay(Ability ability, Game game, Ability source, UUID controllerId, boolean noMana, Cost costToPay) {
+        paid = Optional
+                .ofNullable(source.getSourcePermanentIfItStillExists(game))
+                .filter(permanent -> permanent.transform(source, game))
+                .isPresent();
+        return paid;
+    }
+}

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

@@ -0,0 +1,110 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.common.DiesAttachedTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.ReturnToHandSourceEffect;
+import mage.abilities.effects.common.continuous.AddCardSubtypeAttachedEffect;
+import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.cards.Cards;
+import mage.constants.*;
+import mage.filter.StaticFilters;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.TargetCard;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AvatarDestiny extends CardImpl {
+
+    private static final DynamicValue xValue = new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_CREATURE);
+
+    public AvatarDestiny(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}");
+
+        this.subtype.add(SubType.AURA);
+
+        // Enchant creature you control
+        TargetPermanent auraTarget = new TargetControlledCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
+        this.addAbility(new EnchantAbility(auraTarget));
+
+        // Enchanted creature gets +1/+1 for each creature card in your graveyard and is an Avatar in addition to its other types.
+        Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(xValue, xValue));
+        ability.addEffect(new AddCardSubtypeAttachedEffect(
+                SubType.AVATAR, AttachmentType.AURA
+        ).setText("and is an Avatar in addition to its other types"));
+        this.addAbility(ability);
+
+        // When enchanted creature dies, mill cards equal to its power. Return this card to its owner's hand and up to one creature card milled this way to the battlefield under your control.
+        this.addAbility(new DiesAttachedTriggeredAbility(new AvatarDestinyEffect(), "enchanted creature"));
+    }
+
+    private AvatarDestiny(final AvatarDestiny card) {
+        super(card);
+    }
+
+    @Override
+    public AvatarDestiny copy() {
+        return new AvatarDestiny(this);
+    }
+}
+
+class AvatarDestinyEffect extends OneShotEffect {
+
+    AvatarDestinyEffect() {
+        super(Outcome.Benefit);
+        staticText = "mill cards equal to its power. Return this card to its owner's hand and up to one " +
+                "creature card milled this way to the battlefield under your control";
+    }
+
+    private AvatarDestinyEffect(final AvatarDestinyEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AvatarDestinyEffect copy() {
+        return new AvatarDestinyEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player == null) {
+            return false;
+        }
+        int count = Optional
+                .ofNullable((Permanent) getValue("attachedTo"))
+                .map(MageObject::getPower)
+                .map(MageInt::getValue)
+                .orElse(0);
+        Cards cards = player.millCards(count, source, game);
+        game.processAction();
+        new ReturnToHandSourceEffect(false, true).apply(game, source);
+        TargetCard target = new TargetCard(0, 1, Zone.ALL, StaticFilters.FILTER_CARD_CREATURE);
+        target.withNotTarget(true);
+        player.choose(Outcome.PutCreatureInPlay, cards, target, source, game);
+        player.moveCards(
+                game.getCard(target.getFirstTarget()), Zone.BATTLEFIELD, source,
+                game, true, false, false, null
+        );
+        return true;
+    }
+}

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

@@ -0,0 +1,58 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.MyTurnCondition;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.effects.keyword.EarthbendTargetEffect;
+import mage.abilities.keyword.HexproofAbility;
+import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.target.common.TargetControlledLandPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AvatarKyoshiEarthbender extends CardImpl {
+
+    public AvatarKyoshiEarthbender(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{G}{G}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.AVATAR);
+        this.power = new MageInt(6);
+        this.toughness = new MageInt(6);
+
+        // During your turn, Avatar Kyoshi has hexproof.
+        this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
+                new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield),
+                MyTurnCondition.instance, "during your turn, {this} has hexproof"
+        )));
+
+        // At the beginning of combat on your turn, earthbend 8, then untap that land.
+        Ability ability = new BeginningOfCombatTriggeredAbility(new EarthbendTargetEffect(8, false));
+        ability.addEffect(new UntapTargetEffect().setText(", then untap that land"));
+        ability.addTarget(new TargetControlledLandPermanent());
+        this.addAbility(ability);
+    }
+
+    private AvatarKyoshiEarthbender(final AvatarKyoshiEarthbender card) {
+        super(card);
+    }
+
+    @Override
+    public AvatarKyoshiEarthbender copy() {
+        return new AvatarKyoshiEarthbender(this);
+    }
+}

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

@@ -0,0 +1,108 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.Mana;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AvatarRokuFirebender extends CardImpl {
+
+    public AvatarRokuFirebender(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}{R}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.AVATAR);
+        this.power = new MageInt(6);
+        this.toughness = new MageInt(6);
+
+        // Whenever a player attacks, add six {R}. Until end of combat, you don't lose this mana as steps end.
+        this.addAbility(new AvatarRokuFirebenderTriggeredAbility());
+
+        // {R}{R}{R}: Target creature gets +3/+0 until end of turn.
+        Ability ability = new SimpleActivatedAbility(
+                new BoostTargetEffect(3, 0), new ManaCostsImpl<>("{R}{R}{R}")
+        );
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+    }
+
+    private AvatarRokuFirebender(final AvatarRokuFirebender card) {
+        super(card);
+    }
+
+    @Override
+    public AvatarRokuFirebender copy() {
+        return new AvatarRokuFirebender(this);
+    }
+}
+
+class AvatarRokuFirebenderTriggeredAbility extends TriggeredAbilityImpl {
+
+    AvatarRokuFirebenderTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new AvatarRokuFirebenderEffect());
+        setTriggerPhrase("Whenever a player attacks, ");
+    }
+
+    private AvatarRokuFirebenderTriggeredAbility(final AvatarRokuFirebenderTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public AvatarRokuFirebenderTriggeredAbility copy() {
+        return new AvatarRokuFirebenderTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.DECLARED_ATTACKERS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        return !game.getCombat().getAttackers().isEmpty();
+    }
+}
+
+class AvatarRokuFirebenderEffect extends OneShotEffect {
+
+    AvatarRokuFirebenderEffect() {
+        super(Outcome.Benefit);
+        staticText = "add six {R}. Until end of combat, you don't lose this mana as steps end";
+    }
+
+    private AvatarRokuFirebenderEffect(final AvatarRokuFirebenderEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AvatarRokuFirebenderEffect copy() {
+        return new AvatarRokuFirebenderEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player == null) {
+            return false;
+        }
+        player.getManaPool().addMana(Mana.RedMana(6), game, source, Duration.EndOfCombat);
+        return true;
+    }
+}

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

@@ -0,0 +1,114 @@
+package mage.cards.a;
+
+import mage.abilities.Ability;
+import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.ExileSpellEffect;
+import mage.abilities.effects.keyword.AirbendTargetEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.filter.StaticFilters;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTargets;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AvatarsWrath extends CardImpl {
+
+    public AvatarsWrath(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{W}{W}");
+
+        // Choose up to one target creature, then airbend all other creatures.
+        this.getSpellAbility().addEffect(new AvatarsWrathAirbendEffect());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 1));
+
+        // Until your next turn, your opponents can't cast spells from anywhere other than their hand.
+        this.getSpellAbility().addEffect(new AvatarsWrathRuleEffect());
+
+        // Exile Avatar's Wrath.
+        this.getSpellAbility().addEffect(new ExileSpellEffect().concatBy("<br>"));
+    }
+
+    private AvatarsWrath(final AvatarsWrath card) {
+        super(card);
+    }
+
+    @Override
+    public AvatarsWrath copy() {
+        return new AvatarsWrath(this);
+    }
+}
+
+class AvatarsWrathAirbendEffect extends OneShotEffect {
+
+    AvatarsWrathAirbendEffect() {
+        super(Outcome.Benefit);
+        staticText = "choose up to one target creature, then airbend all other creatures";
+    }
+
+    private AvatarsWrathAirbendEffect(final AvatarsWrathAirbendEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AvatarsWrathAirbendEffect copy() {
+        return new AvatarsWrathAirbendEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        List<Permanent> permanents = game
+                .getBattlefield()
+                .getActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), source, game);
+        Optional.ofNullable(game.getPermanent(getTargetPointer().getFirst(game, source)))
+                .ifPresent(permanents::remove);
+        return !permanents.isEmpty()
+                && new AirbendTargetEffect()
+                .setTargetPointer(new FixedTargets(permanents, game))
+                .apply(game, source);
+    }
+}
+
+class AvatarsWrathRuleEffect extends ContinuousRuleModifyingEffectImpl {
+
+    AvatarsWrathRuleEffect() {
+        super(Duration.UntilYourNextTurn, Outcome.Benefit);
+        staticText = "<br>Until your next turn, your opponents can't cast spells from anywhere other than their hand.";
+    }
+
+    private AvatarsWrathRuleEffect(final AvatarsWrathRuleEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AvatarsWrathRuleEffect copy() {
+        return new AvatarsWrathRuleEffect(this);
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        if (!game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
+            return false;
+        }
+        Card card = game.getCard(event.getSourceId());
+        return card != null && game.getState().getZone(card.getId()) != Zone.HAND;
+    }
+}